l10n: es.po v2.19.0 round 2

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

diff --git a/po/es.po b/po/es.po
index a68bcd999154320e8f81a228d5e75d0768ed2b60..022ac764e090917a63e651ccea2fc67058537e76 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-06-16 22:06+0800\n"
-"PO-Revision-Date: 2018-06-16 09:57-0500\n"
+"POT-Creation-Date: 2018-09-04 08:50+0800\n"
+"PO-Revision-Date: 2018-09-06 04:25-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.0.7\n"
+"X-Generator: Poedit 2.1.1\n"

 
 

-#: advice.c:92
+#: advice.c:97

 #, 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:137
+#: advice.c:150

 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:139
+#: advice.c:152

 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:141
+#: advice.c:154

 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:143
+#: advice.c:156

 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:145
+#: advice.c:158

 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:147
+#: advice.c:160

 #, 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:155
+#: advice.c:168

 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:163
+#: advice.c:176

 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:168 builtin/merge.c:1250
+#: advice.c:181 builtin/merge.c:1286

 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:170
+#: advice.c:183

 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:171
+#: advice.c:184

 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:177
+#: advice.c:190

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


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

-#: apply.c:58
+#: apply.c:59

 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opción de espacios en blanco no reconocida '%s'"
 
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opción de espacios en blanco no reconocida '%s'"
 

-#: apply.c:74
+#: apply.c:75

 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
 
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
 

-#: apply.c:122
+#: apply.c:125

 msgid "--reject and --3way cannot be used together."
 msgstr "--reject y --3way no se pueden utilizar juntas."
 
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject y --3way no se pueden utilizar juntas."
 

-#: apply.c:124
+#: apply.c:127

 msgid "--cached and --3way cannot be used together."
 msgstr "--cached y --3way no se pueden utilizar juntas."
 
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached y --3way no se pueden utilizar juntas."
 

-#: apply.c:127
+#: apply.c:130

 msgid "--3way outside a repository"
 msgstr "--3way está fuera de un repositorio"
 
 msgid "--3way outside a repository"
 msgstr "--3way está fuera de un repositorio"
 

-#: apply.c:138
+#: apply.c:141

 msgid "--index outside a repository"
 msgstr "--index está fuera de un repositorio"
 
 msgid "--index outside a repository"
 msgstr "--index está fuera de un repositorio"
 

-#: apply.c:141
+#: apply.c:144

 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:821
+#: apply.c:826

 #, 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:830
+#: apply.c:835

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

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

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

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

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

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

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

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

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

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

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

 #, 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:1301
+#: 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:1473
+#: 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:1542
+#: 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:1562
+#: 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 +209,83 @@ msgstr[1] ""
 "los headers de git diff carecen de información de los nombres de los "
 "archivos %d cuando los remueven de la ruta principal componentes (línea %d)"
 
 "los headers de git diff carecen de información de los nombres de los "
 "archivos %d cuando los remueven de la ruta principal componentes (línea %d)"
 

-#: apply.c:1575
+#: 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:1763
+#: 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:1765
+#: 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:1799
+#: 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:1836
+#: 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:1838
+#: 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:1841
+#: apply.c:1846

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

-#: apply.c:1988
+#: 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:2025
+#: 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:2185
+#: apply.c:2190

 #, 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:2271
+#: apply.c:2276

 #, 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:2275
+#: apply.c:2280

 #, 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:2934
+#: apply.c:2939

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

-#: apply.c:3055
+#: apply.c:3060

 #, 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:3067
+#: apply.c:3072

 #, 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:3073
+#: apply.c:3078

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


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

-#: apply.c:3095
+#: apply.c:3100

 #, 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:3103
+#: apply.c:3108

 #, 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:3149
+#: apply.c:3154

 #, 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:3159
+#: apply.c:3164

 #, 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,288 +318,288 @@ 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:3167
+#: apply.c:3172

 #, 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:3185
+#: apply.c:3190

 #, 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:3198
+#: apply.c:3203

 #, 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:3204
+#: apply.c:3209

 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
 "obtuvo %s)"
 
 #, 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:3225
+#: apply.c:3230

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

-#: apply.c:3347
+#: apply.c:3352

 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 

-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
+#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

 #, c-format
 msgid "failed to read %s"
 msgstr "no se pudo leer %s"
 
 #, c-format
 msgid "failed to read %s"
 msgstr "no se pudo leer %s"
 

-#: apply.c:3404
+#: apply.c:3412

 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbólico"
 
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbólico"
 

-#: apply.c:3433 apply.c:3673
+#: apply.c:3441 apply.c:3681

 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "la ruta %s ha sido renombrada/suprimida"
 
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "la ruta %s ha sido renombrada/suprimida"
 

-#: apply.c:3516 apply.c:3687
+#: apply.c:3524 apply.c:3696

 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el índice"
 
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el índice"
 

-#: apply.c:3525 apply.c:3695
+#: apply.c:3533 apply.c:3704

 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no concuerda con el índice"
 
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no concuerda con el índice"
 

-#: apply.c:3560
+#: apply.c:3568

 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "el repositorio carece del blob necesario para regresar en un merge de tres-"
 "vías."
 
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "el repositorio carece del blob necesario para regresar en un merge de tres-"
 "vías."
 

-#: apply.c:3563
+#: apply.c:3571

 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retrocediendo en un merge de tres-vías...\n"
 
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retrocediendo en un merge de tres-vías...\n"
 

-#: apply.c:3579 apply.c:3583
+#: apply.c:3587 apply.c:3591

 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no se pueden leer los contenidos actuales de '%s'"
 
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no se pueden leer los contenidos actuales de '%s'"
 

-#: apply.c:3595
+#: apply.c:3603

 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Falló el merge en retroceso de tres-vías...\n"
 
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Falló el merge en retroceso de tres-vías...\n"
 

-#: apply.c:3609
+#: apply.c:3617

 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 

-#: apply.c:3614
+#: apply.c:3622

 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 

-#: apply.c:3640
+#: apply.c:3648

 msgid "removal patch leaves file contents"
 msgstr "parche de remoción deja contenidos en el archivo"
 
 msgid "removal patch leaves file contents"
 msgstr "parche de remoción deja contenidos en el archivo"
 

-#: apply.c:3712
+#: apply.c:3721

 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 

-#: apply.c:3714
+#: apply.c:3723

 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 

-#: apply.c:3864 apply.c:3866
+#: apply.c:3874 apply.c:3876

 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta invalida '%s'"
 
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta invalida '%s'"
 

-#: apply.c:3922
+#: apply.c:3932

 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el índice"
 
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el índice"
 

-#: apply.c:3925
+#: apply.c:3935

 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 

-#: apply.c:3945
+#: apply.c:3955

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
 

-#: apply.c:3950
+#: apply.c:3960

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
 

-#: apply.c:3970
+#: apply.c:3980

 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' esta tras un enlace simbólico"
 
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' esta tras un enlace simbólico"
 

-#: apply.c:3974
+#: apply.c:3984

 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 

-#: apply.c:3989
+#: apply.c:3999

 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 

-#: apply.c:4080
+#: apply.c:4091

 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta información del sha1 o es inútil para el submódulo %s"
 
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta información del sha1 o es inútil para el submódulo %s"
 

-#: apply.c:4087
+#: apply.c:4098

 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 

-#: apply.c:4090
+#: apply.c:4101

 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 

-#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
+#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

 #, 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'"
 

-#: apply.c:4099
+#: apply.c:4110

 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no se pudo añadir %s al índice temporal"
 
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no se pudo añadir %s al índice temporal"
 

-#: apply.c:4109
+#: apply.c:4120

 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un índice temporal para %s"
 
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un índice temporal para %s"
 

-#: apply.c:4247
+#: apply.c:4258

 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede remover %s del índice"
 
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede remover %s del índice"
 

-#: apply.c:4282
+#: apply.c:4292

 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submódulo %s"
 
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submódulo %s"
 

-#: apply.c:4288
+#: apply.c:4298

 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no es posible establecer el archivo recién creado '%s'"
 
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no es posible establecer el archivo recién creado '%s'"
 

-#: apply.c:4296
+#: apply.c:4306

 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no es posible crear una copia de seguridad para el archivo recién creado %s"
 
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no es posible crear una copia de seguridad para el archivo recién creado %s"
 

-#: apply.c:4302 apply.c:4446
+#: apply.c:4312 apply.c:4457

 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no es posible agregar una entrada en el cache para %s"
 
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no es posible agregar una entrada en el cache para %s"
 

-#: apply.c:4343
+#: apply.c:4355

 #, c-format
 msgid "failed to write to '%s'"
 msgstr "falló escribir para '%s'"
 
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "falló escribir para '%s'"
 

-#: apply.c:4347
+#: apply.c:4359

 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 
 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 

-#: apply.c:4417
+#: apply.c:4429

 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no es posible escribir el archivo '%s' modo %o"
 
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no es posible escribir el archivo '%s' modo %o"
 

-#: apply.c:4515
+#: apply.c:4527

 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 

-#: apply.c:4523
+#: apply.c:4535

 msgid "internal error"
 msgstr "error interno"
 
 msgid "internal error"
 msgstr "error interno"
 

-#: apply.c:4526
+#: apply.c:4538

 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Aplicando parche %%s con %d rechazo..."
 msgstr[1] "Aplicando parche %%s con %d rechazos..."
 
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Aplicando parche %%s con %d rechazo..."
 msgstr[1] "Aplicando parche %%s con %d rechazos..."
 

-#: apply.c:4537
+#: apply.c:4549

 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 

-#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
+#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

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

-#: apply.c:4559
+#: apply.c:4571

 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 

-#: apply.c:4563
+#: apply.c:4575

 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 

-#: apply.c:4673
+#: apply.c:4685

 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 

-#: apply.c:4681
+#: apply.c:4693

 msgid "unrecognized input"
 msgstr "input no reconocido"
 
 msgid "unrecognized input"
 msgstr "input no reconocido"
 

-#: apply.c:4700
+#: apply.c:4712

 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:4837
+#: apply.c:4849

 #, 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:4864
+#: apply.c:4876

 #, 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:4870 apply.c:4885
+#: apply.c:4882 apply.c:4897

 #, 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:4878
+#: apply.c:4890

 #, 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,260 +608,314 @@ 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:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

 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:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
-#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
-#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
-#: git-add--interactive.perl:197
+#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
+#: builtin/pull.c:198 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

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

-#: apply.c:4922
+#: apply.c:4934

 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:4925
+#: apply.c:4937

 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:4927 builtin/am.c:2263
+#: apply.c:4939 builtin/am.c:2263

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

-#: apply.c:4928
+#: apply.c:4940

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

-#: apply.c:4931
+#: apply.c:4943

 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:4933
+#: apply.c:4945

 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:4937
+#: apply.c:4949

 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:4939
+#: apply.c:4951

 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:4941
+#: apply.c:4953

 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:4943
+#: apply.c:4955

 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:4945
+#: apply.c:4957
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "marca los nuevos archivos con `git add --intent-to-add`"
+
+#: apply.c:4959

 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:4947
+#: apply.c:4961

 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:4950
+#: apply.c:4964

 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:4952
+#: apply.c:4966

 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:4954
+#: apply.c:4968

 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:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

 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:4959
+#: apply.c:4973

 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:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
+#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

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

-#: builtin/pack-objects.c:3177
+#: builtin/pack-objects.c:3202

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

-#: apply.c:4961
+#: apply.c:4975

 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:4964 apply.c:4967
+#: apply.c:4978 apply.c:4981

 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:4970
+#: apply.c:4984

 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:4972
+#: apply.c:4986

 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:4974
+#: apply.c:4988

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

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

-#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
-#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
+#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
+#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

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

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

 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:4982
+#: apply.c:4996

 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:4984 builtin/am.c:2251
+#: apply.c:4998 builtin/am.c:2251

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

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

 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"
 

-#: archive.c:13
+#: archive.c:14

 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
 
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
 

-#: archive.c:14
+#: archive.c:15

 msgid "git archive --list"
 msgstr "git archive --list"
 
 msgid "git archive --list"
 msgstr "git archive --list"
 

-#: archive.c:15
+#: archive.c:16

 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"
 "árbol> [<ruta>...]"
 
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"
 "árbol> [<ruta>...]"
 

-#: archive.c:16
+#: archive.c:17

 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:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

 #, 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:434
+#: archive.c:446

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

-#: archive.c:434
+#: archive.c:446

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

-#: archive.c:435 builtin/log.c:1462
+#: archive.c:447 builtin/log.c:1473

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

-#: archive.c:436
+#: archive.c:448

 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:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
-#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
+#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
+#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
+#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

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

-#: archive.c:438 builtin/archive.c:89
+#: archive.c:450 builtin/archive.c:89

 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:440
+#: archive.c:452

 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:441
+#: archive.c:453

 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:442
+#: archive.c:454

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

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

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

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

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

-#: archive.c:454
+#: archive.c:466

 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:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
+#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

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

-#: archive.c:457 builtin/archive.c:91
+#: archive.c:469 builtin/archive.c:91

 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:458 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:491

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

-#: archive.c:459 builtin/archive.c:93
+#: archive.c:471 builtin/archive.c:93

 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:466
+#: archive.c:478

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

-#: archive.c:468
+#: archive.c:480

 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:470
+#: archive.c:482

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

-#: archive.c:492
+#: archive.c:504

 #, 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:499
+#: archive.c:511

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

+#: archive-tar.c:125 archive-zip.c:344
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "no se puede transmitir el blob %s"
+
+#: archive-tar.c:260 archive-zip.c:361
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
+
+#: archive-tar.c:287 archive-zip.c:352
+#, c-format
+msgid "cannot read %s"
+msgstr "no se puede leer %s"
+
+#: archive-tar.c:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no se puede comenzar filtro '%s'"
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr "incapaz de redirigir descriptor"
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtro '%s' reportó un error"
+
+#: archive-zip.c:313
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "ruta no válida UTF-8: %s"
+
+#: archive-zip.c:317
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
+
+#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#, c-format
+msgid "deflate error (%d)"
+msgstr "error al desinflar (%d)"
+
+#: archive-zip.c:605
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
+

 #: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"
 #: attr.c:218
 #, c-format
 msgid "%.*s is not a valid attribute name"


@@ -875,22 +929,22 @@ msgstr ""
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 

-#: bisect.c:461
+#: bisect.c:467

 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 

-#: bisect.c:669
+#: bisect.c:675

 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podemos bisecar mas!\n"
 
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podemos bisecar mas!\n"
 

-#: bisect.c:723
+#: bisect.c:729

 #, 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:747
+#: bisect.c:753

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


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

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

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


@@ -908,7 +962,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:757
+#: bisect.c:763

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


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

-#: bisect.c:765
+#: bisect.c:771

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


@@ -928,7 +982,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:778
+#: bisect.c:784

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


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

-#: bisect.c:811
+#: bisect.c:817

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

-#: bisect.c:851
+#: bisect.c:857

 #, 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:870 builtin/notes.c:175 builtin/tag.c:236
+#: bisect.c:876 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:921
+#: bisect.c:927 builtin/merge.c:137

 #, 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:951
+#: bisect.c:957

 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:970
+#: bisect.c:976

 #, 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:978
+#: bisect.c:984

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


@@ -977,7 +1031,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:997
+#: bisect.c:1003

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


@@ -987,51 +1041,52 @@ 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:1003
+#: bisect.c:1009

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

-#: blame.c:1756
+#: blame.c:1784

 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:1767
+#: blame.c:1798

 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:1787
+#: blame.c:1819

 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:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
-#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
+#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
+#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
+#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
+#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

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

-#: blame.c:1814
+#: blame.c:1846

 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:1825
+#: blame.c:1857

 #, 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:1836
+#: blame.c:1868

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

-#: branch.c:54
+#: branch.c:52

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


@@ -1044,97 +1099,97 @@ msgstr ""
 "la infamación del rastreo remoto invocando\n"
 "\"git branch --set-upstream-to=%s%s%s\"."
 
 "la infamación del rastreo remoto invocando\n"
 "\"git branch --set-upstream-to=%s%s%s\"."
 

-#: branch.c:68
+#: branch.c:66

 #, c-format
 msgid "Not setting branch %s as its own upstream."
 msgstr "La rama %s no se configura como su propio upstream."
 
 #, c-format
 msgid "Not setting branch %s as its own upstream."
 msgstr "La rama %s no se configura como su propio upstream."
 

-#: branch.c:94
+#: branch.c:92

 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
 "por rebase."
 
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
 "por rebase."
 

-#: branch.c:95
+#: branch.c:93

 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
 
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
 

-#: branch.c:99
+#: branch.c:97

 #, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
 
 #, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
 

-#: branch.c:100
+#: branch.c:98

 #, c-format
 msgid "Branch '%s' set up to track local branch '%s'."
 msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
 
 #, c-format
 msgid "Branch '%s' set up to track local branch '%s'."
 msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
 

-#: branch.c:105
+#: branch.c:103

 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
 "rebase."
 
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
 "rebase."
 

-#: branch.c:106
+#: branch.c:104

 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
 
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
 

-#: branch.c:110
+#: branch.c:108

 #, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
 "rebase."
 
 #, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
 "rebase."
 

-#: branch.c:111
+#: branch.c:109

 #, c-format
 msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
 
 #, c-format
 msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
 

-#: branch.c:120
+#: branch.c:118

 msgid "Unable to write upstream branch configuration"
 msgstr "No es posible escribir la configuración de la rama upstream"
 
 msgid "Unable to write upstream branch configuration"
 msgstr "No es posible escribir la configuración de la rama upstream"
 

-#: branch.c:157
+#: branch.c:155

 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr "No rastreando: información ambigua para la referencia %s"
 
 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr "No rastreando: información ambigua para la referencia %s"
 

-#: branch.c:190
+#: branch.c:188

 #, c-format
 msgid "'%s' is not a valid branch name."
 msgstr "'%s' no es un nombre valido de rama."
 
 #, c-format
 msgid "'%s' is not a valid branch name."
 msgstr "'%s' no es un nombre valido de rama."
 

-#: branch.c:209
+#: branch.c:207

 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr "Una rama llamada '%s' ya existe."
 
 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr "Una rama llamada '%s' ya existe."
 

-#: branch.c:214
+#: branch.c:212

 msgid "Cannot force update the current branch."
 msgstr "No se puede forzar la actualización de la rama actual."
 
 msgid "Cannot force update the current branch."
 msgstr "No se puede forzar la actualización de la rama actual."
 

-#: branch.c:234
+#: branch.c:232

 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "No se puede configurar el rastreo de información; el punto de partida '%s' "
 "no es una rama."
 
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 "No se puede configurar el rastreo de información; el punto de partida '%s' "
 "no es una rama."
 

-#: branch.c:236
+#: branch.c:234

 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la rama de upstream solicitada '%s' no existe"
 
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la rama de upstream solicitada '%s' no existe"
 

-#: branch.c:238
+#: branch.c:236

 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"


@@ -1155,100 +1210,100 @@ 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:281
+#: branch.c:279

 #, 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:301
+#: branch.c:299

 #, 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:306
+#: branch.c:304

 #, 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:360
+#: branch.c:358

 #, 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:383
+#: branch.c:381

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

-#: bundle.c:34
+#: bundle.c:36

 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' no se ve como un archivo bundle v2"
 
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' no se ve como un archivo bundle v2"
 

-#: bundle.c:62
+#: bundle.c:64

 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 

-#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
+#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

 #, 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:139
+#: bundle.c:141

 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:190
+#: bundle.c:192

 #, 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:197
+#: bundle.c:199

 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:199
+#: bundle.c:201

 #, 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:258
+#: bundle.c:260

 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:269
+#: bundle.c:271

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

-#: bundle.c:311
+#: bundle.c:313

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

-#: bundle.c:360
+#: bundle.c:362

 #, 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:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
+#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

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

-#: bundle.c:458
+#: bundle.c:461

 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:470
+#: bundle.c:473

 #, 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:501

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


@@ -1257,19 +1312,19 @@ 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:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
+#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
+#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
 
 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
 

-#: commit.c:45
+#: commit.c:50

 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s no es un commit!"
 
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s no es un commit!"
 

-#: commit.c:182
+#: commit.c:191

 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"


@@ -1289,7 +1344,7 @@ msgstr ""
 "Apapa este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 
 "Apapa este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 

-#: commit.c:1540
+#: commit.c:1629

 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"


@@ -1300,188 +1355,396 @@ 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:669
+#: commit-graph.c:83
+#, c-format
+msgid "graph file %s is too small"
+msgstr "archivo graph %s es muy pequeño"
+
+#: commit-graph.c:90
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr "firma de graph %X no concuerda con firma %X"
+
+#: commit-graph.c:97
+#, 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:104
+#, 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:128
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr "offset del chunk impropio %08x%08x"
+
+#: commit-graph.c:164
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr "id de chunk %08x parece tener múltiples tiempos"
+
+#: commit-graph.c:261
+#, c-format
+msgid "could not find commit %s"
+msgstr "no se pudo encontrar commit %s"
+
+#: commit-graph.c:565 builtin/pack-objects.c:2568
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "incapaz de obtener el tipo de objeto: %s"
+
+#: commit-graph.c:730
+#, c-format
+msgid "error adding pack %s"
+msgstr "error agregando pack %s"
+
+#: commit-graph.c:732
+#, c-format
+msgid "error opening index for %s"
+msgstr "error abriendo index para %s"
+
+#: commit-graph.c:773

 #, 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:696
+#: commit-graph.c:800

 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:707 builtin/init-db.c:516 builtin/init-db.c:521
+#: commit-graph.c:806

 #, c-format
 #, c-format

-msgid "cannot mkdir %s"
-msgstr "no se pude crear directorio %s"
+msgid "unable to create leading directories of %s"
+msgstr "no se pudo crear directorios principales para %s"
+
+#: commit-graph.c:904
+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"

 
 #: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
 
 #: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
 msgstr "memoria agotada"
 

-#: config.c:187
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"profundidad máxima de inclusión excedida (%d) mientras se incluía\n"
+"\t%s\n"
+"de\n"
+"\t%s\n"
+"Esto puede ser causado por inclusiones circulares."
+
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "no se pudo expandir rutas de inclusión '%s'"
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr "inclusiones de configuración relativas tienen que venir de archivos"
+
+#: config.c:190

 msgid "relative config include conditionals must come from files"
 msgstr ""
 "la configuración relativa incluye condicionales que deben venir de archivos"
 
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "la configuración relativa incluye condicionales que deben venir de archivos"
 

-#: config.c:788
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "llave no contiene una sección: %s"
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "llave no contiene el nombre de variable: %s"
+
+#: config.c:378 sequencer.c:2206
+#, c-format
+msgid "invalid key: %s"
+msgstr "llave invalida: %s"
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "llave inválida (nueva línea): %s"
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parámetro de configuración malogrado: %s"
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr "formato malogrado en %s"
+
+#: config.c:793

 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "mala línea de config %d en el blob %s"
 
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "mala línea de config %d en el blob %s"
 

-#: config.c:792
+#: config.c:797

 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "mala línea de config %d en el archivo %s"
 
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "mala línea de config %d en el archivo %s"
 

-#: config.c:796
+#: config.c:801

 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "mala línea de config %d en la entrada standard"
 
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "mala línea de config %d en la entrada standard"
 

-#: config.c:800
+#: config.c:805

 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "mala línea de config %d en el submódulo-blob %s"
 
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "mala línea de config %d en el submódulo-blob %s"
 

-#: config.c:804
+#: config.c:809

 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "mala línea de config %d en la línea de comando %s"
 
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "mala línea de config %d en la línea de comando %s"
 

-#: config.c:808
+#: config.c:813

 #, c-format
 msgid "bad config line %d in %s"
 msgstr "mala línea de config %d en %s"
 
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "mala línea de config %d en %s"
 

-#: config.c:936
+#: config.c:952

 msgid "out of range"
 msgstr "fuera de rango"
 
 msgid "out of range"
 msgstr "fuera de rango"
 

-#: config.c:936
+#: config.c:952

 msgid "invalid unit"
 msgstr "unidad invalida"
 
 msgid "invalid unit"
 msgstr "unidad invalida"
 

-#: config.c:942
+#: config.c:958

 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "mal valor de config numérica '%s' para '%s': %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "mal valor de config numérica '%s' para '%s': %s"
 

-#: config.c:947
+#: config.c:963

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
 

-#: config.c:950
+#: config.c:966

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
 

-#: config.c:953
+#: config.c:969

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
 

-#: config.c:956
+#: config.c:972

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
 

-#: config.c:959
+#: config.c:975

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
 

-#: config.c:962
+#: config.c:978

 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
 
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
 

-#: config.c:1057
+#: config.c:1073

 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "falló al expandir el directorio de usuario en: '%s'"
 
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "falló al expandir el directorio de usuario en: '%s'"
 

-#: config.c:1066
+#: config.c:1082

 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' para '%s' no es una marca de tiempo válida"
 
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' para '%s' no es una marca de tiempo válida"
 

-#: config.c:1171 config.c:1182
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "largo de abreviatura fuera de rango: %d"
+
+#: config.c:1187 config.c:1198

 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mala compresión zlib en nivel %d"
 
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mala compresión zlib en nivel %d"
 

-#: config.c:1307
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar debería tener solo un caracter"
+
+#: config.c:1323

 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo invalido de creación de objetos: %s"
 
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo invalido de creación de objetos: %s"
 

-#: config.c:1473
+#: config.c:1403
+#, c-format
+msgid "malformed value for %s"
+msgstr "valor malformado para %s"
+
+#: config.c:1429
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valor malformado para %s: %s"
+
+#: config.c:1430
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "debe ser uno de nothing, matching, simple, upstream o current"
+
+#: config.c:1489 builtin/pack-objects.c:3279

 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mala compresión pack en el nivel %d"
 
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mala compresión pack en el nivel %d"
 

-#: config.c:1681
+#: config.c:1610
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "incapaz de cargar configuración de objeto blob '%s'"
+
+#: config.c:1613
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referencia '%s' no apunta a un blob"
+
+#: config.c:1630
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "no se posible resolver configuración de blob '%s'"
+
+#: config.c:1660
+#, c-format
+msgid "failed to parse %s"
+msgstr "no se pudo analizar %s"
+
+#: config.c:1700

 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuración de la línea de comando"
 
 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuración de la línea de comando"
 

-#: config.c:2013
+#: config.c:2032

 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurrió mientras se leían los archivos de configuración"
 
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurrió mientras se leían los archivos de configuración"
 

-#: config.c:2200
+#: config.c:2202

 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Invalido %s: '%s'"
 
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Invalido %s: '%s'"
 

-#: config.c:2243
+#: config.c:2245

 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
 "defecto"
 
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
 "defecto"
 

-#: config.c:2269
+#: config.c:2271

 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
 
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
 

-#: config.c:2294
+#: config.c:2296

 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
 
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
 

-#: config.c:2296
+#: config.c:2298

 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
 
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
 

-#: config.c:2402
+#: config.c:2379
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nombre de sección inválido '%s'"
+
+#: config.c:2411

 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene múltiples valores"
 
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene múltiples valores"
 

-#: config.c:2766 config.c:3019
+#: config.c:2440
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "falló al escribir nuevo archivo de configuración %s"
+
+#: config.c:2691 config.c:3015
+#, c-format
+msgid "could not lock config file %s"
+msgstr "no se pudo bloquear archivo de configuración %s"
+
+#: config.c:2702
+#, c-format
+msgid "opening %s"
+msgstr "abriendo %s"
+
+#: config.c:2737 builtin/config.c:324
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "patrón inválido: %s"
+
+#: config.c:2762
+#, c-format
+msgid "invalid config file %s"
+msgstr "archivo de configuración inválido: %s"
+
+#: config.c:2775 config.c:3028

 #, 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:2905
+#: config.c:2786
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "no es posible hacer mmap '%s'"
+
+#: config.c:2795 config.c:3033
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod en %s falló"
+
+#: config.c:2880 config.c:3130
+#, c-format
+msgid "could not write config file %s"
+msgstr "no se pudo escribir el archivo de configuración %s"
+
+#: config.c:2914

 #, 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:2907 builtin/remote.c:779
+#: config.c:2916 builtin/remote.c:781

 #, 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:3006
+#, c-format
+msgid "invalid section name: %s"
+msgstr "sección de nombre inválida: %s"
+
+#: config.c:3173
+#, c-format
+msgid "missing value for '%s'"
+msgstr "valor faltante para '%s'"
+

 #: connect.c:61
 #: connect.c:61

-msgid "The remote end hung up upon initial contact"
-msgstr "El remoto se colgó en el contacto inicial"
+msgid "the remote end hung up upon initial contact"
+msgstr "el remoto se colgó en el contacto inicial"

 
 #: connect.c:63
 msgid ""
 
 #: connect.c:63
 msgid ""


@@ -1495,58 +1758,212 @@ msgstr ""
 "Por favor asegúrese que tiene los permisos de acceso correctos\n"
 "y que el repositorio existe."
 
 "Por favor asegúrese que tiene los permisos de acceso correctos\n"
 "y que el repositorio existe."
 

-#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "servidor no soporta '%s'"
+
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "servidor no soporta feature '%s'"
+
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr "se espera flush tras capacidades"
+
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignorando capacidades tras primera línea '%s'"
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "error de protocolo: capacidades imprevistas^{}"
+
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
+
+#: connect.c:275
+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:183 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+#: connect.c:316
+msgid "invalid packet"
+msgstr "paquete inválido"
+
+#: connect.c:336
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "error de protocolo: '%s' inesperado"
+
+#: connect.c:444
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "respuesta de referencias ls-refs inválida: %s"
+
+#: connect.c:448
+msgid "expected flush after ref listing"
+msgstr "flush esperado tras listado de refs"
+
+#: connect.c:547
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protocolo '%s' no es soportado"
+
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "no es posible configurar SO_KEEPALIVE en el socket"
+
+#: connect.c:638 connect.c:701
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Revisando %s... "
+
+#: connect.c:642
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"hecho.\n"
+"Conectando a %s (puerto %s) ... "
+
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"no es posible conectar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
+msgstr "hecho."
+
+#: connect.c:705
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "no es posible revisar %s (%s)"
+
+#: connect.c:711
+#, c-format
+msgid "unknown port %s"
+msgstr "puerto desconocido %s"
+
+#: connect.c:848 connect.c:1174
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "hostname extraño '%s' bloqueado"
+
+#: connect.c:850
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "puerto extraño '%s' bloqueado"
+
+#: connect.c:860
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "no se puede comenzar proxy %s"
+
+#: connect.c:927
+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
+msgid "ssh variant 'simple' does not support -4"
+msgstr "variante 'simple' de ssh no soporta -4"
+
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
+msgstr "variante 'simple' de ssh no soporta -6"
+
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "variante ssh 'simple' no soporta configurar puerto"
+
+#: connect.c:1262
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "ruta extraña '%s' bloqueada"
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr "no es posible hacer fork"
+
+#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

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

-#: connected.c:78
+#: connected.c:80

 msgid "Could not run 'git rev-list'"
 msgstr "No se pudo correr 'git rev-list'"
 
 msgid "Could not run 'git rev-list'"
 msgstr "No se pudo correr 'git rev-list'"
 

-#: connected.c:98
+#: connected.c:100

 msgid "failed write to rev-list"
 msgstr "falló escribir a rev-list"
 
 msgid "failed write to rev-list"
 msgstr "falló escribir a rev-list"
 

-#: connected.c:105
+#: connected.c:107

 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:206
+#: convert.c:194

 #, c-format
 #, c-format

-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF será reemplazado por LF en %s."
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d ilegal"

 
 

-#: convert.c:208
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF será reemplazado por LF en %s"
+
+#: convert.c:209

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

-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"

 msgstr ""
 "CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
 msgstr ""
 "CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 

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

 #, 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:218
+#: convert.c:219

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

-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"

 msgstr ""
 "LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
 msgstr ""
 "LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 

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

 #, 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:286
+#: convert.c:287

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


@@ -1555,12 +1972,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:304
+#: convert.c:305

 #, 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:306
+#: convert.c:307

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


@@ -1569,20 +1986,72 @@ 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:424
+#: convert.c:425 convert.c:496

 #, 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:467
+#: convert.c:468

 #, 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:1225
+#: convert.c:674
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "No se puede hacer fork para ejecutar filtros externos '%s'"
+
+#: convert.c:694
+#, 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
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "filtro externo '%s' falló %d"
+
+#: convert.c:736 convert.c:739
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "lectura de filtro externo '%s' falló"
+
+#: convert.c:742 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "filtro externo '%s' falló"
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr "tipo de filtro inesperado"
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr "nombre de ruta muy largo para filtro externo"
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
+"filtradas"
+
+#: convert.c:1228

 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false no son working-tree-encodings válidos"
 
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false no son working-tree-encodings válidos"
 

+#: convert.c:1402 convert.c:1436
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: falló al limpiar filtro '%s'"
+
+#: convert.c:1480
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: filtro smudge %s falló"
+

 #: date.c:116
 msgid "in the future"
 msgstr "en el futuro"
 #: date.c:116
 msgid "in the future"
 msgstr "en el futuro"


@@ -1656,40 +2125,53 @@ msgstr[1] "hace %<PRIuMAX> años"
 msgid "failed to read orderfile '%s'"
 msgstr "falló al leer orden de archivos '%s'"
 
 msgid "failed to read orderfile '%s'"
 msgstr "falló al leer orden de archivos '%s'"
 

-#: diffcore-rename.c:535
+#: diffcore-rename.c:536

 msgid "Performing inexact rename detection"
 msgstr "Realizando una detección de cambios de nombre inexacta"
 
 msgid "Performing inexact rename detection"
 msgstr "Realizando una detección de cambios de nombre inexacta"
 

-#: diff.c:74
+#: diff.c:108

 #, c-format
 msgid "option '%s' requires a value"
 msgstr "opción '%s' requiere un valor"
 
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "opción '%s' requiere un valor"
 

-#: diff.c:152
+#: diff.c:158

 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Falló al analizar dirstat porcentaje de corte '%s'\n"
 
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Falló al analizar dirstat porcentaje de corte '%s'\n"
 

-#: diff.c:157
+#: diff.c:163

 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  parámetro '%s' de dirstat desconocido\n"
 
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  parámetro '%s' de dirstat desconocido\n"
 

-#: diff.c:281
+#: diff.c:291
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
+"'dimmed_zebra', 'plain'"
+
+#: diff.c:316
+#, c-format
+msgid "ignoring unknown color-moved-ws mode '%s'"
+msgstr "ignorando modo desconocido color-moved-ws '%s'"
+
+#: diff.c:323

 msgid ""
 msgid ""

-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"

 msgstr ""
 msgstr ""

-"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, "
-"'plain'"
+"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
+"modos de espacios en blanco"

 
 

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

 #, 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:401
+#: diff.c:454

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


@@ -1698,24 +2180,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:3823
+#: diff.c:4096

 #, 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:4153
+#: diff.c:4427

 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:4156
+#: diff.c:4430

 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:4244
+#: diff.c:4508

 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:4410
+#: diff.c:4674

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


@@ -1724,22 +2206,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:4424
+#: diff.c:4688

 #, 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:5500
+#: diff.c:5766

 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:5503
+#: diff.c:5769

 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:5506
+#: diff.c:5772

 #, 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."


@@ -1747,25 +2229,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:1867
+#: dir.c:569
+#, 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:958
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "no se puede usar %s como archivo de exclusión"
+
+#: dir.c:1873

 #, 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:2109
+#: dir.c:2115

 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:2233
-msgid "Untracked cache is disabled on this system or location."
-msgstr "Untracked cache esta desactivado en este sistema o ubicación."
+#: dir.c:2239
+msgid "untracked cache is disabled on this system or location"
+msgstr "untracked cache esta desactivado en este sistema o ubicación."
+
+#: dir.c:3037
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "archivo índice corrompido en repositorio %s"

 
 

-#: dir.c:3075 dir.c:3080
+#: dir.c:3082 dir.c:3087

 #, 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:3109
+#: dir.c:3116

 #, 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'"


@@ -1775,218 +2273,272 @@ msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
 
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
 

-#: entry.c:177
+#: entry.c:178

 msgid "Filtering content"
 msgstr "Filtrando contenido"
 
 msgid "Filtering content"
 msgstr "Filtrando contenido"
 

-#: entry.c:435
+#: entry.c:437

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

+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "ruta de namespace de git mala \"%s\""
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "no se pudo configurar GIT_DIR a '%s'"
+
+#: exec-cmd.c:361
+#, c-format
+msgid "too many args to run %s"
+msgstr "demasiados argumentos para correr %s"
+

 #: fetch-object.c:17
 msgid "Remote with no URL"
 msgstr "Remoto sin URL"
 
 #: fetch-object.c:17
 msgid "Remote with no URL"
 msgstr "Remoto sin URL"
 

-#: fetch-pack.c:254
+#: fetch-pack.c:152

 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:266
+#: fetch-pack.c:164

 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:285 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "error remoto: %s"
-
-#: fetch-pack.c:286
+#: fetch-pack.c:184

 #, 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:338
+#: fetch-pack.c:254

 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:429 fetch-pack.c:1310
+#: fetch-pack.c:342 fetch-pack.c:1257

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

-#: fetch-pack.c:435 fetch-pack.c:1316
+#: fetch-pack.c:348 fetch-pack.c:1263

 #, 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:437 fetch-pack.c:1318
+#: fetch-pack.c:350 fetch-pack.c:1265

 #, 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:440 fetch-pack.c:1321
+#: fetch-pack.c:353 fetch-pack.c:1268

 #, 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:442 fetch-pack.c:1323
+#: fetch-pack.c:355 fetch-pack.c:1270

 #, 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:445 fetch-pack.c:1326
+#: fetch-pack.c:358 fetch-pack.c:1273

 #, 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:486
+#: fetch-pack.c:399

 #, 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:500
+#: fetch-pack.c:416

 #, 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:533
+#: fetch-pack.c:447

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

-#: fetch-pack.c:543 progress.c:229
+#: fetch-pack.c:459 progress.c:229

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

-#: fetch-pack.c:555
+#: fetch-pack.c:471

 #, 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:601
+#: fetch-pack.c:517

 #, 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:828
+#: fetch-pack.c:764

 #, 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:869
+#: fetch-pack.c:803

 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:877
+#: fetch-pack.c:811

 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: mal paquete de header"
 
 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: mal paquete de header"
 

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

 #, 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:960
+#: fetch-pack.c:895

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

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

 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:989
+#: fetch-pack.c:926

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

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

 msgid "Server supports multi_ack_detailed"
 msgstr "Servidor soporta ulti_ack_detailed"
 
 msgid "Server supports multi_ack_detailed"
 msgstr "Servidor soporta ulti_ack_detailed"
 

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

 msgid "Server supports no-done"
 msgstr "Servidor soporta no-done"
 
 msgid "Server supports no-done"
 msgstr "Servidor soporta no-done"
 

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

 msgid "Server supports multi_ack"
 msgstr "Servidor soporta multi_ack"
 
 msgid "Server supports multi_ack"
 msgstr "Servidor soporta multi_ack"
 

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

 msgid "Server supports side-band-64k"
 msgstr "Servidor soporta side-band-64k"
 
 msgid "Server supports side-band-64k"
 msgstr "Servidor soporta side-band-64k"
 

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

 msgid "Server supports side-band"
 msgstr "Servidor soporta side-band"
 
 msgid "Server supports side-band"
 msgstr "Servidor soporta side-band"
 

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

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

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

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

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

 msgid "Server supports ofs-delta"
 msgstr "Servidor soporta ofs-delta"
 
 msgid "Server supports ofs-delta"
 msgstr "Servidor soporta ofs-delta"
 

-#: fetch-pack.c:1034 fetch-pack.c:1204
+#: fetch-pack.c:971 fetch-pack.c:1150

 msgid "Server supports filter"
 msgstr "Servidor soporta filtro"
 
 msgid "Server supports filter"
 msgstr "Servidor soporta filtro"
 

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

 #, 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:1048
+#: fetch-pack.c:985

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

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

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

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

 msgid "Server does not support --deepen"
 msgstr "Servidor no soporta --deepen"
 
 msgid "Server does not support --deepen"
 msgstr "Servidor no soporta --deepen"
 

-#: fetch-pack.c:1065
+#: fetch-pack.c:1004

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

-#: fetch-pack.c:1077 fetch-pack.c:1414
+#: fetch-pack.c:1016 fetch-pack.c:1393

 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:1199
+#: fetch-pack.c:1145

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

-#: fetch-pack.c:1584
+#: fetch-pack.c:1191
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "error leyendo sección header '%s'"
+
+#: fetch-pack.c:1197
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "se esperaba '%s', se recibió '%s'"
+
+#: fetch-pack.c:1236
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "linea de confirmación inesperada: '%s'"
+
+#: fetch-pack.c:1241
+#, c-format
+msgid "error processing acks: %d"
+msgstr "error procesando acks: %d"
+
+#: fetch-pack.c:1278
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "error procesando información superficial: %d"
+
+#: fetch-pack.c:1294
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "se esperaba wanted-ref, se obtuvo '%s'"
+
+#: fetch-pack.c:1304
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inesperado: '%s'"
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "error procesando refs deseadas: %d"
+
+#: fetch-pack.c:1603

 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:1610
+#: fetch-pack.c:1621 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
+msgstr "remoto no mando todos los objetos necesarios"
+
+#: fetch-pack.c:1647

 #, 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:1613
+#: fetch-pack.c:1650

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

-#: gpg-interface.c:185
+#: gpg-interface.c:253

 msgid "gpg failed to sign the data"
 msgstr "gpg falló al firmar la data"
 
 msgid "gpg failed to sign the data"
 msgstr "gpg falló al firmar la data"
 

-#: gpg-interface.c:210
+#: gpg-interface.c:279

 msgid "could not create temporary file"
 msgstr "no se pudo crear archivo temporal"
 
 msgid "could not create temporary file"
 msgstr "no se pudo crear archivo temporal"
 

-#: gpg-interface.c:213
+#: gpg-interface.c:282

 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falló al escribir la firma separada para '%s'"
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falló al escribir la firma separada para '%s'"


@@ -1996,18 +2548,18 @@ msgstr "falló al escribir la firma separada para '%s'"
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invalido '%.*s' en log.graphColors"
 
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invalido '%.*s' en log.graphColors"
 

-#: grep.c:2020
+#: grep.c:2115

 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 

-#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
+#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "falló al marcar '%s'"
 
 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "falló al marcar '%s'"
 

-#: grep.c:2048
+#: grep.c:2143

 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"


@@ -2086,7 +2638,7 @@ msgstr "comando de listado de tipos no soportado '%s'"
 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:467
+#: help.c:552

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


@@ -2095,31 +2647,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:526
+#: help.c:611

 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:548
+#: help.c:633

 #, 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:553
+#: help.c:638

 #, 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:558
+#: help.c:643

 #, 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:566
+#: help.c:651

 #, 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:570
+#: help.c:655

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


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

-#: help.c:585
+#: help.c:670

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

-#: help.c:652
+#: help.c:738

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

-#: help.c:656
+#: help.c:742

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


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

-#: ident.c:416 builtin/commit.c:587
+#: ident.c:416 builtin/commit.c:600

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


@@ -2248,118 +2800,118 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "No se pudo crear '%s.lock': %s"
 
 msgid "Unable to create '%s.lock': %s"
 msgstr "No se pudo crear '%s.lock': %s"
 

-#: merge.c:71
+#: merge.c:40

 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:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:606 builtin/clone.c:761
+#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
+#: builtin/checkout.c:608 builtin/clone.c:763

 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:298
+#: merge-recursive.c:303

 msgid "(bad commit)\n"
 msgstr "(mal commit)\n"
 
 msgid "(bad commit)\n"
 msgstr "(mal commit)\n"
 

-#: merge-recursive.c:320
+#: merge-recursive.c:325

 #, 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:328
+#: merge-recursive.c:333

 #, 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:410
+#: merge-recursive.c:415

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

-#: merge-recursive.c:881
+#: merge-recursive.c:886

 #, 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:892
+#: merge-recursive.c:897

 #, 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:906 merge-recursive.c:925
+#: merge-recursive.c:911 merge-recursive.c:930

 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:915
+#: merge-recursive.c:920

 #, 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:957 builtin/cat-file.c:37
+#: merge-recursive.c:962 builtin/cat-file.c:39

 #, 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:959
+#: merge-recursive.c:964

 #, 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:983
+#: merge-recursive.c:988

 #, 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:994
+#: merge-recursive.c:999

 #, 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:999
+#: merge-recursive.c:1004

 #, 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:1186
+#: merge-recursive.c:1191

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

-#: merge-recursive.c:1193
+#: merge-recursive.c:1198

 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
 
 #, 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:1200
+#: merge-recursive.c:1205

 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
 
 #, 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:1208 merge-recursive.c:1220
+#: merge-recursive.c:1213 merge-recursive.c:1225

 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
 
 #, 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:1211 merge-recursive.c:1223
+#: merge-recursive.c:1216 merge-recursive.c:1228

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

-#: merge-recursive.c:1245
+#: merge-recursive.c:1250

 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
 
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
 

-#: merge-recursive.c:1249
+#: merge-recursive.c:1254

 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
 
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
 

-#: merge-recursive.c:1250
+#: merge-recursive.c:1255

 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
 
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
 

-#: merge-recursive.c:1253
+#: merge-recursive.c:1258

 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"


@@ -2376,33 +2928,33 @@ msgstr ""
 "\n"
 "el cual aceptará esta sugerencia.\n"
 
 "\n"
 "el cual aceptará esta sugerencia.\n"
 

-#: merge-recursive.c:1262
+#: merge-recursive.c:1267

 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
 
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
 

-#: merge-recursive.c:1321
+#: merge-recursive.c:1326

 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:1326
+#: merge-recursive.c:1331

 #, 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:1358
+#: merge-recursive.c:1363

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

-#: merge-recursive.c:1423
+#: merge-recursive.c:1434

 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
 "cambio."
 
 #, 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:1475
+#: merge-recursive.c:1501

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


@@ -2411,7 +2963,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:1480
+#: merge-recursive.c:1506

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


@@ -2420,7 +2972,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:1487
+#: merge-recursive.c:1513

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


@@ -2429,7 +2981,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:1492
+#: merge-recursive.c:1518

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


@@ -2438,32 +2990,32 @@ 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:1526
+#: merge-recursive.c:1552

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

-#: merge-recursive.c:1526
+#: merge-recursive.c:1552

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

-#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
-#: merge-recursive.c:3086
+#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
+#: merge-recursive.c:3129

 #, 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:1594
+#: merge-recursive.c:1620

 #, 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:1599
+#: merge-recursive.c:1625

 #, 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:1625
+#: merge-recursive.c:1651

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


@@ -2472,30 +3024,30 @@ 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:1630
+#: merge-recursive.c:1656

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

-#: merge-recursive.c:1694
+#: merge-recursive.c:1720

 #, 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:1733
+#: merge-recursive.c:1759

 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Renombrando %s a %s y %s a %s más bien"
 
 #, 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:1745
+#: merge-recursive.c:1771

 #, 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."
 
 #, 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:1951
+#: merge-recursive.c:1977

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


@@ -2506,7 +3058,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:1983
+#: merge-recursive.c:2009

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


@@ -2516,7 +3068,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:1993
+#: merge-recursive.c:2019

 #, 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; "


@@ -2525,7 +3077,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:2085
+#: merge-recursive.c:2111

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


@@ -2534,7 +3086,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:2330
+#: merge-recursive.c:2356

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


@@ -2543,126 +3095,131 @@ 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:2736
+#: merge-recursive.c:2762

 #, 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"
 
 #, 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:2751
+#: merge-recursive.c:2777

 #, c-format
 msgid "Adding merged %s"
 msgstr "Agregar %s fusionado"
 
 #, c-format
 msgid "Adding merged %s"
 msgstr "Agregar %s fusionado"
 

-#: merge-recursive.c:2758 merge-recursive.c:3089
+#: merge-recursive.c:2784 merge-recursive.c:3132

 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando más bien como %s"
 
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando más bien como %s"
 

-#: merge-recursive.c:2914
+#: merge-recursive.c:2941

 #, 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:2917
+#: merge-recursive.c:2944

 #, 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:2986
+#: merge-recursive.c:3013

 msgid "modify"
 msgstr "modificar"
 
 msgid "modify"
 msgstr "modificar"
 

-#: merge-recursive.c:2986
+#: merge-recursive.c:3013

 msgid "modified"
 msgstr "modificado"
 
 msgid "modified"
 msgstr "modificado"
 

-#: merge-recursive.c:2997
+#: merge-recursive.c:3024

 msgid "content"
 msgstr "contenido"
 
 msgid "content"
 msgstr "contenido"
 

-#: merge-recursive.c:3004
+#: merge-recursive.c:3031

 msgid "add/add"
 msgstr "agregar/agregar"
 
 msgid "add/add"
 msgstr "agregar/agregar"
 

-#: merge-recursive.c:3046
+#: merge-recursive.c:3076

 #, 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:3055 git-submodule.sh:895
+#: merge-recursive.c:3098 git-submodule.sh:865

 msgid "submodule"
 msgstr "submódulo"
 
 msgid "submodule"
 msgstr "submódulo"
 

-#: merge-recursive.c:3056
+#: merge-recursive.c:3099

 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 

-#: merge-recursive.c:3178
+#: merge-recursive.c:3221

 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 

-#: merge-recursive.c:3204
+#: merge-recursive.c:3247

 msgid "file/directory"
 msgstr "archivo/directorio"
 
 msgid "file/directory"
 msgstr "archivo/directorio"
 

-#: merge-recursive.c:3210
+#: merge-recursive.c:3253

 msgid "directory/file"
 msgstr "directorio/archivo"
 
 msgid "directory/file"
 msgstr "directorio/archivo"
 

-#: merge-recursive.c:3217
+#: merge-recursive.c:3260

 #, 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:3226
+#: merge-recursive.c:3269

 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 

-#: merge-recursive.c:3267
+#: merge-recursive.c:3303

 #, c-format
 #, c-format

-msgid "Dirty index: cannot merge (dirty: %s)"
-msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"merge:\n"
+"  %s"

 
 

-#: merge-recursive.c:3271
+#: merge-recursive.c:3314

 msgid "Already up to date!"
 msgstr "¡Ya está actualizado!"
 
 msgid "Already up to date!"
 msgstr "¡Ya está actualizado!"
 

-#: merge-recursive.c:3280
+#: merge-recursive.c:3323

 #, 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:3379
+#: merge-recursive.c:3422

 msgid "Merging:"
 msgstr "Fusionando:"
 
 msgid "Merging:"
 msgstr "Fusionando:"
 

-#: merge-recursive.c:3392
+#: merge-recursive.c:3435

 #, 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:3431
+#: merge-recursive.c:3474

 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:3495
+#: merge-recursive.c:3540

 #, 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:3511 builtin/merge.c:659 builtin/merge.c:816
+#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 

-#: notes-merge.c:272
+#: notes-merge.c:274

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


@@ -2674,23 +3231,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:279
+#: notes-merge.c:281

 #, 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:43
+#: notes-utils.c:45

 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:102
+#: notes-utils.c:104

 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Mal valor para notes.rewriteMode: '%s'"
 
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Mal valor para notes.rewriteMode: '%s'"
 

-#: notes-utils.c:112
+#: notes-utils.c:114

 #, 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/)"


@@ -2699,37 +3256,57 @@ 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:142
+#: notes-utils.c:144

 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mal valor para %s: '%s'"
 
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mal valor para %s: '%s'"
 

-#: object.c:242
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipo de objeto \"%s\" inválido"
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objeto %s es un %s, no un %s"
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "El objeto %s tiene un id de tipo desconocido %d"
+
+#: object.c:246

 #, 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
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr "sha1 no concuerda %s"
+

 #: packfile.c:563
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 
 #: packfile.c:563
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 

-#: packfile.c:1742
+#: packfile.c:1745

 #, 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:1746
+#: packfile.c:1749

 #, 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:621
+#: parse-options.c:672

 msgid "..."
 msgstr "..."
 
 msgid "..."
 msgstr "..."
 

-#: parse-options.c:640
+#: parse-options.c:691

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


@@ -2737,17 +3314,17 @@ 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:646
+#: parse-options.c:697

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

-#: parse-options.c:649
+#: parse-options.c:700

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

-#: parse-options.c:688
+#: parse-options.c:739

 msgid "-NUM"
 msgstr "-NUM"
 
 msgid "-NUM"
 msgstr "-NUM"
 


@@ -2841,11 +3418,71 @@ msgstr "%s: magic pathspec no soportado por este comando: %s"
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 

+#: pkt-line.c:104
+msgid "flush packet write failed"
+msgstr "limpieza de escritura de paquetes falló"
+
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
+msgstr "error de protocolo: línea imposiblemente larga"
+
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
+msgstr "escritura de paquetes con formato falló"
+
+#: pkt-line.c:192
+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
+msgid "packet write failed"
+msgstr "escritura de paquetes falló"
+
+#: pkt-line.c:291
+msgid "read error"
+msgstr "error de lectura"
+
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
+msgstr "El remoto se colgó de manera inesperada"
+
+#: pkt-line.c:327
+#, 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
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "error de protocolo: mal largo de línea %d"
+

 #: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 
 #: pretty.c:962
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 

-#: read-cache.c:1500
+#: range-diff.c:48
+msgid "could not start `log`"
+msgstr "no se pudo comenzar `log`"
+
+#: range-diff.c:51
+msgid "could not read `log` output"
+msgstr "no se pudo leer output de `log`"
+
+#: range-diff.c:66 sequencer.c:4540
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "no se pudo analizar commit '%s'"
+
+#: range-diff.c:196
+msgid "failed to generate diff"
+msgstr "falló al generar diff"
+
+#: range-diff.c:421 range-diff.c:423
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "no se pudo leer el log para '%s'"
+
+#: read-cache.c:1579

 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"


@@ -2854,7 +3491,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:1510
+#: read-cache.c:1589

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


@@ -2863,227 +3500,329 @@ 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:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

 #, 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:2477 sequencer.c:2102 sequencer.c:3234
+#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

 #, 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:2490
+#: read-cache.c:2666

 #, 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:2502
+#: read-cache.c:2678

 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible remover el vinculo: %s"
 
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible remover el vinculo: %s"
 

-#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s no apunta a ningún objeto válido!"
+
+#: refs.c:579
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando referencia rota %s"
+
+#: refs.c:581 ref-filter.c:2067
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#: refs.c:685
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "no se pudo abrir '%s' para escritura: %s"
+
+#: refs.c:695 refs.c:746
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "No se pudo leer la referencia '%s'"
+
+#: refs.c:701
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "ref '%s' ya existe"
+
+#: refs.c:706
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "ID de objecto inesperado cuando se escribía '%s'"
+
+#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
+#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no se pudo escribir en '%s'"
+
+#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:780

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

-#: refs.c:1880
+#: refs.c:748
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "ID de objecto inesperado cuando se borraba '%s'"
+
+#: refs.c:879
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "log de ref %s tiene un vacío tras %s"
+
+#: refs.c:885
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log de ref %s finalizado inesperadamente en %s"
+
+#: refs.c:943
+#, c-format
+msgid "log for %s is empty"
+msgstr "log de %s está vacío"
+
+#: refs.c:1035
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "rehusando actualizar ref con mal nombre '%s'"
+
+#: refs.c:1111
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref falló para ref '%s': %s"
+
+#: refs.c:1853
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "múltiples actualizaciones para ref '%s' no permitidas"
+
+#: refs.c:1885

 msgid "ref updates forbidden inside quarantine environment"
 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
 
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
 

+#: refs.c:1981 refs.c:2011
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; no se puede crear '%s'"
+
+#: refs.c:1987 refs.c:2022
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "No se puede procesar '%s' y '%s' al mismo tiempo"
+

 #: refs/files-backend.c:1191
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo remover la referencia %s"
 
 #: refs/files-backend.c:1191
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo remover la referencia %s"
 

-#: refs/files-backend.c:1205 refs/packed-backend.c:1531
-#: refs/packed-backend.c:1541
+#: refs/files-backend.c:1205 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542

 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no se pudo eliminar la referencia %s: %s"
 
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no se pudo eliminar la referencia %s: %s"
 

-#: refs/files-backend.c:1208 refs/packed-backend.c:1544
+#: refs/files-backend.c:1208 refs/packed-backend.c:1545

 #, c-format
 msgid "could not delete references: %s"
 msgstr "no se pudo eliminar la referencia: %s"
 
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no se pudo eliminar la referencia: %s"
 

-#: ref-filter.c:35 wt-status.c:1850
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido: '%s'"
+
+#: ref-filter.c:38 wt-status.c:1850

 msgid "gone"
 msgstr "desaparecido"
 
 msgid "gone"
 msgstr "desaparecido"
 

-#: ref-filter.c:36
+#: ref-filter.c:39

 #, c-format
 msgid "ahead %d"
 msgstr "adelante %d"
 
 #, c-format
 msgid "ahead %d"
 msgstr "adelante %d"
 

-#: ref-filter.c:37
+#: ref-filter.c:40

 #, c-format
 msgid "behind %d"
 msgstr "detrás %d"
 
 #, c-format
 msgid "behind %d"
 msgstr "detrás %d"
 

-#: ref-filter.c:38
+#: ref-filter.c:41

 #, c-format
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 
 #, c-format
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 

-#: ref-filter.c:121
+#: ref-filter.c:137

 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<color>)"
 
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<color>)"
 

-#: ref-filter.c:123
+#: ref-filter.c:139

 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconocido: %%(color:%s)"
 
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconocido: %%(color:%s)"
 

-#: ref-filter.c:145
+#: ref-filter.c:161

 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor entero esperado refname:lstrip=%s"
 
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor entero esperado refname:lstrip=%s"
 

-#: ref-filter.c:149
+#: ref-filter.c:165

 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor entero esperado refname:rstrip=%s"
 
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor entero esperado refname:rstrip=%s"
 

-#: ref-filter.c:151
+#: ref-filter.c:167

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

-#: ref-filter.c:206
+#: ref-filter.c:222
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) no toma ningún argumento"
+
+#: ref-filter.c:234
+#, c-format
+msgid "%%(objectsize) does not take arguments"
+msgstr "%%(objectsize) no toma argumentos"
+
+#: ref-filter.c:246

 #, 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:215
+#: ref-filter.c:255

 #, 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:235
+#: ref-filter.c:275

 #, 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:264
+#: ref-filter.c:304

 #, 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:266
+#: ref-filter.c:306

 #, 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:281
+#: ref-filter.c:321

 #, 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:285
+#: ref-filter.c:325

 #, 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:315
+#: ref-filter.c:355

 #, 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:327
+#: ref-filter.c:367

 #, 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:334
+#: ref-filter.c:374

 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 

-#: ref-filter.c:343
+#: ref-filter.c:383

 #, 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:351
+#: ref-filter.c:391

 #, 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:369
+#: ref-filter.c:409

 #, 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:464
+#: ref-filter.c:505

 #, 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:491
+#: ref-filter.c:532

 #, 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:608
+#: ref-filter.c:656

 #, 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:671
+#: ref-filter.c:719

 #, 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:673
+#: ref-filter.c:721

 #, 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:675
+#: ref-filter.c:723

 #, 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:703
+#: ref-filter.c:751

 #, 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:705
+#: ref-filter.c:753

 #, 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:707
+#: ref-filter.c:755

 #, 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:722
+#: ref-filter.c:770

 #, 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:779
+#: ref-filter.c:827

 #, 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:1387
+#: ref-filter.c:1416

 #, 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:1390
+#: ref-filter.c:1419

 #, 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:1393
+#: ref-filter.c:1422

 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(no hay rama, comenzando bisecado en %s)"
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(no hay rama, comenzando bisecado en %s)"


@@ -3091,7 +3830,7 @@ msgstr "(no hay rama, comenzando bisecado 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:1401
+#: ref-filter.c:1430

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"


@@ -3099,148 +3838,143 @@ 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:1408
+#: ref-filter.c:1437

 #, 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:1412
+#: ref-filter.c:1441

 msgid "(no branch)"
 msgstr "(sin rama)"
 
 msgid "(no branch)"
 msgstr "(sin rama)"
 

-#: ref-filter.c:1442
+#: ref-filter.c:1475 ref-filter.c:1623

 #, 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:1445
+#: ref-filter.c:1483

 #, 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:1902
+#: ref-filter.c:1980

 #, 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:1984
+#: ref-filter.c:2062

 #, 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:1989
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorando referencia rota %s"
-
-#: ref-filter.c:2261
+#: ref-filter.c:2340

 #, 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:2365
+#: ref-filter.c:2444

 #, 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:605
+#: remote.c:606

 #, 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:609
+#: remote.c:610

 #, 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:613
+#: remote.c:614

 #, 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:621
+#: remote.c:622

 msgid "Internal error"
 msgstr "Error interno"
 
 msgid "Internal error"
 msgstr "Error interno"
 

-#: remote.c:1534 remote.c:1635
+#: remote.c:1536 remote.c:1637

 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:1543
+#: remote.c:1545

 #, 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:1546
+#: remote.c:1548

 #, 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:1552
+#: remote.c:1554

 #, 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:1567
+#: remote.c:1569

 #, 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:1579
+#: remote.c:1581

 #, 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:1589
+#: remote.c:1591

 #, 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:1602
+#: remote.c:1604

 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:1624
+#: remote.c:1626

 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:1939
+#: remote.c:1951

 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n"
 
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n"
 

-#: remote.c:1943
+#: remote.c:1955

 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:1946
+#: remote.c:1958

 #, 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:1950
+#: remote.c:1962

 #, 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:1953
+#: remote.c:1965

 #, 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:1957
+#: remote.c:1969

 #, 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:1963
+#: remote.c:1975

 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:1966
+#: remote.c:1978

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


@@ -3250,11 +3984,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:1974
+#: remote.c:1986

 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:1977
+#: remote.c:1989

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -3269,20 +4003,35 @@ 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:1987
+#: remote.c:1999

 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"
 

-#: revision.c:2289
+#: replace-object.c:20
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "mal nombre de ref de reemplazo: %s"
+
+#: replace-object.c:29
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "duplicar ref de reemplazo: %s"
+
+#: replace-object.c:72
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "remplazar profundiad muy elevada para objeto %s"
+
+#: revision.c:2305

 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:2292
+#: revision.c:2308

 #, 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:2489
+#: revision.c:2505

 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"
 


@@ -3300,30 +4049,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:141
+#: send-pack.c:142

 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:143
+#: send-pack.c:144

 #, 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:145
+#: send-pack.c:146

 #, 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:309

 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:422

 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:424

 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"


@@ -3331,42 +4080,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:436

 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:441

 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:175
+#: sequencer.c:177

 #, 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:275
+#: sequencer.c:278

 #, 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:301
+#: sequencer.c:304

 msgid "revert"
 msgstr "revertir"
 
 msgid "revert"
 msgstr "revertir"
 

-#: sequencer.c:303
+#: sequencer.c:306

 msgid "cherry-pick"
 msgstr "cherry-pick"
 
 msgid "cherry-pick"
 msgstr "cherry-pick"
 

-#: sequencer.c:305
+#: sequencer.c:308

 msgid "rebase -i"
 msgstr "rebase -i"
 
 msgid "rebase -i"
 msgstr "rebase -i"
 

-#: sequencer.c:307
+#: sequencer.c:310

 #, c-format
 #, c-format

-msgid "Unknown action: %d"
-msgstr "Acción desconocida: %d"
+msgid "unknown action: %d"
+msgstr "acción desconocida: %d"

 
 

-#: sequencer.c:364
+#: sequencer.c:367

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


@@ -3374,7 +4123,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:367
+#: sequencer.c:370

 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"


@@ -3384,45 +4133,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:380 sequencer.c:2468
+#: sequencer.c:383 sequencer.c:2488

 #, 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:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
-#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no se pudo escribir en '%s'"
-
-#: sequencer.c:387
+#: sequencer.c:390

 #, 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:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
-#: sequencer.c:2702
+#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
+#: sequencer.c:2741

 #, 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:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
-#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
-#: builtin/merge.c:1046
+#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
+#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
+#: builtin/merge.c:1081

 #, 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:441
+#: sequencer.c:444

 #, 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:445
+#: sequencer.c:448

 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:474
+#: sequencer.c:477

 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"


@@ -3430,20 +4173,35 @@ 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:563
+#: sequencer.c:566

 #, 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:579
+#: sequencer.c:582

 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:592
+#: sequencer.c:595

 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:749
+#: sequencer.c:723 sequencer.c:740
+#, c-format
+msgid "could not parse '%s' (looking for '%s')"
+msgstr "no se pudo configurar '%s' (buscando '%s')"
+
+#: sequencer.c:731
+#, c-format
+msgid "bad quoting on %s value in '%s'"
+msgstr "mal citado en %s valor en '%s'"
+
+#: sequencer.c:747
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr "formato de fecha inválido '%s' en '%s'"
+
+#: sequencer.c:761

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -3473,15 +4231,15 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
 "\n"
 "  git rebase --continue\n"
 

-#: sequencer.c:818
+#: sequencer.c:830

 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 
 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 

-#: sequencer.c:1043
+#: sequencer.c:1055

 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:1050
+#: sequencer.c:1062

 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"


@@ -3508,7 +4266,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:1063
+#: sequencer.c:1075

 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"


@@ -3532,313 +4290,342 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:1103
+#: sequencer.c:1115

 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:1105
+#: sequencer.c:1117

 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:1151
+#: sequencer.c:1163

 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:1153
+#: sequencer.c:1165

 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 

-#: sequencer.c:1157
+#: sequencer.c:1169

 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 
 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 

-#: sequencer.c:1178
+#: sequencer.c:1190

 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 

-#: sequencer.c:1180
+#: sequencer.c:1192

 #, 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:1184 builtin/commit.c:1528
+#: sequencer.c:1196 builtin/commit.c:1528

 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:1235 sequencer.c:1832
+#: sequencer.c:1247 sequencer.c:1845

 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:1245 builtin/am.c:1630 builtin/merge.c:645
+#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

 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:1262 sequencer.c:1317
+#: sequencer.c:1274 sequencer.c:1329

 #, 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:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
-#: builtin/merge.c:850
+#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855
+#: builtin/merge.c:880

 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:1344
+#: sequencer.c:1356

 #, 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:1349
+#: sequencer.c:1361

 #, 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:1500 sequencer.c:1525
+#: sequencer.c:1457 sequencer.c:1565
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando desconocido: %d"
+
+#: sequencer.c:1512 sequencer.c:1537

 #, 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:1510 sequencer.c:4355
+#: sequencer.c:1522 sequencer.c:4520

 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:1512 sequencer.c:2729
+#: sequencer.c:1524 sequencer.c:2768

 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 

-#: sequencer.c:1514
+#: sequencer.c:1526

 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:1520
+#: sequencer.c:1532

 #, 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:1527 git-rebase--interactive.sh:457
+#: sequencer.c:1539 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:1535
+#: sequencer.c:1547

 #, 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:1542
+#: sequencer.c:1554

 #, 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:1548
+#: sequencer.c:1560

 #, c-format
 #, c-format

-msgid "The commit message #%d will be skipped:"
-msgstr "El mensaje del commit #%d será saltado:"
-
-#: sequencer.c:1553
-#, c-format
-msgid "unknown command: %d"
-msgstr "comando desconocido: %d"
+msgid "The commit message #%d will be skipped:"
+msgstr "El mensaje del commit #%d será saltado:"

 
 

-#: sequencer.c:1631
+#: sequencer.c:1643

 msgid "your index file is unmerged."
 msgstr "tu archivo índice no esta fusionado."
 
 msgid "your index file is unmerged."
 msgstr "tu archivo índice no esta fusionado."
 

-#: sequencer.c:1638
+#: sequencer.c:1650

 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:1657
+#: sequencer.c:1669

 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se entrego la opción -m."
 
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se entrego la opción -m."
 

-#: sequencer.c:1665
+#: sequencer.c:1677

 #, 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:1669
+#: sequencer.c:1681

 #, 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."
 
 #, 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:1675
+#: sequencer.c:1687

 #, 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:1694
+#: sequencer.c:1706

 #, 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:1759
+#: sequencer.c:1771

 #, 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:1813
+#: sequencer.c:1826

 #, 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:1814
+#: sequencer.c:1827

 #, 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:1864
-msgid "empty commit set passed"
-msgstr "conjunto de commits vacío entregado"
-
-#: sequencer.c:1874
+#: sequencer.c:1885

 #, 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:1881
+#: sequencer.c:1892

 #, 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:1961
+#: sequencer.c:1972

 #, 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:1970
+#: sequencer.c:1981

 #, 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:2029
+#: sequencer.c:2040

 #, 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:2037
+#: sequencer.c:2048

 #, 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:2085 sequencer.c:4138 sequencer.c:4173
+#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

 #, 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'."
 

-#: sequencer.c:2108
+#: sequencer.c:2119

 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:2110
+#: sequencer.c:2121

 #, 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:2115
+#: sequencer.c:2126

 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 

-#: sequencer.c:2126
+#: sequencer.c:2137

 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:2128
+#: sequencer.c:2139

 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:2195
-#, c-format
-msgid "invalid key: %s"
-msgstr "llave invalida: %s"
-
-#: sequencer.c:2198
+#: sequencer.c:2209

 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor invalido para %s: %s"
 
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor invalido para %s: %s"
 

-#: sequencer.c:2269
+#: sequencer.c:2285

 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 

-#: sequencer.c:2285
+#: sequencer.c:2301

 #, 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:2323
+#: sequencer.c:2335 sequencer.c:3775
+msgid "empty commit set passed"
+msgstr "conjunto de commits vacío entregado"
+
+#: sequencer.c:2343

 msgid "a cherry-pick or revert is already in progress"
 msgstr "un cherry-pick o revert ya esta en progreso"
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un cherry-pick o revert ya esta en progreso"
 

-#: sequencer.c:2324
+#: sequencer.c:2344

 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:2327
+#: sequencer.c:2347

 #, 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:2341
+#: sequencer.c:2361

 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 

-#: sequencer.c:2396 sequencer.c:3403
+#: sequencer.c:2416 sequencer.c:3543

 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:2398
+#: sequencer.c:2418

 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 

-#: sequencer.c:2400 sequencer.c:2435
+#: sequencer.c:2420 sequencer.c:2455

 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:2421 builtin/grep.c:720
+#: sequencer.c:2441 builtin/grep.c:721

 #, 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:2423
+#: sequencer.c:2443

 #, 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:2424
+#: sequencer.c:2444

 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 

-#: sequencer.c:2430
+#: sequencer.c:2450

 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
 
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
 

-#: sequencer.c:2441
+#: sequencer.c:2461

 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:2545 sequencer.c:3321
+#: sequencer.c:2565 sequencer.c:3461

 #, 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:2583 sequencer.c:3301
+#: sequencer.c:2603 sequencer.c:3441

 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 

-#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
+#: sequencer.c:2618
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "no se pudo copiar '%s' a '%s'"
+
+#: sequencer.c:2626
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Puede enmendar el commit ahora, con\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Una vez que esté satisfecho con los cambios, ejecute\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:2636
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "No se pudo aplicar %s... %.*s"
+
+#: sequencer.c:2643
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "No se pudo fusionar %.*s"
+
+#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

 #, 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:2641
+#: sequencer.c:2680 sequencer.c:3095

 msgid "could not read index"
 msgstr "no se pudo leer índice"
 
 msgid "could not read index"
 msgstr "no se pudo leer índice"
 

-#: sequencer.c:2646
+#: sequencer.c:2685

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -3853,11 +4640,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2652
+#: sequencer.c:2691

 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:2658
+#: sequencer.c:2697

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -3874,62 +4661,81 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2771
+#: sequencer.c:2758
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nombre de label ilegal: '%.*s'"
+
+#: sequencer.c:2810

 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 
 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 

-#: sequencer.c:2776
+#: sequencer.c:2815

 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 

-#: sequencer.c:2811
+#: sequencer.c:2850

 #, 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:2829
+#: sequencer.c:2868

 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 
 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 

-#: sequencer.c:2861
+#: sequencer.c:2895
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "no se pudo resolver '%s'"
+
+#: sequencer.c:2921

 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:2884
+#: sequencer.c:2943

 #, c-format
 #, c-format

-msgid "could not resolve '%s'"
-msgstr "no se pudo resolver '%s'"
+msgid "unable to parse '%.*s'"
+msgstr "no se puede analizar '%.*s'"
+
+#: sequencer.c:2952
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nada para fusionar: '%.*s'"
+
+#: sequencer.c:2964
+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:2906
+#: sequencer.c:2979

 #, 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:2916 sequencer.c:2941
+#: sequencer.c:2989 sequencer.c:3015

 #, 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'"
 

-#: sequencer.c:3005
+#: sequencer.c:3127

 #, 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:3021
+#: sequencer.c:3143

 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:3088
+#: sequencer.c:3211

 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 

-#: sequencer.c:3100
+#: sequencer.c:3223

 #, 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:3103 git-rebase.sh:188
+#: sequencer.c:3226 git-rebase.sh:188

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -3941,7 +4747,7 @@ 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:3134
+#: sequencer.c:3257

 #, c-format
 msgid ""
 "Could not execute the todo command\n"
 #, c-format
 msgid ""
 "Could not execute the todo command\n"


@@ -3962,48 +4768,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 

-#: sequencer.c:3202
+#: sequencer.c:3325

 #, 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:3264
+#: sequencer.c:3404

 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 

-#: sequencer.c:3309
+#: sequencer.c:3449

 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:3314 sequencer.c:4352
+#: sequencer.c:3454 sequencer.c:4517

 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 
 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 

-#: sequencer.c:3328
+#: sequencer.c:3468

 #, 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:3414
+#: sequencer.c:3554

 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:3423
+#: sequencer.c:3563

 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:3425
+#: sequencer.c:3565

 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invalido: '%s'"
 
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invalido: '%s'"
 

-#: sequencer.c:3427
+#: sequencer.c:3567

 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 

-#: sequencer.c:3430
+#: sequencer.c:3570

 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"


@@ -4014,54 +4820,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:3455 sequencer.c:3493
+#: sequencer.c:3595 sequencer.c:3633

 #, 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:3508
+#: sequencer.c:3648

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede remover CHERRY_PICK_HEAD"
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede remover CHERRY_PICK_HEAD"
 

-#: sequencer.c:3515
+#: sequencer.c:3655

 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:3612
+#: sequencer.c:3752

 #, 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:3616
+#: sequencer.c:3756

 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: mala revision"
 
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: mala revision"
 

-#: sequencer.c:3649
+#: sequencer.c:3791

 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:4098
+#: sequencer.c:4238

 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 

-#: sequencer.c:4101
+#: sequencer.c:4241

 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:4142 sequencer.c:4177
+#: sequencer.c:4281 sequencer.c:4337

 #, 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:4236
+#: sequencer.c:4396

 #, 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:4302
+#: sequencer.c:4466

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"


@@ -4070,7 +4876,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:4309
+#: sequencer.c:4473

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


@@ -4088,7 +4894,7 @@ msgstr ""
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 

-#: sequencer.c:4321
+#: sequencer.c:4486

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


@@ -4099,12 +4905,7 @@ 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:4375
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr "no se pudo analizar commit '%s'"
-
-#: sequencer.c:4490
+#: sequencer.c:4660

 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 


@@ -4270,6 +5071,38 @@ msgstr "falló fork"
 msgid "setsid failed"
 msgstr "falló setsid"
 
 msgid "setsid failed"
 msgstr "falló setsid"
 

+#: sha1-file.c:381
+#, 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
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
+
+#: sha1-file.c:503
+#, 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
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz de normalizar directorio de objeto: %s"
+
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
+msgstr "no es posible hacer fdopen en lockfile alternos"
+
+#: sha1-file.c:583
+msgid "unable to read alternates file"
+msgstr "no es posible leer archivos alternos"
+
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
+msgstr "no es posible mover archivos alternos en el lugar"
+

 #: sha1-file.c:625
 #, c-format
 msgid "path '%s' does not exist"
 #: sha1-file.c:625
 #, c-format
 msgid "path '%s' does not exist"


@@ -4297,16 +5130,210 @@ msgstr "repositorio de referencia '%s' es superficial (shallow)"
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 

-#: sha1-name.c:442
+#: sha1-file.c:781
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
+
+#: sha1-file.c:806
+msgid "mmap failed"
+msgstr "mmap falló"
+
+#: sha1-file.c:973
+#, c-format
+msgid "object file %s is empty"
+msgstr "archivo de objeto %s está vacío"
+
+#: sha1-file.c:1093 sha1-file.c:2206
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto perdido corrupto '%s'"
+
+#: sha1-file.c:1095 sha1-file.c:2210
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "basura al final del objeto perdido '%s'"
+
+#: sha1-file.c:1137
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: sha1-file.c:1219
+#, 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
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#: sha1-file.c:1228
+#, 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
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz de analizar header %s"
+
+#: sha1-file.c:1422
+#, c-format
+msgid "failed to read object %s"
+msgstr "falló al leer objeto %s"
+
+#: sha1-file.c:1426
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "reemplazo %s no encontrado para %s"
+
+#: sha1-file.c:1430
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto perdido %s (guardado en %s) está corrompido"
+
+#: sha1-file.c:1434
+#, 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
+#, c-format
+msgid "unable to write sha1 filename %s"
+msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+
+#: sha1-file.c:1543
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+#: sha1-file.c:1550
+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:1635
+#, 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
+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:1667
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no es posible desinflar el objeto nuevo %s (%d)"
+
+#: sha1-file.c:1671
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd en objeto %s falló (%d)"
+
+#: sha1-file.c:1675
+#, 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:899
+#, c-format
+msgid "failed utime() on %s"
+msgstr "falló utime() en %s"
+
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
+msgstr "no se puede leer sha1_file para %s"
+
+#: sha1-file.c:1805
+msgid "corrupt commit"
+msgstr "commit corrupto"
+
+#: sha1-file.c:1813
+msgid "corrupt tag"
+msgstr "tag corrupto"
+
+#: sha1-file.c:1906
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error leyendo al indexar %s"
+
+#: sha1-file.c:1909
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura corta al indexar %s"
+
+#: sha1-file.c:1980 sha1-file.c:1989
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falló al insertar en la base de datos"
+
+#: sha1-file.c:1995
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo de archivo no soportado"
+
+#: sha1-file.c:2019
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no es objeto válido"
+
+#: sha1-file.c:2021
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no es un objeto '%s' válido"
+
+#: sha1-file.c:2048 builtin/index-pack.c:158
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#: sha1-file.c:2217 sha1-file.c:2269
+#, c-format
+msgid "sha1 mismatch for %s (expected %s)"
+msgstr "sha1 no concuerda para %s (se esperaba %s)"
+
+#: sha1-file.c:2241
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no es posible hacer mmap a %s"
+
+#: sha1-file.c:2246
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz de desempaquetar header de %s"
+
+#: sha1-file.c:2252
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz de analizar header de %s"
+
+#: sha1-file.c:2263
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no es posible desempaquetar contenidos de %s"
+
+#: sha1-name.c:444

 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "SHA1 %s corto es ambiguao"
 
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "SHA1 %s corto es ambiguao"
 

-#: sha1-name.c:453
+#: sha1-name.c:455

 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 
 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 

-#: sha1-name.c:695
+#: sha1-name.c:699

 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"


@@ -4363,36 +5390,46 @@ msgstr "en el submódulo no poblado '%s'"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 

-#: submodule.c:837
+#: submodule.c:839

 #, 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:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
+#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888

 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:1375
+#: submodule.c:1377

 #, 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:1513
+#: submodule.c:1515

 #, 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:1526
+#: submodule.c:1528

 #, 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:1619
+#: submodule.c:1543
+#, 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:1633

 #, 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:1718
+#: submodule.c:1685
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submódulo '%s' no pudo ser actualizado."
+
+#: submodule.c:1734

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


@@ -4400,18 +5437,18 @@ 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:1730 submodule.c:1786
+#: submodule.c:1746 submodule.c:1802

 #, 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:1734 builtin/submodule--helper.c:1261
-#: builtin/submodule--helper.c:1271
+#: submodule.c:1750 builtin/submodule--helper.c:1406
+#: builtin/submodule--helper.c:1416

 #, 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'"
 

-#: submodule.c:1737
+#: submodule.c:1753

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -4422,30 +5459,30 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
 "'%s' hacia\n"
 "'%s'\n"
 

-#: submodule.c:1821
+#: submodule.c:1837

 #, 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:1865
+#: submodule.c:1881

 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:1904
+#: submodule.c:1920

 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree retornó un código %d inesperado"
 
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree retornó un código %d inesperado"
 

-#: submodule-config.c:230
+#: submodule-config.c:231

 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ignorando submódulo sospechoso: %s"
 
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "ignorando submódulo sospechoso: %s"
 

-#: submodule-config.c:294
+#: submodule-config.c:295

 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "no se permiten valores negativos para submodule.fetchjobs"
 
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "no se permiten valores negativos para submodule.fetchjobs"
 

-#: submodule-config.c:467
+#: submodule-config.c:468

 #, c-format
 msgid "invalid value for %s"
 msgstr "valor inválido para %s"
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor inválido para %s"


@@ -4461,7 +5498,7 @@ msgstr "ejecución del comando de remolque '%s' falló"
 msgid "unknown value '%s' for key '%s'"
 msgstr "valor '%s' desconocido para la clave '%s'"
 
 msgid "unknown value '%s' for key '%s'"
 msgstr "valor '%s' desconocido para la clave '%s'"
 

-#: trailer.c:539 trailer.c:544 builtin/remote.c:293
+#: trailer.c:539 trailer.c:544 builtin/remote.c:294

 #, c-format
 msgid "more than one %s"
 msgstr "más de un %s"
 #, c-format
 msgid "more than one %s"
 msgstr "más de un %s"


@@ -4480,7 +5517,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:1008 builtin/am.c:46
+#: trailer.c:1008 builtin/am.c:47

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


@@ -4509,16 +5546,39 @@ msgstr "no se pudo renombrar el archivo temporal a %s"
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 

+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no se pudo leer el conjunto '%s'"
+

 #: transport.c:208
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 
 #: transport.c:208
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 

-#: transport.c:584
+#: transport.c:586

 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:996
+#: transport.c:659
+msgid "support for protocol v2 not implemented yet"
+msgstr "soporte para protocolo v2 no implementado todavía"
+
+#: transport.c:785
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconocido para configuración '%s': %s"
+
+#: transport.c:851
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporte '%s' no permitido"
+
+#: transport.c:903
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ya no es soportado"
+
+#: transport.c:998

 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"


@@ -4527,7 +5587,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:1000
+#: transport.c:1002

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


@@ -4554,32 +5614,207 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
 "para hacer un push al remoto.\n"
 "\n"
 

-#: transport.c:1008
+#: transport.c:1010

 msgid "Aborting."
 msgstr "Abortando."
 
 msgid "Aborting."
 msgstr "Abortando."
 

-#: transport-helper.c:1087
+#: transport.c:1148
+msgid "failed to push all needed submodules"
+msgstr "falló al hacer push a todos los submódulos necesarios"
+
+#: transport.c:1270 transport-helper.c:643
+msgid "operation not supported by protocol"
+msgstr "operación no soportada por protocolo"
+
+#: transport.c:1352
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr "escritura total al helper remoto falló"
+
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "no es posible encontrar helper remoto para '%s'"
+
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
+msgstr "no se puede duplicar output de fd del helper"
+
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacidad mandatoria desconocida %s; este helper remoto probablemente "
+"necesita una nueva versión de Git"
+
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
+msgstr "este helper remoto debería implementar capacidad refspec"
+
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s dijo inesperadamente: '%s'"
+
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s también bloqueó %s"
+
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
+msgstr "no se pudo ejecutar fast-import"
+
+#: transport-helper.c:502
+msgid "error while running fast-import"
+msgstr "error al ejecutar fast-import"
+
+#: transport-helper.c:531 transport-helper.c:1091
+#, c-format
+msgid "could not read ref %s"
+msgstr "no se pudo leer la referencia %s"
+
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "respuesta para conectar desconocida: %s"
+
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
+msgstr "configurando servicio de ruta remota no soportado por el protocolo"
+
+#: transport-helper.c:600
+msgid "invalid remote service path"
+msgstr "ruta de servicio remoto inválida"
+
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "no se puede conectar al subservicio %s"
+
+#: transport-helper.c:713
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "se esperaba ok/error, helper dijo '%s'"
+
+#: transport-helper.c:766
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "helper reportó estado inesperado de %s"
+
+#: transport-helper.c:827
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s no soporta dry-run"
+
+#: transport-helper.c:830
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s no soporta --signed"
+
+#: transport-helper.c:833
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s no soporta --signed=if-asked"
+
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s no soporta 'push-option'"
+
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper no soporta push; se necesita refspec"
+
+#: transport-helper.c:937
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s no soporta 'force'"
+
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
+msgstr "no se pudo ejecutar fast-export"
+
+#: transport-helper.c:989
+msgid "error while running fast-export"
+msgstr "error al ejecutar fast-export"
+
+#: transport-helper.c:1014
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+"No hay refs comunes y ninguno especificado; no se hace nada.\n"
+"Tal vez deberías especificar un branch como 'master'.\n"
+
+#: transport-helper.c:1077
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "respuesta malformada en lista de refs: %s"
+
+#: transport-helper.c:1230
+#, c-format
+msgid "read(%s) failed"
+msgstr "leer(%s) falló"
+
+#: transport-helper.c:1257
+#, c-format
+msgid "write(%s) failed"
+msgstr "escribir(%s) falló"
+
+#: transport-helper.c:1306

 #, c-format
 #, c-format

-msgid "Could not read ref %s"
-msgstr "No se pudo leer la referencia %s"
+msgid "%s thread failed"
+msgstr "hilo %s falló"

 
 

-#: tree-walk.c:31
+#: transport-helper.c:1310
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "hilo %s falló al unirse: %s"
+
+#: transport-helper.c:1329 transport-helper.c:1333
+#, 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:1370
+#, c-format
+msgid "%s process failed to wait"
+msgstr "proceso %s falló al esperar"
+
+#: transport-helper.c:1374
+#, c-format
+msgid "%s process failed"
+msgstr "proceso %s falló"
+
+#: transport-helper.c:1392 transport-helper.c:1401
+msgid "can't start thread for copying data"
+msgstr "no se puede iniciar hilo para copiar data"
+
+#: tree-walk.c:33

 msgid "too-short tree object"
 msgstr "objeto de árbol muy corto"
 
 msgid "too-short tree object"
 msgstr "objeto de árbol muy corto"
 

-#: tree-walk.c:37
+#: tree-walk.c:39

 msgid "malformed mode in tree entry"
 msgstr "modo mal formado en la entrada de árbol"
 
 msgid "malformed mode in tree entry"
 msgstr "modo mal formado en la entrada de árbol"
 

-#: tree-walk.c:41
+#: tree-walk.c:43

 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:113
+#: tree-walk.c:115

 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:111
+#: unpack-trees.c:112

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


@@ -4590,7 +5825,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:113
+#: unpack-trees.c:114

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


@@ -4600,7 +5835,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
 "checkout:\n"
 "%%s"
 

-#: unpack-trees.c:116
+#: unpack-trees.c:117

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


@@ -4610,7 +5845,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:118
+#: unpack-trees.c:119

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


@@ -4620,7 +5855,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
 "merge:\n"
 "%%s"
 

-#: unpack-trees.c:121
+#: unpack-trees.c:122

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


@@ -4629,7 +5864,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:123
+#: unpack-trees.c:124

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


@@ -4638,7 +5873,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:128
+#: unpack-trees.c:129

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


@@ -4648,7 +5883,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
 "seguimiento en ellos:\n"
 "%s"
 

-#: unpack-trees.c:132
+#: unpack-trees.c:133

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


@@ -4658,7 +5893,7 @@ msgstr ""
 "removidos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 
 "removidos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 

-#: unpack-trees.c:134
+#: unpack-trees.c:135

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


@@ -4668,7 +5903,7 @@ msgstr ""
 "al actualizar el árbol de trabajo:\n"
 "%%s"
 
 "al actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:137
+#: unpack-trees.c:138

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


@@ -4678,7 +5913,7 @@ msgstr ""
 "removidos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
 "removidos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 

-#: unpack-trees.c:139
+#: unpack-trees.c:140

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


@@ -4688,7 +5923,7 @@ msgstr ""
 "al fusionar:\n"
 "%%s"
 
 "al fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:142
+#: unpack-trees.c:143

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


@@ -4698,7 +5933,7 @@ msgstr ""
 "removidos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
 "removidos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 

-#: unpack-trees.c:144
+#: unpack-trees.c:145

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


@@ -4708,7 +5943,7 @@ msgstr ""
 "removidos al ejecutar %s:\n"
 "%%s"
 
 "removidos al ejecutar %s:\n"
 "%%s"
 

-#: unpack-trees.c:150
+#: unpack-trees.c:151

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


@@ -4719,7 +5954,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:152
+#: unpack-trees.c:153

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


@@ -4730,7 +5965,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:155
+#: unpack-trees.c:156

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


@@ -4740,7 +5975,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:157
+#: unpack-trees.c:158

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


@@ -4750,7 +5985,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
 "sobrescritos al fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:160
+#: unpack-trees.c:161

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


@@ -4760,7 +5995,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:162
+#: unpack-trees.c:163

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


@@ -4770,12 +6005,12 @@ msgstr ""
 "por %s:\n"
 "%%s"
 
 "por %s:\n"
 "%%s"
 

-#: unpack-trees.c:170
+#: unpack-trees.c:171

 #, 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:173
+#: unpack-trees.c:174

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


@@ -4785,7 +6020,7 @@ msgstr ""
 "actualizadas:\n"
 "%s"
 
 "actualizadas:\n"
 "%s"
 

-#: unpack-trees.c:175
+#: unpack-trees.c:176

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


@@ -4796,7 +6031,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:177
+#: unpack-trees.c:178

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


@@ -4807,7 +6042,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:179
+#: unpack-trees.c:180

 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 #, c-format
 msgid ""
 "Cannot update submodule:\n"


@@ -4816,12 +6051,12 @@ msgstr ""
 "No se puede actualizar le submódulo:\n"
 "%s"
 
 "No se puede actualizar le submódulo:\n"
 "%s"
 

-#: unpack-trees.c:262
+#: unpack-trees.c:254

 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 

-#: unpack-trees.c:344
+#: unpack-trees.c:336

 msgid "Checking out files"
 msgstr "Revisando archivos"
 
 msgid "Checking out files"
 msgstr "Revisando archivos"
 


@@ -4892,8 +6127,8 @@ msgstr "'%s' no apunta de vuelta a '%s'"
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 

-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
+#: builtin/am.c:863 builtin/merge.c:1078

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


@@ -5391,21 +6626,21 @@ msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"

-#: wt-status.c:2366
+#: wt-status.c:2376

 #, 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:2372
+#: wt-status.c:2382

 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:2374
+#: wt-status.c:2384

 #, 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."
 

-#: compat/precompose_utf8.c:58 builtin/clone.c:442
+#: compat/precompose_utf8.c:58 builtin/clone.c:443

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


@@ -5419,7 +6654,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 

-#: builtin/add.c:88 builtin/commit.c:266
+#: builtin/add.c:88 builtin/commit.c:279

 msgid "updating files failed"
 msgstr "falló la actualización de carpetas"
 
 msgid "updating files failed"
 msgstr "falló la actualización de carpetas"
 


@@ -5432,7 +6667,7 @@ msgstr "remover '%s'\n"
 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:892
+#: builtin/add.c:233 builtin/rev-parse.c:893

 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"
 


@@ -5468,9 +6703,9 @@ 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"
 
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 

-#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
+#: builtin/remote.c:1344 builtin/rm.c:240 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)"
 


@@ -5478,7 +6713,7 @@ msgstr "dry run ( ejecución en seco)"
 msgid "interactive picking"
 msgstr "selección interactiva"
 
 msgid "interactive picking"
 msgstr "selección interactiva"
 

-#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302

 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 
 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 


@@ -5522,19 +6757,15 @@ msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
 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:307 builtin/update-index.c:974
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/add.c:307 builtin/update-index.c:975
+#: builtin/add.c:308 builtin/update-index.c:973

 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:309
+#: builtin/add.c:310

 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:324
+#: builtin/add.c:325

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


@@ -5565,153 +6796,153 @@ msgstr ""
 "\n"
 "Vea \"git help submodule\" para mas información."
 
 "\n"
 "Vea \"git help submodule\" para mas información."
 

-#: builtin/add.c:352
+#: builtin/add.c:353

 #, 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:370
+#: builtin/add.c:371

 #, 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:378
+#: builtin/add.c:379

 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 
 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 

-#: builtin/add.c:416
+#: builtin/add.c:417

 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:423
+#: builtin/add.c:424

 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
 
 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:427
+#: builtin/add.c:428

 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
 
 #, 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:442
+#: builtin/add.c:443

 #, 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:443
+#: builtin/add.c:444

 #, 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/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
-#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
-#: builtin/rm.c:270 builtin/submodule--helper.c:328
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
+#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
+#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
+#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329

 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 
 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 

-#: builtin/am.c:414
+#: builtin/am.c:415

 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:498
+#: builtin/am.c:499

 #, 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:539
+#: builtin/am.c:540

 #, 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:576
+#: builtin/am.c:577

 #, 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:602
+#: builtin/am.c:603

 msgid "fseek failed"
 msgstr "fall de fseek"
 
 msgid "fseek failed"
 msgstr "fall de fseek"
 

-#: builtin/am.c:790
+#: builtin/am.c:791

 #, 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:855
+#: builtin/am.c:856

 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:903
+#: builtin/am.c:904

 msgid "invalid timestamp"
 msgstr "timestamp invalido"
 
 msgid "invalid timestamp"
 msgstr "timestamp invalido"
 

-#: builtin/am.c:908 builtin/am.c:920
+#: builtin/am.c:909 builtin/am.c:921

 msgid "invalid Date line"
 msgstr "línea Date invalida"
 
 msgid "invalid Date line"
 msgstr "línea Date invalida"
 

-#: builtin/am.c:915
+#: builtin/am.c:916

 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:1008
+#: builtin/am.c:1009

 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:1013 builtin/clone.c:407
+#: builtin/am.c:1014 builtin/clone.c:408

 #, 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:1018
+#: builtin/am.c:1019

 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 
 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 

-#: builtin/am.c:1148 builtin/commit.c:351
+#: builtin/am.c:1149 builtin/commit.c:364

 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:1162
+#: builtin/am.c:1163

 #, 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:1163
+#: builtin/am.c:1164

 #, 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:1164
+#: builtin/am.c:1165

 #, 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:1271
+#: builtin/am.c:1272

 msgid "Patch is empty."
 msgstr "El parche esta vacío."
 
 msgid "Patch is empty."
 msgstr "El parche esta vacío."
 

-#: builtin/am.c:1337
+#: builtin/am.c:1338

 #, 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:1359
+#: builtin/am.c:1360

 #, 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:1554
+#: builtin/am.c:1556

 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:1556
+#: builtin/am.c:1558

 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:1575
+#: builtin/am.c:1577

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


@@ -5719,28 +6950,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:1581
+#: builtin/am.c:1583

 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:1606
+#: builtin/am.c:1608

 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:1637
+#: builtin/am.c:1640

 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:1683 builtin/am.c:1687
+#: builtin/am.c:1686 builtin/am.c:1690

 #, 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:1703
+#: builtin/am.c:1706

 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:1708
+#: builtin/am.c:1711

 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 


@@ -5748,25 +6979,25 @@ 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:1718
+#: builtin/am.c:1721

 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:1768
+#: builtin/am.c:1771

 #, 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:1808 builtin/am.c:1879
+#: builtin/am.c:1811 builtin/am.c:1879

 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 

-#: builtin/am.c:1824
+#: builtin/am.c:1828

 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:1832
+#: builtin/am.c:1834

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


@@ -5841,8 +7072,8 @@ msgstr "opción histórica -- no-op"
 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:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:192
+#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
+#: builtin/repack.c:299

 msgid "be quiet"
 msgstr "ser silencioso"
 
 msgid "be quiet"
 msgstr "ser silencioso"
 


@@ -5885,17 +7116,17 @@ msgstr "descubrir todo antes de una línea de tijeras"
 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:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
-#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
-#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
-#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
+#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
+#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
+#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
+#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144

 #: parse-options.h:146 parse-options.h:258
 msgid "n"
 msgstr "n"
 
 #: parse-options.h:146 parse-options.h:258
 msgid "n"
 msgstr "n"
 

-#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39

 msgid "format"
 msgstr "formato"
 
 msgid "format"
 msgstr "formato"
 


@@ -5939,8 +7170,8 @@ msgstr "mentir sobre la fecha del committer"
 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:2298 builtin/commit.c:1468 builtin/merge.c:239
-#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
+#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400

 msgid "key-id"
 msgstr "key-id"
 
 msgid "key-id"
 msgstr "key-id"
 


@@ -6079,141 +7310,141 @@ msgstr "--write-terms requiere dos argumentos"
 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/blame.c:29
+#: builtin/blame.c:31

 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
 
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
 

-#: builtin/blame.c:34
+#: builtin/blame.c:36

 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> están documentadas en git-rev-list(1)"
 
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> están documentadas en git-rev-list(1)"
 

-#: builtin/blame.c:404
+#: builtin/blame.c:406

 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 
 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 

-#: builtin/blame.c:411
+#: builtin/blame.c:413

 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 
 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 

-#: builtin/blame.c:697
+#: builtin/blame.c:700

 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color invalido '%s' en color.blame.repeatedLines"
 
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color invalido '%s' en color.blame.repeatedLines"
 

-#: builtin/blame.c:715
+#: builtin/blame.c:718

 msgid "invalid value for blame.coloring"
 msgstr "valor inválido para blame.coloring"
 
 msgid "invalid value for blame.coloring"
 msgstr "valor inválido para blame.coloring"
 

-#: builtin/blame.c:786
+#: builtin/blame.c:789

 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
 
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
 

-#: builtin/blame.c:787
+#: builtin/blame.c:790

 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
 
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
 

-#: builtin/blame.c:788
+#: builtin/blame.c:791

 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "No tratar commits raíces como extremos (Default: off)"
 
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "No tratar commits raíces como extremos (Default: off)"
 

-#: builtin/blame.c:789
+#: builtin/blame.c:792

 msgid "Show work cost statistics"
 msgstr "Mostrar estadísticas de costo de trabajo"
 
 msgid "Show work cost statistics"
 msgstr "Mostrar estadísticas de costo de trabajo"
 

-#: builtin/blame.c:790
+#: builtin/blame.c:793

 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 
 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 

-#: builtin/blame.c:791
+#: builtin/blame.c:794

 msgid "Show output score for blame entries"
 msgstr "Mostrar la puntuación de salida de las entradas de blame"
 
 msgid "Show output score for blame entries"
 msgstr "Mostrar la puntuación de salida de las entradas de blame"
 

-#: builtin/blame.c:792
+#: builtin/blame.c:795

 msgid "Show original filename (Default: auto)"
 msgstr "Mostrar nombre original del archivo (Default: auto)"
 
 msgid "Show original filename (Default: auto)"
 msgstr "Mostrar nombre original del archivo (Default: auto)"
 

-#: builtin/blame.c:793
+#: builtin/blame.c:796

 msgid "Show original linenumber (Default: off)"
 msgstr "Mostrar número de línea original (Default: off)"
 
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostrar número de línea original (Default: off)"
 

-#: builtin/blame.c:794
+#: builtin/blame.c:797

 msgid "Show in a format designed for machine consumption"
 msgstr "Mostrar en un formato diseñado para consumo de máquina"
 
 msgid "Show in a format designed for machine consumption"
 msgstr "Mostrar en un formato diseñado para consumo de máquina"
 

-#: builtin/blame.c:795
+#: builtin/blame.c:798

 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostrar en formato porcelana con información de commit por línea"
 
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostrar en formato porcelana con información de commit por línea"
 

-#: builtin/blame.c:796
+#: builtin/blame.c:799

 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
 
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
 

-#: builtin/blame.c:797
+#: builtin/blame.c:800

 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostrar timestamp en formato raw (Default: off)"
 
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostrar timestamp en formato raw (Default: off)"
 

-#: builtin/blame.c:798
+#: builtin/blame.c:801

 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
 
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
 

-#: builtin/blame.c:799
+#: builtin/blame.c:802

 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Suprimir nombre del autor y timestamp (Default: off)"
 
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Suprimir nombre del autor y timestamp (Default: off)"
 

-#: builtin/blame.c:800
+#: builtin/blame.c:803

 msgid "Show author email instead of name (Default: off)"
 msgstr "Mostrar en cambio el email del autor (Default: off)"
 
 msgid "Show author email instead of name (Default: off)"
 msgstr "Mostrar en cambio el email del autor (Default: off)"
 

-#: builtin/blame.c:801
+#: builtin/blame.c:804

 msgid "Ignore whitespace differences"
 msgstr "Ignorar diferencias de espacios en blanco"
 
 msgid "Ignore whitespace differences"
 msgstr "Ignorar diferencias de espacios en blanco"
 

-#: builtin/blame.c:802
+#: builtin/blame.c:805

 msgid "color redundant metadata from previous line differently"
 msgstr "colorear metadata redundante de lineas previas de manera diferente"
 
 msgid "color redundant metadata from previous line differently"
 msgstr "colorear metadata redundante de lineas previas de manera diferente"
 

-#: builtin/blame.c:803
+#: builtin/blame.c:806

 msgid "color lines by age"
 msgstr "colorear lineas por edad"
 
 msgid "color lines by age"
 msgstr "colorear lineas por edad"
 

-#: builtin/blame.c:810
+#: builtin/blame.c:813

 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Usar un heurístico experimental para mejorar los diffs"
 
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Usar un heurístico experimental para mejorar los diffs"
 

-#: builtin/blame.c:812
+#: builtin/blame.c:815

 msgid "Spend extra cycles to find better match"
 msgstr "Ocupo más ciclos para encontrar mejoras resultados"
 
 msgid "Spend extra cycles to find better match"
 msgstr "Ocupo más ciclos para encontrar mejoras resultados"
 

-#: builtin/blame.c:813
+#: builtin/blame.c:816

 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
 
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
 

-#: builtin/blame.c:814
+#: builtin/blame.c:817

 msgid "Use <file>'s contents as the final image"
 msgstr "Usar contenido de <archivo> como imagen final"
 
 msgid "Use <file>'s contents as the final image"
 msgstr "Usar contenido de <archivo> como imagen final"
 

-#: builtin/blame.c:815 builtin/blame.c:816
+#: builtin/blame.c:818 builtin/blame.c:819

 msgid "score"
 msgstr "puntaje"
 
 msgid "score"
 msgstr "puntaje"
 

-#: builtin/blame.c:815
+#: builtin/blame.c:818

 msgid "Find line copies within and across files"
 msgstr "Encontrar copias de líneas entre y a través de archivos"
 
 msgid "Find line copies within and across files"
 msgstr "Encontrar copias de líneas entre y a través de archivos"
 

-#: builtin/blame.c:816
+#: builtin/blame.c:819

 msgid "Find line movements within and across files"
 msgstr "Encontrar movimientos de líneas entre y a través de archivos"
 
 msgid "Find line movements within and across files"
 msgstr "Encontrar movimientos de líneas entre y a través de archivos"
 

-#: builtin/blame.c:817
+#: builtin/blame.c:820

 msgid "n,m"
 msgstr "n,m"
 
 msgid "n,m"
 msgstr "n,m"
 

-#: builtin/blame.c:817
+#: builtin/blame.c:820

 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:866
+#: builtin/blame.c:869

 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"
 


@@ -6225,50 +7456,50 @@ 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:917
+#: builtin/blame.c:920

 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:1003
+#: builtin/blame.c:1007

 #, 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:1049
+#: builtin/blame.c:1053

 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 

-#: builtin/branch.c:27
+#: builtin/branch.c:28

 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
 
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
 

-#: builtin/branch.c:28
+#: builtin/branch.c:29

 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]"
 
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]"
 

-#: builtin/branch.c:29
+#: builtin/branch.c:30

 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..."
 
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..."
 

-#: builtin/branch.c:30
+#: builtin/branch.c:31

 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
 
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
 

-#: builtin/branch.c:31
+#: builtin/branch.c:32

 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
 
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
 

-#: builtin/branch.c:32
+#: builtin/branch.c:33

 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
 
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
 

-#: builtin/branch.c:33
+#: builtin/branch.c:34

 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opciones>] [-r | -a] [--formato]"
 
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opciones>] [-r | -a] [--formato]"
 

-#: builtin/branch.c:146
+#: builtin/branch.c:151

 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"


@@ -6277,7 +7508,7 @@ msgstr ""
 "borrando la rama '%s' que ha sido fusionada en\n"
 "         '%s', pero aún no ha sido fusionada a HEAD."
 
 "borrando la rama '%s' que ha sido fusionada en\n"
 "         '%s', pero aún no ha sido fusionada a HEAD."
 

-#: builtin/branch.c:150
+#: builtin/branch.c:155

 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"


@@ -6286,12 +7517,12 @@ msgstr ""
 "no borrando rama '%s' que todavía no ha sido fusionada \n"
 "\ta '%s', aunque se fusione con HEAD."
 
 "no borrando rama '%s' que todavía no ha sido fusionada \n"
 "\ta '%s', aunque se fusione con HEAD."
 

-#: builtin/branch.c:164
+#: builtin/branch.c:169

 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No se pudo encontrar el objeto commit para '%s'"
 
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No se pudo encontrar el objeto commit para '%s'"
 

-#: builtin/branch.c:168
+#: builtin/branch.c:173

 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"


@@ -6300,116 +7531,116 @@ msgstr ""
 "La rama '%s' no ha sido fusionada completamente.\n"
 "Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
 
 "La rama '%s' no ha sido fusionada completamente.\n"
 "Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
 

-#: builtin/branch.c:181
+#: builtin/branch.c:186

 msgid "Update of config-file failed"
 msgstr "Falló de actualización de config-file"
 
 msgid "Update of config-file failed"
 msgstr "Falló de actualización de config-file"
 

-#: builtin/branch.c:212
+#: builtin/branch.c:217

 msgid "cannot use -a with -d"
 msgstr "no se puede usar-a con -d"
 
 msgid "cannot use -a with -d"
 msgstr "no se puede usar-a con -d"
 

-#: builtin/branch.c:218
+#: builtin/branch.c:223

 msgid "Couldn't look up commit object for HEAD"
 msgstr "No se pudo revisar el objeto commit para HEAD"
 
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No se pudo revisar el objeto commit para HEAD"
 

-#: builtin/branch.c:232
+#: builtin/branch.c:237

 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 

-#: builtin/branch.c:247
+#: builtin/branch.c:252

 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "rama de rastreo remoto '%s' no encontrada."
 
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "rama de rastreo remoto '%s' no encontrada."
 

-#: builtin/branch.c:248
+#: builtin/branch.c:253

 #, c-format
 msgid "branch '%s' not found."
 msgstr "rama '%s' no encontrada."
 
 #, c-format
 msgid "branch '%s' not found."
 msgstr "rama '%s' no encontrada."
 

-#: builtin/branch.c:263
+#: builtin/branch.c:268

 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Error al eliminar la rama de rastreo remota '%s'"
 
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Error al eliminar la rama de rastreo remota '%s'"
 

-#: builtin/branch.c:264
+#: builtin/branch.c:269

 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Error al eliminar la rama '%s'"
 
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Error al eliminar la rama '%s'"
 

-#: builtin/branch.c:271
+#: builtin/branch.c:276

 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 

-#: builtin/branch.c:272
+#: builtin/branch.c:277

 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Eliminada la rama %s (era %s)..\n"
 
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Eliminada la rama %s (era %s)..\n"
 

-#: builtin/branch.c:416 builtin/tag.c:58
+#: builtin/branch.c:421 builtin/tag.c:59

 msgid "unable to parse format string"
 msgstr "no es posible analizar el string de formato"
 
 msgid "unable to parse format string"
 msgstr "no es posible analizar el string de formato"
 

-#: builtin/branch.c:453
+#: builtin/branch.c:458

 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Rama %s está siendo rebasada en %s"
 
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Rama %s está siendo rebasada en %s"
 

-#: builtin/branch.c:457
+#: builtin/branch.c:462

 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Rama %s está siendo bisecada en %s"
 
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Rama %s está siendo bisecada en %s"
 

-#: builtin/branch.c:474
+#: builtin/branch.c:479

 msgid "cannot copy the current branch while not on any."
 msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
 
 msgid "cannot copy the current branch while not on any."
 msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
 

-#: builtin/branch.c:476
+#: builtin/branch.c:481

 msgid "cannot rename the current branch while not on any."
 msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
 
 msgid "cannot rename the current branch while not on any."
 msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
 

-#: builtin/branch.c:487
+#: builtin/branch.c:492

 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nombre de rama invalido: '%s'"
 
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nombre de rama invalido: '%s'"
 

-#: builtin/branch.c:514
+#: builtin/branch.c:519

 msgid "Branch rename failed"
 msgstr "Cambio de nombre de rama fallido"
 
 msgid "Branch rename failed"
 msgstr "Cambio de nombre de rama fallido"
 

-#: builtin/branch.c:516
+#: builtin/branch.c:521

 msgid "Branch copy failed"
 msgstr "Copiado de rama fallido"
 
 msgid "Branch copy failed"
 msgstr "Copiado de rama fallido"
 

-#: builtin/branch.c:520
+#: builtin/branch.c:525

 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Copia creada de la rama malnombrada '%s'"
 
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Copia creada de la rama malnombrada '%s'"
 

-#: builtin/branch.c:523
+#: builtin/branch.c:528

 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Rama mal llamada '%s' renombrada"
 
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Rama mal llamada '%s' renombrada"
 

-#: builtin/branch.c:529
+#: builtin/branch.c:534

 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
 
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
 

-#: builtin/branch.c:538
+#: builtin/branch.c:543

 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La rama está renombrada, pero falló la actualización del archivo de "
 "configuración"
 
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La rama está renombrada, pero falló la actualización del archivo de "
 "configuración"
 

-#: builtin/branch.c:540
+#: builtin/branch.c:545

 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "La rama está copiada, pero falló la actualización del archivo de "
 "configuración"
 
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "La rama está copiada, pero falló la actualización del archivo de "
 "configuración"
 

-#: builtin/branch.c:556
+#: builtin/branch.c:561

 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"


@@ -6420,186 +7651,190 @@ msgstr ""
 "%s\n"
 "Las líneas que comiencen con '%c' serán removidas.\n"
 
 "%s\n"
 "Las líneas que comiencen con '%c' serán removidas.\n"
 

-#: builtin/branch.c:589
+#: builtin/branch.c:602

 msgid "Generic options"
 msgstr "Opciones genéricas"
 
 msgid "Generic options"
 msgstr "Opciones genéricas"
 

-#: builtin/branch.c:591
+#: builtin/branch.c:604

 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostrar hash y tema, dar dos veces para rama upstream"
 
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostrar hash y tema, dar dos veces para rama upstream"
 

-#: builtin/branch.c:592
+#: builtin/branch.c:605

 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 
 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 

-#: builtin/branch.c:593
+#: builtin/branch.c:606

 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurando modo tracking (mirar git-pull(1))"
 
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurando modo tracking (mirar git-pull(1))"
 

-#: builtin/branch.c:595
+#: builtin/branch.c:608

 msgid "do not use"
 msgstr "no usar"
 
 msgid "do not use"
 msgstr "no usar"
 

-#: builtin/branch.c:597
+#: builtin/branch.c:610

 msgid "upstream"
 msgstr "upstream"
 
 msgid "upstream"
 msgstr "upstream"
 

-#: builtin/branch.c:597
+#: builtin/branch.c:610

 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 
 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 

-#: builtin/branch.c:598
+#: builtin/branch.c:611

 msgid "Unset the upstream info"
 msgstr "Desconfigurando la info de upstream"
 
 msgid "Unset the upstream info"
 msgstr "Desconfigurando la info de upstream"
 

-#: builtin/branch.c:599
+#: builtin/branch.c:612

 msgid "use colored output"
 msgstr "usar salida con colores"
 
 msgid "use colored output"
 msgstr "usar salida con colores"
 

-#: builtin/branch.c:600
+#: builtin/branch.c:613

 msgid "act on remote-tracking branches"
 msgstr "actuar en ramas de traqueo remoto"
 
 msgid "act on remote-tracking branches"
 msgstr "actuar en ramas de traqueo remoto"
 

-#: builtin/branch.c:602 builtin/branch.c:604
+#: builtin/branch.c:615 builtin/branch.c:617

 msgid "print only branches that contain the commit"
 msgstr "mostrar solo ramas que contienen el commit"
 
 msgid "print only branches that contain the commit"
 msgstr "mostrar solo ramas que contienen el commit"
 

-#: builtin/branch.c:603 builtin/branch.c:605
+#: builtin/branch.c:616 builtin/branch.c:618

 msgid "print only branches that don't contain the commit"
 msgstr "mostrar solo ramas que no contienen el commit"
 
 msgid "print only branches that don't contain the commit"
 msgstr "mostrar solo ramas que no contienen el commit"
 

-#: builtin/branch.c:608
+#: builtin/branch.c:621

 msgid "Specific git-branch actions:"
 msgstr "Acciones específicas de git-branch:"
 
 msgid "Specific git-branch actions:"
 msgstr "Acciones específicas de git-branch:"
 

-#: builtin/branch.c:609
+#: builtin/branch.c:622

 msgid "list both remote-tracking and local branches"
 msgstr "listar ramas de remote-tracking y locales"
 
 msgid "list both remote-tracking and local branches"
 msgstr "listar ramas de remote-tracking y locales"
 

-#: builtin/branch.c:611
+#: builtin/branch.c:624

 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 
 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 

-#: builtin/branch.c:612
+#: builtin/branch.c:625

 msgid "delete branch (even if not merged)"
 msgstr "borrar rama (incluso si no esta fusionada)"
 
 msgid "delete branch (even if not merged)"
 msgstr "borrar rama (incluso si no esta fusionada)"
 

-#: builtin/branch.c:613
+#: builtin/branch.c:626

 msgid "move/rename a branch and its reflog"
 msgstr "mover/renombrar una rama y su reflog"
 
 msgid "move/rename a branch and its reflog"
 msgstr "mover/renombrar una rama y su reflog"
 

-#: builtin/branch.c:614
+#: builtin/branch.c:627

 msgid "move/rename a branch, even if target exists"
 msgstr "mover/renombrar una rama, incluso si el destino existe"
 
 msgid "move/rename a branch, even if target exists"
 msgstr "mover/renombrar una rama, incluso si el destino existe"
 

-#: builtin/branch.c:615
+#: builtin/branch.c:628

 msgid "copy a branch and its reflog"
 msgstr "copiar una rama y su reflog"
 
 msgid "copy a branch and its reflog"
 msgstr "copiar una rama y su reflog"
 

-#: builtin/branch.c:616
+#: builtin/branch.c:629

 msgid "copy a branch, even if target exists"
 msgstr "copiar una rama, incluso si el objetivo existe"
 
 msgid "copy a branch, even if target exists"
 msgstr "copiar una rama, incluso si el objetivo existe"
 

-#: builtin/branch.c:617
+#: builtin/branch.c:630

 msgid "list branch names"
 msgstr "listar nombres de ramas"
 
 msgid "list branch names"
 msgstr "listar nombres de ramas"
 

-#: builtin/branch.c:618
+#: builtin/branch.c:631

 msgid "create the branch's reflog"
 msgstr "crea el reflog de la rama"
 
 msgid "create the branch's reflog"
 msgstr "crea el reflog de la rama"
 

-#: builtin/branch.c:620
+#: builtin/branch.c:634
+msgid "deprecated synonym for --create-reflog"
+msgstr "sinónimo deprecado para --create-reflog"
+
+#: builtin/branch.c:639

 msgid "edit the description for the branch"
 msgstr "edita la descripción de la rama"
 
 msgid "edit the description for the branch"
 msgstr "edita la descripción de la rama"
 

-#: builtin/branch.c:621
+#: builtin/branch.c:640

 msgid "force creation, move/rename, deletion"
 msgstr "fuerza la creación,movimiento/renombrado,borrado"
 
 msgid "force creation, move/rename, deletion"
 msgstr "fuerza la creación,movimiento/renombrado,borrado"
 

-#: builtin/branch.c:622
+#: builtin/branch.c:641

 msgid "print only branches that are merged"
 msgstr "muestra solo ramas que han sido fusionadas"
 
 msgid "print only branches that are merged"
 msgstr "muestra solo ramas que han sido fusionadas"
 

-#: builtin/branch.c:623
+#: builtin/branch.c:642

 msgid "print only branches that are not merged"
 msgstr "muestra solo ramas que no han sido fusionadas"
 
 msgid "print only branches that are not merged"
 msgstr "muestra solo ramas que no han sido fusionadas"
 

-#: builtin/branch.c:624
+#: builtin/branch.c:643

 msgid "list branches in columns"
 msgstr "muestra las ramas en columnas"
 
 msgid "list branches in columns"
 msgstr "muestra las ramas en columnas"
 

-#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:412
+#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:413

 msgid "key"
 msgstr "clave"
 
 msgid "key"
 msgstr "clave"
 

-#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:413
+#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:414

 msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 
 msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 

-#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408
-#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:415
+#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410
+#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
+#: builtin/tag.c:416

 msgid "object"
 msgstr "objeto"
 
 msgid "object"
 msgstr "objeto"
 

-#: builtin/branch.c:629
+#: builtin/branch.c:648

 msgid "print only branches of the object"
 msgstr "imprimir sólo las ramas del objeto"
 
 msgid "print only branches of the object"
 msgstr "imprimir sólo las ramas del objeto"
 

-#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
+#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423

 msgid "sorting and filtering are case insensitive"
 msgstr "ordenamiento y filtrado son case-insensitive"
 
 msgid "sorting and filtering are case insensitive"
 msgstr "ordenamiento y filtrado son case-insensitive"
 

-#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
+#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421

 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 

-#: builtin/branch.c:655 builtin/clone.c:737
+#: builtin/branch.c:674 builtin/clone.c:739

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

-#: builtin/branch.c:678
+#: builtin/branch.c:697

 msgid "--column and --verbose are incompatible"
 msgstr "--column y --verbose son incompatibles"
 
 msgid "--column and --verbose are incompatible"
 msgstr "--column y --verbose son incompatibles"
 

-#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
+#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778

 msgid "branch name required"
 msgstr "se necesita el nombre de la rama"
 
 msgid "branch name required"
 msgstr "se necesita el nombre de la rama"
 

-#: builtin/branch.c:721
+#: builtin/branch.c:745

 msgid "Cannot give description to detached HEAD"
 msgstr "No se puede dar descripción al HEAD desacoplado"
 
 msgid "Cannot give description to detached HEAD"
 msgstr "No se puede dar descripción al HEAD desacoplado"
 

-#: builtin/branch.c:726
+#: builtin/branch.c:750

 msgid "cannot edit description of more than one branch"
 msgstr "no se puede editar la descripción de más de una rama"
 
 msgid "cannot edit description of more than one branch"
 msgstr "no se puede editar la descripción de más de una rama"
 

-#: builtin/branch.c:733
+#: builtin/branch.c:757

 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aún no hay commits en la rama '%s'."
 
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aún no hay commits en la rama '%s'."
 

-#: builtin/branch.c:736
+#: builtin/branch.c:760

 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hay ninguna rama llamada '%s'."
 
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hay ninguna rama llamada '%s'."
 

-#: builtin/branch.c:751
+#: builtin/branch.c:775

 msgid "too many branches for a copy operation"
 msgstr "demasiadas ramas para una operación de copiado"
 
 msgid "too many branches for a copy operation"
 msgstr "demasiadas ramas para una operación de copiado"
 

-#: builtin/branch.c:760
+#: builtin/branch.c:784

 msgid "too many arguments for a rename operation"
 msgstr "demasiados argumentos para una operación de renombrado"
 
 msgid "too many arguments for a rename operation"
 msgstr "demasiados argumentos para una operación de renombrado"
 

-#: builtin/branch.c:765
+#: builtin/branch.c:789

 msgid "too many arguments to set new upstream"
 msgstr "demasiados argumentos para configurar un nuevo upstream"
 
 msgid "too many arguments to set new upstream"
 msgstr "demasiados argumentos para configurar un nuevo upstream"
 

-#: builtin/branch.c:769
+#: builtin/branch.c:793

 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."


@@ -6607,37 +7842,37 @@ 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:772 builtin/branch.c:794 builtin/branch.c:810
+#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834

 #, 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'"
 

-#: builtin/branch.c:776
+#: builtin/branch.c:800

 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 

-#: builtin/branch.c:788
+#: builtin/branch.c:812

 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:792
+#: builtin/branch.c:816

 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:798
+#: builtin/branch.c:822

 #, 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:813
+#: builtin/branch.c:837

 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:816
+#: builtin/branch.c:840

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


@@ -6658,7 +7893,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:525
+#: builtin/cat-file.c:577

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


@@ -6666,7 +7901,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:526
+#: builtin/cat-file.c:578

 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"


@@ -6674,67 +7909,71 @@ 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:563
+#: builtin/cat-file.c:615

 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:564
+#: builtin/cat-file.c:616

 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 

-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:617

 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:567
+#: builtin/cat-file.c:619

 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:568
+#: builtin/cat-file.c:620

 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:570
+#: builtin/cat-file.c:622

 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:572
+#: builtin/cat-file.c:624

 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:573 git-submodule.sh:894
+#: builtin/cat-file.c:625 git-submodule.sh:864

 msgid "blob"
 msgstr "blob"
 
 msgid "blob"
 msgstr "blob"
 

-#: builtin/cat-file.c:574
+#: builtin/cat-file.c:626

 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:576
+#: builtin/cat-file.c:628

 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:577
+#: builtin/cat-file.c:629

 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 

-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:631

 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:582
+#: builtin/cat-file.c:634

 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:585
+#: builtin/cat-file.c:637

 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:587
+#: builtin/cat-file.c:639

 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:641
+msgid "do not order --batch-all-objects output"
+msgstr "no ordenar el output de --batch-all-objects"
+

 #: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
 #: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."


@@ -6751,7 +7990,7 @@ msgstr "reportar todos los atributos configurados en el archivo"
 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:100
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101

 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"
 


@@ -6759,7 +7998,8 @@ msgstr "leer nombres de archivos de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carácter NUL"
 
 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:1113 builtin/gc.c:500
+#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
+#: builtin/worktree.c:447

 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 


@@ -6851,9 +8091,9 @@ msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
 msgstr "escribir el contenido en un archivo temporal"
 
 #: builtin/checkout-index.c:173 builtin/column.c:31

-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
-#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
-#: builtin/worktree.c:610
+#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
+#: builtin/worktree.c:620

 msgid "string"
 msgstr "string"
 
 msgid "string"
 msgstr "string"
 


@@ -6865,113 +8105,113 @@ msgstr "cuando cree archivos, anteponer <string>"
 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:27
+#: builtin/checkout.c:29

 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 

-#: builtin/checkout.c:28
+#: builtin/checkout.c:30

 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:136 builtin/checkout.c:169
+#: builtin/checkout.c:138 builtin/checkout.c:171

 #, 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:138 builtin/checkout.c:171
+#: builtin/checkout.c:140 builtin/checkout.c:173

 #, 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:154
+#: builtin/checkout.c:156

 #, 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:198
+#: builtin/checkout.c:200

 #, 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:215
+#: builtin/checkout.c:217

 #, 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:231
+#: builtin/checkout.c:233

 #, 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:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
+#: builtin/checkout.c:264

 #, 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:265 builtin/checkout.c:268
+#: builtin/checkout.c:267 builtin/checkout.c:270

 #, 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:271
+#: builtin/checkout.c:273

 #, 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:340 builtin/checkout.c:347
+#: builtin/checkout.c:342 builtin/checkout.c:349

 #, 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:506
+#: builtin/checkout.c:508

 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:643
+#: builtin/checkout.c:645

 #, 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:684
+#: builtin/checkout.c:686

 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 

-#: builtin/checkout.c:688 builtin/clone.c:691
+#: builtin/checkout.c:690 builtin/clone.c:692

 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:692
+#: builtin/checkout.c:694

 #, 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:695
+#: builtin/checkout.c:697

 #, 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:699
+#: builtin/checkout.c:701

 #, 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:701 builtin/checkout.c:1046
+#: builtin/checkout.c:703 builtin/checkout.c:1052

 #, 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:703
+#: builtin/checkout.c:705

 #, 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:754
+#: builtin/checkout.c:756

 #, 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:760
+#: builtin/checkout.c:762

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


@@ -6994,7 +8234,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: builtin/checkout.c:779
+#: builtin/checkout.c:781

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


@@ -7021,160 +8261,160 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
 " git branch <nombre-de-rama> %s\n"
 "\n"
 

-#: builtin/checkout.c:811
+#: builtin/checkout.c:813

 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:815
+#: builtin/checkout.c:817

 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:843 builtin/checkout.c:1041
+#: builtin/checkout.c:845 builtin/checkout.c:1047

 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:947
+#: builtin/checkout.c:952

 #, 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:987 builtin/worktree.c:240 builtin/worktree.c:389
+#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396

 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invalida: %s"
 
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invalida: %s"
 

-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1022

 #, 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:1055
+#: builtin/checkout.c:1061

 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:1058 builtin/checkout.c:1062
+#: builtin/checkout.c:1064 builtin/checkout.c:1068

 #, 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:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
+#: builtin/checkout.c:1083

 #, 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:1082
+#: builtin/checkout.c:1088

 #, 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:1114 builtin/checkout.c:1116 builtin/clone.c:118
-#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
-#: builtin/worktree.c:435
+#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
+#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
+#: builtin/worktree.c:442

 msgid "branch"
 msgstr "rama"
 
 msgid "branch"
 msgstr "rama"
 

-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1122

 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:1117
+#: builtin/checkout.c:1124

 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:1118
+#: builtin/checkout.c:1125

 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:1119 builtin/worktree.c:437
+#: builtin/checkout.c:1126 builtin/worktree.c:444

 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:1120
+#: builtin/checkout.c:1127

 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:1122
+#: builtin/checkout.c:1129

 msgid "new-branch"
 msgstr "nueva-rama"
 
 msgid "new-branch"
 msgstr "nueva-rama"
 

-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1129

 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 

-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1131

 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:1125
+#: builtin/checkout.c:1134

 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:1127
+#: builtin/checkout.c:1136

 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:1129
+#: builtin/checkout.c:1138

 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:1131 builtin/merge.c:241
+#: builtin/checkout.c:1140 builtin/merge.c:273

 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 

-#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
+#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264

 msgid "style"
 msgstr "estilo"
 
 msgid "style"
 msgstr "estilo"
 

-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1143

 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:1137
+#: builtin/checkout.c:1146

 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:1139
+#: builtin/checkout.c:1148

 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
 
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
 

-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1150

 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:1145 builtin/clone.c:85 builtin/fetch.c:149
-#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
+#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
+#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572

 #: 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:1175
+#: builtin/checkout.c:1184

 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:1192
+#: builtin/checkout.c:1201

 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:1197
-msgid "Missing branch name; try -b"
-msgstr "Falta nombre de rama; prueba -b"
+#: builtin/checkout.c:1206
+msgid "missing branch name; try -b"
+msgstr "falta nombre de rama; prueba -b"

 
 

-#: builtin/checkout.c:1233
+#: builtin/checkout.c:1243

 msgid "invalid path specification"
 msgstr "especificación de ruta invalida"
 
 msgid "invalid path specification"
 msgstr "especificación de ruta invalida"
 

-#: builtin/checkout.c:1240
+#: builtin/checkout.c:1250

 #, 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:1244
+#: builtin/checkout.c:1254

 #, 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:1248
+#: builtin/checkout.c:1258

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


@@ -7182,38 +8422,68 @@ 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/clean.c:26
+#: builtin/checkout.c:1278
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"'%s' acertó más de una rama remota rastreada.\n"
+"Encontramos %d remotos con una referencia que concuerda. Así que volvemos\n"
+"a intentar resolver el argumento como una ruta, pero eso también falló!\n"
+"\n"
+"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n"
+"puedes hacerlo proporcionando el nombre completo con la opción --track:\n"
+"\n"
+"    git checkout --track origin/<nombre>\n"
+"\n"
+"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una "
+"rama\n"
+"de nombre <nombre> remota, como 'origin', considera configurar\n"
+"checkout.defaultRemote=origin en tu configuración."
+
+#: builtin/clean.c:27

 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:30
+#: builtin/clean.c:31

 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 
 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 

-#: builtin/clean.c:31
+#: builtin/clean.c:32

 #, 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:32
+#: builtin/clean.c:33

 #, 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:33
+#: builtin/clean.c:34

 #, 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:34
+#: builtin/clean.c:35

 #, 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:302 git-add--interactive.perl:579
+#: builtin/clean.c:297 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -7226,7 +8496,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:306 git-add--interactive.perl:588
+#: builtin/clean.c:301 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -7247,38 +8517,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:522 git-add--interactive.perl:554
+#: builtin/clean.c:517 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:664
+#: builtin/clean.c:659

 #, 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:701
+#: builtin/clean.c:696

 #, 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:722
+#: builtin/clean.c:717

 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:763
+#: builtin/clean.c:758

 #, 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:788 git-add--interactive.perl:1717
+#: builtin/clean.c:783 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:796
+#: builtin/clean.c:791

 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"


@@ -7296,64 +8566,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:823 git-add--interactive.perl:1793
+#: builtin/clean.c:818 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 

-#: builtin/clean.c:824 git-add--interactive.perl:1790
+#: builtin/clean.c:819 git-add--interactive.perl:1790

 msgid "What now"
 msgstr "Ahora que"
 
 msgid "What now"
 msgstr "Ahora que"
 

-#: builtin/clean.c:832
+#: builtin/clean.c:827

 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se removerá el siguiente objeto:"
 msgstr[1] "Se removerán los siguientes objetos:"
 
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se removerá el siguiente objeto:"
 msgstr[1] "Se removerán los siguientes objetos:"
 

-#: builtin/clean.c:848
+#: builtin/clean.c:843

 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:910
+#: builtin/clean.c:905

 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:912
+#: builtin/clean.c:907

 msgid "force"
 msgstr "forzar"
 
 msgid "force"
 msgstr "forzar"
 

-#: builtin/clean.c:913
+#: builtin/clean.c:908

 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 

-#: builtin/clean.c:915
+#: builtin/clean.c:910

 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 

-#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
-#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
-#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
-#: builtin/show-ref.c:176
+#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
+#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:177

 msgid "pattern"
 msgstr "patrón"
 
 msgid "pattern"
 msgstr "patrón"
 

-#: builtin/clean.c:917
+#: builtin/clean.c:912

 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:918
+#: builtin/clean.c:913

 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:920
+#: builtin/clean.c:915

 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 

-#: builtin/clean.c:938
+#: builtin/clean.c:933

 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:942
+#: builtin/clean.c:937

 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"


@@ -7361,7 +8631,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:945
+#: builtin/clean.c:940

 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"


@@ -7369,146 +8639,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:42
+#: builtin/clone.c:43

 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:87
+#: builtin/clone.c:88

 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 

-#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480

 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:92
+#: builtin/clone.c:93

 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:94
+#: builtin/clone.c:95

 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:96
+#: builtin/clone.c:97

 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:98
+#: builtin/clone.c:99

 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 

-#: builtin/clone.c:100 builtin/clone.c:104
+#: builtin/clone.c:101 builtin/clone.c:105

 msgid "pathspec"
 msgstr "pathspec"
 
 msgid "pathspec"
 msgstr "pathspec"
 

-#: builtin/clone.c:100 builtin/clone.c:104
+#: builtin/clone.c:101 builtin/clone.c:105

 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:107
+#: builtin/clone.c:108

 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:108 builtin/init-db.c:476
+#: builtin/clone.c:109 builtin/init-db.c:477

 msgid "template-directory"
 msgstr "directorio-template"
 
 msgid "template-directory"
 msgstr "directorio-template"
 

-#: builtin/clone.c:109 builtin/init-db.c:477
+#: builtin/clone.c:110 builtin/init-db.c:478

 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:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
-#: builtin/submodule--helper.c:1594
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:1739

 msgid "reference repository"
 msgstr "repositorio de referencia"
 
 msgid "reference repository"
 msgstr "repositorio de referencia"
 

-#: builtin/clone.c:115 builtin/submodule--helper.c:1225
-#: builtin/submodule--helper.c:1596
+#: builtin/clone.c:116 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1741

 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estas clonado"
 
 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estas clonado"
 

-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3166 builtin/repack.c:213
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3191 builtin/repack.c:320

 msgid "name"
 msgstr "nombre"
 
 msgid "name"
 msgstr "nombre"
 

-#: builtin/clone.c:117
+#: builtin/clone.c:118

 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:119
+#: builtin/clone.c:120

 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:121
+#: builtin/clone.c:122

 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:122 builtin/fetch.c:150 builtin/grep.c:813
+#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814

 #: builtin/pull.c:216
 msgid "depth"
 msgstr "profundidad"
 
 #: builtin/pull.c:216
 msgid "depth"
 msgstr "profundidad"
 

-#: builtin/clone.c:123
+#: builtin/clone.c:124

 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:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
+#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182

 #: parse-options.h:154
 msgid "time"
 msgstr "tiempo"
 
 #: parse-options.h:154
 msgid "time"
 msgstr "tiempo"
 

-#: builtin/clone.c:125
+#: builtin/clone.c:126

 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:126 builtin/fetch.c:154
+#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166

 msgid "revision"
 msgstr "revision"
 
 msgid "revision"
 msgstr "revision"
 

-#: builtin/clone.c:127 builtin/fetch.c:155
+#: builtin/clone.c:128 builtin/fetch.c:144

 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:129
+#: builtin/clone.c:130

 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:131
+#: builtin/clone.c:132

 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:133
+#: builtin/clone.c:134

 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:134 builtin/init-db.c:485
+#: builtin/clone.c:135 builtin/init-db.c:486

 msgid "gitdir"
 msgstr "gitdir"
 
 msgid "gitdir"
 msgstr "gitdir"
 

-#: builtin/clone.c:135 builtin/init-db.c:486
+#: builtin/clone.c:136 builtin/init-db.c:487

 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:136
+#: builtin/clone.c:137

 msgid "key=value"
 msgstr "llave=valor"
 
 msgid "key=value"
 msgstr "llave=valor"
 

-#: builtin/clone.c:137
+#: builtin/clone.c:138

 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:138 builtin/fetch.c:173 builtin/pull.c:229
+#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229

 #: builtin/push.c:583
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
 #: builtin/push.c:583
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 

-#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
+#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232

 #: builtin/push.c:585
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
 #: builtin/push.c:585
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 

-#: builtin/clone.c:278
+#: builtin/clone.c:279

 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"


@@ -7516,42 +8786,42 @@ 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:331
+#: builtin/clone.c:332

 #, 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:403
+#: builtin/clone.c:404

 #, 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:411
+#: builtin/clone.c:412

 #, 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:425
+#: builtin/clone.c:426

 #, 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:447
+#: builtin/clone.c:448

 #, 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:451
+#: builtin/clone.c:452

 #, 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:477
+#: builtin/clone.c:478

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

-#: builtin/clone.c:491
+#: builtin/clone.c:492

 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"


@@ -7561,100 +8831,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:568
+#: builtin/clone.c:569

 #, 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:663
-msgid "remote did not send all necessary objects"
-msgstr "remoto no mando todos los objetos necesarios"
-
-#: builtin/clone.c:679
+#: builtin/clone.c:680

 #, 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:728
+#: builtin/clone.c:730

 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:758
+#: builtin/clone.c:760

 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:803
+#: builtin/clone.c:805

 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:866
+#: builtin/clone.c:868

 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:868
+#: builtin/clone.c:870

 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:907 builtin/receive-pack.c:1947
+#: builtin/clone.c:910 builtin/receive-pack.c:1935

 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 
 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 

-#: builtin/clone.c:911
+#: builtin/clone.c:914

 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:924
+#: builtin/clone.c:927

 #, 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:927
+#: builtin/clone.c:930

 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:940
+#: builtin/clone.c:943

 #, 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:946 builtin/fetch.c:1460
+#: builtin/clone.c:949 builtin/fetch.c:1512

 #, 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:956
+#: builtin/clone.c:959

 #, 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:966
+#: builtin/clone.c:969

 #, 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:981 builtin/clone.c:1002 builtin/difftool.c:270
-#: builtin/worktree.c:246 builtin/worktree.c:276
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
+#: builtin/worktree.c:247 builtin/worktree.c:277

 #, 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:986
+#: builtin/clone.c:989

 #, 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:1006
+#: builtin/clone.c:1009

 #, 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:1008
+#: builtin/clone.c:1011

 #, 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:1032
+#: builtin/clone.c:1035

 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"


@@ -7662,36 +8928,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:1093
+#: builtin/clone.c:1096

 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:1095
+#: builtin/clone.c:1098

 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:1097
+#: builtin/clone.c:1100

 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:1099
+#: builtin/clone.c:1102

 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:1102
+#: builtin/clone.c:1105

 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:1107
+#: builtin/clone.c:1110

 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 

-#: builtin/clone.c:1169 builtin/clone.c:1177
+#: builtin/clone.c:1180 builtin/clone.c:1188

 #, 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:1180
+#: builtin/clone.c:1191

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


@@ -7727,15 +8993,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:37
+#: builtin/commit.c:38

 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:42
+#: builtin/commit.c:43

 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:47
+#: builtin/commit.c:48

 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"


@@ -7745,7 +9011,7 @@ msgstr ""
 "vaciaría. Puedes repetir el comando con --alow-empty, o puedes remover \n"
 "el commit completamente con \"git reset HEAD^\".\n"
 
 "vaciaría. Puedes repetir el comando con --alow-empty, o puedes remover \n"
 "el commit completamente con \"git reset HEAD^\".\n"
 

-#: builtin/commit.c:52
+#: builtin/commit.c:53

 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"


@@ -7760,11 +9026,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
 "    git commit --allow-empty\n"
 "\n"
 

-#: builtin/commit.c:59
+#: builtin/commit.c:60

 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:62
+#: builtin/commit.c:63

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -7780,61 +9046,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:293
+#: builtin/commit.c:306

 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:334
+#: builtin/commit.c:347

 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:340
+#: builtin/commit.c:353

 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 

-#: builtin/commit.c:353
+#: builtin/commit.c:366

 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:355
+#: builtin/commit.c:368

 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:380 builtin/commit.c:403 builtin/commit.c:449
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462

 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:432
+#: builtin/commit.c:445

 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:434
+#: builtin/commit.c:447

 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:442
+#: builtin/commit.c:455

 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:461
+#: builtin/commit.c:474

 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:558
+#: builtin/commit.c:571

 #, 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:560
+#: builtin/commit.c:573

 #, 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:579
+#: builtin/commit.c:592

 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 

-#: builtin/commit.c:631
+#: builtin/commit.c:644

 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"


@@ -7842,38 +9108,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:668 builtin/commit.c:701 builtin/commit.c:1029
+#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042

 #, 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:680 builtin/shortlog.c:316
+#: builtin/commit.c:693 builtin/shortlog.c:317

 #, 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:682
+#: builtin/commit.c:695

 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:686
+#: builtin/commit.c:699

 #, 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:715 builtin/commit.c:723
+#: builtin/commit.c:728 builtin/commit.c:736

 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:720
+#: builtin/commit.c:733

 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:774
+#: builtin/commit.c:787

 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:792
+#: builtin/commit.c:805

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


@@ -7888,7 +9154,7 @@ msgstr ""
 "\t%s\n"
 "y vuelve a intentar.\n"
 
 "\t%s\n"
 "y vuelve a intentar.\n"
 

-#: builtin/commit.c:797
+#: builtin/commit.c:810

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


@@ -7903,7 +9169,7 @@ msgstr ""
 "\t%s\n"
 "y vuelva a intentar.\n"
 
 "\t%s\n"
 "y vuelva a intentar.\n"
 

-#: builtin/commit.c:810
+#: builtin/commit.c:823

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


@@ -7913,7 +9179,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:818
+#: 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"


@@ -7925,102 +9191,102 @@ msgstr ""
 "con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 
 "con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 

-#: builtin/commit.c:835
+#: builtin/commit.c:848

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 

-#: builtin/commit.c:843
+#: builtin/commit.c:856

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

-#: builtin/commit.c:850
+#: builtin/commit.c:863

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 

-#: builtin/commit.c:867
+#: builtin/commit.c:880

 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:933
+#: builtin/commit.c:946

 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 

-#: builtin/commit.c:947 builtin/tag.c:257
+#: builtin/commit.c:960 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:991
+#: builtin/commit.c:1004

 #, 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:1005
+#: builtin/commit.c:1018

 #, 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:1019 builtin/commit.c:1269
+#: builtin/commit.c:1032 builtin/commit.c:1269

 #, 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:1057
+#: builtin/commit.c:1070

 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:1090
+#: builtin/commit.c:1103

 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:1099
+#: builtin/commit.c:1112

 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:1102
+#: builtin/commit.c:1115

 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:1104
+#: builtin/commit.c:1117

 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:1107
+#: builtin/commit.c:1120

 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:1117
+#: builtin/commit.c:1130

 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:1119
+#: builtin/commit.c:1132

 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:1127
+#: builtin/commit.c:1140

 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:1144
+#: builtin/commit.c:1157

 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:1146
+#: builtin/commit.c:1159

 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:1160 builtin/tag.c:543
+#: builtin/commit.c:1173 builtin/tag.c:544

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup invalido %s"
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup invalido %s"
 

-#: builtin/commit.c:1165
+#: builtin/commit.c:1178

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


@@ -8045,7 +9311,7 @@ msgid "version"
 msgstr "version"
 
 #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
 msgstr "version"
 
 #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558

-#: builtin/worktree.c:581
+#: builtin/worktree.c:591

 msgid "machine-readable output"
 msgstr "output formato-maquina"
 
 msgid "machine-readable output"
 msgstr "output formato-maquina"
 


@@ -8058,7 +9324,7 @@ msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
 #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
 msgstr "terminar entradas con NUL"
 
 #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494

-#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398

 msgid "mode"
 msgstr "modo"
 
 msgid "mode"
 msgstr "modo"
 


@@ -8117,7 +9383,7 @@ msgstr "mostrar diff en el template del mensaje de commit"
 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:1454 builtin/tag.c:394
+#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395

 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 


@@ -8129,7 +9395,7 @@ msgstr "autor"
 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:1456 builtin/gc.c:501
+#: builtin/commit.c:1456 builtin/gc.c:504

 msgid "date"
 msgstr "fecha"
 
 msgid "date"
 msgstr "fecha"
 


@@ -8137,8 +9403,8 @@ msgstr "fecha"
 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:1457 builtin/merge.c:228 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:392
+#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
+#: builtin/notes.c:567 builtin/tag.c:393

 msgid "message"
 msgstr "mensaje"
 
 msgid "message"
 msgstr "mensaje"
 


@@ -8174,8 +9440,8 @@ msgstr ""
 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:1463 builtin/log.c:1446 builtin/merge.c:242
-#: builtin/pull.c:154 builtin/revert.c:105
+#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
+#: builtin/pull.c:154 builtin/revert.c:106

 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 


@@ -8191,7 +9457,7 @@ msgstr "forzar la edición del commit"
 msgid "default"
 msgstr "default"
 
 msgid "default"
 msgstr "default"
 

-#: builtin/commit.c:1466 builtin/tag.c:398
+#: builtin/commit.c:1466 builtin/tag.c:399

 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"
 


@@ -8199,8 +9465,8 @@ msgstr "cómo quitar espacios y #comentarios de mensajes"
 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:1469 builtin/merge.c:240 builtin/pull.c:184
-#: builtin/revert.c:113
+#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
+#: builtin/revert.c:114

 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 


@@ -8278,55 +9544,64 @@ msgstr "Abortando commit; no se ha editado el mensaje\n"
 
 #: builtin/commit.c:1650
 msgid ""
 
 #: builtin/commit.c:1650
 msgid ""

-"Repository has been updated, but unable to write\n"
+"repository has been updated, but unable to write\n"

 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""

-"El repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
+"el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"

 "new_index. Verifique que el disco no este lleno y la quota no ha\n"
 "sido superada, y luego \"git reset HEAD\" para recuperar."
 
 "new_index. Verifique que el disco no este lleno y la quota no ha\n"
 "sido superada, y luego \"git reset HEAD\" para recuperar."
 

-#: builtin/commit-graph.c:9
+#: builtin/commit-graph.c:10

 msgid "git commit-graph [--object-dir <objdir>]"
 msgstr "git commit-graph [--object-dir <objdir>]"
 
 msgid "git commit-graph [--object-dir <objdir>]"
 msgstr "git commit-graph [--object-dir <objdir>]"
 

-#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23

 msgid "git commit-graph read [--object-dir <objdir>]"
 msgstr "git commit-graph read [--object-dir <objdir>]"
 
 msgid "git commit-graph read [--object-dir <objdir>]"
 msgstr "git commit-graph read [--object-dir <objdir>]"
 

-#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr "git commit-graph verify [--object-dir <objdir>]"
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28

 msgid ""
 msgid ""

-"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
-"stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"

 msgstr ""
 msgstr ""

-"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
-"stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append][--reachable|--"
+"stdin-packs|--stdin-commits]"

 
 

-#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
-#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
+#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
+#: builtin/log.c:1477

 msgid "dir"
 msgstr "dir"
 
 msgid "dir"
 msgstr "dir"
 

-#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
-#: builtin/commit-graph.c:148
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:185

 msgid "The object directory to store the graph"
 msgstr "El directorio de objetos para guardar el gráfico"
 
 msgid "The object directory to store the graph"
 msgstr "El directorio de objetos para guardar el gráfico"
 

-#: builtin/commit-graph.c:95
+#: builtin/commit-graph.c:134
+msgid "start walk at all refs"
+msgstr "comenzar caminata en todas las refs"
+
+#: builtin/commit-graph.c:136

 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "escanear paquete de índices por stdin por commits"
 
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "escanear paquete de índices por stdin por commits"
 

-#: builtin/commit-graph.c:97
+#: builtin/commit-graph.c:138

 msgid "start walk at commits listed by stdin"
 msgstr "comenzar a caminar a los commits listados por stdin"
 
 msgid "start walk at commits listed by stdin"
 msgstr "comenzar a caminar a los commits listados por stdin"
 

-#: builtin/commit-graph.c:99
+#: builtin/commit-graph.c:140

 msgid "include all commits already in the commit-graph file"
 msgstr "inclye todos los commits que ya están en el archivo commit-graph"
 
 msgid "include all commits already in the commit-graph file"
 msgstr "inclye todos los commits que ya están en el archivo commit-graph"
 

-#: builtin/commit-graph.c:108
-msgid "cannot use both --stdin-commits and --stdin-packs"
-msgstr "no se pueden usar ambos --stdin-commits y --stdin-packs"
+#: builtin/commit-graph.c:149
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"

 
 #: builtin/config.c:10
 msgid "git config [<options>]"
 
 #: builtin/config.c:10
 msgid "git config [<options>]"


@@ -8337,161 +9612,197 @@ msgstr "git config [<opciones>]"
 msgid "unrecognized --type argument, %s"
 msgstr "argumento --type no reconocido, %s"
 
 msgid "unrecognized --type argument, %s"
 msgstr "argumento --type no reconocido, %s"
 

-#: builtin/config.c:123
+#: builtin/config.c:113
+msgid "only one type at a time"
+msgstr "solo un tipo a la vez"
+
+#: builtin/config.c:122

 msgid "Config file location"
 msgstr "Ubicación del archivo configuración"
 
 msgid "Config file location"
 msgstr "Ubicación del archivo configuración"
 

-#: builtin/config.c:124
+#: builtin/config.c:123

 msgid "use global config file"
 msgstr "usar archivo de config global"
 
 msgid "use global config file"
 msgstr "usar archivo de config global"
 

-#: builtin/config.c:125
+#: builtin/config.c:124

 msgid "use system config file"
 msgstr "usar archivo de config del sistema"
 
 msgid "use system config file"
 msgstr "usar archivo de config del sistema"
 

-#: builtin/config.c:126
+#: builtin/config.c:125

 msgid "use repository config file"
 msgstr "usar archivo de config del repositorio"
 
 msgid "use repository config file"
 msgstr "usar archivo de config del repositorio"
 

-#: builtin/config.c:127
+#: builtin/config.c:126

 msgid "use given config file"
 msgstr "usar archivo config especificado"
 
 msgid "use given config file"
 msgstr "usar archivo config especificado"
 

-#: builtin/config.c:128
+#: builtin/config.c:127

 msgid "blob-id"
 msgstr "blob-id"
 
 msgid "blob-id"
 msgstr "blob-id"
 

-#: builtin/config.c:128
+#: builtin/config.c:127

 msgid "read config from given blob object"
 msgstr "leer config del objeto blob suministrado"
 
 msgid "read config from given blob object"
 msgstr "leer config del objeto blob suministrado"
 

-#: builtin/config.c:129
+#: builtin/config.c:128

 msgid "Action"
 msgstr "Acción"
 
 msgid "Action"
 msgstr "Acción"
 

-#: builtin/config.c:130
+#: builtin/config.c:129

 msgid "get value: name [value-regex]"
 msgstr "obtener valor: nombre [valor-regex]"
 
 msgid "get value: name [value-regex]"
 msgstr "obtener valor: nombre [valor-regex]"
 

-#: builtin/config.c:131
+#: builtin/config.c:130

 msgid "get all values: key [value-regex]"
 msgstr "obtener todos los valores: llave [valores-regex]"
 
 msgid "get all values: key [value-regex]"
 msgstr "obtener todos los valores: llave [valores-regex]"
 

-#: builtin/config.c:132
+#: builtin/config.c:131

 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
 
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
 

-#: builtin/config.c:133
+#: builtin/config.c:132

 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtener valor especifico para el URL: sección[.var] URL"
 
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtener valor especifico para el URL: sección[.var] URL"
 

-#: builtin/config.c:134
+#: builtin/config.c:133

 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "remplazar todas las variables que concuerden: nombre valor [valor_regex]"
 
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "remplazar todas las variables que concuerden: nombre valor [valor_regex]"
 

-#: builtin/config.c:135
+#: builtin/config.c:134

 msgid "add a new variable: name value"
 msgstr "agregar nueva variable: nombre valor"
 
 msgid "add a new variable: name value"
 msgstr "agregar nueva variable: nombre valor"
 

-#: builtin/config.c:136
+#: builtin/config.c:135

 msgid "remove a variable: name [value-regex]"
 msgstr "borrar una variable. nombre [valor-regex]"
 
 msgid "remove a variable: name [value-regex]"
 msgstr "borrar una variable. nombre [valor-regex]"
 

-#: builtin/config.c:137
+#: builtin/config.c:136

 msgid "remove all matches: name [value-regex]"
 msgstr "borrar todas las concurrencias: nombre [valor-regex]"
 
 msgid "remove all matches: name [value-regex]"
 msgstr "borrar todas las concurrencias: nombre [valor-regex]"
 

-#: builtin/config.c:138
+#: builtin/config.c:137

 msgid "rename section: old-name new-name"
 msgstr "renombrar sección: nombre-viejo nombre-nuevo"
 
 msgid "rename section: old-name new-name"
 msgstr "renombrar sección: nombre-viejo nombre-nuevo"
 

-#: builtin/config.c:139
+#: builtin/config.c:138

 msgid "remove a section: name"
 msgstr "borrar una sección: nombre"
 
 msgid "remove a section: name"
 msgstr "borrar una sección: nombre"
 

-#: builtin/config.c:140
+#: builtin/config.c:139

 msgid "list all"
 msgstr "listar todo"
 
 msgid "list all"
 msgstr "listar todo"
 

-#: builtin/config.c:141
+#: builtin/config.c:140

 msgid "open an editor"
 msgstr "abrir el editor"
 
 msgid "open an editor"
 msgstr "abrir el editor"
 

-#: builtin/config.c:142
+#: builtin/config.c:141

 msgid "find the color configured: slot [default]"
 msgstr "encontrar el color configurado: slot [default]"
 
 msgid "find the color configured: slot [default]"
 msgstr "encontrar el color configurado: slot [default]"
 

-#: builtin/config.c:143
+#: builtin/config.c:142

 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
 
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
 

-#: builtin/config.c:144
+#: builtin/config.c:143

 msgid "Type"
 msgstr "Tipo"
 
 msgid "Type"
 msgstr "Tipo"
 

-#: builtin/config.c:145
+#: builtin/config.c:144

 msgid "value is given this type"
 msgstr "al valor se ha dado este tipo"
 
 msgid "value is given this type"
 msgstr "al valor se ha dado este tipo"
 

-#: builtin/config.c:146
+#: builtin/config.c:145

 msgid "value is \"true\" or \"false\""
 msgstr "valor es \"true\" o \"false\""
 
 msgid "value is \"true\" or \"false\""
 msgstr "valor es \"true\" o \"false\""
 

-#: builtin/config.c:147
+#: builtin/config.c:146

 msgid "value is decimal number"
 msgstr "valor es un numero decimal"
 
 msgid "value is decimal number"
 msgstr "valor es un numero decimal"
 

-#: builtin/config.c:148
+#: builtin/config.c:147

 msgid "value is --bool or --int"
 msgstr "valor es --bool o --int"
 
 msgid "value is --bool or --int"
 msgstr "valor es --bool o --int"
 

-#: builtin/config.c:149
+#: builtin/config.c:148

 msgid "value is a path (file or directory name)"
 msgstr "valor es una ruta (archivo o nombre de directorio)"
 
 msgid "value is a path (file or directory name)"
 msgstr "valor es una ruta (archivo o nombre de directorio)"
 

-#: builtin/config.c:150
+#: builtin/config.c:149

 msgid "value is an expiry date"
 msgstr "valor es una fecha de expiración"
 
 msgid "value is an expiry date"
 msgstr "valor es una fecha de expiración"
 

-#: builtin/config.c:151
+#: builtin/config.c:150

 msgid "Other"
 msgstr "Otro"
 
 msgid "Other"
 msgstr "Otro"
 

-#: builtin/config.c:152
+#: builtin/config.c:151

 msgid "terminate values with NUL byte"
 msgstr "terminar valores con un byte NULL"
 
 msgid "terminate values with NUL byte"
 msgstr "terminar valores con un byte NULL"
 

-#: builtin/config.c:153
+#: builtin/config.c:152

 msgid "show variable names only"
 msgstr "mostrar solo nombres de variables"
 
 msgid "show variable names only"
 msgstr "mostrar solo nombres de variables"
 

-#: builtin/config.c:154
+#: builtin/config.c:153

 msgid "respect include directives on lookup"
 msgstr "respetar directivas include en la búsqueda"
 
 msgid "respect include directives on lookup"
 msgstr "respetar directivas include en la búsqueda"
 

-#: builtin/config.c:155
+#: builtin/config.c:154

 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
 
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
 

-#: builtin/config.c:156
+#: builtin/config.c:155

 msgid "value"
 msgstr "valor"
 
 msgid "value"
 msgstr "valor"
 

-#: builtin/config.c:156
+#: builtin/config.c:155

 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:332
+#: builtin/config.c:168
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "número de argumentos inválidos, deberían ser %d"
+
+#: builtin/config.c:170
+#, 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:304
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "patrón de llave inválido: %s"
+
+#: builtin/config.c:340

 #, 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:431
+#: builtin/config.c:397
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "no se analizar color '%s'"
+
+#: builtin/config.c:439

 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:575
+#: builtin/config.c:492 builtin/config.c:724
+msgid "not in a git directory"
+msgstr "no en un directorio git"
+
+#: builtin/config.c:495
+msgid "writing to stdin is not supported"
+msgstr "escribir en stdin no está soportado"
+
+#: builtin/config.c:498
+msgid "writing config blobs is not supported"
+msgstr "escribir blobs de configuración no está soportado"
+
+#: builtin/config.c:583

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -8506,20 +9817,68 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
 "#\tname = %s\n"
 "#\temail = %s\n"
 

-#: builtin/config.c:603
+#: builtin/config.c:606
+msgid "only one config file at a time"
+msgstr "solo un archivo de configuración a la vez"
+
+#: builtin/config.c:611

 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:606
+#: builtin/config.c:614

 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:735
+#: builtin/config.c:633
+msgid "$HOME not set"
+msgstr "$HOME no está configurado"
+
+#: builtin/config.c:670
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color y tipo de variable incoherente"
+
+#: builtin/config.c:675
+msgid "only one action at a time"
+msgstr "solo una acción a la vez"
+
+#: builtin/config.c:688
+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:694
+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:700
+msgid "--default is only applicable to --get"
+msgstr "--default solo es aplicable para --get"
+
+#: builtin/config.c:713
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "no se puede leer el archivo de configuración '%s'"
+
+#: builtin/config.c:716
+msgid "error processing config file(s)"
+msgstr "error al procesar archivo(s) de configuración"
+
+#: builtin/config.c:726
+msgid "editing stdin is not supported"
+msgstr "editar stdin no está soportado"
+
+#: builtin/config.c:728
+msgid "editing blobs is not supported"
+msgstr "editar blobs no está soportado"
+
+#: builtin/config.c:742

 #, 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:748
+#: builtin/config.c:755

 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"


@@ -8528,6 +9887,11 @@ 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:829 builtin/config.c:840
+#, c-format
+msgid "no such section: %s"
+msgstr "no existe la sección: %s"
+

 #: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 #: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"


@@ -8536,57 +9900,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:22
+#: builtin/describe.c:26

 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:23
+#: builtin/describe.c:27

 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 

-#: builtin/describe.c:57
+#: builtin/describe.c:62

 msgid "head"
 msgstr "head"
 
 msgid "head"
 msgstr "head"
 

-#: builtin/describe.c:57
+#: builtin/describe.c:62

 msgid "lightweight"
 msgstr "ligero"
 
 msgid "lightweight"
 msgstr "ligero"
 

-#: builtin/describe.c:57
+#: builtin/describe.c:62

 msgid "annotated"
 msgstr "anotado"
 
 msgid "annotated"
 msgstr "anotado"
 

-#: builtin/describe.c:267
+#: builtin/describe.c:272

 #, 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:271
+#: builtin/describe.c:276

 #, 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:273
+#: builtin/describe.c:278

 #, 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:317
+#: builtin/describe.c:322

 #, 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:319
+#: builtin/describe.c:324

 #, 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:366
+#: builtin/describe.c:378

 #, 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:392
+#: builtin/describe.c:404

 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"


@@ -8595,7 +9959,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:396
+#: builtin/describe.c:408

 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"


@@ -8604,12 +9968,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:426
+#: builtin/describe.c:438

 #, 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:429
+#: builtin/describe.c:441

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


@@ -8618,90 +9982,90 @@ 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:497
+#: builtin/describe.c:509

 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 

-#: builtin/describe.c:500 builtin/log.c:502
+#: builtin/describe.c:512 builtin/log.c:508

 #, 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:508
+#: builtin/describe.c:520

 #, 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:522
+#: builtin/describe.c:534

 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:523
+#: builtin/describe.c:535

 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:524
+#: builtin/describe.c:536

 msgid "use any ref"
 msgstr "use cualquier ref"
 
 msgid "use any ref"
 msgstr "use cualquier ref"
 

-#: builtin/describe.c:525
+#: builtin/describe.c:537

 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:526
+#: builtin/describe.c:538

 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 

-#: builtin/describe.c:527
+#: builtin/describe.c:539

 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:530
+#: builtin/describe.c:542

 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 

-#: builtin/describe.c:532
+#: builtin/describe.c:544

 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:534
+#: builtin/describe.c:546

 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:536
+#: builtin/describe.c:548

 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:538 builtin/name-rev.c:406
+#: builtin/describe.c:550 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:539 builtin/describe.c:542
+#: builtin/describe.c:551 builtin/describe.c:554

 msgid "mark"
 msgstr "marca"
 
 msgid "mark"
 msgstr "marca"
 

-#: builtin/describe.c:540
+#: builtin/describe.c:552

 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:543
+#: builtin/describe.c:555

 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:561
+#: builtin/describe.c:573

 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:590
+#: builtin/describe.c:602

 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:640
+#: builtin/describe.c:652

 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:642
+#: builtin/describe.c:654

 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"
 


@@ -8715,50 +10079,50 @@ msgstr "'%s': no es un archivo regular o un enlace simbólico"
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 

-#: builtin/diff.c:356
+#: builtin/diff.c:363

 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:399
+#: builtin/diff.c:407

 #, 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:408
+#: builtin/diff.c:416

 #, 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:413
+#: builtin/diff.c:421

 #, 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:29
+#: builtin/difftool.c:30

 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:259
+#: builtin/difftool.c:260

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

-#: builtin/difftool.c:301
+#: builtin/difftool.c:302

 #, 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:303
+#: builtin/difftool.c:304

 #, 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:311
+#: builtin/difftool.c:312

 #, 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:412
+#: builtin/difftool.c:413

 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')."


@@ -8766,54 +10130,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:632
+#: builtin/difftool.c:633

 #, 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:634
+#: builtin/difftool.c:635

 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:645
+#: builtin/difftool.c:646

 #, 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:646
+#: builtin/difftool.c:647

 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:695
+#: builtin/difftool.c:696

 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:697
+#: builtin/difftool.c:698

 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:699
+#: builtin/difftool.c:700

 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:704
+#: builtin/difftool.c:705

 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:705
-msgid "<tool>"
-msgstr "<herramienta>"
-

 #: builtin/difftool.c:706
 #: builtin/difftool.c:706

+msgid "tool"
+msgstr "herramienta"
+
+#: builtin/difftool.c:707

 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:708
+#: builtin/difftool.c:709

 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 
 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:711
+#: builtin/difftool.c:712

 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"


@@ -8821,165 +10185,161 @@ 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:713
-msgid "<command>"
-msgstr "<comando>"
-
-#: builtin/difftool.c:714
+#: builtin/difftool.c:715

 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:738
+#: builtin/difftool.c:739

 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:745
+#: builtin/difftool.c:746

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

-#: builtin/fast-export.c:27
+#: builtin/fast-export.c:29

 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:1000
+#: builtin/fast-export.c:1006

 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:1002
+#: builtin/fast-export.c:1008

 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:1005
+#: builtin/fast-export.c:1011

 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:1008
+#: builtin/fast-export.c:1014

 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:1010
+#: builtin/fast-export.c:1016

 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:1012
+#: builtin/fast-export.c:1018

 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:1014
+#: builtin/fast-export.c:1020

 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:1016
+#: builtin/fast-export.c:1022

 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:1017
+#: builtin/fast-export.c:1023

 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:1018
+#: builtin/fast-export.c:1024

 msgid "refspec"
 msgstr "refspec"
 
 msgid "refspec"
 msgstr "refspec"
 

-#: builtin/fast-export.c:1019
+#: builtin/fast-export.c:1025

 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:1020
+#: builtin/fast-export.c:1026

 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 

-#: builtin/fetch.c:26
+#: builtin/fetch.c:27

 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 

-#: builtin/fetch.c:27
+#: builtin/fetch.c:28

 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 

-#: builtin/fetch.c:28
+#: builtin/fetch.c:29

 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 

-#: builtin/fetch.c:29
+#: builtin/fetch.c:30

 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 

-#: builtin/fetch.c:123 builtin/pull.c:193
+#: builtin/fetch.c:112 builtin/pull.c:193

 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:125 builtin/pull.c:196
+#: builtin/fetch.c:114 builtin/pull.c:196

 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:127 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:199

 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"
 

-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:117 builtin/pull.c:201

 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/fetch.c:130
+#: builtin/fetch.c:119

 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:132 builtin/pull.c:203
+#: builtin/fetch.c:121 builtin/pull.c:203

 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"
 

-#: builtin/fetch.c:134
+#: builtin/fetch.c:123

 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 

-#: builtin/fetch.c:136
+#: builtin/fetch.c:125

 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:138 builtin/pull.c:206
+#: builtin/fetch.c:127 builtin/pull.c:206

 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"
 

-#: builtin/fetch.c:140
+#: builtin/fetch.c:129

 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "limpiar tags locales que no se encuentran en el remoto y eliminar tags "
 "cambiados"
 
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "limpiar tags locales que no se encuentran en el remoto y eliminar tags "
 "cambiados"
 

-#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
+#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131

 msgid "on-demand"
 msgstr "en demanda"
 
 msgid "on-demand"
 msgstr "en demanda"
 

-#: builtin/fetch.c:142
+#: builtin/fetch.c:131

 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:146 builtin/pull.c:214
+#: builtin/fetch.c:135 builtin/pull.c:214

 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 

-#: builtin/fetch.c:148
+#: builtin/fetch.c:137

 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:151 builtin/fetch.c:157 builtin/pull.c:217
+#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217

 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"
 

-#: builtin/fetch.c:153
+#: builtin/fetch.c:142

 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:159 builtin/pull.c:220
+#: builtin/fetch.c:148 builtin/pull.c:220

 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 

-#: builtin/fetch.c:162
+#: builtin/fetch.c:151

 msgid "prepend this to submodule path output"
 msgstr "anteponer esto a salida de la ruta del submódulo"
 
 msgid "prepend this to submodule path output"
 msgstr "anteponer esto a salida de la ruta del submódulo"
 

-#: builtin/fetch.c:165
+#: builtin/fetch.c:154

 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"


@@ -8987,99 +10347,103 @@ 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:169 builtin/pull.c:223
+#: builtin/fetch.c:158 builtin/pull.c:223

 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:170 builtin/pull.c:225
+#: builtin/fetch.c:159 builtin/pull.c:225

 msgid "refmap"
 msgstr "refmap"
 
 msgid "refmap"
 msgstr "refmap"
 

-#: builtin/fetch.c:171 builtin/pull.c:226
+#: builtin/fetch.c:160 builtin/pull.c:226

 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 
 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 

-#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582

 #: 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:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582

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

-#: builtin/fetch.c:442
+#: builtin/fetch.c:167
+msgid "report that we have only objects reachable from this object"
+msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
+
+#: builtin/fetch.c:418

 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:560
+#: builtin/fetch.c:552

 #, 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:653
+#: builtin/fetch.c:645

 #, 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:657
+#: builtin/fetch.c:649

 msgid "[up to date]"
 msgstr "[actualizado]"
 
 msgid "[up to date]"
 msgstr "[actualizado]"
 

-#: builtin/fetch.c:670 builtin/fetch.c:750
+#: builtin/fetch.c:662 builtin/fetch.c:744

 msgid "[rejected]"
 msgstr "[rechazado]"
 
 msgid "[rejected]"
 msgstr "[rechazado]"
 

-#: builtin/fetch.c:671
+#: builtin/fetch.c:663

 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:680
+#: builtin/fetch.c:672

 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 

-#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
-#: builtin/fetch.c:745
+#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
+#: builtin/fetch.c:739

 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:700
+#: builtin/fetch.c:694

 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 

-#: builtin/fetch.c:703
+#: builtin/fetch.c:697

 msgid "[new branch]"
 msgstr "[nueva rama]"
 
 msgid "[new branch]"
 msgstr "[nueva rama]"
 

-#: builtin/fetch.c:706
+#: builtin/fetch.c:700

 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 

-#: builtin/fetch.c:745
+#: builtin/fetch.c:739

 msgid "forced update"
 msgstr "actualización forzada"
 
 msgid "forced update"
 msgstr "actualización forzada"
 

-#: builtin/fetch.c:750
+#: builtin/fetch.c:744

 msgid "non-fast-forward"
 msgstr "avance lento"
 
 msgid "non-fast-forward"
 msgstr "avance lento"
 

-#: builtin/fetch.c:795
+#: builtin/fetch.c:790

 #, 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:815
+#: builtin/fetch.c:811

 #, 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:903 builtin/fetch.c:999
+#: builtin/fetch.c:900 builtin/fetch.c:1011

 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 

-#: builtin/fetch.c:914
+#: builtin/fetch.c:911

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


@@ -9088,56 +10452,56 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para remover cualquier rama vieja o conflictiva"
 
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para remover cualquier rama vieja o conflictiva"
 

-#: builtin/fetch.c:969
+#: builtin/fetch.c:981

 #, 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:970
+#: builtin/fetch.c:982

 #, 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:1002
+#: builtin/fetch.c:1014

 msgid "[deleted]"
 msgstr "[eliminado]"
 
 msgid "[deleted]"
 msgstr "[eliminado]"
 

-#: builtin/fetch.c:1003 builtin/remote.c:1033
+#: builtin/fetch.c:1015 builtin/remote.c:1035

 msgid "(none)"
 msgstr "(nada)"
 
 msgid "(none)"
 msgstr "(nada)"
 

-#: builtin/fetch.c:1026
+#: builtin/fetch.c:1038

 #, 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:1045
+#: builtin/fetch.c:1057

 #, 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:1048
+#: builtin/fetch.c:1060

 #, 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:1287
+#: builtin/fetch.c:1339

 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 

-#: builtin/fetch.c:1289 builtin/remote.c:98
+#: builtin/fetch.c:1341 builtin/remote.c:99

 #, 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:1335 builtin/fetch.c:1503
+#: builtin/fetch.c:1387 builtin/fetch.c:1555

 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 "--filter solo puede ser usado con el remoto configurado en core.partialClone"
 
 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 "--filter solo puede ser usado con el remoto configurado en core.partialClone"
 

-#: builtin/fetch.c:1358
+#: builtin/fetch.c:1410

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


@@ -9145,66 +10509,66 @@ 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:1395
+#: builtin/fetch.c:1447

 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:1444
+#: builtin/fetch.c:1496

 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:1446
+#: builtin/fetch.c:1498

 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:1451
+#: builtin/fetch.c:1503

 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:1453
+#: builtin/fetch.c:1505

 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:1469
+#: builtin/fetch.c:1521

 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:1471
+#: builtin/fetch.c:1523

 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:1480
+#: builtin/fetch.c:1532

 #, 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:1487
+#: builtin/fetch.c:1539

 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/fmt-merge-msg.c:15
+#: builtin/fmt-merge-msg.c:17

 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
 
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
 

-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:671

 msgid "populate log with at most <n> entries from shortlog"
 msgstr "poblar el log con máximo <n> entradas del shorlog"
 
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "poblar el log con máximo <n> entradas del shorlog"
 

-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:674

 msgid "alias for --log (deprecated)"
 msgstr "alias para --log (deprecado)"
 
 msgid "alias for --log (deprecated)"
 msgstr "alias para --log (deprecado)"
 

-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:677

 msgid "text"
 msgstr "texto"
 
 msgid "text"
 msgstr "texto"
 

-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:678

 msgid "use <text> as start of message"
 msgstr "use <text> como comienzo de mensaje"
 
 msgid "use <text> as start of message"
 msgstr "use <text> como comienzo de mensaje"
 

-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:679

 msgid "file to read from"
 msgstr "archivo del cual leer"
 
 msgid "file to read from"
 msgstr "archivo del cual leer"
 


@@ -9244,7 +10608,7 @@ msgstr "cite los marcadores de posición adecuadamente para Tcl"
 msgid "show only <n> matched refs"
 msgstr "mostrar solo <n> refs encontradas"
 
 msgid "show only <n> matched refs"
 msgstr "mostrar solo <n> refs encontradas"
 

-#: builtin/for-each-ref.c:39 builtin/tag.c:421
+#: builtin/for-each-ref.c:39 builtin/tag.c:422

 msgid "respect format colors"
 msgstr "respetar el formato de colores"
 
 msgid "respect format colors"
 msgstr "respetar el formato de colores"
 


@@ -9268,81 +10632,81 @@ 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:569
+#: builtin/fsck.c:574

 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 

-#: builtin/fsck.c:661
+#: builtin/fsck.c:666

 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 

-#: builtin/fsck.c:667
+#: builtin/fsck.c:672

 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 
 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 

-#: builtin/fsck.c:668
+#: builtin/fsck.c:673

 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 
 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 

-#: builtin/fsck.c:669
+#: builtin/fsck.c:674

 msgid "report tags"
 msgstr "reportar tags"
 
 msgid "report tags"
 msgstr "reportar tags"
 

-#: builtin/fsck.c:670
+#: builtin/fsck.c:675

 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 

-#: builtin/fsck.c:671
+#: builtin/fsck.c:676

 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:672
+#: builtin/fsck.c:677

 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:673
+#: builtin/fsck.c:678

 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:674
+#: builtin/fsck.c:679

 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 

-#: builtin/fsck.c:675
+#: builtin/fsck.c:680

 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:677
+#: builtin/fsck.c:682

 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:678 builtin/prune.c:109
+#: builtin/fsck.c:683 builtin/prune.c:110

 msgid "show progress"
 msgstr "mostrar progreso"
 
 msgid "show progress"
 msgstr "mostrar progreso"
 

-#: builtin/fsck.c:679
+#: builtin/fsck.c:684

 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:745
+#: builtin/fsck.c:750

 msgid "Checking objects"
 msgstr "Revisando objetos"
 
 msgid "Checking objects"
 msgstr "Revisando objetos"
 

-#: builtin/gc.c:33
+#: builtin/gc.c:34

 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 

-#: builtin/gc.c:88
+#: builtin/gc.c:90

 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Falló el fstat %s: %s"
 
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Falló el fstat %s: %s"
 

-#: builtin/gc.c:452
+#: builtin/gc.c:455

 #, c-format
 msgid "Can't stat %s"
 msgstr "No se puede definir %s"
 
 #, c-format
 msgid "Can't stat %s"
 msgstr "No se puede definir %s"
 

-#: builtin/gc.c:461
+#: builtin/gc.c:464

 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"


@@ -9357,54 +10721,54 @@ msgstr ""
 "\n"
 "%s"
 
 "\n"
 "%s"
 

-#: builtin/gc.c:502
+#: builtin/gc.c:505

 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 
 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 

-#: builtin/gc.c:504
+#: builtin/gc.c:507

 msgid "be more thorough (increased runtime)"
 msgstr "ser más exhaustivo (aumentar runtime)"
 
 msgid "be more thorough (increased runtime)"
 msgstr "ser más exhaustivo (aumentar runtime)"
 

-#: builtin/gc.c:505
+#: builtin/gc.c:508

 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 

-#: builtin/gc.c:508
+#: builtin/gc.c:511

 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
 
 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
 

-#: builtin/gc.c:511
+#: builtin/gc.c:514

 msgid "repack all other packs except the largest pack"
 msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
 
 msgid "repack all other packs except the largest pack"
 msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
 

-#: builtin/gc.c:528
+#: builtin/gc.c:531

 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "falló al analizar valor %s de gc.logexpirity"
 
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "falló al analizar valor %s de gc.logexpirity"
 

-#: builtin/gc.c:539
+#: builtin/gc.c:542

 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "falló al analizar valor %s de prune expiry"
 
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "falló al analizar valor %s de prune expiry"
 

-#: builtin/gc.c:559
+#: builtin/gc.c:562

 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Auto empaquetado del repositorio en segundo plano para un performance "
 "óptimo.\n"
 
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Auto empaquetado del repositorio en segundo plano para un performance "
 "óptimo.\n"
 

-#: builtin/gc.c:561
+#: builtin/gc.c:564

 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
 
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
 

-#: builtin/gc.c:562
+#: builtin/gc.c:565

 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vea \"git help gc\" para limpieza manual.\n"
 
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vea \"git help gc\" para limpieza manual.\n"
 

-#: builtin/gc.c:598
+#: builtin/gc.c:601

 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"


@@ -9412,7 +10776,7 @@ 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:645
+#: builtin/gc.c:652

 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""


@@ -9437,7 +10801,8 @@ 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:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
+#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
+#: builtin/pack-objects.c:2636

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


@@ -9452,234 +10817,242 @@ msgstr "no es posible leer el  árbol (%s)"
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 

-#: builtin/grep.c:703
+#: builtin/grep.c:704

 #, 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:790
+#: builtin/grep.c:791

 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:792
+#: builtin/grep.c:793

 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:794
+#: builtin/grep.c:795

 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:796
+#: builtin/grep.c:797

 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:798
+#: builtin/grep.c:799

 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:801
+#: builtin/grep.c:802

 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:803
+#: builtin/grep.c:804

 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:805
+#: builtin/grep.c:806

 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:807
+#: builtin/grep.c:808

 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:809
+#: builtin/grep.c:810

 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:812
+#: builtin/grep.c:813

 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:814
+#: builtin/grep.c:815

 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:818
+#: builtin/grep.c:819

 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:821
+#: builtin/grep.c:822

 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:824
+#: builtin/grep.c:825

 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:827
+#: builtin/grep.c:828

 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:830
+#: builtin/grep.c:831

 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:831
+#: builtin/grep.c:832
+msgid "show column number of first match"
+msgstr "mostrar el número de columna de la primer coincidencia"
+
+#: builtin/grep.c:833

 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:832
+#: builtin/grep.c:834

 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 

-#: builtin/grep.c:834
+#: builtin/grep.c:836

 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:836
+#: builtin/grep.c:838

 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:838
+#: builtin/grep.c:840

 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:841
+#: builtin/grep.c:843

 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:843
+#: builtin/grep.c:845

 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:846
+#: builtin/grep.c:848
+msgid "show only matching parts of a line"
+msgstr "mostrar solo partes que concuerdan de una línea"
+
+#: builtin/grep.c:850

 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:847
+#: builtin/grep.c:851

 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 

-#: builtin/grep.c:849
+#: builtin/grep.c:853

 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:851
+#: builtin/grep.c:855

 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:854
+#: builtin/grep.c:858

 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:857
+#: builtin/grep.c:861

 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:859
+#: builtin/grep.c:863

 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:861
+#: builtin/grep.c:865

 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:862
+#: builtin/grep.c:866

 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 

-#: builtin/grep.c:865
+#: builtin/grep.c:869

 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:867
+#: builtin/grep.c:871

 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:870
+#: builtin/grep.c:874

 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 

-#: builtin/grep.c:872
+#: builtin/grep.c:876

 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 

-#: builtin/grep.c:874
+#: builtin/grep.c:878

 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:886
+#: builtin/grep.c:890

 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:888
+#: builtin/grep.c:892

 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:890
+#: builtin/grep.c:894

 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:894
+#: builtin/grep.c:898

 msgid "pager"
 msgstr "paginador"
 
 msgid "pager"
 msgstr "paginador"
 

-#: builtin/grep.c:894
+#: builtin/grep.c:898

 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:898
+#: builtin/grep.c:902

 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:962
-msgid "no pattern given."
-msgstr "no se ha entregado patrón."
+#: builtin/grep.c:966
+msgid "no pattern given"
+msgstr "no se ha entregado patrón"

 
 

-#: builtin/grep.c:994
+#: builtin/grep.c:1002

 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:1001
+#: builtin/grep.c:1009

 #, 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:1036 builtin/index-pack.c:1531
+#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632

 #, 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:1041
+#: builtin/grep.c:1049 builtin/pack-objects.c:3286

 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:1065
+#: builtin/grep.c:1073

 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:1088
-msgid "option not supported with --recurse-submodules."
-msgstr "opción no soportada con --recurse-submodules."
-
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached o --untracked no pueden ser usadas con --no-index."
+#: builtin/grep.c:1096
+msgid "option not supported with --recurse-submodules"
+msgstr "opción no soportada con --recurse-submodules"

 
 

-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado."
+#: builtin/grep.c:1102
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached o --untracked no pueden ser usadas con --no-index"

 
 #: builtin/grep.c:1108
 
 #: builtin/grep.c:1108

-msgid "both --cached and trees are given."
-msgstr "--cached y árboles han sido entregados."
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"

 
 

-#: builtin/hash-object.c:83
+#: builtin/grep.c:1116
+msgid "both --cached and trees are given"
+msgstr "--cached y árboles han sido entregados"
+
+#: builtin/hash-object.c:84

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


@@ -9687,97 +11060,101 @@ 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:84
+#: builtin/hash-object.c:85

 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:96
+#: builtin/hash-object.c:97

 msgid "type"
 msgstr "tipo"
 
 msgid "type"
 msgstr "tipo"
 

-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97

 msgid "object type"
 msgstr "tipo de objeto"
 
 msgid "object type"
 msgstr "tipo de objeto"
 

-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98

 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:99
+#: builtin/hash-object.c:100

 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:101
+#: builtin/hash-object.c:102

 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:102
+#: builtin/hash-object.c:103

 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:103
+#: builtin/hash-object.c:104

 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"
 

-#: builtin/help.c:45
+#: builtin/help.c:46

 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 
 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 

-#: builtin/help.c:46
+#: builtin/help.c:47

 msgid "exclude guides"
 msgstr "excluir las guias"
 
 msgid "exclude guides"
 msgstr "excluir las guias"
 

-#: builtin/help.c:47
+#: builtin/help.c:48

 msgid "print list of useful guides"
 msgstr "mostrar una lista de nociones utiles"
 
 msgid "print list of useful guides"
 msgstr "mostrar una lista de nociones utiles"
 

-#: builtin/help.c:48
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr "imprimir todos los nombres de variables de configuración"
+
+#: builtin/help.c:51

 msgid "show man page"
 msgstr "mostrar la pagina del manual"
 
 msgid "show man page"
 msgstr "mostrar la pagina del manual"
 

-#: builtin/help.c:49
+#: builtin/help.c:52

 msgid "show manual in web browser"
 msgstr "mostrar la pagina del manual en un navegador web"
 
 msgid "show manual in web browser"
 msgstr "mostrar la pagina del manual en un navegador web"
 

-#: builtin/help.c:51
+#: builtin/help.c:54

 msgid "show info page"
 msgstr "mostrar la pagina de info"
 
 msgid "show info page"
 msgstr "mostrar la pagina de info"
 

-#: builtin/help.c:53
+#: builtin/help.c:56

 msgid "print command description"
 msgstr "imprimir descripción del comando"
 
 msgid "print command description"
 msgstr "imprimir descripción del comando"
 

-#: builtin/help.c:58
+#: builtin/help.c:61

 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
 
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
 

-#: builtin/help.c:70
+#: builtin/help.c:73

 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 

-#: builtin/help.c:97
+#: builtin/help.c:100

 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 
 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 

-#: builtin/help.c:110
+#: builtin/help.c:113

 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 
 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 

-#: builtin/help.c:118
+#: builtin/help.c:121

 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
 
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
 

-#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179

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

-#: builtin/help.c:214
+#: builtin/help.c:217

 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"


@@ -9786,7 +11163,7 @@ msgstr ""
 "'%s': ruta para el visualizador del manual no soportada.\n"
 "Por favor considere usar 'man.<herramienta.cmd'."
 
 "'%s': ruta para el visualizador del manual no soportada.\n"
 "Por favor considere usar 'man.<herramienta.cmd'."
 

-#: builtin/help.c:226
+#: builtin/help.c:229

 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"


@@ -9795,33 +11172,32 @@ msgstr ""
 "'%s': comando no soportado para man viewer.\n"
 "Por favor considere usar 'man.<herramienta>.path."
 
 "'%s': comando no soportado para man viewer.\n"
 "Por favor considere usar 'man.<herramienta>.path."
 

-#: builtin/help.c:343
+#: builtin/help.c:346

 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 

-#: builtin/help.c:360
+#: builtin/help.c:363

 msgid "no man viewer handled the request"
 msgstr "ningún visualizador de manual proceso la petición"
 
 msgid "no man viewer handled the request"
 msgstr "ningún visualizador de manual proceso la petición"
 

-#: builtin/help.c:368
+#: builtin/help.c:371

 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:415
+#: builtin/help.c:418

 #, 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:442 builtin/help.c:459
+#: builtin/help.c:445 builtin/help.c:475

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

-#: builtin/index-pack.c:158
-#, c-format
-msgid "unable to open %s"
-msgstr "no es posible abrir %s"
+#: builtin/help.c:459
+msgid "'git help config' for more information"
+msgstr "'git help config' para más información"

 
 #: builtin/index-pack.c:208
 #, c-format
 
 #: builtin/index-pack.c:208
 #, c-format


@@ -9857,11 +11233,11 @@ 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:303
+#: builtin/index-pack.c:303 builtin/pack-objects.c:590

 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"
 

-#: builtin/index-pack.c:306 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:94

 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"
 


@@ -9928,8 +11304,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:754 builtin/pack-objects.c:198
-#: builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:143
+#: builtin/pack-objects.c:203 builtin/pack-objects.c:297

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


@@ -9949,169 +11325,169 @@ msgstr "no se puede leer el objeto existente %s"
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 

-#: builtin/index-pack.c:842 builtin/index-pack.c:860
+#: builtin/index-pack.c:842 builtin/index-pack.c:861

 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:857
+#: builtin/index-pack.c:858

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

-#: builtin/index-pack.c:862
+#: builtin/index-pack.c:863

 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No todos los objetos hijos de %s son alcanzables"
 
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No todos los objetos hijos de %s son alcanzables"
 

-#: builtin/index-pack.c:934 builtin/index-pack.c:965
+#: builtin/index-pack.c:935 builtin/index-pack.c:966

 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 

-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1136

 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 

-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1136

 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 

-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete está corrompido (SHA1 no concuerda)"
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete está corrompido (SHA1 no concuerda)"
 

-#: builtin/index-pack.c:1174
+#: builtin/index-pack.c:1175

 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 
 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 

-#: builtin/index-pack.c:1177
+#: builtin/index-pack.c:1178

 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 
 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 

-#: builtin/index-pack.c:1189
+#: builtin/index-pack.c:1190

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusión más allá de la locura en parse_pack_objects()"
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusión más allá de la locura en parse_pack_objects()"
 

-#: builtin/index-pack.c:1212
+#: builtin/index-pack.c:1213

 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 

-#: builtin/index-pack.c:1223
+#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407

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

-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1266

 msgid "confusion beyond insanity"
 msgstr "confusión más allá de la locura"
 
 msgid "confusion beyond insanity"
 msgstr "confusión más allá de la locura"
 

-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272

 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completado con %d objeto local"
 msgstr[1] "completado con %d objetos locales"
 
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completado con %d objeto local"
 msgstr[1] "completado con %d objetos locales"
 

-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1284

 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Tail checksum para %s inesperada (corrupción de disco?)"
 
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Tail checksum para %s inesperada (corrupción de disco?)"
 

-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288

 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paquete tiene %d delta sin resolver"
 msgstr[1] "paquete tiene %d deltas sin resolver"
 
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paquete tiene %d delta sin resolver"
 msgstr[1] "paquete tiene %d deltas sin resolver"
 

-#: builtin/index-pack.c:1311
+#: builtin/index-pack.c:1312

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 

-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1389

 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 

-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1403

 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
 
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
 

-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428

 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no se puede escribir %s en el archivo '%s'"
 
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no se puede escribir %s en el archivo '%s'"
 

-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1436

 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "no se puede cerrar escrito %s en archivo '%s'"
 
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "no se puede cerrar escrito %s en archivo '%s'"
 

-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1460

 msgid "error while closing pack file"
 msgstr "error mientras se cierra el archivo paquete"
 
 msgid "error while closing pack file"
 msgstr "error mientras se cierra el archivo paquete"
 

-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474

 msgid "cannot store pack file"
 msgstr "no se puede guardar el archivo paquete"
 
 msgid "cannot store pack file"
 msgstr "no se puede guardar el archivo paquete"
 

-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482

 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:1525
+#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 

-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1595

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 

-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1597

 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No se puede abrir el índice del archivo paquete para '%s'"
 
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No se puede abrir el índice del archivo paquete para '%s'"
 

-#: builtin/index-pack.c:1644
+#: builtin/index-pack.c:1645

 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "no delta: %d objeto"
 msgstr[1] "no delta: %d objetos"
 
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "no delta: %d objeto"
 msgstr[1] "no delta: %d objetos"
 

-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1652

 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "largo de cadena = %d: %lu objeto"
 msgstr[1] "largo de cadena = %d: %lu objetos"
 
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "largo de cadena = %d: %lu objeto"
 msgstr[1] "largo de cadena = %d: %lu objetos"
 

-#: builtin/index-pack.c:1688
+#: builtin/index-pack.c:1689

 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 
 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 

-#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
-#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
+#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
+#: builtin/index-pack.c:1759 builtin/index-pack.c:1763

 #, c-format
 msgid "bad %s"
 msgstr "mal %s"
 
 #, c-format
 msgid "bad %s"
 msgstr "mal %s"
 

-#: builtin/index-pack.c:1778
+#: builtin/index-pack.c:1779

 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 

-#: builtin/index-pack.c:1780
+#: builtin/index-pack.c:1781

 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 

-#: builtin/index-pack.c:1786
+#: builtin/index-pack.c:1787

 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 

-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580

 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 
 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 


@@ -10130,72 +11506,72 @@ msgstr "no se pudo definir template '%s'"
 msgid "cannot opendir '%s'"
 msgstr "no se puede abrir directorio '%s'"
 
 msgid "cannot opendir '%s'"
 msgstr "no se puede abrir directorio '%s'"
 

-#: builtin/init-db.c:77
+#: builtin/init-db.c:78

 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no se puede leer link '%s'"
 
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no se puede leer link '%s'"
 

-#: builtin/init-db.c:79
+#: builtin/init-db.c:80

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

-#: builtin/init-db.c:85
+#: builtin/init-db.c:86

 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no se puede copiar '%s' a '%s'"
 
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no se puede copiar '%s' a '%s'"
 

-#: builtin/init-db.c:89
+#: builtin/init-db.c:90

 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorando template %s"
 
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorando template %s"
 

-#: builtin/init-db.c:120
+#: builtin/init-db.c:121

 #, c-format
 msgid "templates not found in %s"
 msgstr "template no encontrado en %s"
 
 #, c-format
 msgid "templates not found in %s"
 msgstr "template no encontrado en %s"
 

-#: builtin/init-db.c:135
+#: builtin/init-db.c:136

 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no se copian templates de '%s': %s"
 
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no se copian templates de '%s': %s"
 

-#: builtin/init-db.c:328
+#: builtin/init-db.c:329

 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no es posible manejar el tipo de archivo %d"
 
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no es posible manejar el tipo de archivo %d"
 

-#: builtin/init-db.c:331
+#: builtin/init-db.c:332

 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no se puede mover %s a %s"
 
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no se puede mover %s a %s"
 

-#: builtin/init-db.c:348 builtin/init-db.c:351
+#: builtin/init-db.c:349 builtin/init-db.c:352

 #, c-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
 #, c-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 

-#: builtin/init-db.c:404
+#: builtin/init-db.c:405

 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
 
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
 

-#: builtin/init-db.c:405
+#: builtin/init-db.c:406

 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git existente en %s%s\n"
 
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git existente en %s%s\n"
 

-#: builtin/init-db.c:409
+#: builtin/init-db.c:410

 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
 
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
 

-#: builtin/init-db.c:410
+#: builtin/init-db.c:411

 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git vacío en %s%s\n"
 
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git vacío en %s%s\n"
 

-#: builtin/init-db.c:458
+#: builtin/init-db.c:459

 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"


@@ -10203,21 +11579,26 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
 "shared[=<permisos>]] [<directorio>]"
 
 "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
 "shared[=<permisos>]] [<directorio>]"
 

-#: builtin/init-db.c:481
+#: builtin/init-db.c:482

 msgid "permissions"
 msgstr "permisos"
 
 msgid "permissions"
 msgstr "permisos"
 

-#: builtin/init-db.c:482
+#: builtin/init-db.c:483

 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "especifica que el repositorio de git será compartido entre varios usuarios"
 
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "especifica que el repositorio de git será compartido entre varios usuarios"
 

-#: builtin/init-db.c:525
+#: builtin/init-db.c:517 builtin/init-db.c:522
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "no se pude crear directorio %s"
+
+#: builtin/init-db.c:526

 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no se puede aplicar chdir a %s"
 
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no se puede aplicar chdir a %s"
 

-#: builtin/init-db.c:546
+#: builtin/init-db.c:547

 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"


@@ -10226,7 +11607,7 @@ msgstr ""
 "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
 "dir=<directorio>)"
 
 "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
 "dir=<directorio>)"
 

-#: builtin/init-db.c:574
+#: builtin/init-db.c:575

 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No se puede acceder al árbol de trabajo '%s'"
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No se puede acceder al árbol de trabajo '%s'"


@@ -10291,120 +11672,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:48
+#: builtin/log.c:51

 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:49
+#: builtin/log.c:52

 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 

-#: builtin/log.c:93
+#: builtin/log.c:96

 #, 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:153
+#: builtin/log.c:157

 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 

-#: builtin/log.c:154
+#: builtin/log.c:158

 msgid "show source"
 msgstr "mostrar fuente"
 
 msgid "show source"
 msgstr "mostrar fuente"
 

-#: builtin/log.c:155
+#: builtin/log.c:159

 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:157
+#: builtin/log.c:161

 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:159
+#: builtin/log.c:163

 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:160
+#: builtin/log.c:164

 msgid "decorate options"
 msgstr "opciones de decorado"
 
 msgid "decorate options"
 msgstr "opciones de decorado"
 

-#: builtin/log.c:163
+#: builtin/log.c:167

 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:259
+#: builtin/log.c:265

 #, 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:510
+#: builtin/log.c:516

 #, 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:525 builtin/log.c:619
+#: builtin/log.c:531 builtin/log.c:625

 #, 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:643
+#: builtin/log.c:649

 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconocido: %d"
 
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconocido: %d"
 

-#: builtin/log.c:764
+#: builtin/log.c:770

 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 
 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 

-#: builtin/log.c:865
+#: builtin/log.c:871

 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:881
+#: builtin/log.c:887

 #, 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:898
+#: builtin/log.c:904

 msgid "Need exactly one range."
 msgstr "Exactamente un rango necesario."
 
 msgid "Need exactly one range."
 msgstr "Exactamente un rango necesario."
 

-#: builtin/log.c:908
+#: builtin/log.c:914

 msgid "Not a range."
 msgstr "No es un rango."
 
 msgid "Not a range."
 msgstr "No es un rango."
 

-#: builtin/log.c:1014
+#: builtin/log.c:1020

 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:1095
+#: builtin/log.c:1101

 #, 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:1122
+#: builtin/log.c:1128

 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:1172
+#: builtin/log.c:1178

 msgid "Two output directories?"
 msgstr "Dos directorios de salida?"
 
 msgid "Two output directories?"
 msgstr "Dos directorios de salida?"
 

-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
+#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959

 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 

-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
+#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524

 #, 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:1294
+#: builtin/log.c:1300

 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:1298
+#: builtin/log.c:1304

 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"


@@ -10416,230 +11797,230 @@ 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:1318
+#: builtin/log.c:1324

 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:1329
+#: builtin/log.c:1335

 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:1333
+#: builtin/log.c:1339

 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:1382
+#: builtin/log.c:1392

 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:1441
+#: builtin/log.c:1452

 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:1444
+#: builtin/log.c:1455

 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:1448
+#: builtin/log.c:1459

 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:1450
+#: builtin/log.c:1461

 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 
 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 

-#: builtin/log.c:1452
+#: builtin/log.c:1463

 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:1453
+#: builtin/log.c:1464

 msgid "sfx"
 msgstr "sfx"
 
 msgid "sfx"
 msgstr "sfx"
 

-#: builtin/log.c:1454
+#: builtin/log.c:1465

 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:1456
+#: builtin/log.c:1467

 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:1458
+#: builtin/log.c:1469

 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:1460
+#: builtin/log.c:1471

 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:1463
+#: builtin/log.c:1474

 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:1466
+#: builtin/log.c:1477

 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:1469
+#: builtin/log.c:1480

 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:1472
+#: builtin/log.c:1483

 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:1474
+#: builtin/log.c:1485

 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:1476
+#: builtin/log.c:1487

 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:1478
+#: builtin/log.c:1489

 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:1480
+#: builtin/log.c:1491

 msgid "Messaging"
 msgstr "Mensajeando"
 
 msgid "Messaging"
 msgstr "Mensajeando"
 

-#: builtin/log.c:1481
+#: builtin/log.c:1492

 msgid "header"
 msgstr "cabezal"
 
 msgid "header"
 msgstr "cabezal"
 

-#: builtin/log.c:1482
+#: builtin/log.c:1493

 msgid "add email header"
 msgstr "agregar cabecera email"
 
 msgid "add email header"
 msgstr "agregar cabecera email"
 

-#: builtin/log.c:1483 builtin/log.c:1485
+#: builtin/log.c:1494 builtin/log.c:1496

 msgid "email"
 msgstr "email"
 
 msgid "email"
 msgstr "email"
 

-#: builtin/log.c:1483
+#: builtin/log.c:1494

 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 

-#: builtin/log.c:1485
+#: builtin/log.c:1496

 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 

-#: builtin/log.c:1487
+#: builtin/log.c:1498

 msgid "ident"
 msgstr "ident"
 
 msgid "ident"
 msgstr "ident"
 

-#: builtin/log.c:1488
+#: builtin/log.c:1499

 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:1490
+#: builtin/log.c:1501

 msgid "message-id"
 msgstr "id de mensaje"
 
 msgid "message-id"
 msgstr "id de mensaje"
 

-#: builtin/log.c:1491
+#: builtin/log.c:1502

 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:1492 builtin/log.c:1495
+#: builtin/log.c:1503 builtin/log.c:1506

 msgid "boundary"
 msgstr "límite"
 
 msgid "boundary"
 msgstr "límite"
 

-#: builtin/log.c:1493
+#: builtin/log.c:1504

 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 

-#: builtin/log.c:1496
+#: builtin/log.c:1507

 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:1500
+#: builtin/log.c:1511

 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:1502
+#: builtin/log.c:1513

 msgid "signature"
 msgstr "firma"
 
 msgid "signature"
 msgstr "firma"
 

-#: builtin/log.c:1503
+#: builtin/log.c:1514

 msgid "add a signature"
 msgstr "agregar una firma"
 
 msgid "add a signature"
 msgstr "agregar una firma"
 

-#: builtin/log.c:1504
+#: builtin/log.c:1515

 msgid "base-commit"
 msgstr "commit-base"
 
 msgid "base-commit"
 msgstr "commit-base"
 

-#: builtin/log.c:1505
+#: builtin/log.c:1516

 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:1507
+#: builtin/log.c:1518

 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:1508
+#: builtin/log.c:1519

 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:1510
+#: builtin/log.c:1521

 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:1596

 #, 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:1600
-msgid "-n and -k are mutually exclusive."
-msgstr "-n y -k son mutuamente exclusivas."
+#: builtin/log.c:1611
+msgid "-n and -k are mutually exclusive"
+msgstr "-n y -k son mutuamente exclusivas"

 
 

-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
-msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos."
+#: builtin/log.c:1613
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"

 
 

-#: builtin/log.c:1610
+#: builtin/log.c:1621

 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:1612
+#: builtin/log.c:1623

 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:1614
+#: builtin/log.c:1625

 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:1646
+#: builtin/log.c:1657

 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:1648
+#: builtin/log.c:1659

 #, 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:1741
+#: builtin/log.c:1752

 #, 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:1773
+#: builtin/log.c:1785

 msgid "Generating patches"
 msgstr "Generando parches"
 
 msgid "Generating patches"
 msgstr "Generando parches"
 

-#: builtin/log.c:1817
+#: builtin/log.c:1829

 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:1867
+#: builtin/log.c:1880

 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:1921
+#: builtin/log.c:1934

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


@@ -10647,111 +12028,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:468
+#: builtin/ls-files.c:469

 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:517
+#: builtin/ls-files.c:518

 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:519
+#: builtin/ls-files.c:520

 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:521
+#: builtin/ls-files.c:522

 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:523
+#: builtin/ls-files.c:524

 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:525
+#: builtin/ls-files.c:526

 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:527
+#: builtin/ls-files.c:528

 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:529
+#: builtin/ls-files.c:530

 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:531
+#: builtin/ls-files.c:532

 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:534
+#: builtin/ls-files.c:535

 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:536
+#: builtin/ls-files.c:537

 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:538
+#: builtin/ls-files.c:539

 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:540
+#: builtin/ls-files.c:541

 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:542
+#: builtin/ls-files.c:543

 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:545
+#: builtin/ls-files.c:546

 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:547
+#: builtin/ls-files.c:548

 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:549
+#: builtin/ls-files.c:550

 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:552
+#: builtin/ls-files.c:553

 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:555
+#: builtin/ls-files.c:556

 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:557
+#: builtin/ls-files.c:558

 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:560
+#: builtin/ls-files.c:561

 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:563
+#: builtin/ls-files.c:564

 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:565
+#: builtin/ls-files.c:566

 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:566
+#: builtin/ls-files.c:567

 msgid "tree-ish"
 msgstr "árbol-ismo"
 
 msgid "tree-ish"
 msgstr "árbol-ismo"
 

-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:568

 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:569
+#: builtin/ls-files.c:570

 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 


@@ -10801,39 +12182,39 @@ msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
 
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
 

-#: builtin/ls-tree.c:29
+#: builtin/ls-tree.c:30

 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]"
 
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]"
 

-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128

 msgid "only show trees"
 msgstr "solo mostrar árboles"
 
 msgid "only show trees"
 msgstr "solo mostrar árboles"
 

-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130

 msgid "recurse into subtrees"
 msgstr "recurrir en subárboles"
 
 msgid "recurse into subtrees"
 msgstr "recurrir en subárboles"
 

-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132

 msgid "show trees when recursing"
 msgstr "mostrar árboles cuando se recurre"
 
 msgid "show trees when recursing"
 msgstr "mostrar árboles cuando se recurre"
 

-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135

 msgid "terminate entries with NUL byte"
 msgstr "terminar entradas con byte NUL"
 
 msgid "terminate entries with NUL byte"
 msgstr "terminar entradas con byte NUL"
 

-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136

 msgid "include object size"
 msgstr "incluir tamaño de objeto"
 
 msgid "include object size"
 msgstr "incluir tamaño de objeto"
 

-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140

 msgid "list only filenames"
 msgstr "listar solo nombres de archivos"
 
 msgid "list only filenames"
 msgstr "listar solo nombres de archivos"
 

-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143

 msgid "use full path names"
 msgstr "usar rutas completas"
 
 msgid "use full path names"
 msgstr "usar rutas completas"
 

-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145

 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "mostrar todo el árbol; no solo el directorio actual (implica --full-name)"


@@ -10859,168 +12240,168 @@ msgstr "git merge --continue"
 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:147
+#: builtin/merge.c:176

 #, 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:148
+#: builtin/merge.c:177

 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 

-#: builtin/merge.c:153
+#: builtin/merge.c:182

 #, 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:203 builtin/pull.c:142
+#: builtin/merge.c:232 builtin/pull.c:142

 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:206 builtin/pull.c:145
+#: builtin/merge.c:235 builtin/pull.c:145

 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:207 builtin/pull.c:148
+#: builtin/merge.c:236 builtin/pull.c:148

 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 

-#: builtin/merge.c:209 builtin/pull.c:151
+#: builtin/merge.c:238 builtin/pull.c:151

 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:212 builtin/pull.c:157
+#: builtin/merge.c:241 builtin/pull.c:157

 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:214 builtin/pull.c:160
+#: builtin/merge.c:243 builtin/pull.c:160

 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:216 builtin/pull.c:163
+#: builtin/merge.c:245 builtin/pull.c:163

 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:217
+#: builtin/merge.c:246

 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 

-#: builtin/merge.c:219 builtin/pull.c:169
+#: builtin/merge.c:248 builtin/pull.c:169

 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:223 builtin/pull.c:172
+#: builtin/merge.c:252 builtin/pull.c:172

 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:224 builtin/notes.c:777 builtin/pull.c:176
-#: builtin/revert.c:109
+#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
+#: builtin/revert.c:110

 msgid "strategy"
 msgstr "estrategia"
 
 msgid "strategy"
 msgstr "estrategia"
 

-#: builtin/merge.c:225 builtin/pull.c:177
+#: builtin/merge.c:254 builtin/pull.c:177

 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:226 builtin/pull.c:180
+#: builtin/merge.c:255 builtin/pull.c:180

 msgid "option=value"
 msgstr "opción=valor"
 
 msgid "option=value"
 msgstr "opción=valor"
 

-#: builtin/merge.c:227 builtin/pull.c:181
+#: builtin/merge.c:256 builtin/pull.c:181

 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:229
+#: builtin/merge.c:258

 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:233
+#: builtin/merge.c:265

 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:235
+#: builtin/merge.c:267

 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:237 builtin/pull.c:188
+#: builtin/merge.c:269 builtin/pull.c:188

 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:243
+#: builtin/merge.c:275

 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:268
+#: builtin/merge.c:300

 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:273
+#: builtin/merge.c:305

 msgid "stash failed"
 msgstr "stash falló"
 
 msgid "stash failed"
 msgstr "stash falló"
 

-#: builtin/merge.c:278
+#: builtin/merge.c:310

 #, 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:300 builtin/merge.c:317
+#: builtin/merge.c:332 builtin/merge.c:349

 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 

-#: builtin/merge.c:347
+#: builtin/merge.c:379

 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 

-#: builtin/merge.c:358
+#: builtin/merge.c:390

 #, 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:408
+#: builtin/merge.c:440

 #, 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:458
+#: builtin/merge.c:491

 #, 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:548
+#: builtin/merge.c:578

 #, 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:669
+#: builtin/merge.c:699

 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:683
+#: builtin/merge.c:713

 #, 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:698
+#: builtin/merge.c:728

 #, 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:749
+#: builtin/merge.c:779

 #, 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:758
+#: builtin/merge.c:788

 #, 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:764
+#: builtin/merge.c:794

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


@@ -11037,70 +12418,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:800
+#: builtin/merge.c:830

 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 

-#: builtin/merge.c:819
+#: builtin/merge.c:849

 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 

-#: builtin/merge.c:872
+#: builtin/merge.c:902

 #, 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:911
+#: builtin/merge.c:941

 msgid "No current branch."
 msgstr "No rama actual."
 
 msgid "No current branch."
 msgstr "No rama actual."
 

-#: builtin/merge.c:913
+#: builtin/merge.c:943

 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:915
+#: builtin/merge.c:945

 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:920
+#: builtin/merge.c:950

 #, 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:973
+#: builtin/merge.c:1007

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mal valor '%s' en el entorno '%s'"
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mal valor '%s' en el entorno '%s'"
 

-#: builtin/merge.c:1075
+#: builtin/merge.c:1110

 #, 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:1109
+#: builtin/merge.c:1144

 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:1211
+#: builtin/merge.c:1247

 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 

-#: builtin/merge.c:1215
+#: builtin/merge.c:1251

 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:1227
+#: builtin/merge.c:1263

 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 

-#: builtin/merge.c:1231
+#: builtin/merge.c:1267

 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:1247
+#: builtin/merge.c:1283

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


@@ -11108,7 +12489,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:1254
+#: builtin/merge.c:1290

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


@@ -11116,155 +12497,155 @@ 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:1257
+#: builtin/merge.c:1293

 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:1266
+#: builtin/merge.c:1302

 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:1274
+#: builtin/merge.c:1310

 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:1291
+#: builtin/merge.c:1327

 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:1293
+#: builtin/merge.c:1329

 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:1298
+#: builtin/merge.c:1334

 #, 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:1300
+#: builtin/merge.c:1336

 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:1334
+#: builtin/merge.c:1370

 #, 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."
 

-#: builtin/merge.c:1337
+#: builtin/merge.c:1373

 #, 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."
 

-#: builtin/merge.c:1340
+#: builtin/merge.c:1376

 #, 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."
 

-#: builtin/merge.c:1343
+#: builtin/merge.c:1379

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

-#: builtin/merge.c:1402
+#: builtin/merge.c:1438

 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:1411
+#: builtin/merge.c:1447

 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 

-#: builtin/merge.c:1421
+#: builtin/merge.c:1457

 #, 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:1462
+#: builtin/merge.c:1498

 #, 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:1469
+#: builtin/merge.c:1505

 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 

-#: builtin/merge.c:1494
+#: builtin/merge.c:1530

 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:1500
+#: builtin/merge.c:1536

 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:1523 builtin/merge.c:1602
+#: builtin/merge.c:1559 builtin/merge.c:1638

 #, 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:1527
+#: builtin/merge.c:1563

 #, 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:1593
+#: builtin/merge.c:1629

 #, 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:1595
+#: builtin/merge.c:1631

 #, 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:1604
+#: builtin/merge.c:1640

 #, 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:1616
+#: builtin/merge.c:1652

 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Fusión automática fue bien; detenida antes del commit como se solicitó\n"
 
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Fusión automática fue bien; detenida antes del commit como se solicitó\n"
 

-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31

 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <commit> <commit>..."
 
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <commit> <commit>..."
 

-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32

 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <commit>..."
 
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <commit>..."
 

-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33

 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <commit>..."
 
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <commit>..."
 

-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34

 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <commit> <commit>"
 
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <commit> <commit>"
 

-#: builtin/merge-base.c:34
+#: builtin/merge-base.c:35

 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ref> [<commit>]"
 
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ref> [<commit>]"
 

-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:221

 msgid "output all common ancestors"
 msgstr "mostrar todos los ancestros comunes"
 
 msgid "output all common ancestors"
 msgstr "mostrar todos los ancestros comunes"
 

-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:223

 msgid "find ancestors for a single n-way merge"
 msgstr "encontrar ancestros para una única fusión de n-vías"
 
 msgid "find ancestors for a single n-way merge"
 msgstr "encontrar ancestros para una única fusión de n-vías"
 

-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:225

 msgid "list revs not reachable from others"
 msgstr "listar revs no alcanzables desde otros"
 
 msgid "list revs not reachable from others"
 msgstr "listar revs no alcanzables desde otros"
 

-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:227

 msgid "is the first one ancestor of the other?"
 msgstr "es el primer ancestro del otro?"
 
 msgid "is the first one ancestor of the other?"
 msgstr "es el primer ancestro del otro?"
 

-#: builtin/merge-base.c:228
+#: builtin/merge-base.c:229

 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "encontrar donde <commit> forjó del reflog de <ref>"
 
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "encontrar donde <commit> forjó del reflog de <ref>"
 


@@ -11339,19 +12720,19 @@ msgstr "no se pudo resolver ref '%s'"
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
 
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
 

-#: builtin/mktree.c:65
+#: builtin/mktree.c:66

 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 

-#: builtin/mktree.c:153
+#: builtin/mktree.c:154

 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:154 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:25

 msgid "allow missing objects"
 msgstr "permitir objetos faltantes"
 
 msgid "allow missing objects"
 msgstr "permitir objetos faltantes"
 

-#: builtin/mktree.c:155
+#: builtin/mktree.c:156

 msgid "allow creation of more than one tree"
 msgstr "permitir la creación de más de un árbol"
 
 msgid "allow creation of more than one tree"
 msgstr "permitir la creación de más de un árbol"
 


@@ -11364,7 +12745,7 @@ msgstr "git mv [<opciones>] <fuente>... <destino>"
 msgid "Directory %s is in index and no submodule?"
 msgstr "Directorio %s está en el índice y no hay submódulo?"
 
 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/rm.c:288
+#: builtin/mv.c:84

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


@@ -11444,60 +12825,60 @@ msgstr "%s, fuente=%s, destino=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 

-#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
+#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494

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

-#: builtin/name-rev.c:338
+#: builtin/name-rev.c:355

 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opciones>] <commit>..."
 
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opciones>] <commit>..."
 

-#: builtin/name-rev.c:339
+#: builtin/name-rev.c:356

 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opciones>] --all"
 
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opciones>] --all"
 

-#: builtin/name-rev.c:340
+#: builtin/name-rev.c:357

 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opciones>] --stdin"
 
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opciones>] --stdin"
 

-#: builtin/name-rev.c:395
+#: builtin/name-rev.c:413

 msgid "print only names (no SHA-1)"
 msgstr "imprimir sólo nombres (sin SHA-1)"
 
 msgid "print only names (no SHA-1)"
 msgstr "imprimir sólo nombres (sin SHA-1)"
 

-#: builtin/name-rev.c:396
+#: builtin/name-rev.c:414

 msgid "only use tags to name the commits"
 msgstr "sólo usar tags para nombrar commits"
 
 msgid "only use tags to name the commits"
 msgstr "sólo usar tags para nombrar commits"
 

-#: builtin/name-rev.c:398
+#: builtin/name-rev.c:416

 msgid "only use refs matching <pattern>"
 msgstr "solo usar refs que concuerden con <patrón>"
 
 msgid "only use refs matching <pattern>"
 msgstr "solo usar refs que concuerden con <patrón>"
 

-#: builtin/name-rev.c:400
+#: builtin/name-rev.c:418

 msgid "ignore refs matching <pattern>"
 msgstr "ignorar refs que concuerden con <patrón>"
 
 msgid "ignore refs matching <pattern>"
 msgstr "ignorar refs que concuerden con <patrón>"
 

-#: builtin/name-rev.c:402
+#: builtin/name-rev.c:420

 msgid "list all commits reachable from all refs"
 msgstr "listar todos los commits alcanzables desde todas las referencias"
 
 msgid "list all commits reachable from all refs"
 msgstr "listar todos los commits alcanzables desde todas las referencias"
 

-#: builtin/name-rev.c:403
+#: builtin/name-rev.c:421

 msgid "read from stdin"
 msgstr "leer desde stdin"
 
 msgid "read from stdin"
 msgstr "leer desde stdin"
 

-#: builtin/name-rev.c:404
+#: builtin/name-rev.c:422

 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nombres `undefined` (predeterminado)"
 
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nombres `undefined` (predeterminado)"
 

-#: builtin/name-rev.c:410
+#: builtin/name-rev.c:428

 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags en la entrada (uso interno)"
 
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags en la entrada (uso interno)"
 

-#: builtin/notes.c:26
+#: builtin/notes.c:28

 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
 
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
 

-#: builtin/notes.c:27
+#: builtin/notes.c:29

 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"


@@ -11505,13 +12886,13 @@ msgstr ""
 "git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
 "<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 
 "git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
 "<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 

-#: builtin/notes.c:28
+#: builtin/notes.c:30

 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
 "destino>"
 
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
 "destino>"
 

-#: builtin/notes.c:29
+#: builtin/notes.c:31

 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"


@@ -11519,158 +12900,158 @@ msgstr ""
 "git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
 "| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 
 "git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
 "| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
 

-#: builtin/notes.c:30
+#: builtin/notes.c:32

 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
 
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr ""
 "git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
 

-#: builtin/notes.c:31
+#: builtin/notes.c:33

 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
 
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
 

-#: builtin/notes.c:32
+#: builtin/notes.c:34

 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
 "<referencia-de-notas>"
 
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
 "<referencia-de-notas>"
 

-#: builtin/notes.c:33
+#: builtin/notes.c:35

 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 

-#: builtin/notes.c:34
+#: builtin/notes.c:36

 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 

-#: builtin/notes.c:35
+#: builtin/notes.c:37

 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]"
 
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]"
 

-#: builtin/notes.c:36
+#: builtin/notes.c:38

 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]"
 
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]"
 

-#: builtin/notes.c:37
+#: builtin/notes.c:39

 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referencia-de-notas>] get-ref"
 
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referencia-de-notas>] get-ref"
 

-#: builtin/notes.c:42
+#: builtin/notes.c:44

 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objeto>]]"
 
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objeto>]]"
 

-#: builtin/notes.c:47
+#: builtin/notes.c:49

 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opciones>] [<objeto>]"
 
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opciones>] [<objeto>]"
 

-#: builtin/notes.c:52
+#: builtin/notes.c:54

 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>"
 
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>"
 

-#: builtin/notes.c:53
+#: builtin/notes.c:55

 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..."
 
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..."
 

-#: builtin/notes.c:58
+#: builtin/notes.c:60

 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opciones>] [<objeto>]"
 
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opciones>] [<objeto>]"
 

-#: builtin/notes.c:63
+#: builtin/notes.c:65

 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objeto>]"
 
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objeto>]"
 

-#: builtin/notes.c:68
+#: builtin/notes.c:70

 msgid "git notes show [<object>]"
 msgstr "git notes show [<objeto>]"
 
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objeto>]"
 

-#: builtin/notes.c:73
+#: builtin/notes.c:75

 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opciones>] <referencia-de-notas>"
 
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opciones>] <referencia-de-notas>"
 

-#: builtin/notes.c:74
+#: builtin/notes.c:76

 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opciones>]"
 
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opciones>]"
 

-#: builtin/notes.c:75
+#: builtin/notes.c:77

 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opciones>]"
 
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opciones>]"
 

-#: builtin/notes.c:80
+#: builtin/notes.c:82

 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objeto>]"
 
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objeto>]"
 

-#: builtin/notes.c:85
+#: builtin/notes.c:87

 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opciones>]"
 
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opciones>]"
 

-#: builtin/notes.c:90
+#: builtin/notes.c:92

 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 

-#: builtin/notes.c:95
+#: builtin/notes.c:97

 msgid "Write/edit the notes for the following object:"
 msgstr "Escribe/edita las notas para los siguientes objetos:"
 
 msgid "Write/edit the notes for the following object:"
 msgstr "Escribe/edita las notas para los siguientes objetos:"
 

-#: builtin/notes.c:148
+#: builtin/notes.c:150

 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "incapaz de iniciar 'show' para el objeto '%s'"
 
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "incapaz de iniciar 'show' para el objeto '%s'"
 

-#: builtin/notes.c:152
+#: builtin/notes.c:154

 msgid "could not read 'show' output"
 msgstr "no se pudo leer salida de 'show'"
 
 msgid "could not read 'show' output"
 msgstr "no se pudo leer salida de 'show'"
 

-#: builtin/notes.c:160
+#: builtin/notes.c:162

 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "falló la finalización de 'show' para el objeto '%s'"
 
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "falló la finalización de 'show' para el objeto '%s'"
 

-#: builtin/notes.c:195
+#: builtin/notes.c:197

 msgid "please supply the note contents using either -m or -F option"
 msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
 
 msgid "please supply the note contents using either -m or -F option"
 msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
 

-#: builtin/notes.c:204
+#: builtin/notes.c:206

 msgid "unable to write note object"
 msgstr "incapaz de escribir el objeto de nota"
 
 msgid "unable to write note object"
 msgstr "incapaz de escribir el objeto de nota"
 

-#: builtin/notes.c:206
+#: builtin/notes.c:208

 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 

-#: builtin/notes.c:234 builtin/tag.c:507
+#: builtin/notes.c:236 builtin/tag.c:508

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

-#: builtin/notes.c:236 builtin/tag.c:510
+#: builtin/notes.c:238 builtin/tag.c:511

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

-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
-#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
+#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
+#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
+#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664

 #, 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."
 

-#: builtin/notes.c:258
+#: builtin/notes.c:260

 #, 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'."
 

-#: builtin/notes.c:262
+#: builtin/notes.c:264

 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'."
 
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'."
 

-#: builtin/notes.c:302
+#: builtin/notes.c:304

 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línea de entrada mal formada: '%s'."
 
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línea de entrada mal formada: '%s'."
 

-#: builtin/notes.c:317
+#: builtin/notes.c:319

 #, 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'"


@@ -11678,47 +13059,47 @@ msgstr "falló al copiar notas de '%s' a '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.

-#: builtin/notes.c:349
+#: builtin/notes.c:351

 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
 
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
 

-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
-#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
-#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
+#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
+#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
+#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975

 msgid "too many parameters"
 msgstr "demasiados parámetros"
 
 msgid "too many parameters"
 msgstr "demasiados parámetros"
 

-#: builtin/notes.c:382 builtin/notes.c:668
+#: builtin/notes.c:384 builtin/notes.c:670

 #, 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:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568

 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:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571

 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:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574

 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:412 builtin/notes.c:575
+#: builtin/notes.c:414 builtin/notes.c:577

 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:415 builtin/notes.c:578
+#: builtin/notes.c:417 builtin/notes.c:580

 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:416 builtin/notes.c:487
+#: builtin/notes.c:418 builtin/notes.c:489

 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 
 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 

-#: builtin/notes.c:441
+#: builtin/notes.c:443

 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "


@@ -11727,29 +13108,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:456 builtin/notes.c:535
+#: builtin/notes.c:458 builtin/notes.c:537

 #, 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:467 builtin/notes.c:627 builtin/notes.c:892
+#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894

 #, 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:488
+#: builtin/notes.c:490

 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 
 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 

-#: builtin/notes.c:490
+#: builtin/notes.c:492

 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:508
+#: builtin/notes.c:510

 msgid "too few parameters"
 msgstr "muy pocos parámetros"
 
 msgid "too few parameters"
 msgstr "muy pocos parámetros"
 

-#: builtin/notes.c:529
+#: builtin/notes.c:531

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


@@ -11758,12 +13139,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:541
+#: builtin/notes.c:543

 #, 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:593
+#: builtin/notes.c:595

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


@@ -11772,52 +13153,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:688
+#: builtin/notes.c:690

 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:690
+#: builtin/notes.c:692

 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:692
+#: builtin/notes.c:694

 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:712
+#: builtin/notes.c:714

 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:714
+#: builtin/notes.c:716

 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:716
+#: builtin/notes.c:718

 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:729
+#: builtin/notes.c:731

 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:732
+#: builtin/notes.c:734

 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:758
+#: builtin/notes.c:760

 #, 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:774
+#: builtin/notes.c:776

 msgid "General options"
 msgstr "Opciones generales"
 
 msgid "General options"
 msgstr "Opciones generales"
 

-#: builtin/notes.c:776
+#: builtin/notes.c:778

 msgid "Merge options"
 msgstr "Opciones de fusión"
 
 msgid "Merge options"
 msgstr "Opciones de fusión"
 

-#: builtin/notes.c:778
+#: builtin/notes.c:780

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


@@ -11825,47 +13206,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:780
+#: builtin/notes.c:782

 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:782
+#: builtin/notes.c:784

 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:784
+#: builtin/notes.c:786

 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:786
+#: builtin/notes.c:788

 msgid "abort notes merge"
 msgstr "abortar notas de fusión"
 
 msgid "abort notes merge"
 msgstr "abortar notas de fusión"
 

-#: builtin/notes.c:797
+#: builtin/notes.c:799

 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:802
+#: builtin/notes.c:804

 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:826
+#: builtin/notes.c:828

 #, 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:863
+#: builtin/notes.c:865

 #, 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:866
+#: builtin/notes.c:868

 #, 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:868
+#: builtin/notes.c:870

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


@@ -11876,36 +13257,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:890
+#: builtin/notes.c:892

 #, 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:902
+#: builtin/notes.c:904

 msgid "attempt to remove non-existent note is not an error"
 msgstr "intentar remover una nota no existente no es un error"
 
 msgid "attempt to remove non-existent note is not an error"
 msgstr "intentar remover una nota no existente no es un error"
 

-#: builtin/notes.c:905
+#: builtin/notes.c:907

 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:943 builtin/prune.c:107 builtin/worktree.c:151
+#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152

 msgid "do not remove, show only"
 msgstr "no remover, solo mostrar"
 
 msgid "do not remove, show only"
 msgstr "no remover, solo mostrar"
 

-#: builtin/notes.c:944
+#: builtin/notes.c:946

 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 
 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 

-#: builtin/notes.c:986
+#: builtin/notes.c:988

 msgid "notes-ref"
 msgstr "referencia-de-notas"
 
 msgid "notes-ref"
 msgstr "referencia-de-notas"
 

-#: builtin/notes.c:987
+#: builtin/notes.c:989

 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:1022
+#: builtin/notes.c:1024

 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"


@@ -11924,223 +13305,377 @@ 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:211 builtin/pack-objects.c:214
+#: builtin/pack-objects.c:414

 #, c-format
 #, c-format

-msgid "deflate error (%d)"
-msgstr "error al desinflar (%d)"
+msgid "bad packed object CRC for %s"
+msgstr "mal paquete de objeto CRC para %s"
+
+#: builtin/pack-objects.c:425
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "objeto empaquetado corrupto para %s"
+
+#: builtin/pack-objects.c:556
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "delta recursivo encontrado para objeto %s"
+
+#: builtin/pack-objects.c:756
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "%u objetos ordenados, esperados %<PRIu32>"
+
+#: builtin/pack-objects.c:769
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr "packfile es inválido: %s"
+
+#: builtin/pack-objects.c:773
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr "no es posible abrir packfile para reusar: %s"
+
+#: builtin/pack-objects.c:777
+msgid "unable to seek in reused packfile"
+msgstr "no es posible buscar en los packfile reusados"

 
 

-#: builtin/pack-objects.c:810
+#: builtin/pack-objects.c:788
+msgid "unable to read from reused packfile"
+msgstr "no es posible leer de packfile reusado"
+
+#: builtin/pack-objects.c:816

 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:823
+#: builtin/pack-objects.c:829

 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 

-#: builtin/pack-objects.c:1106
+#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
+msgstr "falló al iniciar %s"
+
+#: builtin/pack-objects.c:944
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
+
+#: builtin/pack-objects.c:1112

 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:1765
+#: builtin/pack-objects.c:1489
+#, 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:1498
+#, 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:1771

 msgid "Counting objects"
 msgstr "Contando objetos"
 
 msgid "Counting objects"
 msgstr "Contando objetos"
 

-#: builtin/pack-objects.c:1895
+#: builtin/pack-objects.c:1913

 #, 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:1910
+#: builtin/pack-objects.c:1928

 #, 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:2564
+#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
+#: builtin/pack-objects.c:2021
+#, c-format
+msgid "object %s cannot be read"
+msgstr "objeto %s no puede ser leído"
+
+#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#, c-format
+msgid "object %s inconsistent object length (%lu vs %lu)"
+msgstr "objeto %s inconsistente con el largo del objeto (%lu vs %lu)"
+
+#: builtin/pack-objects.c:2035
+msgid "suboptimal pack - out of memory"
+msgstr "suboptimal pack - fuera de memoria"
+
+#: builtin/pack-objects.c:2366
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Compresión delta usando hasta %d hilos"
+
+#: builtin/pack-objects.c:2502
+#, 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:2586

 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 

-#: builtin/pack-objects.c:2735
+#: builtin/pack-objects.c:2592
+msgid "inconsistency with delta count"
+msgstr "inconsistencia con la cuenta de delta"
+
+#: builtin/pack-objects.c:2671
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"se espseraba ID de objeto al borde, se obtuvo basura:\n"
+"%s"
+
+#: builtin/pack-objects.c:2677
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"se esperaba ID de objeto, se obtuvo basuta:\n"
+"%s"
+
+#: builtin/pack-objects.c:2757

 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:3067
+#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
+msgid "cannot open pack index"
+msgstr "no se puede abrir índice de paquetes"
+
+#: builtin/pack-objects.c:2847
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "objeto perdido en %s no pudo ser examinado"
+
+#: builtin/pack-objects.c:2932
+msgid "unable to force loose object"
+msgstr "incapaz de forzar un objeto perdido"
+
+#: builtin/pack-objects.c:3019
+#, c-format
+msgid "not a rev '%s'"
+msgstr "no es una rev '%s'"
+
+#: builtin/pack-objects.c:3022
+#, c-format
+msgid "bad revision '%s'"
+msgstr "mala revisión '%s'"
+
+#: builtin/pack-objects.c:3042
+msgid "unable to add recent objects"
+msgstr "incapaz de añadir objetos recientes"
+
+#: builtin/pack-objects.c:3092

 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 

-#: builtin/pack-objects.c:3071
+#: builtin/pack-objects.c:3096

 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 

-#: builtin/pack-objects.c:3102
+#: builtin/pack-objects.c:3127

 msgid "do not show progress meter"
 msgstr "no mostrar medidor de progreso"
 
 msgid "do not show progress meter"
 msgstr "no mostrar medidor de progreso"
 

-#: builtin/pack-objects.c:3104
+#: builtin/pack-objects.c:3129

 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 
 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 

-#: builtin/pack-objects.c:3106
+#: builtin/pack-objects.c:3131

 msgid "show progress meter during object writing phase"
 msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
 
 msgid "show progress meter during object writing phase"
 msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
 

-#: builtin/pack-objects.c:3109
+#: builtin/pack-objects.c:3134

 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
 
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
 

-#: builtin/pack-objects.c:3110
-msgid "version[,offset]"
-msgstr "versión[,offset]"
+#: builtin/pack-objects.c:3135
+msgid "<version>[,<offset>]"
+msgstr "<versión>[,<offset>]"

 
 

-#: builtin/pack-objects.c:3111
+#: builtin/pack-objects.c:3136

 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escribir el índice de paquete en la versión de formato idx especificado"
 
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escribir el índice de paquete en la versión de formato idx especificado"
 

-#: builtin/pack-objects.c:3114
+#: builtin/pack-objects.c:3139

 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 
 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 

-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3141

 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 

-#: builtin/pack-objects.c:3118
+#: builtin/pack-objects.c:3143

 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 
 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 

-#: builtin/pack-objects.c:3120
+#: builtin/pack-objects.c:3145

 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 

-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3147

 msgid "limit pack window by memory in addition to object limit"
 msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
 
 msgid "limit pack window by memory in addition to object limit"
 msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
 

-#: builtin/pack-objects.c:3124
+#: builtin/pack-objects.c:3149

 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
 
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
 

-#: builtin/pack-objects.c:3126
+#: builtin/pack-objects.c:3151

 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 

-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3153

 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 

-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3155

 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 

-#: builtin/pack-objects.c:3132
+#: builtin/pack-objects.c:3157

 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 
 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 

-#: builtin/pack-objects.c:3134
+#: builtin/pack-objects.c:3159

 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 

-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3161

 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisión de standard input"
 
 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisión de standard input"
 

-#: builtin/pack-objects.c:3138
+#: builtin/pack-objects.c:3163

 msgid "limit the objects to those that are not yet packed"
 msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
 
 msgid "limit the objects to those that are not yet packed"
 msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
 

-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3166

 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 

-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3169

 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 

-#: builtin/pack-objects.c:3147
+#: builtin/pack-objects.c:3172

 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 

-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3175

 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 

-#: builtin/pack-objects.c:3152
+#: builtin/pack-objects.c:3177

 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
 
 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
 

-#: builtin/pack-objects.c:3154
+#: builtin/pack-objects.c:3179

 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 

-#: builtin/pack-objects.c:3156
+#: builtin/pack-objects.c:3181

 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 

-#: builtin/pack-objects.c:3158
+#: builtin/pack-objects.c:3183

 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 

-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3186

 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 

-#: builtin/pack-objects.c:3163
+#: builtin/pack-objects.c:3188

 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:3165
+#: builtin/pack-objects.c:3190

 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:3167
+#: builtin/pack-objects.c:3192

 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 

-#: builtin/pack-objects.c:3169
+#: builtin/pack-objects.c:3194

 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:3171
+#: builtin/pack-objects.c:3196

 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:3173
+#: builtin/pack-objects.c:3198

 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:3175
+#: builtin/pack-objects.c:3200

 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:3178
+#: builtin/pack-objects.c:3203

 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 

-#: builtin/pack-objects.c:3181
+#: builtin/pack-objects.c:3206

 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:3205
+#: builtin/pack-objects.c:3230

 #, 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:3210
+#: builtin/pack-objects.c:3235

 #, 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:3338
+#: builtin/pack-objects.c:3291
+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:3293
+msgid "minimum pack size limit is 1 MiB"
+msgstr "tamaño mínimo del paquete es 1 MiB"
+
+#: builtin/pack-objects.c:3298
+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:3301
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
+
+#: builtin/pack-objects.c:3307
+msgid "cannot use --filter without --stdout"
+msgstr "no se puede usar--filter sin --stdout"
+
+#: builtin/pack-objects.c:3363

 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 

+#: builtin/pack-objects.c:3382
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
+

 #: builtin/pack-refs.c:7
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opciones>]"
 #: builtin/pack-refs.c:7
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opciones>]"


@@ -12153,31 +13688,31 @@ msgstr "empaquetar todo"
 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 
 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 

-#: builtin/prune-packed.c:8
+#: builtin/prune-packed.c:9

 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 

-#: builtin/prune-packed.c:41
+#: builtin/prune-packed.c:42

 msgid "Removing duplicate objects"
 msgstr "Removiendo objetos duplicados"
 
 msgid "Removing duplicate objects"
 msgstr "Removiendo objetos duplicados"
 

-#: builtin/prune.c:11
+#: builtin/prune.c:12

 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
 
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
 

-#: builtin/prune.c:108
+#: builtin/prune.c:109

 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 
 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 

-#: builtin/prune.c:111
+#: builtin/prune.c:112

 msgid "expire objects older than <time>"
 msgstr "expirar objetos más viejos a <tiempo>"
 
 msgid "expire objects older than <time>"
 msgstr "expirar objetos más viejos a <tiempo>"
 

-#: builtin/prune.c:113
+#: builtin/prune.c:114

 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:127
+#: 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"
 


@@ -12203,7 +13738,7 @@ msgstr "Opciones relacionadas a fusión"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 

-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122

 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 


@@ -12277,7 +13812,7 @@ msgstr "Ver git-pull(1) para detalles."
 msgid "<remote>"
 msgstr "<remoto>"
 
 msgid "<remote>"
 msgstr "<remoto>"
 

-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576

 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"


@@ -12302,27 +13837,27 @@ 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:826
+#: builtin/pull.c:829

 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:874
+#: builtin/pull.c:877

 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:882
+#: builtin/pull.c:885

 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:885
+#: builtin/pull.c:888

 msgid "pull with rebase"
 msgstr "pull con rebase"
 
 msgid "pull with rebase"
 msgstr "pull con rebase"
 

-#: builtin/pull.c:886
+#: builtin/pull.c:889

 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:911
+#: builtin/pull.c:914

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -12333,7 +13868,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:916
+#: builtin/pull.c:919

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -12350,15 +13885,15 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
 "$ git reset --hard\n"
 "para recuperar."
 

-#: builtin/pull.c:931
+#: builtin/pull.c:934

 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:935
+#: builtin/pull.c:938

 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:942
+#: builtin/pull.c:945

 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"


@@ -12577,8 +14112,8 @@ msgid "force updates"
 msgstr "forzar actualizaciones"
 
 #: builtin/push.c:561 builtin/send-pack.c:181
 msgstr "forzar actualizaciones"
 
 #: builtin/push.c:561 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
 msgid "require old value of ref to be at this value"
 
 #: builtin/push.c:562 builtin/send-pack.c:182
 msgid "require old value of ref to be at this value"


@@ -12653,6 +14188,41 @@ msgstr "--all y --mirror son incompatibles"
 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"
 

+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-"
+"nueva>"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>"
+
+#: builtin/range-diff.c:26
+msgid "Percentage by which creation is weighted"
+msgstr "Porcentaje por el cual la creación es pesada"
+
+#: builtin/range-diff.c:28
+msgid "use simple diff colors"
+msgstr "usar colores simples de diff"
+
+#: builtin/range-diff.c:75 builtin/range-diff.c:79
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr "no .. en rango: '%s'"
+
+#: builtin/range-diff.c:89
+msgid "single arg format must be symmetric range"
+msgstr "argumento único de formato debe ser un rango simétrico"
+
+#: builtin/range-diff.c:104
+msgid "need two commit ranges"
+msgstr "se necesitan dos rangos de commits"
+

 #: builtin/read-tree.c:40
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 #: builtin/read-tree.c:40
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "


@@ -12736,7 +14306,7 @@ msgstr "git rebase--helper [<opciones>]"
 msgid "keep empty commits"
 msgstr "mantener commits vacíos"
 
 msgid "keep empty commits"
 msgstr "mantener commits vacíos"
 

-#: builtin/rebase--helper.c:26 builtin/revert.c:123
+#: builtin/rebase--helper.c:26 builtin/revert.c:124

 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"
 


@@ -12788,11 +14358,11 @@ msgstr "insertar comando exec en la lista de pendientes"
 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/receive-pack.c:31
+#: builtin/receive-pack.c:32

 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 

-#: builtin/receive-pack.c:842
+#: builtin/receive-pack.c:830

 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"


@@ -12825,7 +14395,7 @@ msgstr ""
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configure 'receive.denyCurrentBranch' a 'refuse'."
 
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configure 'receive.denyCurrentBranch' a 'refuse'."
 

-#: builtin/receive-pack.c:862
+#: builtin/receive-pack.c:850

 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"


@@ -12846,24 +14416,24 @@ msgstr ""
 "\n"
 "Para suprimir este mensaje, puede configurarlo en 'refuse'."
 
 "\n"
 "Para suprimir este mensaje, puede configurarlo en 'refuse'."
 

-#: builtin/receive-pack.c:1935
+#: builtin/receive-pack.c:1923

 msgid "quiet"
 msgstr "tranquilo"
 
 msgid "quiet"
 msgstr "tranquilo"
 

-#: builtin/receive-pack.c:1949
+#: builtin/receive-pack.c:1937

 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:532 builtin/reflog.c:537
+#: builtin/reflog.c:536 builtin/reflog.c:541

 #, 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/remote.c:14
+#: builtin/remote.c:15

 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 

-#: builtin/remote.c:15
+#: builtin/remote.c:16

 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"


@@ -12871,82 +14441,82 @@ msgstr ""
 "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nombre> <url>"
 
 "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nombre> <url>"
 

-#: builtin/remote.c:16 builtin/remote.c:36
+#: builtin/remote.c:17 builtin/remote.c:37

 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <viejo> <nuevo>"
 
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <viejo> <nuevo>"
 

-#: builtin/remote.c:17 builtin/remote.c:41
+#: builtin/remote.c:18 builtin/remote.c:42

 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 
 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 

-#: builtin/remote.c:18 builtin/remote.c:46
+#: builtin/remote.c:19 builtin/remote.c:47

 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
 
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
 

-#: builtin/remote.c:19
+#: builtin/remote.c:20

 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nombre>"
 
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nombre>"
 

-#: builtin/remote.c:20
+#: builtin/remote.c:21

 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nombre>"
 
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nombre>"
 

-#: builtin/remote.c:21
+#: builtin/remote.c:22

 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 

-#: builtin/remote.c:22
+#: builtin/remote.c:23

 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nombre> <rama>..."
 
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nombre> <rama>..."
 

-#: builtin/remote.c:23 builtin/remote.c:72
+#: builtin/remote.c:24 builtin/remote.c:73

 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nombre>"
 
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nombre>"
 

-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78

 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
 
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
 

-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79

 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nombre> <nuevo-url>"
 
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nombre> <nuevo-url>"
 

-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80

 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nombre> <url>"
 
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nombre> <url>"
 

-#: builtin/remote.c:31
+#: builtin/remote.c:32

 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opciones>] <nombre> <url>"
 
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opciones>] <nombre> <url>"
 

-#: builtin/remote.c:51
+#: builtin/remote.c:52

 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nombre> <rama>..."
 
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nombre> <rama>..."
 

-#: builtin/remote.c:52
+#: builtin/remote.c:53

 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nombre> <rama>..."
 
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nombre> <rama>..."
 

-#: builtin/remote.c:57
+#: builtin/remote.c:58

 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opciones>] <nombre>"
 
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opciones>] <nombre>"
 

-#: builtin/remote.c:62
+#: builtin/remote.c:63

 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opciones>] <nombre>"
 
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opciones>] <nombre>"
 

-#: builtin/remote.c:67
+#: builtin/remote.c:68

 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
 
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
 

-#: builtin/remote.c:96
+#: builtin/remote.c:97

 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 
 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 

-#: builtin/remote.c:128
+#: builtin/remote.c:129

 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"


@@ -12954,88 +14524,84 @@ msgstr ""
 "Usar --mirror es peligroso y está desaprobado;\n"
 "\t usa más bien --mirror=fetch o --mirror=push"
 
 "Usar --mirror es peligroso y está desaprobado;\n"
 "\t usa más bien --mirror=fetch o --mirror=push"
 

-#: builtin/remote.c:145
+#: builtin/remote.c:146

 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento mirror desconocido: %s"
 
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento mirror desconocido: %s"
 

-#: builtin/remote.c:161
+#: builtin/remote.c:162

 msgid "fetch the remote branches"
 msgstr "realizar fetch a las ramas remotas"
 
 msgid "fetch the remote branches"
 msgstr "realizar fetch a las ramas remotas"
 

-#: builtin/remote.c:163
+#: builtin/remote.c:164

 msgid "import all tags and associated objects when fetching"
 msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 
 msgid "import all tags and associated objects when fetching"
 msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 

-#: builtin/remote.c:166
+#: builtin/remote.c:167

 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no realziar fetch a ningún tag (--no-tags)"
 
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no realziar fetch a ningún tag (--no-tags)"
 

-#: builtin/remote.c:168
+#: builtin/remote.c:169

 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 
 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 

-#: builtin/remote.c:169
+#: builtin/remote.c:170

 msgid "master branch"
 msgstr "rama master"
 
 msgid "master branch"
 msgstr "rama master"
 

-#: builtin/remote.c:170
-msgid "push|fetch"
-msgstr "push|fetch"
-
-#: builtin/remote.c:171
+#: builtin/remote.c:172

 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "configurar remote como mirror para realizar push o desde el cual realizar "
 "fetch"
 
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "configurar remote como mirror para realizar push o desde el cual realizar "
 "fetch"
 

-#: builtin/remote.c:183
+#: builtin/remote.c:184

 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una rama master no tiene sentido con --mirror"
 
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una rama master no tiene sentido con --mirror"
 

-#: builtin/remote.c:185
+#: builtin/remote.c:186

 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
 
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
 

-#: builtin/remote.c:192 builtin/remote.c:634
+#: builtin/remote.c:193 builtin/remote.c:635

 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
 
 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
 

-#: builtin/remote.c:196 builtin/remote.c:638
+#: builtin/remote.c:197 builtin/remote.c:639

 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' no es un nombre remoto válido"
 
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' no es un nombre remoto válido"
 

-#: builtin/remote.c:236
+#: builtin/remote.c:237

 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 

-#: builtin/remote.c:342
+#: builtin/remote.c:343

 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "No se pudo realizar el fetch al mapa para refspec %s"
 
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "No se pudo realizar el fetch al mapa para refspec %s"
 

-#: builtin/remote.c:441 builtin/remote.c:449
+#: builtin/remote.c:442 builtin/remote.c:450

 msgid "(matching)"
 msgstr "(concordando)"
 
 msgid "(matching)"
 msgstr "(concordando)"
 

-#: builtin/remote.c:453
+#: builtin/remote.c:454

 msgid "(delete)"
 msgstr "(eliminar)"
 
 msgid "(delete)"
 msgstr "(eliminar)"
 

-#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
+#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863

 #, c-format
 msgid "No such remote: %s"
 msgstr "No existe el remoto: %s"
 
 #, c-format
 msgid "No such remote: %s"
 msgstr "No existe el remoto: %s"
 

-#: builtin/remote.c:644
+#: builtin/remote.c:645

 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
 
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
 

-#: builtin/remote.c:664
+#: builtin/remote.c:665

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -13046,17 +14612,17 @@ msgstr ""
 "\t%s\n"
 "\tPor favor actualice la configuración manualmente si es necesario."
 
 "\t%s\n"
 "\tPor favor actualice la configuración manualmente si es necesario."
 

-#: builtin/remote.c:700
+#: builtin/remote.c:701

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

-#: builtin/remote.c:734
+#: builtin/remote.c:735

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

-#: builtin/remote.c:799
+#: builtin/remote.c:801

 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"


@@ -13071,118 +14637,118 @@ msgstr[1] ""
 "removidas;\n"
 "para borrarlas, use:"
 
 "removidas;\n"
 "para borrarlas, use:"
 

-#: builtin/remote.c:813
+#: builtin/remote.c:815

 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No se pudo borrar la sección de configuración '%s'"
 
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No se pudo borrar la sección de configuración '%s'"
 

-#: builtin/remote.c:914
+#: builtin/remote.c:916

 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
 
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
 

-#: builtin/remote.c:917
+#: builtin/remote.c:919

 msgid " tracked"
 msgstr " rastreada"
 
 msgid " tracked"
 msgstr " rastreada"
 

-#: builtin/remote.c:919
+#: builtin/remote.c:921

 msgid " stale (use 'git remote prune' to remove)"
 msgstr " viejo ( use 'git remote prune' para remover)"
 
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " viejo ( use 'git remote prune' para remover)"
 

-#: builtin/remote.c:921
+#: builtin/remote.c:923

 msgid " ???"
 msgstr " ???"
 
 msgid " ???"
 msgstr " ???"
 

-#: builtin/remote.c:962
+#: builtin/remote.c:964

 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama"
 
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama"
 

-#: builtin/remote.c:971
+#: builtin/remote.c:973

 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 

-#: builtin/remote.c:973
+#: builtin/remote.c:975

 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebasa interactivamente (con fusiones) en remoto %s"
 
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebasa interactivamente (con fusiones) en remoto %s"
 

-#: builtin/remote.c:976
+#: builtin/remote.c:978

 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 

-#: builtin/remote.c:980
+#: builtin/remote.c:982

 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 
 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 

-#: builtin/remote.c:983
+#: builtin/remote.c:985

 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 

-#: builtin/remote.c:986
+#: builtin/remote.c:988

 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 

-#: builtin/remote.c:1029
+#: builtin/remote.c:1031

 msgid "create"
 msgstr "crear"
 
 msgid "create"
 msgstr "crear"
 

-#: builtin/remote.c:1032
+#: builtin/remote.c:1034

 msgid "delete"
 msgstr "borrar"
 
 msgid "delete"
 msgstr "borrar"
 

-#: builtin/remote.c:1036
+#: builtin/remote.c:1038

 msgid "up to date"
 msgstr "actualizado"
 
 msgid "up to date"
 msgstr "actualizado"
 

-#: builtin/remote.c:1039
+#: builtin/remote.c:1041

 msgid "fast-forwardable"
 msgstr "puede realizar fast-forward"
 
 msgid "fast-forwardable"
 msgstr "puede realizar fast-forward"
 

-#: builtin/remote.c:1042
+#: builtin/remote.c:1044

 msgid "local out of date"
 msgstr "desactualizado local"
 
 msgid "local out of date"
 msgstr "desactualizado local"
 

-#: builtin/remote.c:1049
+#: builtin/remote.c:1051

 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 

-#: builtin/remote.c:1052
+#: builtin/remote.c:1054

 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 

-#: builtin/remote.c:1056
+#: builtin/remote.c:1058

 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 

-#: builtin/remote.c:1059
+#: builtin/remote.c:1061

 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 

-#: builtin/remote.c:1127
+#: builtin/remote.c:1129

 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 

-#: builtin/remote.c:1154
+#: builtin/remote.c:1156

 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 

-#: builtin/remote.c:1155
+#: builtin/remote.c:1157

 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 

-#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
+#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313

 msgid "(no URL)"
 msgstr "(sin URL)"
 
 msgid "(no URL)"
 msgstr "(sin URL)"
 


@@ -13190,194 +14756,194 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.

-#: builtin/remote.c:1170 builtin/remote.c:1172
+#: builtin/remote.c:1172 builtin/remote.c:1174

 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL para publicar: %s"
 
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL para publicar: %s"
 

-#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180

 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 

-#: builtin/remote.c:1174
+#: builtin/remote.c:1176

 msgid "(not queried)"
 msgstr "(no consultado)"
 
 msgid "(not queried)"
 msgstr "(no consultado)"
 

-#: builtin/remote.c:1176
+#: builtin/remote.c:1178

 msgid "(unknown)"
 msgstr "(desconocido)"
 
 msgid "(unknown)"
 msgstr "(desconocido)"
 

-#: builtin/remote.c:1180
+#: builtin/remote.c:1182

 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
 
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
 

-#: builtin/remote.c:1192
+#: builtin/remote.c:1194

 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Rama remota:%s"
 msgstr[1] "  Ramas remotas:%s"
 
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Rama remota:%s"
 msgstr[1] "  Ramas remotas:%s"
 

-#: builtin/remote.c:1195 builtin/remote.c:1221
+#: builtin/remote.c:1197 builtin/remote.c:1223

 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 

-#: builtin/remote.c:1204
+#: builtin/remote.c:1206

 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Rama local configurada para 'git pull':"
 msgstr[1] "  Ramas locales configuradas para 'git pull':"
 
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Rama local configurada para 'git pull':"
 msgstr[1] "  Ramas locales configuradas para 'git pull':"
 

-#: builtin/remote.c:1212
+#: builtin/remote.c:1214

 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serán reflejadas por 'git push'"
 
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serán reflejadas por 'git push'"
 

-#: builtin/remote.c:1218
+#: builtin/remote.c:1220

 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referencia local configurada para 'git push'%s:"
 msgstr[1] "  Referencias locales configuradas para 'git push'%s:"
 
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referencia local configurada para 'git push'%s:"
 msgstr[1] "  Referencias locales configuradas para 'git push'%s:"
 

-#: builtin/remote.c:1239
+#: builtin/remote.c:1241

 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 

-#: builtin/remote.c:1241
+#: builtin/remote.c:1243

 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 

-#: builtin/remote.c:1256
+#: builtin/remote.c:1258

 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 
 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 

-#: builtin/remote.c:1258
+#: builtin/remote.c:1260

 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
 
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
 

-#: builtin/remote.c:1268
+#: builtin/remote.c:1270

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

-#: builtin/remote.c:1276
+#: builtin/remote.c:1278

 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref válido: %s"
 
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref válido: %s"
 

-#: builtin/remote.c:1278
+#: builtin/remote.c:1280

 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 
 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 

-#: builtin/remote.c:1296
+#: builtin/remote.c:1298

 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s será colgado!"
 
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s será colgado!"
 

-#: builtin/remote.c:1297
+#: builtin/remote.c:1299

 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ha sido colgado!"
 
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ha sido colgado!"
 

-#: builtin/remote.c:1307
+#: builtin/remote.c:1309

 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 
 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 

-#: builtin/remote.c:1308
+#: builtin/remote.c:1310

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

-#: builtin/remote.c:1324
+#: builtin/remote.c:1326

 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ejecutará prune] %s"
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ejecutará prune] %s"
 

-#: builtin/remote.c:1327
+#: builtin/remote.c:1329

 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 

-#: builtin/remote.c:1372
+#: builtin/remote.c:1374

 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 
 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 

-#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
+#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559

 #, c-format
 msgid "No such remote '%s'"
 msgstr "No existe el remoto '%s'"
 
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No existe el remoto '%s'"
 

-#: builtin/remote.c:1451
+#: builtin/remote.c:1453

 msgid "add branch"
 msgstr "agregar rama"
 
 msgid "add branch"
 msgstr "agregar rama"
 

-#: builtin/remote.c:1458
+#: builtin/remote.c:1460

 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 

-#: builtin/remote.c:1475
+#: builtin/remote.c:1477

 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de push en lugar de URLs de fetch"
 
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de push en lugar de URLs de fetch"
 

-#: builtin/remote.c:1477
+#: builtin/remote.c:1479

 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 

-#: builtin/remote.c:1505
+#: builtin/remote.c:1507

 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 

-#: builtin/remote.c:1531
+#: builtin/remote.c:1533

 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 
 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 

-#: builtin/remote.c:1533
+#: builtin/remote.c:1535

 msgid "add URL"
 msgstr "agregar URL"
 
 msgid "add URL"
 msgstr "agregar URL"
 

-#: builtin/remote.c:1535
+#: builtin/remote.c:1537

 msgid "delete URLs"
 msgstr "borrar URLs"
 
 msgid "delete URLs"
 msgstr "borrar URLs"
 

-#: builtin/remote.c:1542
+#: builtin/remote.c:1544

 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 

-#: builtin/remote.c:1581
+#: builtin/remote.c:1583

 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrón de URL viejo inválido: %s"
 
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrón de URL viejo inválido: %s"
 

-#: builtin/remote.c:1589
+#: builtin/remote.c:1591

 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontró URL: %s"
 
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontró URL: %s"
 

-#: builtin/remote.c:1591
+#: builtin/remote.c:1593

 msgid "Will not delete all non-push URLs"
 msgstr "No borrará todos los URLs de no-push"
 
 msgid "Will not delete all non-push URLs"
 msgstr "No borrará todos los URLs de no-push"
 

-#: builtin/remote.c:1607
+#: builtin/remote.c:1609

 msgid "be verbose; must be placed before a subcommand"
 msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
 
 msgid "be verbose; must be placed before a subcommand"
 msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
 

-#: builtin/remote.c:1638
+#: builtin/remote.c:1640

 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"
 
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"
 

-#: builtin/repack.c:18
+#: builtin/repack.c:20

 msgid "git repack [<options>]"
 msgstr "git repack [<opciones>]"
 
 msgid "git repack [<options>]"
 msgstr "git repack [<opciones>]"
 

-#: builtin/repack.c:23
+#: builtin/repack.c:25

 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."


@@ -13385,93 +14951,93 @@ 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:180
+#: builtin/repack.c:287

 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 

-#: builtin/repack.c:182
+#: builtin/repack.c:289

 msgid "same as -a, and turn unreachable objects loose"
 msgstr "lo mismo que -a, y pierde objetos inaccesibles"
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "lo mismo que -a, y pierde objetos inaccesibles"
 

-#: builtin/repack.c:185
+#: builtin/repack.c:292

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "remover paquetes redundantes, y ejecutar git-prune-packed"
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "remover paquetes redundantes, y ejecutar git-prune-packed"
 

-#: builtin/repack.c:187
+#: builtin/repack.c:294

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 

-#: builtin/repack.c:189
+#: builtin/repack.c:296

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 

-#: builtin/repack.c:191
+#: builtin/repack.c:298

 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 

-#: builtin/repack.c:194
+#: builtin/repack.c:301

 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 

-#: builtin/repack.c:196
+#: builtin/repack.c:303

 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 

-#: builtin/repack.c:197
+#: builtin/repack.c:304

 msgid "approxidate"
 msgstr "aproxime"
 
 msgid "approxidate"
 msgstr "aproxime"
 

-#: builtin/repack.c:198
+#: builtin/repack.c:305

 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos más antiguos que este"
 
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos más antiguos que este"
 

-#: builtin/repack.c:200
+#: builtin/repack.c:307

 msgid "with -a, repack unreachable objects"
 msgstr "con -a, re empaquetar objetos inalcanzables"
 
 msgid "with -a, repack unreachable objects"
 msgstr "con -a, re empaquetar objetos inalcanzables"
 

-#: builtin/repack.c:202
+#: builtin/repack.c:309

 msgid "size of the window used for delta compression"
 msgstr "tamaño de la ventana usado para la compresión delta"
 
 msgid "size of the window used for delta compression"
 msgstr "tamaño de la ventana usado para la compresión delta"
 

-#: builtin/repack.c:203 builtin/repack.c:209
+#: builtin/repack.c:310 builtin/repack.c:316

 msgid "bytes"
 msgstr "bytes"
 
 msgid "bytes"
 msgstr "bytes"
 

-#: builtin/repack.c:204
+#: builtin/repack.c:311

 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
 "entradas"
 
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
 "entradas"
 

-#: builtin/repack.c:206
+#: builtin/repack.c:313

 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 

-#: builtin/repack.c:208
+#: builtin/repack.c:315

 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 
 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 

-#: builtin/repack.c:210
+#: builtin/repack.c:317

 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 
 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 

-#: builtin/repack.c:212
+#: builtin/repack.c:319

 msgid "repack objects in packs marked with .keep"
 msgstr "re-empaquetar objetos en paquetes marcados con .keep"
 
 msgid "repack objects in packs marked with .keep"
 msgstr "re-empaquetar objetos en paquetes marcados con .keep"
 

-#: builtin/repack.c:214
+#: builtin/repack.c:321

 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 
 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 

-#: builtin/repack.c:224
+#: builtin/repack.c:331

 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
 
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
 

-#: builtin/repack.c:228
+#: builtin/repack.c:335

 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:425 builtin/worktree.c:139
+#: builtin/repack.c:510 builtin/worktree.c:140

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


@@ -13500,10 +15066,109 @@ msgstr "git replace -d <objeto>..."
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
 
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
 

-#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
+#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "falló al resolver '%s' como ref válida"
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"formato de reemplazo inválido '%s'\n"
+"formatos válidos son 'short', 'medium' y 'long'"
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "rama de reemplazo '%s' no encontrada"
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Borradas replace refs '%s'"
+
+#: builtin/replace.c:149

 #, c-format
 #, c-format

-msgid "Not a valid object name: '%s'"
-msgstr "Nombre de objeto no válido: '%s'"
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' no es un nombre de ref válido"
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "ref de reemplazo '%s' ya existe"
+
+#: builtin/replace.c:174
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+"Objeto debe ser del mismo tipo.\n"
+"'%s' puntos para un objeto reemplazado de tipo '%s'\n"
+"mientras '%s' puntos para un reemplazo de tipo de objeto '%s'."
+
+#: builtin/replace.c:225
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "no se pudo abrir %s para escritura"
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr "cat-file reportó un fallo"
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "no se pudo abrir %s para lectura"
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr "no es posible generar mktree"
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr "no es posible leer de mktree"
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr "mktree reportó un error"
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr "mktree no retornó un nombre de objeto"
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr "incapaz de correr fstat %s"
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr "incapaz de escribir el objeto en la base de datos"
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "nombre de objeto no válido: '%s'"
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "no es obtener tipo de objeto para %s"
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr "edición de archivo de objeto falló"
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "nuevo objeto es igual al antiguo: '%s'"

 
 #: builtin/replace.c:407
 #, c-format
 
 #: builtin/replace.c:407
 #, c-format


@@ -13526,8 +15191,8 @@ msgstr ""
 
 #: builtin/replace.c:460
 #, c-format
 
 #: builtin/replace.c:460
 #, c-format

-msgid "the original commit '%s' has a gpg signature."
-msgstr "el commit original '%s' tiene una firma gpg."
+msgid "the original commit '%s' has a gpg signature"
+msgstr "el commit original '%s' tiene una firma gpg"

 
 #: builtin/replace.c:461
 msgid "the signature will be removed in the replacement commit!"
 
 #: builtin/replace.c:461
 msgid "the signature will be removed in the replacement commit!"


@@ -13538,6 +15203,16 @@ msgstr "la firma será removida en el commit de reemplazo!"
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 

+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "graft para '%s' innecesario"
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "nuevo commit es le mismo que el antiguo: '%s'"
+

 #: builtin/replace.c:514
 #, c-format
 msgid ""
 #: builtin/replace.c:514
 #, c-format
 msgid ""


@@ -13579,6 +15254,42 @@ msgstr "no se puede imprimir contenidos para --edit"
 msgid "use this format"
 msgstr "usar este formato"
 
 msgid "use this format"
 msgstr "usar este formato"
 

+#: builtin/replace.c:556
+msgid "--format cannot be used when not listing"
+msgstr "--format no puede ser usado cuando no se hace listing"
+
+#: builtin/replace.c:564
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f solo tiene sentido cuando se escribe un reemplazo"
+
+#: builtin/replace.c:568
+msgid "--raw only makes sense with --edit"
+msgstr "--raw solo tiene sentido con --edit"
+
+#: builtin/replace.c:574
+msgid "-d needs at least one argument"
+msgstr "-d necesita al menos un argumento"
+
+#: builtin/replace.c:580
+msgid "bad number of arguments"
+msgstr "mal número de argumentos"
+
+#: builtin/replace.c:586
+msgid "-e needs exactly one argument"
+msgstr "-e necesita exactamente un argumento"
+
+#: builtin/replace.c:592
+msgid "-g needs at least one argument"
+msgstr "-g necesita al menos un argumento"
+
+#: builtin/replace.c:598
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file no toma argumentos"
+
+#: builtin/replace.c:604
+msgid "only one pattern can be given with -l"
+msgstr "solo se puede dar un patrón con -l"
+

 #: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"
 #: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"


@@ -13715,24 +15426,24 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'."
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 

-#: builtin/rev-list.c:397
+#: builtin/rev-list.c:399

 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:455
+#: builtin/rev-list.c:457

 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:458
+#: builtin/rev-list.c:460

 #, 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:499
+#: builtin/rev-list.c:501

 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:502
+#: builtin/rev-list.c:504

 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"
 


@@ -13767,84 +15478,84 @@ msgstr ""
 "Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
 "uso."
 
 "Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
 "uso."
 

-#: builtin/revert.c:23
+#: builtin/revert.c:24

 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opciones>] <commit-ish>..."
 
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opciones>] <commit-ish>..."
 

-#: builtin/revert.c:24
+#: builtin/revert.c:25

 msgid "git revert <subcommand>"
 msgstr "git revert <subcomando>"
 
 msgid "git revert <subcommand>"
 msgstr "git revert <subcomando>"
 

-#: builtin/revert.c:29
+#: builtin/revert.c:30

 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opciones>] <commit-ish>..."
 
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opciones>] <commit-ish>..."
 

-#: builtin/revert.c:30
+#: builtin/revert.c:31

 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcomando>"
 
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcomando>"
 

-#: builtin/revert.c:90
+#: builtin/revert.c:91

 #, 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:99
+#: builtin/revert.c:100

 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:100
+#: builtin/revert.c:101

 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:101
+#: builtin/revert.c:102

 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:102
+#: builtin/revert.c:103

 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:103
+#: builtin/revert.c:104

 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:106
+#: builtin/revert.c:107

 msgid "parent-number"
 msgstr "número-de-padre"
 
 msgid "parent-number"
 msgstr "número-de-padre"
 

-#: builtin/revert.c:107
+#: builtin/revert.c:108

 msgid "select mainline parent"
 msgstr "seleccionar el padre principal"
 
 msgid "select mainline parent"
 msgstr "seleccionar el padre principal"
 

-#: builtin/revert.c:109
+#: builtin/revert.c:110

 msgid "merge strategy"
 msgstr "estrategia de fusión"
 
 msgid "merge strategy"
 msgstr "estrategia de fusión"
 

-#: builtin/revert.c:110
+#: builtin/revert.c:111

 msgid "option"
 msgstr "opción"
 
 msgid "option"
 msgstr "opción"
 

-#: builtin/revert.c:111
+#: builtin/revert.c:112

 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:120
+#: builtin/revert.c:121

 msgid "append commit name"
 msgstr "adjuntar el nombre del commit"
 
 msgid "append commit name"
 msgstr "adjuntar el nombre del commit"
 

-#: builtin/revert.c:122
+#: builtin/revert.c:123

 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:124
+#: builtin/revert.c:125

 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:214
+#: builtin/revert.c:219

 msgid "revert failed"
 msgstr "falló al revertir"
 
 msgid "revert failed"
 msgstr "falló al revertir"
 

-#: builtin/revert.c:227
+#: builtin/revert.c:232

 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 
 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 


@@ -13914,6 +15625,12 @@ msgstr "permitir remover de forma recursiva"
 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
+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
 #, c-format
 msgid "not removing '%s' recursively without -r"
 #: builtin/rm.c:306
 #, c-format
 msgid "not removing '%s' recursively without -r"


@@ -13994,18 +15711,18 @@ msgid "Show the email address of each author"
 msgstr "Mostrar la dirección de correo de cada autor"
 
 #: builtin/shortlog.c:271
 msgstr "Mostrar la dirección de correo de cada autor"
 
 #: builtin/shortlog.c:271

-msgid "w[,i1[,i2]]"
-msgstr "w[,i1[,i2]]"
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"

 
 #: builtin/shortlog.c:272
 msgid "Linewrap output"
 msgstr "Salida de línea"
 
 
 #: builtin/shortlog.c:272
 msgid "Linewrap output"
 msgstr "Salida de línea"
 

-#: builtin/shortlog.c:298
+#: builtin/shortlog.c:299

 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"
 

-#: builtin/show-branch.c:12
+#: builtin/show-branch.c:13

 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"


@@ -14017,130 +15734,130 @@ msgstr ""
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 

-#: builtin/show-branch.c:16
+#: builtin/show-branch.c:17

 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 

-#: builtin/show-branch.c:376
+#: builtin/show-branch.c:395

 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
 msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
 
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
 msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
 

-#: builtin/show-branch.c:530
+#: builtin/show-branch.c:549

 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hay refs que concuerden con %s"
 
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hay refs que concuerden con %s"
 

-#: builtin/show-branch.c:626
+#: builtin/show-branch.c:645

 msgid "show remote-tracking and local branches"
 msgstr "mostrar ramas locales y de rastreo remoto"
 
 msgid "show remote-tracking and local branches"
 msgstr "mostrar ramas locales y de rastreo remoto"
 

-#: builtin/show-branch.c:628
+#: builtin/show-branch.c:647

 msgid "show remote-tracking branches"
 msgstr "mostrar ramas de rastreo remoto"
 
 msgid "show remote-tracking branches"
 msgstr "mostrar ramas de rastreo remoto"
 

-#: builtin/show-branch.c:630
+#: builtin/show-branch.c:649

 msgid "color '*!+-' corresponding to the branch"
 msgstr "color '*!+-' correspondiendo a la rama"
 
 msgid "color '*!+-' corresponding to the branch"
 msgstr "color '*!+-' correspondiendo a la rama"
 

-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:651

 msgid "show <n> more commits after the common ancestor"
 msgstr "mostrar <n> commits más tras encontrar el ancestro común"
 
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostrar <n> commits más tras encontrar el ancestro común"
 

-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:653

 msgid "synonym to more=-1"
 msgstr "sinónimo de más=-1"
 
 msgid "synonym to more=-1"
 msgstr "sinónimo de más=-1"
 

-#: builtin/show-branch.c:635
+#: builtin/show-branch.c:654

 msgid "suppress naming strings"
 msgstr "suprimir strings de nombre"
 
 msgid "suppress naming strings"
 msgstr "suprimir strings de nombre"
 

-#: builtin/show-branch.c:637
+#: builtin/show-branch.c:656

 msgid "include the current branch"
 msgstr "incluir la rama actual"
 
 msgid "include the current branch"
 msgstr "incluir la rama actual"
 

-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:658

 msgid "name commits with their object names"
 msgstr "nombrar commits con sus nombres de objeto"
 
 msgid "name commits with their object names"
 msgstr "nombrar commits con sus nombres de objeto"
 

-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:660

 msgid "show possible merge bases"
 msgstr "mostrar bases de fusión posibles"
 
 msgid "show possible merge bases"
 msgstr "mostrar bases de fusión posibles"
 

-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:662

 msgid "show refs unreachable from any other ref"
 msgstr "mostrar refs inalcanzables por ningún otro ref"
 
 msgid "show refs unreachable from any other ref"
 msgstr "mostrar refs inalcanzables por ningún otro ref"
 

-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:664

 msgid "show commits in topological order"
 msgstr "mostrar commits en orden topológico"
 
 msgid "show commits in topological order"
 msgstr "mostrar commits en orden topológico"
 

-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:667

 msgid "show only commits not on the first branch"
 msgstr "mostrar solo commits que no están en la primera rama"
 
 msgid "show only commits not on the first branch"
 msgstr "mostrar solo commits que no están en la primera rama"
 

-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:669

 msgid "show merges reachable from only one tip"
 msgstr "mostrar fusiones alcanzables solo por una punta"
 
 msgid "show merges reachable from only one tip"
 msgstr "mostrar fusiones alcanzables solo por una punta"
 

-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:671

 msgid "topologically sort, maintaining date order where possible"
 msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
 
 msgid "topologically sort, maintaining date order where possible"
 msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
 

-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:674

 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 

-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:675

 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
 
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
 

-#: builtin/show-branch.c:690
+#: builtin/show-branch.c:711

 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog no es compatible con --all, --remotes, --independent o --merge-base"
 
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog no es compatible con --all, --remotes, --independent o --merge-base"
 

-#: builtin/show-branch.c:714
+#: builtin/show-branch.c:735

 msgid "no branches given, and HEAD is not valid"
 msgstr "no se dieron ramas, y el HEAD no es válido"
 
 msgid "no branches given, and HEAD is not valid"
 msgstr "no se dieron ramas, y el HEAD no es válido"
 

-#: builtin/show-branch.c:717
+#: builtin/show-branch.c:738

 msgid "--reflog option needs one branch name"
 msgstr "opción --reflog necesita un nombre de rama"
 
 msgid "--reflog option needs one branch name"
 msgstr "opción --reflog necesita un nombre de rama"
 

-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:741

 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "solo %d entrada puede ser mostrada a la vez."
 msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
 
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "solo %d entrada puede ser mostrada a la vez."
 msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
 

-#: builtin/show-branch.c:724
+#: builtin/show-branch.c:745

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

-#: builtin/show-branch.c:808
+#: builtin/show-branch.c:829

 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "no se puede manejar más de %d rev."
 msgstr[1] "no se puede manejar más de %d revs."
 
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "no se puede manejar más de %d rev."
 msgstr[1] "no se puede manejar más de %d revs."
 

-#: builtin/show-branch.c:812
+#: builtin/show-branch.c:833

 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' no es una ref válida."
 
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' no es una ref válida."
 

-#: builtin/show-branch.c:815
+#: builtin/show-branch.c:836

 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no se puede encontrar el commit %s (%s)"
 
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no se puede encontrar el commit %s (%s)"
 

-#: builtin/show-ref.c:10
+#: builtin/show-ref.c:11

 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"


@@ -14148,39 +15865,39 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
 
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
 

-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12

 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<patrón>]"
 
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<patrón>]"
 

-#: builtin/show-ref.c:159
+#: builtin/show-ref.c:160

 msgid "only show tags (can be combined with heads)"
 msgstr "solo mostrar tags (puede ser combinado con heads)"
 
 msgid "only show tags (can be combined with heads)"
 msgstr "solo mostrar tags (puede ser combinado con heads)"
 

-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:161

 msgid "only show heads (can be combined with tags)"
 msgstr "solo mostrar heads (puede ser combinado con tags)"
 
 msgid "only show heads (can be combined with tags)"
 msgstr "solo mostrar heads (puede ser combinado con tags)"
 

-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162

 msgid "stricter reference checking, requires exact ref path"
 msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
 
 msgid "stricter reference checking, requires exact ref path"
 msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
 

-#: builtin/show-ref.c:164 builtin/show-ref.c:166
+#: builtin/show-ref.c:165 builtin/show-ref.c:167

 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
 
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
 

-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:169

 msgid "dereference tags into object IDs"
 msgstr "tags de deferencia en IDs de objeto"
 
 msgid "dereference tags into object IDs"
 msgstr "tags de deferencia en IDs de objeto"
 

-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171

 msgid "only show SHA1 hash using <n> digits"
 msgstr "solo mostrar hash SHA1 usando <n> dígitos"
 
 msgid "only show SHA1 hash using <n> digits"
 msgstr "solo mostrar hash SHA1 usando <n> dígitos"
 

-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:175

 msgid "do not print results to stdout (useful with --verify)"
 msgstr "no mostrar resultados en stdout (útil con --verify)"
 
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "no mostrar resultados en stdout (útil con --verify)"
 

-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177

 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostrar refs de stdin que no están en el repositorio local"
 
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostrar refs de stdin que no están en el repositorio local"
 


@@ -14201,12 +15918,12 @@ msgstr ""
 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:37 builtin/submodule--helper.c:1688
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833

 #, 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/submodule--helper.c:44 builtin/submodule--helper.c:1697
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842

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


@@ -14215,25 +15932,63 @@ msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 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:98
+#: builtin/submodule--helper.c:99

 #, 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:406 builtin/submodule--helper.c:1211
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356

 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:411
+#: builtin/submodule--helper.c:412

 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:462 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
+#: builtin/submodule--helper.c:629

 #, 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:500
+#: builtin/submodule--helper.c:521
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Entrando '%s'\n"
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command retornó estado no-cero para %s\n"
+"."
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command retornó estado no-cero mientras cursaba en los submódulos "
+"anidados de %s\n"
+"."
+
+#: builtin/submodule--helper.c:561
+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:1040
+msgid "Recurse into nested submodules"
+msgstr "Recursar en submódulos anidados"
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] <ruta>"
+
+#: builtin/submodule--helper.c:644

 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "


@@ -14242,57 +15997,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:511
+#: builtin/submodule--helper.c:655

 #, 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:515
+#: builtin/submodule--helper.c:659

 #, 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:525
+#: builtin/submodule--helper.c:669

 #, 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:532
+#: builtin/submodule--helper.c:676

 #, 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:554
+#: builtin/submodule--helper.c:698

 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:559
+#: builtin/submodule--helper.c:703

 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:631 builtin/submodule--helper.c:757
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901

 #, 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:670
+#: builtin/submodule--helper.c:814

 #, 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:697 builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010

 #, 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:721 builtin/submodule--helper.c:1031
+#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176

 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:722
+#: builtin/submodule--helper.c:866

 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"


@@ -14300,51 +16055,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:723
+#: builtin/submodule--helper.c:867

 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:728
+#: builtin/submodule--helper.c:872

 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:752
+#: builtin/submodule--helper.c:896

 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:816
+#: builtin/submodule--helper.c:960

 #, 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:822
+#: builtin/submodule--helper.c:966

 #, 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:836
+#: builtin/submodule--helper.c:980

 #, 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:847
+#: builtin/submodule--helper.c:991

 #, 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:895
+#: builtin/submodule--helper.c:1038

 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:897
-msgid "Recurse into nested submodules"
-msgstr "Recursar en submódulos anidados"
-
-#: builtin/submodule--helper.c:902
+#: builtin/submodule--helper.c:1045

 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:956
+#: builtin/submodule--helper.c:1099

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


@@ -14353,7 +16104,7 @@ msgstr ""
 "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
 "rf' si realmente quiere removerlo incluyendo todo en su historia)"
 
 "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
 "rf' si realmente quiere removerlo incluyendo todo en su historia)"
 

-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:1111

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


@@ -14362,81 +16113,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:976
+#: builtin/submodule--helper.c:1119

 #, 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:978
+#: builtin/submodule--helper.c:1121

 #, 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:987
+#: builtin/submodule--helper.c:1132

 #, 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:1003
+#: builtin/submodule--helper.c:1148

 #, 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:1032
+#: builtin/submodule--helper.c:1177

 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:1033
+#: builtin/submodule--helper.c:1178

 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 
 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 

-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1183

 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:1052
+#: builtin/submodule--helper.c:1197

 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:1145 builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293

 #, 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:1184
+#: builtin/submodule--helper.c:1329

 #, 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:1191
+#: builtin/submodule--helper.c:1336

 #, 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:1214
+#: builtin/submodule--helper.c:1359

 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:1217
+#: builtin/submodule--helper.c:1362

 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:1220
+#: builtin/submodule--helper.c:1365

 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:1228
+#: builtin/submodule--helper.c:1373

 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 

-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
+#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751

 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 
 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 

-#: builtin/submodule--helper.c:1236
+#: builtin/submodule--helper.c:1381

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


@@ -14445,83 +16196,83 @@ msgstr ""
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 

-#: builtin/submodule--helper.c:1267
+#: builtin/submodule--helper.c:1412

 #, 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:1281
+#: builtin/submodule--helper.c:1426

 #, 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:1347
+#: builtin/submodule--helper.c:1492

 #, 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:1351
+#: builtin/submodule--helper.c:1496

 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:1380
+#: builtin/submodule--helper.c:1525

 #, 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:1409
+#: builtin/submodule--helper.c:1554

 #, 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:1544
+#: builtin/submodule--helper.c:1689

 #, 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:1555
+#: builtin/submodule--helper.c:1700

 #, 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:1585 builtin/submodule--helper.c:1808
+#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953

 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:1588
+#: builtin/submodule--helper.c:1733

 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:1592
+#: builtin/submodule--helper.c:1737

 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:1598
+#: builtin/submodule--helper.c:1743

 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:1601
+#: builtin/submodule--helper.c:1746

 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 
 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 

-#: builtin/submodule--helper.c:1603
+#: builtin/submodule--helper.c:1748

 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:1604
+#: builtin/submodule--helper.c:1749

 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:1611
+#: builtin/submodule--helper.c:1756

 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:1624
+#: builtin/submodule--helper.c:1769

 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:1692
+#: builtin/submodule--helper.c:1837

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


@@ -14530,20 +16281,20 @@ 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:1809
+#: builtin/submodule--helper.c:1954

 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 

-#: builtin/submodule--helper.c:1815
+#: builtin/submodule--helper.c:1960

 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:1901
+#: builtin/submodule--helper.c:2071

 #, 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:1907
+#: builtin/submodule--helper.c:2077

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


@@ -14568,15 +16319,15 @@ msgstr "eliminar referencia simbólica"
 msgid "shorten ref output"
 msgstr "salida de referencia más corta"
 
 msgid "shorten ref output"
 msgstr "salida de referencia más corta"
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363

 msgid "reason"
 msgstr "razón"
 
 msgid "reason"
 msgstr "razón"
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363

 msgid "reason of the update"
 msgstr "razón de la actualización"
 
 msgid "reason of the update"
 msgstr "razón de la actualización"
 

-#: builtin/tag.c:24
+#: builtin/tag.c:25

 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"


@@ -14584,11 +16335,11 @@ msgstr ""
 "git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
 "<nombre-de-tag> [<head>]"
 
 "git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
 "<nombre-de-tag> [<head>]"
 

-#: builtin/tag.c:25
+#: builtin/tag.c:26

 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nombre-de-tag>..."
 
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nombre-de-tag>..."
 

-#: builtin/tag.c:26
+#: builtin/tag.c:27

 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"


@@ -14598,21 +16349,21 @@ msgstr ""
 "points-at <objeto>]\n"
 "\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
 
 "points-at <objeto>]\n"
 "\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
 

-#: builtin/tag.c:28
+#: builtin/tag.c:29

 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
 
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
 

-#: builtin/tag.c:86
+#: builtin/tag.c:87

 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' no encontrado."
 
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' no encontrado."
 

-#: builtin/tag.c:102
+#: builtin/tag.c:103

 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 

-#: builtin/tag.c:132
+#: builtin/tag.c:133

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


@@ -14625,7 +16376,7 @@ msgstr ""
 "  %s\n"
 "Las líneas que comienzan con '%c' serán ignoradas.\n"
 
 "  %s\n"
 "Las líneas que comienzan con '%c' serán ignoradas.\n"
 

-#: builtin/tag.c:136
+#: builtin/tag.c:137

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


@@ -14640,151 +16391,151 @@ msgstr ""
 "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
 "ti mismo si quieres hacerlo.\n"
 
 "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
 "ti mismo si quieres hacerlo.\n"
 

-#: builtin/tag.c:190
+#: builtin/tag.c:191

 msgid "unable to sign the tag"
 msgstr "incapaz de firmar tag"
 
 msgid "unable to sign the tag"
 msgstr "incapaz de firmar tag"
 

-#: builtin/tag.c:192
+#: builtin/tag.c:193

 msgid "unable to write tag file"
 msgstr "incapaz de escribir el archivo de tag"
 
 msgid "unable to write tag file"
 msgstr "incapaz de escribir el archivo de tag"
 

-#: builtin/tag.c:217
+#: builtin/tag.c:218

 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 

-#: builtin/tag.c:266
+#: builtin/tag.c:267

 msgid "no tag message?"
 msgstr "¿Sin mensaje de tag?"
 
 msgid "no tag message?"
 msgstr "¿Sin mensaje de tag?"
 

-#: builtin/tag.c:273
+#: builtin/tag.c:274

 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "El mensaje del tag ha sido dejado en %s\n"
 
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "El mensaje del tag ha sido dejado en %s\n"
 

-#: builtin/tag.c:382
+#: builtin/tag.c:383

 msgid "list tag names"
 msgstr "listar nombres de tags"
 
 msgid "list tag names"
 msgstr "listar nombres de tags"
 

-#: builtin/tag.c:384
+#: builtin/tag.c:385

 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> líneas de cada mensaje de tag"
 
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> líneas de cada mensaje de tag"
 

-#: builtin/tag.c:386
+#: builtin/tag.c:387

 msgid "delete tags"
 msgstr "eliminar tags"
 
 msgid "delete tags"
 msgstr "eliminar tags"
 

-#: builtin/tag.c:387
+#: builtin/tag.c:388

 msgid "verify tags"
 msgstr "verificar tags"
 
 msgid "verify tags"
 msgstr "verificar tags"
 

-#: builtin/tag.c:389
+#: builtin/tag.c:390

 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 
 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 

-#: builtin/tag.c:391
+#: builtin/tag.c:392

 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 
 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 

-#: builtin/tag.c:393
+#: builtin/tag.c:394

 msgid "tag message"
 msgstr "mensaje de tag"
 
 msgid "tag message"
 msgstr "mensaje de tag"
 

-#: builtin/tag.c:395
+#: builtin/tag.c:396

 msgid "force edit of tag message"
 msgstr "forzar la edición del mensaje de tag"
 
 msgid "force edit of tag message"
 msgstr "forzar la edición del mensaje de tag"
 

-#: builtin/tag.c:396
+#: builtin/tag.c:397

 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 

-#: builtin/tag.c:400
+#: builtin/tag.c:401

 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 
 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 

-#: builtin/tag.c:401
+#: builtin/tag.c:402

 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 
 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 

-#: builtin/tag.c:402 builtin/update-ref.c:368
+#: builtin/tag.c:403 builtin/update-ref.c:369

 msgid "create a reflog"
 msgstr "crear un reflog"
 
 msgid "create a reflog"
 msgstr "crear un reflog"
 

-#: builtin/tag.c:404
+#: builtin/tag.c:405

 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 

-#: builtin/tag.c:405
+#: builtin/tag.c:406

 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 
 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 

-#: builtin/tag.c:406 builtin/tag.c:408
+#: builtin/tag.c:407 builtin/tag.c:409

 msgid "print only tags that contain the commit"
 msgstr "mostrar solo tags que contienen el commit"
 
 msgid "print only tags that contain the commit"
 msgstr "mostrar solo tags que contienen el commit"
 

-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:408 builtin/tag.c:410

 msgid "print only tags that don't contain the commit"
 msgstr "mostrar solo tags que no contienen el commit"
 
 msgid "print only tags that don't contain the commit"
 msgstr "mostrar solo tags que no contienen el commit"
 

-#: builtin/tag.c:410
+#: builtin/tag.c:411

 msgid "print only tags that are merged"
 msgstr "sólo imprimir las tags que están fusionadas"
 
 msgid "print only tags that are merged"
 msgstr "sólo imprimir las tags que están fusionadas"
 

-#: builtin/tag.c:411
+#: builtin/tag.c:412

 msgid "print only tags that are not merged"
 msgstr "sólo imprimir las tags que no están fusionadas"
 
 msgid "print only tags that are not merged"
 msgstr "sólo imprimir las tags que no están fusionadas"
 

-#: builtin/tag.c:416
+#: builtin/tag.c:417

 msgid "print only tags of the object"
 msgstr "sólo imprimir tags de el objeto"
 
 msgid "print only tags of the object"
 msgstr "sólo imprimir tags de el objeto"
 

-#: builtin/tag.c:460
+#: builtin/tag.c:461

 msgid "--column and -n are incompatible"
 msgstr "--column y -n son incompatibles"
 
 msgid "--column and -n are incompatible"
 msgstr "--column y -n son incompatibles"
 

-#: builtin/tag.c:482
+#: builtin/tag.c:483

 msgid "-n option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 
 msgid "-n option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 

-#: builtin/tag.c:484
+#: builtin/tag.c:485

 msgid "--contains option is only allowed in list mode"
 msgstr "opción --contains solo es permitido en modo lista"
 
 msgid "--contains option is only allowed in list mode"
 msgstr "opción --contains solo es permitido en modo lista"
 

-#: builtin/tag.c:486
+#: builtin/tag.c:487

 msgid "--no-contains option is only allowed in list mode"
 msgstr "opción --no-contains solo es permitida en modo lista"
 
 msgid "--no-contains option is only allowed in list mode"
 msgstr "opción --no-contains solo es permitida en modo lista"
 

-#: builtin/tag.c:488
+#: builtin/tag.c:489

 msgid "--points-at option is only allowed in list mode"
 msgstr "opción --points-at solo es permitida en modo lista"
 
 msgid "--points-at option is only allowed in list mode"
 msgstr "opción --points-at solo es permitida en modo lista"
 

-#: builtin/tag.c:490
+#: builtin/tag.c:491

 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "opciones --merged y --no-merged  solo están permitidas en modo lista"
 
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "opciones --merged y --no-merged  solo están permitidas en modo lista"
 

-#: builtin/tag.c:501
+#: builtin/tag.c:502

 msgid "only one -F or -m option is allowed."
 msgstr "sólo se permite una de las opciones, -m ó -F."
 
 msgid "only one -F or -m option is allowed."
 msgstr "sólo se permite una de las opciones, -m ó -F."
 

-#: builtin/tag.c:520
+#: builtin/tag.c:521

 msgid "too many params"
 msgstr "demasiados parámetros"
 
 msgid "too many params"
 msgstr "demasiados parámetros"
 

-#: builtin/tag.c:526
+#: builtin/tag.c:527

 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no es un nombre de tag válido."
 
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no es un nombre de tag válido."
 

-#: builtin/tag.c:531
+#: builtin/tag.c:532

 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 

-#: builtin/tag.c:562
+#: builtin/tag.c:563

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 

-#: builtin/unpack-objects.c:498
+#: builtin/unpack-objects.c:500

 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 


@@ -14793,11 +16544,6 @@ msgstr "Desempaquetando objetos"
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 

-#: builtin/update-index.c:88
-#, c-format
-msgid "failed to stat %s"
-msgstr "falló al iniciar %s"
-

 #: builtin/update-index.c:98
 #, c-format
 msgid "failed to create file %s"
 #: builtin/update-index.c:98
 #, c-format
 msgid "failed to create file %s"


@@ -14849,147 +16595,147 @@ msgstr "info de estado del directorio no cambia tras borrar un directorio"
 msgid " OK"
 msgstr " OK"
 
 msgid " OK"
 msgstr " OK"
 

-#: builtin/update-index.c:589
+#: builtin/update-index.c:588

 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:946
+#: builtin/update-index.c:944

 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:949
+#: builtin/update-index.c:947

 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 

-#: builtin/update-index.c:952
+#: builtin/update-index.c:950

 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:954
+#: builtin/update-index.c:952

 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:956
+#: builtin/update-index.c:954

 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:958
+#: builtin/update-index.c:956

 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:961
+#: builtin/update-index.c:959

 msgid "refresh stat information"
 msgstr "refresh información de estado"
 
 msgid "refresh stat information"
 msgstr "refresh información de estado"
 

-#: builtin/update-index.c:965
+#: builtin/update-index.c:963

 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:969
+#: builtin/update-index.c:967

 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 

-#: builtin/update-index.c:970
+#: builtin/update-index.c:968

 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:979
+#: builtin/update-index.c:977

 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:982
+#: builtin/update-index.c:980

 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 

-#: builtin/update-index.c:985
+#: builtin/update-index.c:983

 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:988
+#: builtin/update-index.c:986

 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 

-#: builtin/update-index.c:991
+#: builtin/update-index.c:989

 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:993
+#: builtin/update-index.c:991

 msgid "remove named paths even if present in worktree"
 msgstr ""
 "remover rutas nombradas incluso si están presentes en el árbol de trabajo"
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "remover rutas nombradas incluso si están presentes en el árbol de trabajo"
 

-#: builtin/update-index.c:995
+#: builtin/update-index.c:993

 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:997
+#: builtin/update-index.c:995

 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:1001
+#: builtin/update-index.c:999

 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:1005
+#: builtin/update-index.c:1003

 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:1009
+#: builtin/update-index.c:1007

 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:1013
+#: builtin/update-index.c:1011

 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:1016
+#: builtin/update-index.c:1014

 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:1018
+#: builtin/update-index.c:1016

 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:1022
+#: builtin/update-index.c:1020

 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:1024
+#: builtin/update-index.c:1022

 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:1026
+#: builtin/update-index.c:1024

 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:1028
+#: builtin/update-index.c:1026

 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:1030
+#: builtin/update-index.c:1028

 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:1032
+#: builtin/update-index.c:1030

 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:1034
+#: builtin/update-index.c:1032

 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:1036
+#: builtin/update-index.c:1034

 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:1039
+#: builtin/update-index.c:1037

 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:1138
+#: builtin/update-index.c:1136

 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"


@@ -14997,7 +16743,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:1147
+#: builtin/update-index.c:1145

 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"


@@ -15005,7 +16751,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:1158
+#: builtin/update-index.c:1156

 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"


@@ -15013,11 +16759,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:1162
+#: builtin/update-index.c:1160

 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 

-#: builtin/update-index.c:1170
+#: builtin/update-index.c:1168

 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"


@@ -15025,29 +16771,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:1174
+#: builtin/update-index.c:1172

 #, 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:1182
+#: builtin/update-index.c:1180

 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:1186
+#: builtin/update-index.c:1184

 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 

-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1187

 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:1193
+#: builtin/update-index.c:1191

 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 


@@ -15065,19 +16811,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opciones>] --stdin [-z]"
 
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opciones>] --stdin [-z]"
 

-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364

 msgid "delete the reference"
 msgstr "eliminar la referencia"
 
 msgid "delete the reference"
 msgstr "eliminar la referencia"
 

-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366

 msgid "update <refname> not the one it points to"
 msgstr "actualiza <refname> no a lo que apunta"
 
 msgid "update <refname> not the one it points to"
 msgstr "actualiza <refname> no a lo que apunta"
 

-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367

 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin tiene argumentos terminados en NUL"
 
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin tiene argumentos terminados en NUL"
 

-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368

 msgid "read updates from stdin"
 msgstr "lee actualizaciones de stdin"
 
 msgid "read updates from stdin"
 msgstr "lee actualizaciones de stdin"
 


@@ -15105,15 +16851,15 @@ msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrumpir transferencia tras <n> segundos de inactividad"
 
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrumpir transferencia tras <n> segundos de inactividad"
 

-#: builtin/verify-commit.c:18
+#: builtin/verify-commit.c:20

 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 

-#: builtin/verify-commit.c:73
+#: builtin/verify-commit.c:76

 msgid "print commit contents"
 msgstr "imprimir contenido del commit"
 
 msgid "print commit contents"
 msgstr "imprimir contenido del commit"
 

-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38

 msgid "print raw gpg status output"
 msgstr "muestra la salida de status gpg en formato raw"
 
 msgid "print raw gpg status output"
 msgstr "muestra la salida de status gpg en formato raw"
 


@@ -15165,22 +16911,22 @@ msgstr "git worktree remove [<opciones>] <worktree>"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 

-#: builtin/worktree.c:58
+#: builtin/worktree.c:59

 #, 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:64
+#: builtin/worktree.c:65

 #, 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:69 builtin/worktree.c:78
+#: builtin/worktree.c:70 builtin/worktree.c:79

 #, 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:88
+#: builtin/worktree.c:89

 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "


@@ -15189,198 +16935,198 @@ 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:96
+#: builtin/worktree.c:97

 #, 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:105
+#: builtin/worktree.c:106

 #, 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:152
+#: builtin/worktree.c:153

 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:154
+#: builtin/worktree.c:155

 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:229
+#: builtin/worktree.c:230

 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 

-#: builtin/worktree.c:260
+#: builtin/worktree.c:261

 #, 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:373 builtin/worktree.c:379
+#: builtin/worktree.c:380 builtin/worktree.c:386

 #, 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:375
+#: builtin/worktree.c:382

 #, 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:384
+#: builtin/worktree.c:391

 #, 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:390
+#: builtin/worktree.c:397

 #, 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:431
+#: builtin/worktree.c:438

 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:434
+#: builtin/worktree.c:441

 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 

-#: builtin/worktree.c:436
+#: builtin/worktree.c:443

 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:438
+#: builtin/worktree.c:445

 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:439
+#: builtin/worktree.c:446

 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:441
+#: builtin/worktree.c:449

 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:444
+#: builtin/worktree.c:452

 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:452
+#: builtin/worktree.c:460

 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:511
+#: builtin/worktree.c:521

 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:611
+#: builtin/worktree.c:621

 msgid "reason for locking"
 msgstr "razón para bloquear"
 
 msgid "reason for locking"
 msgstr "razón para bloquear"
 

-#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
-#: builtin/worktree.c:850
+#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
+#: builtin/worktree.c:860

 #, 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:625 builtin/worktree.c:658
+#: builtin/worktree.c:635 builtin/worktree.c:668

 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:630
+#: builtin/worktree.c:640

 #, 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:632
+#: builtin/worktree.c:642

 #, 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:660
+#: builtin/worktree.c:670

 #, 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:685
+#: builtin/worktree.c:695

 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "árboles de trabajo conteniendo submódulos no puede ser movidos o removidos"
 
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "árboles de trabajo conteniendo submódulos no puede ser movidos o removidos"
 

-#: builtin/worktree.c:712 builtin/worktree.c:852
+#: builtin/worktree.c:722 builtin/worktree.c:862

 #, 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:717
+#: builtin/worktree.c:727

 #, 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:723
+#: builtin/worktree.c:733

 #, 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:730
+#: builtin/worktree.c:740

 #, c-format
 msgid "cannot move a locked working tree, lock reason: %s"
 msgstr ""
 "no se puede mover un árbol de trabajo encerrado, motivo del encierro: %s"
 
 #, c-format
 msgid "cannot move a locked working tree, lock reason: %s"
 msgstr ""
 "no se puede mover un árbol de trabajo encerrado, motivo del encierro: %s"
 

-#: builtin/worktree.c:732
+#: builtin/worktree.c:742

 msgid "cannot move a locked working tree"
 msgstr "no se puede mover un árbol de trabajo encerrado"
 
 msgid "cannot move a locked working tree"
 msgstr "no se puede mover un árbol de trabajo encerrado"
 

-#: builtin/worktree.c:735
+#: builtin/worktree.c:745

 #, 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:740
+#: builtin/worktree.c:750

 #, 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:788
+#: builtin/worktree.c:798

 #, 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:792
+#: builtin/worktree.c:802

 #, 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:797
+#: builtin/worktree.c:807

 #, 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:808 builtin/worktree.c:822
+#: builtin/worktree.c:818 builtin/worktree.c:832

 #, 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:834
+#: builtin/worktree.c:844

 msgid "force removing even if the worktree is dirty"
 msgstr "forzar remoción incluso si el árbol de trabajo está sucio"
 
 msgid "force removing even if the worktree is dirty"
 msgstr "forzar remoción incluso si el árbol de trabajo está sucio"
 

-#: builtin/worktree.c:856
+#: builtin/worktree.c:866

 #, c-format
 msgid "cannot remove a locked working tree, lock reason: %s"
 msgstr ""
 "no se pueden remover árbol de trabajo encerrado, razón del encierro: %s"
 
 #, c-format
 msgid "cannot remove a locked working tree, lock reason: %s"
 msgstr ""
 "no se pueden remover árbol de trabajo encerrado, razón del encierro: %s"
 

-#: builtin/worktree.c:858
+#: builtin/worktree.c:868

 msgid "cannot remove a locked working tree"
 msgstr "no se puede remover árbol de trabajo encerrado"
 
 msgid "cannot remove a locked working tree"
 msgstr "no se puede remover árbol de trabajo encerrado"
 

-#: builtin/worktree.c:861
+#: builtin/worktree.c:871

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "falló validación, no se puede remover árbol de trabajo: %s"
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "falló validación, no se puede remover árbol de trabajo: %s"


@@ -15397,7 +17143,7 @@ msgstr "<prefijo>/"
 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:31
+#: builtin/write-tree.c:30

 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 
 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 


@@ -15480,12 +17226,12 @@ msgstr "no se entregó directorio para -C\n"
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 

-#: git.c:765
+#: git.c:770

 #, 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:777
+#: git.c:782

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


@@ -15935,259 +17681,263 @@ msgid "Applies a quilt patchset onto the current branch"
 msgstr "Aplica un parche quilt en la rama actual"
 
 #: command-list.h:144
 msgstr "Aplica un parche quilt en la rama actual"
 
 #: command-list.h:144

+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
+
+#: command-list.h:145

 msgid "Reads tree information into the index"
 msgstr "Lee información del ábol en el índice"
 
 msgid "Reads tree information into the index"
 msgstr "Lee información del ábol en el índice"
 

-#: command-list.h:145
+#: command-list.h:146

 msgid "Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 
 msgid "Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 

-#: command-list.h:146
+#: command-list.h:147

 msgid "Receive what is pushed into the repository"
 msgstr "Recibir lo que es empujado en el respositorio"
 
 msgid "Receive what is pushed into the repository"
 msgstr "Recibir lo que es empujado en el respositorio"
 

-#: command-list.h:147
+#: command-list.h:148

 msgid "Manage reflog information"
 msgstr "Gestionar información de reflog"
 
 msgid "Manage reflog information"
 msgstr "Gestionar información de reflog"
 

-#: command-list.h:148
+#: command-list.h:149

 msgid "Manage set of tracked repositories"
 msgstr "Gestiona un conjunto de repositorios rastreados"
 
 msgid "Manage set of tracked repositories"
 msgstr "Gestiona un conjunto de repositorios rastreados"
 

-#: command-list.h:149
+#: command-list.h:150

 msgid "Pack unpacked objects in a repository"
 msgstr "empaquetar objetos no empaquetados en un repositorio"
 
 msgid "Pack unpacked objects in a repository"
 msgstr "empaquetar objetos no empaquetados en un repositorio"
 

-#: command-list.h:150
+#: command-list.h:151

 msgid "Create, list, delete refs to replace objects"
 msgstr "Crea, lista, borra referencias para reemplazar objetos"
 
 msgid "Create, list, delete refs to replace objects"
 msgstr "Crea, lista, borra referencias para reemplazar objetos"
 

-#: command-list.h:151
+#: command-list.h:152

 msgid "Generates a summary of pending changes"
 msgstr "Genera un resumen de cambios pendientes"
 
 msgid "Generates a summary of pending changes"
 msgstr "Genera un resumen de cambios pendientes"
 

-#: command-list.h:152
+#: command-list.h:153

 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 

-#: command-list.h:153
+#: command-list.h:154

 msgid "Reset current HEAD to the specified state"
 msgstr "Reinicia el HEAD actual a un estado especifico"
 
 msgid "Reset current HEAD to the specified state"
 msgstr "Reinicia el HEAD actual a un estado especifico"
 

-#: command-list.h:154
+#: command-list.h:155

 msgid "Revert some existing commits"
 msgstr "Revierte algunos commits existentes"
 
 msgid "Revert some existing commits"
 msgstr "Revierte algunos commits existentes"
 

-#: command-list.h:155
+#: command-list.h:156

 msgid "Lists commit objects in reverse chronological order"
 msgstr "Lista objetos commit en orden cronológico inverso"
 
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Lista objetos commit en orden cronológico inverso"
 

-#: command-list.h:156
+#: command-list.h:157

 msgid "Pick out and massage parameters"
 msgstr "Seleccionar y masajear los parámetros"
 
 msgid "Pick out and massage parameters"
 msgstr "Seleccionar y masajear los parámetros"
 

-#: command-list.h:157
+#: command-list.h:158

 msgid "Remove files from the working tree and from the index"
 msgstr "Borra archivos del árbol de trabajo y del índice"
 
 msgid "Remove files from the working tree and from the index"
 msgstr "Borra archivos del árbol de trabajo y del índice"
 

-#: command-list.h:158
+#: command-list.h:159

 msgid "Send a collection of patches as emails"
 msgstr "Envía una colección de parches como e-mails"
 
 msgid "Send a collection of patches as emails"
 msgstr "Envía una colección de parches como e-mails"
 

-#: command-list.h:159
+#: command-list.h:160

 msgid "Push objects over Git protocol to another repository"
 msgstr "Empujar objetos por protocolo Git a otro repositorio"
 
 msgid "Push objects over Git protocol to another repository"
 msgstr "Empujar objetos por protocolo Git a otro repositorio"
 

-#: command-list.h:160
+#: command-list.h:161

 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 

-#: command-list.h:161
+#: command-list.h:162

 msgid "Summarize 'git log' output"
 msgstr "Resumir la salida 'git log'"
 
 msgid "Summarize 'git log' output"
 msgstr "Resumir la salida 'git log'"
 

-#: command-list.h:162
+#: command-list.h:163

 msgid "Show various types of objects"
 msgstr "Muestra varios tipos de objetos"
 
 msgid "Show various types of objects"
 msgstr "Muestra varios tipos de objetos"
 

-#: command-list.h:163
+#: command-list.h:164

 msgid "Show branches and their commits"
 msgstr "Mostrar ramas y sus commits"
 
 msgid "Show branches and their commits"
 msgstr "Mostrar ramas y sus commits"
 

-#: command-list.h:164
+#: command-list.h:165

 msgid "Show packed archive index"
 msgstr "Mostrar el índice de archivo empaquetado"
 
 msgid "Show packed archive index"
 msgstr "Mostrar el índice de archivo empaquetado"
 

-#: command-list.h:165
+#: command-list.h:166

 msgid "List references in a local repository"
 msgstr "Listar referencias en el repositorio local"
 
 msgid "List references in a local repository"
 msgstr "Listar referencias en el repositorio local"
 

-#: command-list.h:166
+#: command-list.h:167

 msgid "Git's i18n setup code for shell scripts"
 msgstr "El código de configuración i18n de Git para scripts de shell"
 
 msgid "Git's i18n setup code for shell scripts"
 msgstr "El código de configuración i18n de Git para scripts de shell"
 

-#: command-list.h:167
+#: command-list.h:168

 msgid "Common Git shell script setup code"
 msgstr "Código de configuración de script de shell común de Git"
 
 msgid "Common Git shell script setup code"
 msgstr "Código de configuración de script de shell común de Git"
 

-#: command-list.h:168
+#: command-list.h:169

 msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 "Poner en un stash los cambios en un directorio de trabajo sucio de todas "
 "maneras"
 
 msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 "Poner en un stash los cambios en un directorio de trabajo sucio de todas "
 "maneras"
 

-#: command-list.h:169
+#: command-list.h:170

 msgid "Add file contents to the staging area"
 msgstr "Agrega contenidos de un archivo al área de staging"
 
 msgid "Add file contents to the staging area"
 msgstr "Agrega contenidos de un archivo al área de staging"
 

-#: command-list.h:170
+#: command-list.h:171

 msgid "Show the working tree status"
 msgstr "Muestra el estado del árbol de trabajo"
 
 msgid "Show the working tree status"
 msgstr "Muestra el estado del árbol de trabajo"
 

-#: command-list.h:171
+#: command-list.h:172

 msgid "Remove unnecessary whitespace"
 msgstr "Eliminar el espacio en blanco innecesario"
 
 msgid "Remove unnecessary whitespace"
 msgstr "Eliminar el espacio en blanco innecesario"
 

-#: command-list.h:172
+#: command-list.h:173

 msgid "Initialize, update or inspect submodules"
 msgstr "Inicializa, actualiza o inspecciona submódulos"
 
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicializa, actualiza o inspecciona submódulos"
 

-#: command-list.h:173
+#: command-list.h:174

 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operación bidireccional entre un repositorio Subversion y Git"
 
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operación bidireccional entre un repositorio Subversion y Git"
 

-#: command-list.h:174
+#: command-list.h:175

 msgid "Read, modify and delete symbolic refs"
 msgstr "Lee, modifica y borra referencias simbólicas"
 
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lee, modifica y borra referencias simbólicas"
 

-#: command-list.h:175
+#: command-list.h:176

 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 

-#: command-list.h:176
+#: command-list.h:177

 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un archivo temporal con contenidos de un blob"
 
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un archivo temporal con contenidos de un blob"
 

-#: command-list.h:177
+#: command-list.h:178

 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objetos de un archivo empaquetado"
 
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objetos de un archivo empaquetado"
 

-#: command-list.h:178
+#: command-list.h:179

 msgid "Register file contents in the working tree to the index"
 msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
 
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
 

-#: command-list.h:179
+#: command-list.h:180

 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Actualiza el nombre del objeto almacenado en una referencia de forma segura"
 
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Actualiza el nombre del objeto almacenado en una referencia de forma segura"
 

-#: command-list.h:180
+#: command-list.h:181

 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Actualiza el archivo de información auxiliar para ayudar a los servidores "
 "dumb"
 
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Actualiza el archivo de información auxiliar para ayudar a los servidores "
 "dumb"
 

-#: command-list.h:181
+#: command-list.h:182

 msgid "Send archive back to git-archive"
 msgstr "Enviar archivo a git-archive"
 
 msgid "Send archive back to git-archive"
 msgstr "Enviar archivo a git-archive"
 

-#: command-list.h:182
+#: command-list.h:183

 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Enviar objetos empaquetados a git-fetch-pack"
 
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Enviar objetos empaquetados a git-fetch-pack"
 

-#: command-list.h:183
+#: command-list.h:184

 msgid "Show a Git logical variable"
 msgstr "Mostrar una variable lógica de Git"
 
 msgid "Show a Git logical variable"
 msgstr "Mostrar una variable lógica de Git"
 

-#: command-list.h:184
+#: command-list.h:185

 msgid "Check the GPG signature of commits"
 msgstr "Verificar firma GPG de commits"
 
 msgid "Check the GPG signature of commits"
 msgstr "Verificar firma GPG de commits"
 

-#: command-list.h:185
+#: command-list.h:186

 msgid "Validate packed Git archive files"
 msgstr "Valida archivos Git empaquetados"
 
 msgid "Validate packed Git archive files"
 msgstr "Valida archivos Git empaquetados"
 

-#: command-list.h:186
+#: command-list.h:187

 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG de etiquetas"
 
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG de etiquetas"
 

-#: command-list.h:187
+#: command-list.h:188

 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 

-#: command-list.h:188
+#: command-list.h:189

 msgid "Show logs with difference each commit introduces"
 msgstr "Muestra logs con las diferencias que cada commit introduce"
 
 msgid "Show logs with difference each commit introduces"
 msgstr "Muestra logs con las diferencias que cada commit introduce"
 

-#: command-list.h:189
+#: command-list.h:190

 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples árboles de trabajo"
 
 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples árboles de trabajo"
 

-#: command-list.h:190
+#: command-list.h:191

 msgid "Create a tree object from the current index"
 msgstr "Crea un objeto árbol del índice actual"
 
 msgid "Create a tree object from the current index"
 msgstr "Crea un objeto árbol del índice actual"
 

-#: command-list.h:191
+#: command-list.h:192

 msgid "Defining attributes per path"
 msgstr "Definiendo atributos por ruta"
 
 msgid "Defining attributes per path"
 msgstr "Definiendo atributos por ruta"
 

-#: command-list.h:192
+#: command-list.h:193

 msgid "Git command-line interface and conventions"
 msgstr "Interfaz y convenciones de línea de comandos de Git"
 
 msgid "Git command-line interface and conventions"
 msgstr "Interfaz y convenciones de línea de comandos de Git"
 

-#: command-list.h:193
+#: command-list.h:194

 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial básico de Git para desarrolladores"
 
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial básico de Git para desarrolladores"
 

-#: command-list.h:194
+#: command-list.h:195

 msgid "Git for CVS users"
 msgstr "Git para usuarios CVS"
 
 msgid "Git for CVS users"
 msgstr "Git para usuarios CVS"
 

-#: command-list.h:195
+#: command-list.h:196

 msgid "Tweaking diff output"
 msgstr "Afinar la salida de diff"
 
 msgid "Tweaking diff output"
 msgstr "Afinar la salida de diff"
 

-#: command-list.h:196
+#: command-list.h:197

 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunto mínimo útil de comandos diarios de Git"
 
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunto mínimo útil de comandos diarios de Git"
 

-#: command-list.h:197
+#: command-list.h:198

 msgid "A Git Glossary"
 msgstr "Un Glosario de Git"
 
 msgid "A Git Glossary"
 msgstr "Un Glosario de Git"
 

-#: command-list.h:198
+#: command-list.h:199

 msgid "Hooks used by Git"
 msgstr "Hooks utilizados por Git"
 
 msgid "Hooks used by Git"
 msgstr "Hooks utilizados por Git"
 

-#: command-list.h:199
+#: command-list.h:200

 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
 
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
 

-#: command-list.h:200
+#: command-list.h:201

 msgid "Defining submodule properties"
 msgstr "Definiendo las propiedades del submódulo"
 
 msgid "Defining submodule properties"
 msgstr "Definiendo las propiedades del submódulo"
 

-#: command-list.h:201
+#: command-list.h:202

 msgid "Git namespaces"
 msgstr "namespaces de Git"
 
 msgid "Git namespaces"
 msgstr "namespaces de Git"
 

-#: command-list.h:202
+#: command-list.h:203

 msgid "Git Repository Layout"
 msgstr "Disposición del repositorio Git"
 
 msgid "Git Repository Layout"
 msgstr "Disposición del repositorio Git"
 

-#: command-list.h:203
+#: command-list.h:204

 msgid "Specifying revisions and ranges for Git"
 msgstr "Especificando revisiones y rangos para Git"
 
 msgid "Specifying revisions and ranges for Git"
 msgstr "Especificando revisiones y rangos para Git"
 

-#: command-list.h:204
+#: command-list.h:205

 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial de introducción a Git: parte dos"
 
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial de introducción a Git: parte dos"
 

-#: command-list.h:205
+#: command-list.h:206

 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial de introducción para Git"
 
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial de introducción para Git"
 

-#: command-list.h:206
+#: command-list.h:207

 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"
 


@@ -16435,7 +18185,7 @@ 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\"."
 

-#: git-rebase.sh:173 git-rebase.sh:442
+#: git-rebase.sh:173 git-rebase.sh:454

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


@@ -16449,28 +18199,28 @@ msgstr "Autostash aplicado."
 msgid "Cannot store $stash_sha1"
 msgstr "No se puede almacenar $stash_sha1"
 
 msgid "Cannot store $stash_sha1"
 msgstr "No se puede almacenar $stash_sha1"
 

-#: git-rebase.sh:229
+#: git-rebase.sh:236

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

-#: git-rebase.sh:234
+#: git-rebase.sh:241

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

-#: git-rebase.sh:403
+#: git-rebase.sh:415

 msgid "No rebase in progress?"
 msgstr "No hay rebase en progreso?"
 
 msgid "No rebase in progress?"
 msgstr "No hay rebase en progreso?"
 

-#: git-rebase.sh:414
+#: git-rebase.sh:426

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

-#: git-rebase.sh:421
+#: git-rebase.sh:433

 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 

-#: git-rebase.sh:424
+#: git-rebase.sh:436

 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"


@@ -16478,7 +18228,7 @@ 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"
 

-#: git-rebase.sh:468
+#: git-rebase.sh:480

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


@@ -16499,80 +18249,92 @@ 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-rebase.sh:509
+#: git-rebase.sh:545

 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
 msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'"
 
 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
 msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'"
 

-#: git-rebase.sh:537
+#: git-rebase.sh:556
+msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
+msgstr "error: no se puede combinar '--preserve_merges' con '--rebase-merges'"
+
+#: git-rebase.sh:562
+msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
+msgstr "error: no se puede combinar '--rebase_merges' con '--strategy-option'"
+
+#: git-rebase.sh:564
+msgid "error: cannot combine '--rebase_merges' with '--strategy'"
+msgstr "error: no se puede combinar '--rebase_merges' con '--strategy'"
+
+#: git-rebase.sh:590

 #, 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-rebase.sh:561
+#: git-rebase.sh:614

 #, 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-rebase.sh:564 git-rebase.sh:568
+#: git-rebase.sh:617 git-rebase.sh:621

 #, 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-rebase.sh:573
+#: git-rebase.sh:626

 #, 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-rebase.sh:599
+#: git-rebase.sh:652

 #, 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-rebase.sh:632
+#: git-rebase.sh:685

 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 

-#: git-rebase.sh:637
+#: git-rebase.sh:690

 #, 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-rebase.sh:641
+#: git-rebase.sh:694

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

-#: git-rebase.sh:664
+#: git-rebase.sh:717

 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 

-#: git-rebase.sh:666
+#: git-rebase.sh:719

 #, 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-rebase.sh:674
+#: git-rebase.sh:727

 #, 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."
 

-#: git-rebase.sh:676
+#: git-rebase.sh:729

 #, 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-rebase.sh:688
+#: git-rebase.sh:741

 #, 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-rebase.sh:697
+#: git-rebase.sh:750

 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-rebase.sh:707
+#: git-rebase.sh:760

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Avance rápido de $branch_name a $onto_name."
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Avance rápido de $branch_name a $onto_name."


@@ -16809,30 +18571,19 @@ msgstr "Falló al agregar el submódulo '$sm_path'"
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Falló al registrar el submódulo '$sm_path'"
 
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Falló al registrar el submódulo '$sm_path'"
 

-#: git-submodule.sh:354
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr "Entrando a '$displaypath'"
-
-#: git-submodule.sh:374
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-"Deteniendo en '$displaypath'; script retornó un status distinto de cero."
-
-#: git-submodule.sh:600
+#: git-submodule.sh:565

 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No se pudo encontrar la revisión actual en la ruta de submódulo "
 "'$displaypath'"
 
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No se pudo encontrar la revisión actual en la ruta de submódulo "
 "'$displaypath'"
 

-#: git-submodule.sh:610
+#: git-submodule.sh:575

 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
 

-#: git-submodule.sh:615
+#: git-submodule.sh:580

 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "


@@ -16841,12 +18592,12 @@ msgstr ""
 "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
 "de submódulo  '$sm_path'"
 
 "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
 "de submódulo  '$sm_path'"
 

-#: git-submodule.sh:633
+#: git-submodule.sh:603

 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
 

-#: git-submodule.sh:639
+#: git-submodule.sh:609

 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "


@@ -16855,75 +18606,75 @@ msgstr ""
 "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
 "Fetch directo del commit falló."
 
 "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
 "Fetch directo del commit falló."
 

-#: git-submodule.sh:646
+#: git-submodule.sh:616

 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
 
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
 

-#: git-submodule.sh:647
+#: git-submodule.sh:617

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
 

-#: git-submodule.sh:651
+#: git-submodule.sh:621

 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
 "'$displaypath'"
 
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
 "'$displaypath'"
 

-#: git-submodule.sh:652
+#: git-submodule.sh:622

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
 

-#: git-submodule.sh:657
+#: git-submodule.sh:627

 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
 
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
 

-#: git-submodule.sh:658
+#: git-submodule.sh:628

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
 

-#: git-submodule.sh:663
+#: git-submodule.sh:633

 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Falló la ejecución  de  '$command $sha1' en la ruta de submódulo "
 "'$displaypath'"
 
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Falló la ejecución  de  '$command $sha1' en la ruta de submódulo "
 "'$displaypath'"
 

-#: git-submodule.sh:664
+#: git-submodule.sh:634

 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
 
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
 

-#: git-submodule.sh:695
+#: git-submodule.sh:665

 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
 

-#: git-submodule.sh:791
+#: git-submodule.sh:761

 msgid "The --cached option cannot be used with the --files option"
 msgstr "La opción --cached no puede ser usada con la opción --files"
 
 msgid "The --cached option cannot be used with the --files option"
 msgstr "La opción --cached no puede ser usada con la opción --files"
 

-#: git-submodule.sh:843
+#: git-submodule.sh:813

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modo $mod_dst inesperado"
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "modo $mod_dst inesperado"
 

-#: git-submodule.sh:863
+#: git-submodule.sh:833

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
 

-#: git-submodule.sh:866
+#: git-submodule.sh:836

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
 

-#: git-submodule.sh:869
+#: git-submodule.sh:839

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""


@@ -16934,12 +18685,7 @@ msgstr ""
 msgid "See git-${cmd}(1) for details."
 msgstr "Véase git-${cmd}(1) para más detalles."
 
 msgid "See git-${cmd}(1) for details."
 msgstr "Véase git-${cmd}(1) para más detalles."
 

-#: git-rebase--interactive.sh:142
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasando ($new_count/$total)"
-
-#: git-rebase--interactive.sh:158
+#: git-rebase--interactive.sh:43

 msgid ""
 "\n"
 "Commands:\n"
 msgid ""
 "\n"
 "Commands:\n"


@@ -16979,7 +18725,7 @@ msgstr ""
 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
 "abajo.\n"
 
 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
 "abajo.\n"
 

-#: git-rebase--interactive.sh:179
+#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173

 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"


@@ -16987,7 +18733,7 @@ msgstr ""
 "\n"
 "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
 
 "\n"
 "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
 

-#: git-rebase--interactive.sh:183
+#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177

 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"


@@ -16995,7 +18741,120 @@ msgstr ""
 "\n"
 "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"
 
 "\n"
 "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"
 

-#: git-rebase--interactive.sh:221
+#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr "no se puede desacoplar HEAD"
+
+#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Esta editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase después de editar, ejecute:\n"
+"    git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr "No se pudo ejecutar el editor"
+
+#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
+
+#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr "¿Sin HEAD?"
+
+#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "No se pudo crear $state_dir temporalmente"
+
+#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr "No se pudo marcar como interactivo"
+
+#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
+msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
+
+#: git-rebase--interactive.sh:224
+msgid ""
+"\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"
+"\n"
+"\t"
+msgstr ""
+"\n"
+"\tComo sea, si quieres borrar todo, el rebase será abortado.\n"
+"\n"
+"\t"
+
+#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr "Tenga en cuenta que los commits vacíos están comentados"
+
+#: git-rebase--interactive.sh:280
+msgid "Could not generate todo list"
+msgstr "No se pudo generar lista de pendientes"
+
+#: git-rebase--preserve-merges.sh:136
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Rebasando ($new_count/$total)"
+
+#: git-rebase--preserve-merges.sh:152
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandos:\n"
+"p, pick <commit> = usar commit\n"
+"r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
+"e, edit <commit> = usar commit, pero parar para un amend\n"
+"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
+"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
+"este commit\n"
+"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n"
+"d, drop <commit> = remover commit\n"
+"l, label <label> = poner label al HEAD actual con un nombre\n"
+"t, reset <label> = reiniciar HEAD a el label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       crea un commit de fusión usando el mensaje original de\n"
+".       fusión (o la línea de oneline, si no se especifica un mensaje\n"
+".       de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
+"\n"
+"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
+"abajo.\n"
+
+#: git-rebase--preserve-merges.sh:215

 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -17014,83 +18873,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
 "\n"
 "\tgit rebase --continue"
 

-#: git-rebase--interactive.sh:246
+#: git-rebase--preserve-merges.sh:240

 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: no es un commit que pueda ser cogido"
 
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: no es un commit que pueda ser cogido"
 

-#: git-rebase--interactive.sh:285
+#: git-rebase--preserve-merges.sh:279

 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nombre de commit inválido: $sha1"
 
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nombre de commit inválido: $sha1"
 

-#: git-rebase--interactive.sh:325
+#: git-rebase--preserve-merges.sh:309

 msgid "Cannot write current commit's replacement sha1"
 msgstr "No se puede escribir el remplazo sha1 del commit actual"
 
 msgid "Cannot write current commit's replacement sha1"
 msgstr "No se puede escribir el remplazo sha1 del commit actual"
 

-#: git-rebase--interactive.sh:376
+#: git-rebase--preserve-merges.sh:360

 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rápido a $sha1"
 
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rápido a $sha1"
 

-#: git-rebase--interactive.sh:378
+#: git-rebase--preserve-merges.sh:362

 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "No se puede realizar avance rápido a $sha1"
 
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "No se puede realizar avance rápido a $sha1"
 

-#: git-rebase--interactive.sh:387
+#: git-rebase--preserve-merges.sh:371

 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "No se puede mover HEAD a $first_parent"
 
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "No se puede mover HEAD a $first_parent"
 

-#: git-rebase--interactive.sh:392
+#: git-rebase--preserve-merges.sh:376

 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Rehusando a ejecutar squash en fusión: $sha1"
 
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Rehusando a ejecutar squash en fusión: $sha1"
 

-#: git-rebase--interactive.sh:410
+#: git-rebase--preserve-merges.sh:394

 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Error rehaciendo fusión $sha1"
 
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Error rehaciendo fusión $sha1"
 

-#: git-rebase--interactive.sh:419
+#: git-rebase--preserve-merges.sh:403

 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No se pudo coger $sha1"
 
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No se pudo coger $sha1"
 

-#: git-rebase--interactive.sh:428
+#: git-rebase--preserve-merges.sh:412

 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Este es el mensaje del commit #${n}:"
 
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Este es el mensaje del commit #${n}:"
 

-#: git-rebase--interactive.sh:433
+#: git-rebase--preserve-merges.sh:417

 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "El mensaje del commit  #${n} será ignorado:"
 
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "El mensaje del commit  #${n} será ignorado:"
 

-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:428

 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Esta es una combinación de $count commit."
 msgstr[1] "Esta es la combinación de $count commits."
 
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] "Esta es una combinación de $count commit."
 msgstr[1] "Esta es la combinación de $count commits."
 

-#: git-rebase--interactive.sh:453
+#: git-rebase--preserve-merges.sh:437

 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "No se puede escribir $fixup_msg"
 
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "No se puede escribir $fixup_msg"
 

-#: git-rebase--interactive.sh:456
+#: git-rebase--preserve-merges.sh:440

 msgid "This is a combination of 2 commits."
 msgstr "Esto es una combinación de 2 commits."
 
 msgid "This is a combination of 2 commits."
 msgstr "Esto es una combinación de 2 commits."
 

-#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
-#: git-rebase--interactive.sh:543
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527

 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No se puede aplicar $sha1... $rest"
 
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No se puede aplicar $sha1... $rest"
 

-#: git-rebase--interactive.sh:572
+#: git-rebase--preserve-merges.sh:556

 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"


@@ -17107,31 +18966,31 @@ msgstr ""
 "problema antes\n"
 "de que sea capaz de reformular el commit."
 
 "problema antes\n"
 "de que sea capaz de reformular el commit."
 

-#: git-rebase--interactive.sh:587
+#: git-rebase--preserve-merges.sh:571

 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Detenido en $sha1_abbrev... $rest"
 
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Detenido en $sha1_abbrev... $rest"
 

-#: git-rebase--interactive.sh:602
+#: git-rebase--preserve-merges.sh:586

 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "No se puede '$squash_style' sin un commit previo"
 
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "No se puede '$squash_style' sin un commit previo"
 

-#: git-rebase--interactive.sh:644
+#: git-rebase--preserve-merges.sh:628

 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 

-#: git-rebase--interactive.sh:652
+#: git-rebase--preserve-merges.sh:636

 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ejecución fallida: $rest"
 
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ejecución fallida: $rest"
 

-#: git-rebase--interactive.sh:654
+#: git-rebase--preserve-merges.sh:638

 msgid "and made changes to the index and/or the working tree"
 msgstr "y hizo cambios al índice y/o al árbol de trabajo"
 
 msgid "and made changes to the index and/or the working tree"
 msgstr "y hizo cambios al índice y/o al árbol de trabajo"
 

-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:640

 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"


@@ -17142,7 +19001,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user

-#: git-rebase--interactive.sh:669
+#: git-rebase--preserve-merges.sh:653

 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"


@@ -17157,29 +19016,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
 "\n"
 "\tgit rebase --continue"
 

-#: git-rebase--interactive.sh:680
+#: git-rebase--preserve-merges.sh:664

 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Comando desconocido: $command $sha1 $rest"
 
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Comando desconocido: $command $sha1 $rest"
 

-#: git-rebase--interactive.sh:681
+#: git-rebase--preserve-merges.sh:665

 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
 
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
 

-#: git-rebase--interactive.sh:716
+#: git-rebase--preserve-merges.sh:700

 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "$head_name rebasado y actualizado satisfactoriamente."
 
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "$head_name rebasado y actualizado satisfactoriamente."
 

-#: git-rebase--interactive.sh:740
-msgid "could not detach HEAD"
-msgstr "no se puede desacoplar HEAD"
-
-#: git-rebase--interactive.sh:778
+#: git-rebase--preserve-merges.sh:757

 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "No se pudo remover CHERRY_PICK_HEAD"
 
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "No se pudo remover CHERRY_PICK_HEAD"
 

-#: git-rebase--interactive.sh:783
+#: git-rebase--preserve-merges.sh:762

 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"


@@ -17210,12 +19065,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
 "\n"
 "  git rebase --continue\n"
 

-#: git-rebase--interactive.sh:800
+#: git-rebase--preserve-merges.sh:779

 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 "Error tratando de encontrar la identidad del autor para remediar el commit"
 
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 "Error tratando de encontrar la identidad del autor para remediar el commit"
 

-#: git-rebase--interactive.sh:805
+#: git-rebase--preserve-merges.sh:784

 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."
 msgid ""
 "You have uncommitted changes in your working tree. Please commit them\n"
 "first and then run 'git rebase --continue' again."


@@ -17223,74 +19078,21 @@ msgstr ""
 "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
 "primero y entonces ejecuta 'git rebase --continue' de nuevo."
 
 "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
 "primero y entonces ejecuta 'git rebase --continue' de nuevo."
 

-#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793

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

-#: git-rebase--interactive.sh:843
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Esta editando el archivo TODO de un rebase interactivo.\n"
-"Para continuar el rebase después de editar, ejecute:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937
-msgid "Could not execute editor"
-msgstr "No se pudo ejecutar el editor"
-
-#: git-rebase--interactive.sh:872
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-
-#: git-rebase--interactive.sh:879
-msgid "No HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: git-rebase--interactive.sh:880
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No se pudo crear $state_dir temporalmente"
-
-#: git-rebase--interactive.sh:883
-msgid "Could not mark as interactive"
-msgstr "No se pudo marcar como interactivo"
-
-#: git-rebase--interactive.sh:915
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-
-#: git-rebase--interactive.sh:920
+#: git-rebase--preserve-merges.sh:893

 msgid ""
 "\n"
 msgid ""
 "\n"

-"\tHowever, if you remove everything, the rebase will be aborted.\n"
+"However, if you remove everything, the rebase will be aborted.\n"

 "\n"
 "\n"

-"\t"

 msgstr ""
 "\n"
 msgstr ""
 "\n"

-"\tComo sea, si quieres borrar todo, el rebase será abortado.\n"
+"Como sea, si quieres borrar todo, el rebase será abortado.\n"

 "\n"
 "\n"

-"\t"
-
-#: git-rebase--interactive.sh:927
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacíos están comentados"
-
-#: git-rebase--interactive.sh:980
-msgid "Could not generate todo list"
-msgstr "No se pudo generar lista de pendientes"

 
 

-#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947

 msgid "Could not init rewritten commits"
 msgstr "No se puede inicializar los commits reescritos"
 
 msgid "Could not init rewritten commits"
 msgstr "No se puede inicializar los commits reescritos"
 


@@ -18152,112 +19954,134 @@ msgstr "Servidor no soporta STARTTLS! %s"
 msgid "STARTTLS failed! %s"
 msgstr "Falló STARTTLS! %s"
 
 msgid "STARTTLS failed! %s"
 msgstr "Falló STARTTLS! %s"
 

-#: git-send-email.perl:1512
+#: git-send-email.perl:1511

 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
 "smtp-debug."
 
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
 "smtp-debug."
 

-#: git-send-email.perl:1530
+#: git-send-email.perl:1529

 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falló al enviar %s\n"
 
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falló al enviar %s\n"
 

-#: git-send-email.perl:1533
+#: git-send-email.perl:1532

 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 

-#: git-send-email.perl:1533
+#: git-send-email.perl:1532

 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 

-#: git-send-email.perl:1535
+#: git-send-email.perl:1534

 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 

-#: git-send-email.perl:1535
+#: git-send-email.perl:1534

 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 

-#: git-send-email.perl:1547
+#: git-send-email.perl:1546

 msgid "Result: "
 msgstr "Resultado: "
 
 msgid "Result: "
 msgstr "Resultado: "
 

-#: git-send-email.perl:1550
+#: git-send-email.perl:1549

 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 

-#: git-send-email.perl:1568
+#: git-send-email.perl:1567

 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 
 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 

-#: git-send-email.perl:1615 git-send-email.perl:1635
+#: git-send-email.perl:1614 git-send-email.perl:1634

 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
 
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
 

-#: git-send-email.perl:1621
+#: git-send-email.perl:1620

 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
 
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
 

-#: git-send-email.perl:1674
+#: git-send-email.perl:1673

 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
 
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
 

-#: git-send-email.perl:1699
+#: git-send-email.perl:1698

 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Agregando cc: %s de la línea '%s'\n"
 
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Agregando cc: %s de la línea '%s'\n"
 

-#: git-send-email.perl:1817
+#: git-send-email.perl:1809

 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 

-#: git-send-email.perl:1824
+#: git-send-email.perl:1816

 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Agregando %s: %s de: '%s'\n"
 
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Agregando %s: %s de: '%s'\n"
 

-#: git-send-email.perl:1828
+#: git-send-email.perl:1820

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) falló al cerrar el pipe para '%s'"
 
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) falló al cerrar el pipe para '%s'"
 

-#: git-send-email.perl:1855
+#: git-send-email.perl:1850

 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 
 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 

-#: git-send-email.perl:1863
+#: git-send-email.perl:1858

 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia invalida"
 
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia invalida"
 

-#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
+#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961

 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no es posible abrir %s: %s\n"
 
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no es posible abrir %s: %s\n"
 

-#: git-send-email.perl:1904
+#: git-send-email.perl:1902

 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
 
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
 

-#: git-send-email.perl:1920
+#: git-send-email.perl:1919

 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.

-#: git-send-email.perl:1924
+#: git-send-email.perl:1923

 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 

+#~ msgid "Dirty index: cannot merge (dirty: %s)"
+#~ msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
+
+#~ msgid "(+/-)x"
+#~ msgstr "(+/-)x"
+
+#~ msgid "<command>"
+#~ msgstr "<comando>"
+
+#~ msgid "push|fetch"
+#~ msgstr "push|fetch"
+
+#~ msgid "w[,i1[,i2]]"
+#~ msgstr "w[,i1[,i2]]"
+
+#~ msgid "Entering '$displaypath'"
+#~ msgstr "Entrando a '$displaypath'"
+
+#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
+#~ msgstr ""
+#~ "Deteniendo en '$displaypath'; script retornó un status distinto de cero."
+

 #~ msgid "Everyday Git With 20 Commands Or So"
 #~ msgstr "Git diario con 20 comandos o algo así"
 
 #~ msgid "Everyday Git With 20 Commands Or So"
 #~ msgstr "Git diario con 20 comandos o algo así"
 


@@ -18316,9 +20140,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: "
 #~ "los strings vacíos como pathspecs serán inválidas en las próximas "
 #~ "versiones. por favor use . si quería hacer coincidir todas las rutas"
 
 #~ "los strings vacíos como pathspecs serán inválidas en las próximas "
 #~ "versiones. por favor use . si quería hacer coincidir todas las rutas"
 

-#~ msgid "unable to open '%s' for writing"
-#~ msgstr "No se pudo abrir '%s' para escritura"
-

 #~ msgid "could not truncate '%s'"
 #~ msgstr "no se pudo truncar '%s'"
 
 #~ msgid "could not truncate '%s'"
 #~ msgstr "no se pudo truncar '%s'"
 


@@ -18340,9 +20161,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: "
 #~ msgid "show ignored files"
 #~ msgstr "mostrar archivos ignorados"
 
 #~ msgid "show ignored files"
 #~ msgstr "mostrar archivos ignorados"
 

-#~ msgid "%s is not a valid '%s' object"
-#~ msgstr "%s no es un objeto '%s' válido"
-

 #~ msgid "Don't know how to fetch from %s"
 #~ msgstr "No se sabe como extraer de %s"
 
 #~ msgid "Don't know how to fetch from %s"
 #~ msgstr "No se sabe como extraer de %s"