l10n: es.po: Spanish update for v2.18.0 round 1

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

diff --git a/po/es.po b/po/es.po
index 4e9949673ccadd0399d3b2ec39cd7656a6df63d3..8939f28324778774119889bff88932cc2a370dfb 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-03-16 07:29+0800\n"
-"PO-Revision-Date: 2018-03-15 21:31-0500\n"
+"POT-Creation-Date: 2018-05-31 23:32+0800\n"
+"PO-Revision-Date: 2018-05-31 23:07-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"


@@ -18,38 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 

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

 #, c-format
 #, c-format

-msgid "hint: %.*s\n"
-msgstr "ayuda: %.*s\n"
+msgid "%shint: %.*s%s\n"
+msgstr "%sayuda: %.*s%s\n"

 
 

-#: advice.c:90
+#: advice.c:137

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

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

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

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

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

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

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

 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:121 builtin/merge.c:1251
+#: advice.c:168 builtin/merge.c:1249

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

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

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

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


@@ -343,14 +343,14 @@ msgstr ""
 #: apply.c:3225
 #, c-format
 msgid "patch failed: %s:%ld"
 #: apply.c:3225
 #, c-format
 msgid "patch failed: %s:%ld"

-msgstr "el parche fallo: %s:%ld"
+msgstr "el parche falló: %s:%ld"

 
 #: apply.c:3347
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
 
 #: apply.c:3347
 #, 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:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 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"


@@ -394,7 +394,7 @@ msgstr "no se pueden leer los contenidos actuales de '%s'"
 #: apply.c:3595
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 #: apply.c:3595
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"

-msgstr "Fallo el merge en retroceso de tres-vías...\n"
+msgstr "Falló el merge en retroceso de tres-vías...\n"

 
 #: apply.c:3609
 #, c-format
 
 #: apply.c:3609
 #, c-format


@@ -478,7 +478,7 @@ msgstr "falta información sha1 o es inútil (%s)."
 #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
 #, c-format
 msgid "make_cache_entry failed for path '%s'"

-msgstr "make_cache_entry fallo para la ruta '%s'"
+msgstr "make_cache_entry falló para la ruta '%s'"

 
 #: apply.c:4099
 #, c-format
 
 #: apply.c:4099
 #, c-format


@@ -519,7 +519,7 @@ msgstr "no es posible agregar una entrada en el cache para %s"
 #: apply.c:4343
 #, c-format
 msgid "failed to write to '%s'"
 #: apply.c:4343
 #, c-format
 msgid "failed to write to '%s'"

-msgstr "fallo escribir para '%s'"
+msgstr "falló escribir para '%s'"

 
 #: apply.c:4347
 #, c-format
 
 #: apply.c:4347
 #, c-format


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

-#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
+#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

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


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

 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
 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:118 builtin/fetch.c:127 builtin/pull.c:193
-#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
-#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
-#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
+#: 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
 msgid "path"
 msgstr "ruta"
 #: git-add--interactive.perl:197
 msgid "path"
 msgstr "ruta"


@@ -692,7 +692,7 @@ msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
 
 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 
 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

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

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


@@ -723,9 +723,9 @@ msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 

-#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
-#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
+#: 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

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


@@ -766,7 +766,7 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 

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


@@ -787,10 +787,10 @@ msgstr "prefijo"
 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:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: archive.c:439 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/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:120
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

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


@@ -823,8 +823,8 @@ msgstr "comprimir mejor"
 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:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
-#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

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


@@ -875,22 +875,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:460
+#: bisect.c:461

 #, 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:668
+#: bisect.c:669

 #, 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:722
+#: bisect.c:723

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

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


@@ -899,7 +899,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:751
+#: bisect.c:752

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


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

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


@@ -917,7 +917,7 @@ msgstr ""
 "La base de fisión %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"
 
 "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:764
+#: bisect.c:765

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

 #, 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 +939,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:810
+#: bisect.c:811

 #, 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:850
+#: bisect.c:851

 #, 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:869 builtin/notes.c:175 builtin/tag.c:235
+#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

 #, 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:920
+#: bisect.c:921

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

 msgid "reading bisect refs failed"
 msgid "reading bisect refs failed"

-msgstr "fallo leer las refs de bisect"
+msgstr "falló leer las refs de bisect"

 
 

-#: bisect.c:969
+#: bisect.c:970

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

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


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

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


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

 #, 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:1758
+#: blame.c:1756

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

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

 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:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
-#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
-#: builtin/shortlog.c:191
+#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860
+#: sequencer.c:3631 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:371
+#: builtin/shortlog.c:192

 msgid "revision walk setup failed"
 msgid "revision walk setup failed"

-msgstr "fallo la configuración del camino de revisión"
+msgstr "falló la configuración del camino de revisión"

 
 

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

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

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

 #, 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:53
+#: branch.c:54

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


@@ -1044,97 +1044,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:67
+#: branch.c:68

 #, 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:93
+#: branch.c:94

 #, 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:94
+#: branch.c:95

 #, 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:98
+#: branch.c:99

 #, 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:99
+#: branch.c:100

 #, 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:104
+#: branch.c:105

 #, 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:105
+#: branch.c:106

 #, 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:109
+#: branch.c:110

 #, 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:110
+#: branch.c:111

 #, 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:119
+#: branch.c:120

 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:156
+#: branch.c:157

 #, 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:189
+#: branch.c:190

 #, 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:208
+#: branch.c:209

 #, 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:213
+#: branch.c:214

 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:233
+#: branch.c:234

 #, 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:235
+#: branch.c:236

 #, 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:237
+#: branch.c:238

 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,27 +1155,27 @@ msgstr ""
 "\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
 "el push."
 
 "\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
 "el push."
 

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

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

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

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

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

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


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

-#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
+#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

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


@@ -1234,7 +1234,7 @@ msgstr "rev-list murió"
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
 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:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

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


@@ -1257,18 +1257,39 @@ 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:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072
+#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 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"
 
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
 

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

 #, 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:1506
+#: commit.c:182
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
+"y será removido en una versión futura de Git.\n"
+"\n"
+"Por favor use \"git replace --convert-graft-file\"\n"
+"para convertir los grafts en refs.\n"
+"\n"
+"Apapa este mensaje ejecutando\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1537

 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"


@@ -1279,176 +1300,190 @@ 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
+#, 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
+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
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "no se pude crear directorio %s"
+

 #: 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:186
+#: config.c:187

 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:720
+#: config.c:788

 #, 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:724
+#: config.c:792

 #, 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:728
+#: config.c:796

 #, 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:732
+#: config.c:800

 #, 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:736
+#: config.c:804

 #, 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:740
+#: config.c:808

 #, 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:868
+#: config.c:936

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

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

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

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

 #, 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:879
+#: config.c:947

 #, 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:882
+#: config.c:950

 #, 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:885
+#: config.c:953

 #, 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:888
+#: config.c:956

 #, 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:891
+#: config.c:959

 #, 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:894
+#: config.c:962

 #, 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:989
+#: config.c:1057

 #, c-format
 msgid "failed to expand user dir in: '%s'"
 #, c-format
 msgid "failed to expand user dir in: '%s'"

-msgstr "fallo al expandir el directorio de usuario en: '%s'"
+msgstr "falló al expandir el directorio de usuario en: '%s'"

 
 

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

 #, 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:1094 config.c:1105
+#: config.c:1171 config.c:1182

 #, 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:1225
+#: config.c:1307

 #, 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:1386
+#: config.c:1473

 #, 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:1582
+#: config.c:1681

 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:1914
+#: config.c:2013

 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:2101
+#: config.c:2200

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

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

 #, 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:2170
+#: config.c:2269

 #, 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:2195
+#: config.c:2294

 #, 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:2197
+#: config.c:2296

 #, 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:2256
+#: config.c:2402

 #, 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:2599 config.c:2816
+#: config.c:2766 config.c:3019

 #, c-format
 msgid "fstat on %s failed"
 #, c-format
 msgid "fstat on %s failed"

-msgstr "fstat en %s fallo"
+msgstr "fstat en %s falló"

 
 

-#: config.c:2706
+#: config.c:2905

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

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

-#: connect.c:52
+#: connect.c:60

 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:54
+#: connect.c:62

 msgid ""
 "Could not read from remote repository.\n"
 "\n"
 msgid ""
 "Could not read from remote repository.\n"
 "\n"


@@ -1460,7 +1495,7 @@ 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:198 builtin/prune.c:144
+#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

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


@@ -1470,18 +1505,18 @@ msgstr "No se pudo correr 'git rev-list'"
 
 #: connected.c:98
 msgid "failed write to rev-list"
 
 #: connected.c:98
 msgid "failed write to rev-list"

-msgstr "fallo escribir a rev-list"
+msgstr "falló escribir a rev-list"

 
 #: connected.c:105
 msgid "failed to close rev-list's stdin"
 
 #: connected.c:105
 msgid "failed to close rev-list's stdin"

-msgstr "fallo al cerrar la entrada standard de rev-list"
+msgstr "falló al cerrar la entrada standard de rev-list"

 
 

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

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

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

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


@@ -1491,12 +1526,12 @@ msgstr ""
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 

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

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

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

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


@@ -1506,6 +1541,48 @@ msgstr ""
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 
 "El archivo tendrá sus finales de línea originales en tu directorio de "
 "trabajo."
 

+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM está prohibido en '%s' si es codificado como %s"
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "
+"working-tree-encoding."
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM es requerido en '%s' si es codificado como %s"
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+"Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
+"UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
+
+#: convert.c:424
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "falló al codificar '%s' de %s a %s"
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
+
+#: convert.c:1225
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false no son working-tree-encodings válidos"
+

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


@@ -1577,7 +1654,7 @@ msgstr[1] "hace %<PRIuMAX> años"
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"

-msgstr "fallo al leer orden de archivos '%s'"
+msgstr "falló al leer orden de archivos '%s'"

 
 #: diffcore-rename.c:535
 msgid "Performing inexact rename detection"
 
 #: diffcore-rename.c:535
 msgid "Performing inexact rename detection"


@@ -1591,7 +1668,7 @@ msgstr "opción '%s' requiere un valor"
 #: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 #: diff.c:152
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"

-msgstr "  Fallo al analizar dirstat porcentaje de corte '%s'\n"
+msgstr "  Falló al analizar dirstat porcentaje de corte '%s'\n"

 
 #: diff.c:157
 #, c-format
 
 #: diff.c:157
 #, c-format


@@ -1621,48 +1698,48 @@ 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:3822
+#: diff.c:3823

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

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

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

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

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

-"Fallo al analizar parámetro de opción --dirstat/-X:\n"
+"Falló al analizar parámetro de opción --dirstat/-X:\n"

 "%s"
 
 "%s"
 

-#: diff.c:4417
+#: diff.c:4424

 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"

-msgstr "Fallo al analizar parámetro de opción --submodule: '%s'"
+msgstr "Falló al analizar parámetro de opción --submodule: '%s'"

 
 

-#: diff.c:5493
+#: diff.c:5500

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

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

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


@@ -1670,25 +1747,25 @@ 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:1866
+#: dir.c:1867

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

 msgid "failed to get kernel name and information"
 msgid "failed to get kernel name and information"

-msgstr "fallo al conseguir la información y nombre del kernel"
+msgstr "falló al conseguir la información y nombre del kernel"

 
 

-#: dir.c:2232
+#: dir.c:2233

 msgid "Untracked cache is disabled on this system or location."
 msgstr "Untracked cache esta desactivado en este sistema o ubicación."
 
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Untracked cache esta desactivado en este sistema o ubicación."
 

-#: dir.c:3024 dir.c:3029
+#: dir.c:3075 dir.c:3080

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

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


@@ -1711,222 +1788,226 @@ msgstr "no se pudo establecer el archivo '%s'"
 msgid "Remote with no URL"
 msgstr "Remoto sin URL"
 
 msgid "Remote with no URL"
 msgstr "Remoto sin URL"
 

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

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

 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:284 builtin/archive.c:63
+#: fetch-pack.c:285 builtin/archive.c:63

 #, c-format
 msgid "remote error: %s"
 msgstr "error remoto: %s"
 
 #, c-format
 msgid "remote error: %s"
 msgstr "error remoto: %s"
 

-#: fetch-pack.c:285
+#: fetch-pack.c:286

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

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

 #, 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:434
+#: fetch-pack.c:435 fetch-pack.c:1316

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-msgstr "%s fallo"
+msgstr "%s falló"

 
 

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

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

 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:944
+#: fetch-pack.c:993

 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:947
+#: fetch-pack.c:996

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

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

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

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

 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:961
+#: fetch-pack.c:1010

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

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

 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:969
+#: fetch-pack.c:1018

 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:979
+#: fetch-pack.c:1028

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

-#: fetch-pack.c:985
+#: fetch-pack.c:1034 fetch-pack.c:1204

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

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

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

 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:1003
+#: fetch-pack.c:1052

 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:1005
+#: fetch-pack.c:1054

 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:1016
+#: fetch-pack.c:1065

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

-#: fetch-pack.c:1028
+#: fetch-pack.c:1077 fetch-pack.c:1414

 msgid "git fetch-pack: fetch failed."
 msgid "git fetch-pack: fetch failed."

-msgstr "git fetch-pack: fetch fallo."
+msgstr "git fetch-pack: fetch falló."
+
+#: fetch-pack.c:1199
+msgid "Server does not support shallow requests"
+msgstr "Servidor no soporta peticiones superficiales"

 
 

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

 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:1212
+#: fetch-pack.c:1610

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

 #, 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:181
+#: gpg-interface.c:185

 msgid "gpg failed to sign the data"
 msgid "gpg failed to sign the data"

-msgstr "gpg fallo al firmar la data"
+msgstr "gpg falló al firmar la data"

 
 

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

 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:214
+#: gpg-interface.c:213

 #, c-format
 msgid "failed writing detached signature to '%s'"
 #, c-format
 msgid "failed writing detached signature to '%s'"

-msgstr "fallo al escribir la firma separada para '%s'"
+msgstr "falló al escribir la firma separada para '%s'"

 
 #: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invalido '%.*s' en log.graphColors"
 
 
 #: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora color invalido '%.*s' en log.graphColors"
 

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

 #, 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:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 #: builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"

-msgstr "fallo al marcar '%s'"
+msgstr "falló al marcar '%s'"

 
 

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

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


@@ -2068,7 +2149,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:582
+#: ident.c:416 builtin/commit.c:587

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


@@ -2106,82 +2187,161 @@ 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:74
+#: merge.c:71

 msgid "failed to read the cache"
 msgid "failed to read the cache"

-msgstr "fallo al leer la cache"
+msgstr "falló al leer la cache"

 
 

-#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:599 builtin/clone.c:759
+#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:606 builtin/clone.c:761

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

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

-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:320

 #, c-format
 #, c-format

-msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache fallo para la ruta '%s'"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."

 
 

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

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

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

 #, c-format
 msgid "failed to create path '%s'%s"
 #, c-format
 msgid "failed to create path '%s'%s"

-msgstr "fallo al crear la ruta '%s'%s"
+msgstr "falló al crear la ruta '%s'%s"

 
 

-#: merge-recursive.c:782
+#: merge-recursive.c:892

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

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

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

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

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

 #, c-format
 msgid "failed to open '%s': %s"
 #, c-format
 msgid "failed to open '%s': %s"

-msgstr "fallo al abrir '%s': %s"
+msgstr "falló al abrir '%s': %s"

 
 

-#: merge-recursive.c:884
+#: merge-recursive.c:994

 #, c-format
 msgid "failed to symlink '%s': %s"
 #, c-format
 msgid "failed to symlink '%s': %s"

-msgstr "fallo al crear el enlace simbólico '%s': %s"
+msgstr "falló al crear el enlace simbólico '%s': %s"

 
 

-#: merge-recursive.c:889
+#: merge-recursive.c:999

 #, 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:1029
+#: merge-recursive.c:1186
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Fast-forwarding submodule %s to %s"
+msgstr "Avance rápido del submódulo %s a %s"
+
+#: merge-recursive.c:1245
+#, 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
+#, 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
+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
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
+"usando:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"el cual aceptará esta sugerencia.\n"
+
+#: merge-recursive.c:1262
+#, 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

 msgid "Failed to execute internal merge"
 msgid "Failed to execute internal merge"

-msgstr "Fallo al ejecutar la fusión interna"
+msgstr "Falló al ejecutar la fusión interna"

 
 

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

 #, 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:1146
+#: merge-recursive.c:1358
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %s"
+
+#: merge-recursive.c:1423
+#, 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

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


@@ -2190,7 +2350,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:1151
+#: merge-recursive.c:1480

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


@@ -2199,7 +2359,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:1158
+#: merge-recursive.c:1487

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


@@ -2208,7 +2368,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:1163
+#: merge-recursive.c:1492

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


@@ -2217,20 +2377,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:1197
+#: merge-recursive.c:1526

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

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

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

-#: merge-recursive.c:1254
+#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
+#: merge-recursive.c:3086
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Rehusando perder el archivo sucio en %s"
+
+#: merge-recursive.c:1594

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

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


@@ -2239,143 +2411,193 @@ 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:1284
+#: merge-recursive.c:1630

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

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

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

 #, 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:1582
+#: merge-recursive.c:1745
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"CONFLICTO (división de cambio de nombre de directorio): No es claro dónde "
+"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
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
+"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
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
+"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
+
+#: merge-recursive.c:2085
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
+"Renombrar directorio %s->%s en %s"
+
+#: merge-recursive.c:2330
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
+"renombrado."
+
+#: merge-recursive.c:2736

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

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

-#: merge-recursive.c:1604 merge-recursive.c:1834
+#: merge-recursive.c:2758 merge-recursive.c:3089

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

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

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

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

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

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

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

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

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

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

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

 #, 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:1800
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Auto-fusionando %s"
-
-#: merge-recursive.c:1804 git-submodule.sh:879
+#: merge-recursive.c:3055 git-submodule.sh:895

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
 
 #, c-format
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
 

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

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

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

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

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

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

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

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

 #, 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:2228 builtin/merge.c:657 builtin/merge.c:816
+#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

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


@@ -2421,32 +2643,32 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Mal valor para %s: '%s'"
 
 msgid "Bad %s value: '%s'"
 msgstr "Mal valor para %s: '%s'"
 

-#: object.c:239
+#: object.c:242

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

-#: packfile.c:561
+#: packfile.c:563

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

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

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

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

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

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

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


@@ -2454,26 +2676,31 @@ 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:644
+#: parse-options.c:646

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

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

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

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

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

-#: parse-options-cb.c:108
+#: parse-options-cb.c:44
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "fecha de expiración mal formada: '%s'"
+
+#: parse-options-cb.c:112

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

-#: path.c:891
+#: path.c:892

 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"


@@ -2557,7 +2784,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 

-#: read-cache.c:1473
+#: read-cache.c:1500

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


@@ -2566,7 +2793,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:1483
+#: read-cache.c:1510

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


@@ -2575,52 +2802,53 @@ 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:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
+#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

 #, 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:2448 sequencer.c:1900 sequencer.c:2627
+#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

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

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

 #, 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:706
+#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779

 #, c-format
 #, c-format

-msgid "Could not open '%s' for writing"
-msgstr "No se pudo abrir '%s' para escritura"
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"

 
 

-#: refs.c:1850
+#: refs.c:1880

 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/files-backend.c:1189
+#: refs/files-backend.c:1191

 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo remover la referencia %s"
 
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo remover la referencia %s"
 

-#: refs/files-backend.c:1203 refs/packed-backend.c:1528
-#: refs/packed-backend.c:1538
+#: refs/files-backend.c:1205 refs/packed-backend.c:1531
+#: refs/packed-backend.c:1541

 #, 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:1206 refs/packed-backend.c:1541
+#: refs/files-backend.c:1208 refs/packed-backend.c:1544

 #, 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:1842
+#: ref-filter.c:35 wt-status.c:1850

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


@@ -2639,157 +2867,162 @@ msgstr "detrás %d"
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:1316
+#: ref-filter.c:1390
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
+
+#: ref-filter.c:1393

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


@@ -2797,7 +3030,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:1324
+#: ref-filter.c:1401

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"


@@ -2805,148 +3038,148 @@ 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:1331
+#: ref-filter.c:1408

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

 msgid "(no branch)"
 msgstr "(sin rama)"
 
 msgid "(no branch)"
 msgstr "(sin rama)"
 

-#: ref-filter.c:1364
+#: ref-filter.c:1442

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

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

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

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

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
 
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
 

-#: ref-filter.c:2152
+#: ref-filter.c:2261

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

 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 
 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 

-#: remote.c:795
+#: remote.c:605

 #, 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:799
+#: remote.c:609

 #, 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:803
+#: remote.c:613

 #, 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:811
+#: remote.c:621

 msgid "Internal error"
 msgstr "Error interno"
 
 msgid "Internal error"
 msgstr "Error interno"
 

-#: remote.c:1726 remote.c:1828
+#: remote.c:1534 remote.c:1635

 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:1735
+#: remote.c:1543

 #, 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:1738
+#: remote.c:1546

 #, 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:1744
+#: remote.c:1552

 #, 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:1759
+#: remote.c:1567

 #, 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:1771
+#: remote.c:1579

 #, 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:1782
+#: remote.c:1589

 #, 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:1795
+#: remote.c:1602

 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:1817
+#: remote.c:1624

 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:2132
+#: remote.c:1939

 #, 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:2136
+#: remote.c:1943

 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:2139
+#: remote.c:1946

 #, 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:2143
+#: remote.c:1950

 #, 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:2146
+#: remote.c:1953

 #, 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:2150
+#: remote.c:1957

 #, 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:2156
+#: remote.c:1963

 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:2159
+#: remote.c:1966

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


@@ -2956,11 +3189,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:2167
+#: remote.c:1974

 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:2170
+#: remote.c:1977

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -2975,28 +3208,28 @@ 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:2180
+#: remote.c:1987

 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:2277
+#: revision.c:2289

 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:2280
+#: revision.c:2292

 #, 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:2477
+#: revision.c:2489

 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 

-#: run-command.c:731
+#: run-command.c:728

 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 
 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 

-#: run-command.c:1274
+#: run-command.c:1271

 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"


@@ -3045,29 +3278,34 @@ msgstr "el destino no soporta push atómicos (--atomic)"
 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:158
+#: sequencer.c:174

 #, 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:267
+#: sequencer.c:274
+#, c-format
+msgid "could not delete '%s'"
+msgstr "No se pudo borrar '%s'"
+
+#: sequencer.c:300

 msgid "revert"
 msgstr "revertir"
 
 msgid "revert"
 msgstr "revertir"
 

-#: sequencer.c:269
+#: sequencer.c:302

 msgid "cherry-pick"
 msgstr "cherry-pick"
 
 msgid "cherry-pick"
 msgstr "cherry-pick"
 

-#: sequencer.c:271
+#: sequencer.c:304

 msgid "rebase -i"
 msgstr "rebase -i"
 
 msgid "rebase -i"
 msgstr "rebase -i"
 

-#: sequencer.c:273
+#: sequencer.c:306

 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acción desconocida: %d"
 
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acción desconocida: %d"
 

-#: sequencer.c:330
+#: sequencer.c:363

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


@@ -3075,7 +3313,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:333
+#: sequencer.c:366

 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"


@@ -3085,43 +3323,45 @@ 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:346 sequencer.c:2245
+#: sequencer.c:379 sequencer.c:2467

 #, 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:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
-#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
+#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485
+#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 

-#: sequencer.c:353
+#: sequencer.c:386

 #, 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:356 sequencer.c:2128 sequencer.c:2252
+#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487
+#: sequencer.c:2701

 #, 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:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
-#: builtin/commit.c:722 builtin/merge.c:1047
+#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370
+#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727
+#: builtin/merge.c:1045

 #, 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:405
+#: sequencer.c:440

 #, 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:409
+#: sequencer.c:444

 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:438
+#: sequencer.c:473

 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"


@@ -3129,20 +3369,20 @@ 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:526
+#: sequencer.c:562

 #, 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:542
-msgid "could not resolve HEAD commit"
-msgstr "no se pudo resolver el commit de HEAD"
-
-#: sequencer.c:562
+#: sequencer.c:578

 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:658
+#: sequencer.c:591
+msgid "could not resolve HEAD commit"
+msgstr "no se pudo resolver el commit de HEAD"
+
+#: sequencer.c:748

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -3172,11 +3412,15 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
 "\n"
 "  git rebase --continue\n"
 

-#: sequencer.c:915
+#: sequencer.c:817
+msgid "writing root commit"
+msgstr "escribiendo commit raíz"
+
+#: sequencer.c:1042

 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:922
+#: sequencer.c:1049

 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"


@@ -3203,7 +3447,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:935
+#: 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"


@@ -3227,327 +3471,313 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:975
+#: sequencer.c:1102

 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:977
+#: sequencer.c:1104

 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:1023
+#: sequencer.c:1150

 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:1025
+#: sequencer.c:1152

 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 

-#: sequencer.c:1029
+#: sequencer.c:1156

 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 
 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 

-#: sequencer.c:1050
+#: sequencer.c:1177

 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 

-#: sequencer.c:1052
+#: sequencer.c:1179

 #, 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:1056 builtin/commit.c:1491
+#: sequencer.c:1183 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:1107 sequencer.c:1673
+#: sequencer.c:1234 sequencer.c:1831

 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:1117 builtin/am.c:1630 builtin/merge.c:643
+#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

 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:1134 sequencer.c:1186
+#: sequencer.c:1261 sequencer.c:1316

 #, 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:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
-#: builtin/merge.c:851
+#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824
+#: builtin/merge.c:849

 msgid "failed to write commit object"
 msgid "failed to write commit object"

-msgstr "fallo al escribir el objeto commit"
+msgstr "falló al escribir el objeto commit"

 
 

-#: sequencer.c:1213
+#: sequencer.c:1343

 #, 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:1218
+#: sequencer.c:1348

 #, 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:1347
-#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-"1ra línea del mensaje squash no esperada:\n"
-"\n"
-"\t%.*s"
-
-#: sequencer.c:1353
-#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-"1ra línea del mensaje squash inválida:\n"
-"\n"
-"\t%.*s"
-
-#: sequencer.c:1359 sequencer.c:1384
+#: sequencer.c:1499 sequencer.c:1524

 #, 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:1368 sequencer.c:3265
+#: sequencer.c:1509 sequencer.c:4354

 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:1370
+#: sequencer.c:1511 sequencer.c:2728

 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 

-#: sequencer.c:1372
+#: sequencer.c:1513

 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:1378
+#: sequencer.c:1519

 #, 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:1387 git-rebase--interactive.sh:452
+#: sequencer.c:1526 git-rebase--interactive.sh:457

 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:1395
+#: sequencer.c:1534

 #, 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:1402
+#: sequencer.c:1541

 #, 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:1407
+#: sequencer.c:1547

 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d será saltado:"
 
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d será saltado:"
 

-#: sequencer.c:1412
+#: sequencer.c:1552

 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 

-#: sequencer.c:1479
+#: sequencer.c:1630

 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:1498
+#: sequencer.c:1637
+msgid "cannot fixup root commit"
+msgstr "no se puede arreglar el commit raíz"
+
+#: sequencer.c:1656

 #, 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:1506
+#: sequencer.c:1664

 #, 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:1510
+#: sequencer.c:1668

 #, 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:1516
+#: sequencer.c:1674

 #, 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:1535
+#: sequencer.c:1693

 #, 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:1600 sequencer.c:2397
+#: sequencer.c:1758

 #, 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:1654
+#: sequencer.c:1812

 #, 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:1655
+#: sequencer.c:1813

 #, 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:1702
+#: sequencer.c:1863

 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 

-#: sequencer.c:1712
+#: sequencer.c:1873

 #, c-format
 msgid "git %s: failed to read the index"
 #, c-format
 msgid "git %s: failed to read the index"

-msgstr "git %s: fallo al leer el índice"
+msgstr "git %s: falló al leer el índice"

 
 

-#: sequencer.c:1718
+#: sequencer.c:1880

 #, c-format
 msgid "git %s: failed to refresh the index"
 #, c-format
 msgid "git %s: failed to refresh the index"

-msgstr "git %s: fallo al refrescar el índice"
+msgstr "git %s: falló al refrescar el índice"

 
 

-#: sequencer.c:1792
+#: sequencer.c:1960

 #, 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:1801
+#: sequencer.c:1969

 #, 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:1844
+#: sequencer.c:2028

 #, 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:1852
+#: sequencer.c:2036

 #, 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:1883 sequencer.c:3056 sequencer.c:3091
+#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

 #, 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:1906
+#: sequencer.c:2107

 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:1908
+#: sequencer.c:2109

 #, 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:1913
+#: sequencer.c:2114

 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 

-#: sequencer.c:1924
+#: sequencer.c:2125

 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:1926
+#: sequencer.c:2127

 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:1993
+#: sequencer.c:2194

 #, c-format
 msgid "invalid key: %s"
 msgstr "llave invalida: %s"
 
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave invalida: %s"
 

-#: sequencer.c:1996
+#: sequencer.c:2197

 #, 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:2062
+#: sequencer.c:2268
+msgid "unusable squash-onto"
+msgstr "squash-onto inservible"
+
+#: sequencer.c:2284

 #, 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:2100
+#: sequencer.c:2322

 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:2101
+#: sequencer.c:2323

 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:2104
+#: sequencer.c:2326

 #, 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:2118
+#: sequencer.c:2340

 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 

-#: sequencer.c:2173 sequencer.c:2761
+#: sequencer.c:2395 sequencer.c:3402

 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:2175
+#: sequencer.c:2397

 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 

-#: sequencer.c:2177 sequencer.c:2212
+#: sequencer.c:2399 sequencer.c:2434

 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:2198 builtin/grep.c:720
+#: sequencer.c:2420 builtin/grep.c:720

 #, 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:2200
+#: sequencer.c:2422

 #, 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:2201
+#: sequencer.c:2423

 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 

-#: sequencer.c:2207
+#: sequencer.c:2429

 #, 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:2218
+#: sequencer.c:2440

 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:2324 sequencer.c:2679
+#: sequencer.c:2544 sequencer.c:3320

 #, 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:2362 sequencer.c:2659
+#: sequencer.c:2582 sequencer.c:3300

 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 

-#: sequencer.c:2402 builtin/difftool.c:639
+#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

 #, 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:2421
+#: sequencer.c:2640

 msgid "could not read index"
 msgstr "no se pudo leer índice"
 
 msgid "could not read index"
 msgstr "no se pudo leer índice"
 

-#: sequencer.c:2426
+#: sequencer.c:2645

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -3562,11 +3792,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2432
+#: sequencer.c:2651

 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:2438
+#: sequencer.c:2657

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -3583,17 +3813,62 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2497
+#: sequencer.c:2770
+msgid "writing fake root commit"
+msgstr "escribiendo commit raíz falso"
+
+#: sequencer.c:2775
+msgid "writing squash-onto"
+msgstr "escribiendo squash-onto"
+
+#: sequencer.c:2810
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falló al encontrar árbol de %s"
+
+#: sequencer.c:2828
+msgid "could not write index"
+msgstr "no se pudo escribir índice"
+
+#: sequencer.c:2860
+msgid "cannot merge without a current revision"
+msgstr "no se puede fusionar sin una versión actual"
+
+#: sequencer.c:2883
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "no se pudo resolver '%s'"
+
+#: sequencer.c:2905
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "no se puede leer el mensaje del commit '%s'"
+
+#: sequencer.c:2915 sequencer.c:2940
+#, c-format
+msgid "could not write '%s'"
+msgstr "no se pudo escribir '%s'"
+
+#: sequencer.c:3004
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "no se pudo intentar fusionar '%.*s'"
+
+#: sequencer.c:3020
+msgid "merge: Unable to write new index file"
+msgstr "fusión: No se puede escribir el nuevo archivo índice"
+
+#: sequencer.c:3087

 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 

-#: sequencer.c:2509
+#: sequencer.c:3099

 #, 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:2512 git-rebase.sh:178
+#: sequencer.c:3102 git-rebase.sh:188

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -3605,52 +3880,69 @@ 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:2595
+#: sequencer.c:3133
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"No se pudo ejecutar el comando \"todo\"\n"
+"\n"
+"    %.*s\n"
+"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
+"edite la lista de \"todo\" primero:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c:3201

 #, 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:2637
+#: sequencer.c:3263

 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 

-#: sequencer.c:2667
+#: sequencer.c:3308

 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:2672 sequencer.c:3262
+#: sequencer.c:3313 sequencer.c:4351

 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 
 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 

-#: sequencer.c:2686
+#: sequencer.c:3327

 #, 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:2770
+#: sequencer.c:3413

 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:2775
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "no se puede remover CHERRY_PICK_HEAD"
-
-#: sequencer.c:2784
+#: sequencer.c:3422

 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:2786
+#: sequencer.c:3424

 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invalido: '%s'"
 
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo invalido: '%s'"
 

-#: sequencer.c:2788
+#: sequencer.c:3426

 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 

-#: sequencer.c:2791
+#: sequencer.c:3429

 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"


@@ -3661,45 +3953,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:2801
+#: sequencer.c:3454 sequencer.c:3492
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "no se pudo escribir el archivo: '%s'"
+
+#: sequencer.c:3507
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "no se puede remover CHERRY_PICK_HEAD"
+
+#: sequencer.c:3514

 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:2881
+#: sequencer.c:3611

 #, 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:2885
+#: sequencer.c:3615

 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: mala revision"
 
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: mala revision"
 

-#: sequencer.c:2918
+#: sequencer.c:3648

 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:3023
+#: sequencer.c:4097

 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 

-#: sequencer.c:3026
+#: sequencer.c:4100

 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:3060 sequencer.c:3095
+#: sequencer.c:4141 sequencer.c:4176

 #, 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:3146
+#: sequencer.c:4235

 #, 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:3212
+#: sequencer.c:4301

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"


@@ -3708,7 +4009,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:3219
+#: sequencer.c:4308

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


@@ -3726,7 +4027,7 @@ msgstr ""
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 

-#: sequencer.c:3231
+#: sequencer.c:4320

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


@@ -3737,27 +4038,21 @@ 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:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no se pudo abrir '%s' para escritura"
-
-#: sequencer.c:3285
+#: sequencer.c:4374

 #, 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:3401
+#: sequencer.c:4489

 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 

-#: setup.c:122
+#: setup.c:123

 #, c-format
 msgid "'%s' is outside repository"
 msgstr "'%s' está fuera del repositorio"
 
 #, c-format
 msgid "'%s' is outside repository"
 msgstr "'%s' está fuera del repositorio"
 

-#: setup.c:171
+#: setup.c:172

 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"


@@ -3767,7 +4062,7 @@ msgstr ""
 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
 "localmente."
 
 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
 "localmente."
 

-#: setup.c:184
+#: setup.c:185

 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"


@@ -3779,12 +4074,12 @@ msgstr ""
 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 

-#: setup.c:233
+#: setup.c:234

 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "opción '%s' debe venir antes de argumentos no opcionales"
 
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "opción '%s' debe venir antes de argumentos no opcionales"
 

-#: setup.c:252
+#: setup.c:253

 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"


@@ -3795,95 +4090,95 @@ msgstr ""
 "Use '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
 "Use '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 

-#: setup.c:388
+#: setup.c:389

 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no es posible configurar el directorio de trabajo usando una configuración "
 "inválida"
 
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no es posible configurar el directorio de trabajo usando una configuración "
 "inválida"
 

-#: setup.c:395
+#: setup.c:393

 msgid "this operation must be run in a work tree"
 msgstr "esta operación debe ser realizada en un árbol de trabajo"
 
 msgid "this operation must be run in a work tree"
 msgstr "esta operación debe ser realizada en un árbol de trabajo"
 

-#: setup.c:506
+#: setup.c:503

 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Se esperaba versión de git repo  <= %d, encontrada %d"
 
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Se esperaba versión de git repo  <= %d, encontrada %d"
 

-#: setup.c:514
+#: setup.c:511

 msgid "unknown repository extensions found:"
 msgstr "se encontró extensión de repositorio desconocida:"
 
 msgid "unknown repository extensions found:"
 msgstr "se encontró extensión de repositorio desconocida:"
 

-#: setup.c:533
+#: setup.c:530

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

-#: setup.c:535
+#: setup.c:532

 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "muy grande para ser un archivo .git: '%s'"
 
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "muy grande para ser un archivo .git: '%s'"
 

-#: setup.c:537
+#: setup.c:534

 #, c-format
 msgid "error reading %s"
 msgstr "error leyendo %s"
 
 #, c-format
 msgid "error reading %s"
 msgstr "error leyendo %s"
 

-#: setup.c:539
+#: setup.c:536

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

-#: setup.c:541
+#: setup.c:538

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

-#: setup.c:543
+#: setup.c:540

 #, c-format
 msgid "not a git repository: %s"
 msgstr "no es un repositorio git: %s"
 
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no es un repositorio git: %s"
 

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

 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' muy grande"
 
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' muy grande"
 

-#: setup.c:656
+#: setup.c:653

 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no es un repositorio git: '%s'"
 
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no es un repositorio git: '%s'"
 

-#: setup.c:685 setup.c:687 setup.c:718
+#: setup.c:682 setup.c:684 setup.c:715

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

-#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 
 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 

-#: setup.c:816
+#: setup.c:813

 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "no es un repositorio git (ni ninguno de los directorios superiores): %s"
 
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "no es un repositorio git (ni ninguno de los directorios superiores): %s"
 

-#: setup.c:827
+#: setup.c:824

 #, c-format
 msgid "failed to stat '%*s%s%s'"
 #, c-format
 msgid "failed to stat '%*s%s%s'"

-msgstr "fallo al determinar '%*s%s%s'"
+msgstr "falló al determinar '%*s%s%s'"

 
 

-#: setup.c:1057
+#: setup.c:1054

 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 

-#: setup.c:1069 setup.c:1075
+#: setup.c:1066 setup.c:1072

 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 

-#: setup.c:1088
+#: setup.c:1085

 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"


@@ -3893,7 +4188,7 @@ msgstr ""
 "Parando en el límite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 
 "Parando en el límite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 

-#: setup.c:1172
+#: setup.c:1168

 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"


@@ -3902,55 +4197,55 @@ msgstr ""
 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueño de los archivos tiene que tener permisos de lectura y escritura."
 
 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueño de los archivos tiene que tener permisos de lectura y escritura."
 

-#: setup.c:1215
+#: setup.c:1211

 msgid "open /dev/null or dup failed"
 msgstr "falló al abrir /dev/null o dup"
 
 msgid "open /dev/null or dup failed"
 msgstr "falló al abrir /dev/null o dup"
 

-#: setup.c:1230
+#: setup.c:1226

 msgid "fork failed"
 msgstr "falló fork"
 
 msgid "fork failed"
 msgstr "falló fork"
 

-#: setup.c:1235
+#: setup.c:1231

 msgid "setsid failed"
 msgstr "falló setsid"
 
 msgid "setsid failed"
 msgstr "falló setsid"
 

-#: sha1_file.c:592
+#: sha1-file.c:625

 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 

-#: sha1_file.c:618
+#: sha1-file.c:651

 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repositorio de referencia '%s' como un checkout vinculado no es soportado "
 "todavía."
 
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repositorio de referencia '%s' como un checkout vinculado no es soportado "
 "todavía."
 

-#: sha1_file.c:624
+#: sha1-file.c:657

 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 

-#: sha1_file.c:630
+#: sha1-file.c:663

 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 

-#: sha1_file.c:638
+#: sha1-file.c:671

 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 

-#: sha1_name.c:422
+#: sha1-name.c:442

 #, 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:433
+#: sha1-name.c:453

 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 
 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 

-#: sha1_name.c:693
+#: sha1-name.c:695

 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"


@@ -3973,70 +4268,70 @@ msgstr ""
 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
 "ejecutando \"git config advice.objectNameWarning false\""
 
 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
 "ejecutando \"git config advice.objectNameWarning false\""
 

-#: submodule.c:96 submodule.c:130
+#: submodule.c:97 submodule.c:131

 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
 
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
 

-#: submodule.c:100 submodule.c:134
+#: submodule.c:101 submodule.c:135

 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
 
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
 

-#: submodule.c:108
+#: submodule.c:109

 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No se pudo actualizar la entrada %s de .gitmodules"
 
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No se pudo actualizar la entrada %s de .gitmodules"
 

-#: submodule.c:141
+#: submodule.c:142

 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No se pudo remover la entrada %s de .gitmodules"
 
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No se pudo remover la entrada %s de .gitmodules"
 

-#: submodule.c:152
+#: submodule.c:153

 msgid "staging updated .gitmodules failed"
 msgstr "falló realizar stage a los .gitmodules actualizados"
 
 msgid "staging updated .gitmodules failed"
 msgstr "falló realizar stage a los .gitmodules actualizados"
 

-#: submodule.c:312
+#: submodule.c:315

 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 

-#: submodule.c:343
+#: submodule.c:346

 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 

-#: submodule.c:833
+#: submodule.c:837

 #, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
+#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

 msgid "Failed to resolve HEAD as a valid ref."
 msgid "Failed to resolve HEAD as a valid ref."

-msgstr "Fallo al resolver HEAD como un ref valido."
+msgstr "Falló al resolver HEAD como un ref valido."

 
 

-#: submodule.c:1370
+#: submodule.c:1373

 #, 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:1508
+#: submodule.c:1511

 #, 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:1521
+#: submodule.c:1524

 #, 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:1614
+#: submodule.c:1617

 #, 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:1878
+#: submodule.c:1716

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


@@ -4044,18 +4339,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:1890 submodule.c:1946
+#: submodule.c:1728 submodule.c:1784

 #, 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:1894 builtin/submodule--helper.c:1246
-#: builtin/submodule--helper.c:1256
+#: submodule.c:1732 builtin/submodule--helper.c:1261
+#: builtin/submodule--helper.c:1271

 #, 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:1897
+#: submodule.c:1735

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -4066,29 +4361,30 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
 "'%s' hacia\n"
 "'%s'\n"
 

-#: submodule.c:1981
+#: submodule.c:1819

 #, 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:2025
+#: submodule.c:1863

 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:2045
-msgid "BUG: returned path string doesn't match cwd?"
-msgstr "BUG: string de ruta recibido no concuerda con cwd?"
-
-#: submodule.c:2064
+#: submodule.c:1902

 #, 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:263
+#: submodule-config.c:230
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando submódulo sospechoso: %s"
+
+#: submodule-config.c:294

 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:436
+#: submodule-config.c:467

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


@@ -4104,7 +4400,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:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:293

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


@@ -4147,17 +4443,21 @@ msgstr "no se pudo abrir el archivo temporal"
 msgid "could not rename temporary file to %s"
 msgstr "no se pudo renombrar el archivo temporal a %s"
 
 msgid "could not rename temporary file to %s"
 msgstr "no se pudo renombrar el archivo temporal a %s"
 

-#: transport.c:63
+#: transport.c:116

 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 

-#: transport.c:152
+#: transport.c:208

 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 

-#: transport.c:916
+#: transport.c:584
+msgid "could not parse transport.color.* config"
+msgstr "no se pudo analizar valor de configuración transport.color.*"
+
+#: transport.c:996

 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"


@@ -4166,7 +4466,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:920
+#: transport.c:1000

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


@@ -4193,11 +4493,11 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
 "para hacer un push al remoto.\n"
 "\n"
 

-#: transport.c:928
+#: transport.c:1008

 msgid "Aborting."
 msgstr "Abortando."
 
 msgid "Aborting."
 msgstr "Abortando."
 

-#: transport-helper.c:1079
+#: transport-helper.c:1087

 #, c-format
 msgid "Could not read ref %s"
 msgstr "No se pudo leer la referencia %s"
 #, c-format
 msgid "Could not read ref %s"
 msgstr "No se pudo leer la referencia %s"


@@ -4214,22 +4514,22 @@ msgstr "modo mal formado en la entrada de árbol"
 msgid "empty filename in tree entry"
 msgstr "nombre de archivo vacío en la entrada de árbol"
 
 msgid "empty filename in tree entry"
 msgstr "nombre de archivo vacío en la entrada de árbol"
 

-#: tree-walk.c:114
+#: tree-walk.c:113

 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:108
+#: unpack-trees.c:111

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos por "
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos por "

-"checkuot:\n"
+"checkout:\n"

 "%%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:110
+#: unpack-trees.c:113

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"


@@ -4239,7 +4539,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
 "checkout:\n"
 "%%s"
 

-#: unpack-trees.c:113
+#: unpack-trees.c:116

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"


@@ -4249,7 +4549,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:115
+#: unpack-trees.c:118

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"


@@ -4259,7 +4559,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
 "merge:\n"
 "%%s"
 

-#: unpack-trees.c:118
+#: unpack-trees.c:121

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"


@@ -4268,7 +4568,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:120
+#: unpack-trees.c:123

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"


@@ -4277,7 +4577,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:125
+#: unpack-trees.c:128

 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"


@@ -4287,7 +4587,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
 "seguimiento en ellos:\n"
 "%s"
 

-#: unpack-trees.c:129
+#: unpack-trees.c:132

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"


@@ -4297,7 +4597,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:131
+#: unpack-trees.c:134

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"


@@ -4307,7 +4607,7 @@ msgstr ""
 "al actualizar el árbol de trabajo:\n"
 "%%s"
 
 "al actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:134
+#: unpack-trees.c:137

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"


@@ -4317,7 +4617,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:136
+#: unpack-trees.c:139

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"


@@ -4327,7 +4627,7 @@ msgstr ""
 "al fusionar:\n"
 "%%s"
 
 "al fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:139
+#: unpack-trees.c:142

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"


@@ -4337,7 +4637,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:141
+#: unpack-trees.c:144

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"


@@ -4347,7 +4647,7 @@ msgstr ""
 "removidos al ejecutar %s:\n"
 "%%s"
 
 "removidos al ejecutar %s:\n"
 "%%s"
 

-#: unpack-trees.c:146
+#: unpack-trees.c:150

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -4358,7 +4658,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:148
+#: unpack-trees.c:152

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -4369,7 +4669,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:151
+#: unpack-trees.c:155

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"


@@ -4379,7 +4679,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:153
+#: unpack-trees.c:157

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"


@@ -4389,7 +4689,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
 "sobrescritos al fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:156
+#: unpack-trees.c:160

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"


@@ -4399,7 +4699,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:158
+#: unpack-trees.c:162

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"


@@ -4409,12 +4709,12 @@ msgstr ""
 "por %s:\n"
 "%%s"
 
 "por %s:\n"
 "%%s"
 

-#: unpack-trees.c:165
+#: unpack-trees.c:170

 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 

-#: unpack-trees.c:168
+#: unpack-trees.c:173

 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"


@@ -4424,7 +4724,7 @@ msgstr ""
 "actualizadas:\n"
 "%s"
 
 "actualizadas:\n"
 "%s"
 

-#: unpack-trees.c:170
+#: unpack-trees.c:175

 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "


@@ -4435,7 +4735,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:172
+#: unpack-trees.c:177

 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "


@@ -4446,7 +4746,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:174
+#: unpack-trees.c:179

 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 #, c-format
 msgid ""
 "Cannot update submodule:\n"


@@ -4455,12 +4755,12 @@ msgstr ""
 "No se puede actualizar le submódulo:\n"
 "%s"
 
 "No se puede actualizar le submódulo:\n"
 "%s"
 

-#: unpack-trees.c:251
+#: unpack-trees.c:262

 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 

-#: unpack-trees.c:333
+#: unpack-trees.c:344

 msgid "Checking out files"
 msgstr "Revisando archivos"
 
 msgid "Checking out files"
 msgstr "Revisando archivos"
 


@@ -4496,7 +4796,7 @@ msgstr "segmento de ruta '..' invalido"
 #: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"
 #: worktree.c:245 builtin/am.c:2147
 #, c-format
 msgid "failed to read '%s'"

-msgstr "fallo al leer '%s'"
+msgstr "falló al leer '%s'"

 
 #: worktree.c:291
 #, c-format
 
 #: worktree.c:291
 #, c-format


@@ -4532,7 +4832,7 @@ 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
 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:1044
+#: builtin/am.c:862 builtin/merge.c:1042

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


@@ -4546,159 +4846,159 @@ msgstr "no es posible acceder '%s'"
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 

-#: wt-status.c:151
+#: wt-status.c:154

 msgid "Unmerged paths:"
 msgstr "Rutas no fusionadas:"
 
 msgid "Unmerged paths:"
 msgstr "Rutas no fusionadas:"
 

-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:181 wt-status.c:208

 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
 
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
 

-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:183 wt-status.c:210

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
 
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
 

-#: wt-status.c:184
+#: wt-status.c:187

 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 

-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:189 wt-status.c:193

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
 "resolución)"
 
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
 "resolución)"
 

-#: wt-status.c:188
+#: wt-status.c:191

 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 

-#: wt-status.c:199 wt-status.c:1007
+#: wt-status.c:202 wt-status.c:1015

 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 
 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 

-#: wt-status.c:217 wt-status.c:1016
+#: wt-status.c:220 wt-status.c:1024

 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 
 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 

-#: wt-status.c:221
+#: wt-status.c:224

 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
 
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
 

-#: wt-status.c:223
+#: wt-status.c:226

 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
 "commit)"
 
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
 "commit)"
 

-#: wt-status.c:224
+#: wt-status.c:227

 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
 "directorio de trabajo)"
 
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
 "directorio de trabajo)"
 

-#: wt-status.c:226
+#: wt-status.c:229

 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (confirmar o descartar el contenido sin seguimiento o modificado en los "
 "sub-módulos)"
 
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (confirmar o descartar el contenido sin seguimiento o modificado en los "
 "sub-módulos)"
 

-#: wt-status.c:238
+#: wt-status.c:241

 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 

-#: wt-status.c:253
+#: wt-status.c:256

 msgid "both deleted:"
 msgstr "ambos borrados:"
 
 msgid "both deleted:"
 msgstr "ambos borrados:"
 

-#: wt-status.c:255
+#: wt-status.c:258

 msgid "added by us:"
 msgstr "agregado por nosotros:"
 
 msgid "added by us:"
 msgstr "agregado por nosotros:"
 

-#: wt-status.c:257
+#: wt-status.c:260

 msgid "deleted by them:"
 msgstr "borrados por ellos:"
 
 msgid "deleted by them:"
 msgstr "borrados por ellos:"
 

-#: wt-status.c:259
+#: wt-status.c:262

 msgid "added by them:"
 msgstr "agregado por ellos:"
 
 msgid "added by them:"
 msgstr "agregado por ellos:"
 

-#: wt-status.c:261
+#: wt-status.c:264

 msgid "deleted by us:"
 msgstr "borrado por nosotros:"
 
 msgid "deleted by us:"
 msgstr "borrado por nosotros:"
 

-#: wt-status.c:263
+#: wt-status.c:266

 msgid "both added:"
 msgstr "ambos agregados:"
 
 msgid "both added:"
 msgstr "ambos agregados:"
 

-#: wt-status.c:265
+#: wt-status.c:268

 msgid "both modified:"
 msgstr "ambos modificados:"
 
 msgid "both modified:"
 msgstr "ambos modificados:"
 

-#: wt-status.c:275
+#: wt-status.c:278

 msgid "new file:"
 msgstr "nuevo archivo:"
 
 msgid "new file:"
 msgstr "nuevo archivo:"
 

-#: wt-status.c:277
+#: wt-status.c:280

 msgid "copied:"
 msgstr "copiado:"
 
 msgid "copied:"
 msgstr "copiado:"
 

-#: wt-status.c:279
+#: wt-status.c:282

 msgid "deleted:"
 msgstr "borrado:"
 
 msgid "deleted:"
 msgstr "borrado:"
 

-#: wt-status.c:281
+#: wt-status.c:284

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

-#: wt-status.c:283
+#: wt-status.c:286

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

-#: wt-status.c:285
+#: wt-status.c:288

 msgid "typechange:"
 msgstr "cambio de tipo:"
 
 msgid "typechange:"
 msgstr "cambio de tipo:"
 

-#: wt-status.c:287
+#: wt-status.c:290

 msgid "unknown:"
 msgstr "desconocido:"
 
 msgid "unknown:"
 msgstr "desconocido:"
 

-#: wt-status.c:289
+#: wt-status.c:292

 msgid "unmerged:"
 msgstr "des-fusionado:"
 
 msgid "unmerged:"
 msgstr "des-fusionado:"
 

-#: wt-status.c:369
+#: wt-status.c:372

 msgid "new commits, "
 msgstr "nuevos commits, "
 
 msgid "new commits, "
 msgstr "nuevos commits, "
 

-#: wt-status.c:371
+#: wt-status.c:374

 msgid "modified content, "
 msgstr "contenido modificado, "
 
 msgid "modified content, "
 msgstr "contenido modificado, "
 

-#: wt-status.c:373
+#: wt-status.c:376

 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 
 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 

-#: wt-status.c:847
+#: wt-status.c:853

 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 

-#: wt-status.c:879
+#: wt-status.c:885

 msgid "Submodules changed but not updated:"
 msgstr "Submodulos cambiados pero no actualizados:"
 
 msgid "Submodules changed but not updated:"
 msgstr "Submodulos cambiados pero no actualizados:"
 

-#: wt-status.c:881
+#: wt-status.c:887

 msgid "Submodule changes to be committed:"
 msgstr "Submodulos cambiados listos para realizar commit:"
 
 msgid "Submodule changes to be committed:"
 msgstr "Submodulos cambiados listos para realizar commit:"
 

-#: wt-status.c:963
+#: wt-status.c:969

 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."


@@ -4706,107 +5006,107 @@ msgstr ""
 "No modifique o borre la línea de encima.\n"
 "Todo lo que este por abajo será removido."
 
 "No modifique o borre la línea de encima.\n"
 "Todo lo que este por abajo será removido."
 

-#: wt-status.c:1076
+#: wt-status.c:1084

 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 
 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 

-#: wt-status.c:1079
+#: wt-status.c:1087

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregla los conflictos y corre \"git commit\""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregla los conflictos y corre \"git commit\""
 

-#: wt-status.c:1081
+#: wt-status.c:1089

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 

-#: wt-status.c:1086
+#: wt-status.c:1094

 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 

-#: wt-status.c:1089
+#: wt-status.c:1097

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 

-#: wt-status.c:1099
+#: wt-status.c:1107

 msgid "You are in the middle of an am session."
 msgstr "Estás en medio de una sesión am."
 
 msgid "You are in the middle of an am session."
 msgstr "Estás en medio de una sesión am."
 

-#: wt-status.c:1102
+#: wt-status.c:1110

 msgid "The current patch is empty."
 msgstr "El parche actual esta vacío."
 
 msgid "The current patch is empty."
 msgstr "El parche actual esta vacío."
 

-#: wt-status.c:1106
+#: wt-status.c:1114

 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
 
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
 

-#: wt-status.c:1108
+#: wt-status.c:1116

 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 

-#: wt-status.c:1110
+#: wt-status.c:1118

 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 

-#: wt-status.c:1242
+#: wt-status.c:1250

 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no esta presente."
 
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no esta presente."
 

-#: wt-status.c:1244
+#: wt-status.c:1252

 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 
 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 

-#: wt-status.c:1247
+#: wt-status.c:1255

 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "El último comando realizado (%d comando realizado):"
 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "El último comando realizado (%d comando realizado):"
 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 

-#: wt-status.c:1258
+#: wt-status.c:1266

 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver mas en el archivo %s)"
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver mas en el archivo %s)"
 

-#: wt-status.c:1263
+#: wt-status.c:1271

 msgid "No commands remaining."
 msgstr "No quedan mas comandos."
 
 msgid "No commands remaining."
 msgstr "No quedan mas comandos."
 

-#: wt-status.c:1266
+#: wt-status.c:1274

 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Siguiente comando a realizar (%d comando restante):"
 msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
 
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Siguiente comando a realizar (%d comando restante):"
 msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
 

-#: wt-status.c:1274
+#: wt-status.c:1282

 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 

-#: wt-status.c:1287
+#: wt-status.c:1295

 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
 
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
 

-#: wt-status.c:1292
+#: wt-status.c:1300

 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 
 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 

-#: wt-status.c:1306
+#: wt-status.c:1314

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 

-#: wt-status.c:1308
+#: wt-status.c:1316

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 

-#: wt-status.c:1310
+#: wt-status.c:1318

 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
 
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
 

-#: wt-status.c:1316
+#: wt-status.c:1324

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 

-#: wt-status.c:1320
+#: wt-status.c:1328

 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."


@@ -4814,128 +5114,128 @@ msgstr ""
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 

-#: wt-status.c:1325
+#: wt-status.c:1333

 msgid "You are currently splitting a commit during a rebase."
 msgstr "Estás dividiendo un commit durante un rebase."
 
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Estás dividiendo un commit durante un rebase."
 

-#: wt-status.c:1328
+#: wt-status.c:1336

 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
 "continue\")"
 
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
 "continue\")"
 

-#: wt-status.c:1332
+#: wt-status.c:1340

 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
 "'%s'."
 
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
 "'%s'."
 

-#: wt-status.c:1337
+#: wt-status.c:1345

 msgid "You are currently editing a commit during a rebase."
 msgstr "Estás editando un commit durante un rebase."
 
 msgid "You are currently editing a commit during a rebase."
 msgstr "Estás editando un commit durante un rebase."
 

-#: wt-status.c:1340
+#: wt-status.c:1348

 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 

-#: wt-status.c:1342
+#: wt-status.c:1350

 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
 "cambios)"
 
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
 "cambios)"
 

-#: wt-status.c:1352
+#: wt-status.c:1360

 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Estás realizando un cherry-picking en el commit %s."
 
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Estás realizando un cherry-picking en el commit %s."
 

-#: wt-status.c:1357
+#: wt-status.c:1365

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 

-#: wt-status.c:1360
+#: wt-status.c:1368

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 

-#: wt-status.c:1362
+#: wt-status.c:1370

 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
 
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
 

-#: wt-status.c:1371
+#: wt-status.c:1379

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 

-#: wt-status.c:1376
+#: wt-status.c:1384

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 

-#: wt-status.c:1379
+#: wt-status.c:1387

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 

-#: wt-status.c:1381
+#: wt-status.c:1389

 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
 
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
 

-#: wt-status.c:1392
+#: wt-status.c:1400

 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 

-#: wt-status.c:1396
+#: wt-status.c:1404

 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 
 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 

-#: wt-status.c:1399
+#: wt-status.c:1407

 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 

-#: wt-status.c:1596
+#: wt-status.c:1604

 msgid "On branch "
 msgstr "En la rama "
 
 msgid "On branch "
 msgstr "En la rama "
 

-#: wt-status.c:1602
+#: wt-status.c:1610

 msgid "interactive rebase in progress; onto "
 msgstr "rebase interactivo en progreso; en "
 
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interactivo en progreso; en "
 

-#: wt-status.c:1604
+#: wt-status.c:1612

 msgid "rebase in progress; onto "
 msgstr "rebase en progreso; en "
 
 msgid "rebase in progress; onto "
 msgstr "rebase en progreso; en "
 

-#: wt-status.c:1609
+#: wt-status.c:1617

 msgid "HEAD detached at "
 msgstr "HEAD desacoplada en "
 
 msgid "HEAD detached at "
 msgstr "HEAD desacoplada en "
 

-#: wt-status.c:1611
+#: wt-status.c:1619

 msgid "HEAD detached from "
 msgstr "HEAD desacoplada de "
 
 msgid "HEAD detached from "
 msgstr "HEAD desacoplada de "
 

-#: wt-status.c:1614
+#: wt-status.c:1622

 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 
 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 

-#: wt-status.c:1634
+#: wt-status.c:1642

 msgid "Initial commit"
 msgstr "Confirmación inicial"
 
 msgid "Initial commit"
 msgstr "Confirmación inicial"
 

-#: wt-status.c:1635
+#: wt-status.c:1643

 msgid "No commits yet"
 msgstr "No hay commits todavía"
 
 msgid "No commits yet"
 msgstr "No hay commits todavía"
 

-#: wt-status.c:1649
+#: wt-status.c:1657

 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 

-#: wt-status.c:1651
+#: wt-status.c:1659

 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 

-#: wt-status.c:1655
+#: wt-status.c:1663

 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"


@@ -4946,31 +5246,31 @@ msgstr ""
 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos usted mismo (vea 'git help status')."
 
 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos usted mismo (vea 'git help status')."
 

-#: wt-status.c:1661
+#: wt-status.c:1669

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 

-#: wt-status.c:1663
+#: wt-status.c:1671

 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 
 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 

-#: wt-status.c:1669
+#: wt-status.c:1677

 msgid "No changes"
 msgstr "Sin cambios"
 
 msgid "No changes"
 msgstr "Sin cambios"
 

-#: wt-status.c:1674
+#: wt-status.c:1682

 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
 
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
 

-#: wt-status.c:1677
+#: wt-status.c:1685

 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 

-#: wt-status.c:1680
+#: wt-status.c:1688

 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "


@@ -4979,75 +5279,75 @@ msgstr ""
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 

-#: wt-status.c:1683
+#: wt-status.c:1691

 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
 "presentes\n"
 
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
 "presentes\n"
 

-#: wt-status.c:1686
+#: wt-status.c:1694

 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
 "hacerles seguimiento)\n"
 
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
 "hacerles seguimiento)\n"
 

-#: wt-status.c:1689 wt-status.c:1694
+#: wt-status.c:1697 wt-status.c:1702

 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 

-#: wt-status.c:1692
+#: wt-status.c:1700

 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
 
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
 

-#: wt-status.c:1696
+#: wt-status.c:1704

 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"
 
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"
 

-#: wt-status.c:1809
+#: wt-status.c:1817

 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 
 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 

-#: wt-status.c:1813
+#: wt-status.c:1821

 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 

-#: wt-status.c:1844
+#: wt-status.c:1852

 msgid "different"
 msgstr "diferente"
 
 msgid "different"
 msgstr "diferente"
 

-#: wt-status.c:1846 wt-status.c:1854
+#: wt-status.c:1854 wt-status.c:1862

 msgid "behind "
 msgstr "detrás "
 
 msgid "behind "
 msgstr "detrás "
 

-#: wt-status.c:1849 wt-status.c:1852
+#: wt-status.c:1857 wt-status.c:1860

 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"

-#: wt-status.c:2358
+#: wt-status.c:2366

 #, 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:2364
+#: wt-status.c:2372

 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:2366
+#: wt-status.c:2374

 #, 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:440
+#: compat/precompose_utf8.c:58 builtin/clone.c:442

 #, c-format
 msgid "failed to unlink '%s'"
 #, c-format
 msgid "failed to unlink '%s'"

-msgstr "fallo al desvincular '%s'"
+msgstr "falló al desvincular '%s'"

 
 #: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 
 #: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."


@@ -5058,9 +5358,9 @@ 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:257
+#: builtin/add.c:88 builtin/commit.c:266

 msgid "updating files failed"
 msgid "updating files failed"

-msgstr "fallo la actualización de carpetas"
+msgstr "falló la actualización de carpetas"

 
 #: builtin/add.c:98
 #, c-format
 
 #: builtin/add.c:98
 #, c-format


@@ -5086,7 +5386,7 @@ msgstr "No se puede escribir el parche"
 
 #: builtin/add.c:251
 msgid "editing patch failed"
 
 #: builtin/add.c:251
 msgid "editing patch failed"

-msgstr "fallo la edición del parche"
+msgstr "falló la edición del parche"

 
 #: builtin/add.c:254
 #, c-format
 
 #: builtin/add.c:254
 #, c-format


@@ -5102,78 +5402,78 @@ msgstr "Parche vacío. Abortado."
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 

-#: builtin/add.c:271
+#: builtin/add.c:269

 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 

-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
+#: 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

 msgid "dry run"
 msgstr "dry run ( ejecución en seco)"
 
 msgid "dry run"
 msgstr "dry run ( ejecución en seco)"
 

-#: builtin/add.c:294
+#: builtin/add.c:292

 msgid "interactive picking"
 msgstr "selección interactiva"
 
 msgid "interactive picking"
 msgstr "selección interactiva"
 

-#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 
 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 

-#: builtin/add.c:296
+#: builtin/add.c:294

 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 

-#: builtin/add.c:297
+#: builtin/add.c:295

 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar caso contrario ignorar archivos"
 
 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar caso contrario ignorar archivos"
 

-#: builtin/add.c:298
+#: builtin/add.c:296

 msgid "update tracked files"
 msgstr "actualizado las carpetas rastreadas"
 
 msgid "update tracked files"
 msgstr "actualizado las carpetas rastreadas"
 

-#: builtin/add.c:299
+#: builtin/add.c:297

 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 

-#: builtin/add.c:300
+#: builtin/add.c:298

 msgid "record only the fact that the path will be added later"
 msgstr "grabar solo el hecho de que la ruta será agregada después"
 
 msgid "record only the fact that the path will be added later"
 msgstr "grabar solo el hecho de que la ruta será agregada después"
 

-#: builtin/add.c:301
+#: builtin/add.c:299

 msgid "add changes from all tracked and untracked files"
 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
 
 msgid "add changes from all tracked and untracked files"
 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
 

-#: builtin/add.c:304
+#: builtin/add.c:302

 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"
 
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"
 

-#: builtin/add.c:306
+#: builtin/add.c:304

 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 

-#: builtin/add.c:307
+#: builtin/add.c:305

 msgid "just skip files which cannot be added because of errors"
 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
 
 msgid "just skip files which cannot be added because of errors"
 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
 

-#: builtin/add.c:308
+#: builtin/add.c:306

 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:309 builtin/update-index.c:964
+#: builtin/add.c:307 builtin/update-index.c:974

 msgid "(+/-)x"
 msgstr "(+/-)x"
 
 msgid "(+/-)x"
 msgstr "(+/-)x"
 

-#: builtin/add.c:309 builtin/update-index.c:965
+#: builtin/add.c:307 builtin/update-index.c:975

 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:311
+#: builtin/add.c:309

 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:326
+#: builtin/add.c:324

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


@@ -5204,47 +5504,47 @@ msgstr ""
 "\n"
 "Vea \"git help submodule\" para mas información."
 
 "\n"
 "Vea \"git help submodule\" para mas información."
 

-#: builtin/add.c:354
+#: builtin/add.c:352

 #, 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:372
+#: builtin/add.c:370

 #, 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:380
+#: builtin/add.c:378

 msgid "adding files failed"
 msgid "adding files failed"

-msgstr "fallo al agregar archivos"
+msgstr "falló al agregar archivos"

 
 

-#: builtin/add.c:417
+#: builtin/add.c:416

 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 
 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 

-#: builtin/add.c:424
+#: builtin/add.c:423

 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
 
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
 

-#: builtin/add.c:428
+#: builtin/add.c:427

 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
 
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
 

-#: builtin/add.c:443
+#: builtin/add.c:442

 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 

-#: builtin/add.c:444
+#: builtin/add.c:443

 #, 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:449 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: 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/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

-#: builtin/rm.c:271 builtin/submodule--helper.c:326
+#: builtin/rm.c:270 builtin/submodule--helper.c:328

 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 
 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 


@@ -5265,7 +5565,7 @@ msgstr "Línea mal formada: '%s'."
 #: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 #: builtin/am.c:576
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"

-msgstr "Fallo al copiar notas de '%s' a '%s'"
+msgstr "Falló al copiar notas de '%s' a '%s'"

 
 #: builtin/am.c:602
 msgid "fseek failed"
 
 #: builtin/am.c:602
 msgid "fseek failed"


@@ -5296,16 +5596,16 @@ msgstr "offset de zona horaria inválido"
 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:405
+#: builtin/am.c:1013 builtin/clone.c:407

 #, c-format
 msgid "failed to create directory '%s'"
 #, c-format
 msgid "failed to create directory '%s'"

-msgstr "fallo al crear el directorio '%s'"
+msgstr "falló al crear el directorio '%s'"

 
 #: builtin/am.c:1018
 msgid "Failed to split patches."
 
 #: builtin/am.c:1018
 msgid "Failed to split patches."

-msgstr "Fallo al dividir parches."
+msgstr "Falló al dividir parches."

 
 

-#: builtin/am.c:1148 builtin/commit.c:342
+#: builtin/am.c:1148 builtin/commit.c:351

 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"
 


@@ -5408,7 +5708,7 @@ msgstr "Sin cambios -- parche ya aplicado."
 #: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"
 #: builtin/am.c:1832
 #, c-format
 msgid "Patch failed at %s %.*s"

-msgstr "El parche fallo en %s %.*s"
+msgstr "El parche falló en %s %.*s"

 
 #: builtin/am.c:1838
 msgid "Use 'git am --show-current-patch' to see the failed patch"
 
 #: builtin/am.c:1838
 msgid "Use 'git am --show-current-patch' to see the failed patch"


@@ -5445,14 +5745,14 @@ msgstr "No se pudo analizar el objeto '%s'."
 
 #: builtin/am.c:2048
 msgid "failed to clean index"
 
 #: builtin/am.c:2048
 msgid "failed to clean index"

-msgstr "fallo al limpiar el índice"
+msgstr "falló al limpiar el índice"

 
 #: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
 #: builtin/am.c:2083
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""

-"Parece haber movido HEAD desde el último fallo 'am'.\n"
+"Parece haber movido HEAD desde el último falló 'am'.\n"

 "No rebobinando a ORIG_HEAD"
 
 #: builtin/am.c:2174
 "No rebobinando a ORIG_HEAD"
 
 #: builtin/am.c:2174


@@ -5481,7 +5781,7 @@ msgid "allow fall back on 3way merging if needed"
 msgstr "permitir retroceso en fusión de 3-vías si es necesario"
 
 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
 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:182
+#: builtin/repack.c:192

 msgid "be quiet"
 msgstr "ser silencioso"
 
 msgid "be quiet"
 msgstr "ser silencioso"
 


@@ -5524,16 +5824,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/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
-#: parse-options.h:144 parse-options.h:146 parse-options.h:257
+#: 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:207
+#: 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
+#: parse-options.h:146 parse-options.h:258

 msgid "n"
 msgstr "n"
 
 msgid "n"
 msgstr "n"
 

-#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
+#: 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

 msgid "format"
 msgstr "formato"
 
 msgid "format"
 msgstr "formato"
 


@@ -5577,8 +5878,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:1431 builtin/merge.c:237
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238
+#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

 msgid "key-id"
 msgstr "key-id"
 
 msgid "key-id"
 msgstr "key-id"
 


@@ -5600,7 +5901,7 @@ msgstr ""
 
 #: builtin/am.c:2327
 msgid "failed to read the index"
 
 #: builtin/am.c:2327
 msgid "failed to read the index"

-msgstr "fallo al leer el índice"
+msgstr "falló al leer el índice"

 
 #: builtin/am.c:2342
 #, c-format
 
 #: builtin/am.c:2342
 #, c-format


@@ -5717,115 +6018,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:27
+#: builtin/blame.c:29

 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:32
+#: builtin/blame.c:34

 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:677
+#: builtin/blame.c:404
+#, c-format
+msgid "expecting a color: %s"
+msgstr "esperando un color: %s"
+
+#: builtin/blame.c:411
+msgid "must end with a color"
+msgstr "tiene que terminar con un color"
+
+#: builtin/blame.c:697
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "color invalido '%s' en color.blame.repeatedLines"
+
+#: builtin/blame.c:715
+msgid "invalid value for blame.coloring"
+msgstr "valor inválido para blame.coloring"
+
+#: builtin/blame.c:786

 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:678
+#: builtin/blame.c:787

 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:679
+#: builtin/blame.c:788

 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:680
+#: builtin/blame.c:789

 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:681
+#: builtin/blame.c:790

 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 
 msgid "Force progress reporting"
 msgstr "Forzar el reporte de progreso"
 

-#: builtin/blame.c:682
+#: builtin/blame.c:791

 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:683
+#: builtin/blame.c:792

 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:684
+#: builtin/blame.c:793

 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:685
+#: builtin/blame.c:794

 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:686
+#: builtin/blame.c:795

 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:687
+#: builtin/blame.c:796

 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:688
+#: builtin/blame.c:797

 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:689
+#: builtin/blame.c:798

 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:690
+#: builtin/blame.c:799

 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:691
+#: builtin/blame.c:800

 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:692
+#: builtin/blame.c:801

 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:699
+#: builtin/blame.c:802
+msgid "color redundant metadata from previous line differently"
+msgstr "colorear metadata redundante de lineas previas de manera diferente"
+
+#: builtin/blame.c:803
+msgid "color lines by age"
+msgstr "colorear lineas por edad"
+
+#: builtin/blame.c:810

 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:701
+#: builtin/blame.c:812

 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:702
+#: builtin/blame.c:813

 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:703
+#: builtin/blame.c:814

 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:704 builtin/blame.c:705
+#: builtin/blame.c:815 builtin/blame.c:816

 msgid "score"
 msgstr "puntaje"
 
 msgid "score"
 msgstr "puntaje"
 

-#: builtin/blame.c:704
+#: builtin/blame.c:815

 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:705
+#: builtin/blame.c:816

 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:706
+#: builtin/blame.c:817

 msgid "n,m"
 msgstr "n,m"
 
 msgid "n,m"
 msgstr "n,m"
 

-#: builtin/blame.c:706
+#: builtin/blame.c:817

 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:753
+#: builtin/blame.c:866

 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"
 


@@ -5837,18 +6164,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:804
+#: builtin/blame.c:917

 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:890
+#: builtin/blame.c:1003

 #, 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:936
+#: builtin/blame.c:1049

 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 


@@ -5914,7 +6241,7 @@ msgstr ""
 
 #: builtin/branch.c:181
 msgid "Update of config-file failed"
 
 #: builtin/branch.c:181
 msgid "Update of config-file failed"

-msgstr "Fallo de actualización de config-file"
+msgstr "Falló de actualización de config-file"

 
 #: builtin/branch.c:212
 msgid "cannot use -a with -d"
 
 #: builtin/branch.c:212
 msgid "cannot use -a with -d"


@@ -5959,69 +6286,69 @@ msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Eliminada la rama %s (era %s)..\n"
 
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Eliminada la rama %s (era %s)..\n"
 

-#: builtin/branch.c:417 builtin/tag.c:58
+#: builtin/branch.c:416 builtin/tag.c:58

 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:450
+#: builtin/branch.c:453

 #, 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:454
+#: builtin/branch.c:457

 #, 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:471
+#: builtin/branch.c:474

 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:473
+#: builtin/branch.c:476

 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:484
+#: builtin/branch.c:487

 #, 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:511
+#: builtin/branch.c:514

 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:513
+#: builtin/branch.c:516

 msgid "Branch copy failed"
 msgstr "Copiado de rama fallido"
 
 msgid "Branch copy failed"
 msgstr "Copiado de rama fallido"
 

-#: builtin/branch.c:517
+#: builtin/branch.c:520

 #, 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:520
+#: builtin/branch.c:523

 #, 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:526
+#: builtin/branch.c:529

 #, 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:535
+#: builtin/branch.c:538

 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:537
+#: builtin/branch.c:540

 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:553
+#: builtin/branch.c:556

 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"


@@ -6032,184 +6359,186 @@ 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:586
+#: builtin/branch.c:589

 msgid "Generic options"
 msgstr "Opciones genéricas"
 
 msgid "Generic options"
 msgstr "Opciones genéricas"
 

-#: builtin/branch.c:588
+#: builtin/branch.c:591

 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:589
+#: builtin/branch.c:592

 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 
 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 

-#: builtin/branch.c:590
+#: builtin/branch.c:593

 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:592
+#: builtin/branch.c:595

 msgid "do not use"
 msgstr "no usar"
 
 msgid "do not use"
 msgstr "no usar"
 

-#: builtin/branch.c:594
+#: builtin/branch.c:597

 msgid "upstream"
 msgstr "upstream"
 
 msgid "upstream"
 msgstr "upstream"
 

-#: builtin/branch.c:594
+#: builtin/branch.c:597

 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 
 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 

-#: builtin/branch.c:595
+#: builtin/branch.c:598

 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:596
+#: builtin/branch.c:599

 msgid "use colored output"
 msgstr "usar salida con colores"
 
 msgid "use colored output"
 msgstr "usar salida con colores"
 

-#: builtin/branch.c:597
+#: builtin/branch.c:600

 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:599 builtin/branch.c:601
+#: builtin/branch.c:602 builtin/branch.c:604

 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:600 builtin/branch.c:602
+#: builtin/branch.c:603 builtin/branch.c:605

 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:605
+#: builtin/branch.c:608

 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:606
+#: builtin/branch.c:609

 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:608
+#: builtin/branch.c:611

 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 
 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 

-#: builtin/branch.c:609
+#: builtin/branch.c:612

 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:610
+#: builtin/branch.c:613

 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:611
+#: builtin/branch.c:614

 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:612
+#: builtin/branch.c:615

 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:613
+#: builtin/branch.c:616

 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:614
+#: builtin/branch.c:617

 msgid "list branch names"
 msgstr "listar nombres de ramas"
 
 msgid "list branch names"
 msgstr "listar nombres de ramas"
 

-#: builtin/branch.c:615
+#: builtin/branch.c:618

 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:617
+#: builtin/branch.c:620

 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:618
+#: builtin/branch.c:621

 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:619
+#: builtin/branch.c:622

 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:620
+#: builtin/branch.c:623

 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:621
+#: builtin/branch.c:624

 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:622 builtin/for-each-ref.c:40 builtin/tag.c:411
+#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:412

 msgid "key"
 msgstr "clave"
 
 msgid "key"
 msgstr "clave"
 

-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
+#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:413

 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:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: 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/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

-#: builtin/tag.c:414
+#: builtin/tag.c:415

 msgid "object"
 msgstr "objeto"
 
 msgid "object"
 msgstr "objeto"
 

-#: builtin/branch.c:626
+#: builtin/branch.c:629

 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:628 builtin/for-each-ref.c:49 builtin/tag.c:421
+#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422

 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:629 builtin/for-each-ref.c:38 builtin/tag.c:419
+#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420

 #: 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:652 builtin/clone.c:735
+#: builtin/branch.c:655 builtin/clone.c:737

 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:675
+#: builtin/branch.c:678

 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:690 builtin/branch.c:742 builtin/branch.c:751
+#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754

 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:718
+#: builtin/branch.c:721

 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:723
+#: builtin/branch.c:726

 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:730
+#: builtin/branch.c:733

 #, 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:733
+#: builtin/branch.c:736

 #, 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:748
+#: builtin/branch.c:751

 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:757
+#: builtin/branch.c:760

 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:762
+#: builtin/branch.c:765

 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:766
+#: builtin/branch.c:769

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


@@ -6217,37 +6546,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:769 builtin/branch.c:791 builtin/branch.c:807
+#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810

 #, 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:773
+#: builtin/branch.c:776

 #, 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:785
+#: builtin/branch.c:788

 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:789
+#: builtin/branch.c:792

 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:795
+#: builtin/branch.c:798

 #, 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:810
+#: builtin/branch.c:813

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
 

-#: builtin/branch.c:813
+#: builtin/branch.c:816

 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."


@@ -6268,7 +6597,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:523
+#: builtin/cat-file.c:525

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


@@ -6276,7 +6605,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:524
+#: builtin/cat-file.c:526

 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"


@@ -6284,64 +6613,64 @@ 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:561
+#: builtin/cat-file.c:563

 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:562
+#: builtin/cat-file.c:564

 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 

-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565

 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:565
+#: builtin/cat-file.c:567

 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:566
+#: builtin/cat-file.c:568

 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:568
+#: builtin/cat-file.c:570

 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:570
+#: builtin/cat-file.c:572

 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:571 git-submodule.sh:878
+#: builtin/cat-file.c:573 git-submodule.sh:894

 msgid "blob"
 msgstr "blob"
 
 msgid "blob"
 msgstr "blob"
 

-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574

 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:574
+#: builtin/cat-file.c:576

 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:575
+#: builtin/cat-file.c:577

 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 

-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:579

 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:580
+#: builtin/cat-file.c:582

 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:583
+#: builtin/cat-file.c:585

 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:585
+#: builtin/cat-file.c:587

 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"
 


@@ -6369,7 +6698,7 @@ msgstr "leer nombres de archivos de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carácter NUL"
 
 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:1106 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500

 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 


@@ -6461,9 +6790,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:1203 builtin/submodule--helper.c:1206
-#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
-#: builtin/worktree.c:570
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
+#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
+#: builtin/worktree.c:610

 msgid "string"
 msgstr "string"
 
 msgid "string"
 msgstr "string"
 


@@ -6534,54 +6863,54 @@ msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 

-#: builtin/checkout.c:505
+#: builtin/checkout.c:506

 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:636
+#: builtin/checkout.c:643

 #, 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:677
+#: builtin/checkout.c:684

 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 

-#: builtin/checkout.c:681 builtin/clone.c:689
+#: builtin/checkout.c:688 builtin/clone.c:691

 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:685
+#: builtin/checkout.c:692

 #, 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:688
+#: builtin/checkout.c:695

 #, 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:692
+#: builtin/checkout.c:699

 #, 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:694 builtin/checkout.c:1039
+#: builtin/checkout.c:701 builtin/checkout.c:1046

 #, 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:696
+#: builtin/checkout.c:703

 #, 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:747
+#: builtin/checkout.c:754

 #, 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:753
+#: builtin/checkout.c:760

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


@@ -6604,7 +6933,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: builtin/checkout.c:772
+#: builtin/checkout.c:779

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


@@ -6631,160 +6960,160 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
 " git branch <nombre-de-rama> %s\n"
 "\n"
 

-#: builtin/checkout.c:804
+#: builtin/checkout.c:811

 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:808
+#: builtin/checkout.c:815

 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:836 builtin/checkout.c:1034
+#: builtin/checkout.c:843 builtin/checkout.c:1041

 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:940
+#: builtin/checkout.c:947

 #, 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:980 builtin/worktree.c:249
+#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389

 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invalida: %s"
 
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia invalida: %s"
 

-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1016

 #, 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:1048
+#: builtin/checkout.c:1055

 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:1051 builtin/checkout.c:1055
+#: builtin/checkout.c:1058 builtin/checkout.c:1062

 #, 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:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
-#: builtin/checkout.c:1070
+#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
+#: builtin/checkout.c:1077

 #, 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:1075
+#: builtin/checkout.c:1082

 #, 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:1107 builtin/checkout.c:1109 builtin/clone.c:116
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
-#: builtin/worktree.c:389
+#: 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

 msgid "branch"
 msgstr "rama"
 
 msgid "branch"
 msgstr "rama"
 

-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1115

 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:1110
+#: builtin/checkout.c:1117

 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:1111
+#: builtin/checkout.c:1118

 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:1112 builtin/worktree.c:391
+#: builtin/checkout.c:1119 builtin/worktree.c:437

 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:1113
+#: builtin/checkout.c:1120

 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:1115
+#: builtin/checkout.c:1122

 msgid "new-branch"
 msgstr "nueva-rama"
 
 msgid "new-branch"
 msgstr "nueva-rama"
 

-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1122

 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 

-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1123

 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:1118
+#: builtin/checkout.c:1125

 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:1120
+#: builtin/checkout.c:1127

 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:1122
+#: builtin/checkout.c:1129

 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:1124 builtin/merge.c:239
+#: builtin/checkout.c:1131 builtin/merge.c:240

 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 

-#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
+#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264

 msgid "style"
 msgstr "estilo"
 
 msgid "style"
 msgstr "estilo"
 

-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1134

 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:1130
+#: builtin/checkout.c:1137

 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:1132
+#: builtin/checkout.c:1139

 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:1134
+#: builtin/checkout.c:1141

 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:1138 builtin/clone.c:83 builtin/fetch.c:150
-#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
-#: builtin/send-pack.c:173
+#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
+#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572
+#: builtin/send-pack.c:174

 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 

-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1175

 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:1185
+#: builtin/checkout.c:1192

 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:1190
+#: builtin/checkout.c:1197

 msgid "Missing branch name; try -b"
 msgstr "Falta nombre de rama; prueba -b"
 
 msgid "Missing branch name; try -b"
 msgstr "Falta nombre de rama; prueba -b"
 

-#: builtin/checkout.c:1226
+#: builtin/checkout.c:1233

 msgid "invalid path specification"
 msgstr "especificación de ruta invalida"
 
 msgid "invalid path specification"
 msgstr "especificación de ruta invalida"
 

-#: builtin/checkout.c:1233
+#: builtin/checkout.c:1240

 #, 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:1237
+#: builtin/checkout.c:1244

 #, 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:1241
+#: builtin/checkout.c:1248

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


@@ -6821,9 +7150,9 @@ msgstr "Se saltara repositorio %s\n"
 #: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 #: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"

-msgstr "fallo al borrar %s"
+msgstr "falló al borrar %s"

 
 

-#: builtin/clean.c:302 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -6836,7 +7165,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:581
+#: builtin/clean.c:306 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -6857,8 +7186,8 @@ 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:547
-#: git-add--interactive.perl:552
+#: builtin/clean.c:522 git-add--interactive.perl:554
+#: git-add--interactive.perl:559

 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Ahh (%s)?\n"
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Ahh (%s)?\n"


@@ -6883,7 +7212,7 @@ msgstr "Seleccionar objetos para borrar"
 msgid "Remove %s [y/N]? "
 msgstr "Borrar %s [y/N]? "
 
 msgid "Remove %s [y/N]? "
 msgstr "Borrar %s [y/N]? "
 

-#: builtin/clean.c:788 git-add--interactive.perl:1710
+#: builtin/clean.c:788 git-add--interactive.perl:1717

 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"


@@ -6906,11 +7235,11 @@ 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:1786
+#: builtin/clean.c:823 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 

-#: builtin/clean.c:824 git-add--interactive.perl:1783
+#: builtin/clean.c:824 git-add--interactive.perl:1790

 msgid "What now"
 msgstr "Ahora que"
 
 msgid "What now"
 msgstr "Ahora que"
 


@@ -6979,144 +7308,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:40
+#: builtin/clone.c:42

 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:85
+#: builtin/clone.c:87

 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 

-#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
+#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479

 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:90
+#: builtin/clone.c:92

 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:92
+#: builtin/clone.c:94

 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:94
+#: builtin/clone.c:96

 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:96
+#: builtin/clone.c:98

 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 

-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:100 builtin/clone.c:104

 msgid "pathspec"
 msgstr "pathspec"
 
 msgid "pathspec"
 msgstr "pathspec"
 

-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:100 builtin/clone.c:104

 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:105
+#: builtin/clone.c:107

 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:106 builtin/init-db.c:476
+#: builtin/clone.c:108 builtin/init-db.c:476

 msgid "template-directory"
 msgstr "directorio-template"
 
 msgid "template-directory"
 msgstr "directorio-template"
 

-#: builtin/clone.c:107 builtin/init-db.c:477
+#: builtin/clone.c:109 builtin/init-db.c:477

 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:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1577
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
+#: builtin/submodule--helper.c:1594

 msgid "reference repository"
 msgstr "repositorio de referencia"
 
 msgid "reference repository"
 msgstr "repositorio de referencia"
 

-#: builtin/clone.c:113
+#: builtin/clone.c:115 builtin/submodule--helper.c:1225
+#: builtin/submodule--helper.c:1596

 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:114 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3166 builtin/repack.c:213

 msgid "name"
 msgstr "nombre"
 
 msgid "name"
 msgstr "nombre"
 

-#: builtin/clone.c:115
+#: builtin/clone.c:117

 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:117
+#: builtin/clone.c:119

 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:119
+#: builtin/clone.c:121

 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:120 builtin/fetch.c:151 builtin/grep.c:813
-#: builtin/pull.c:211
+#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
+#: builtin/pull.c:216

 msgid "depth"
 msgstr "profundidad"
 
 msgid "depth"
 msgstr "profundidad"
 

-#: builtin/clone.c:121
+#: builtin/clone.c:123

 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:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157

 #: parse-options.h:154
 msgid "time"
 msgstr "tiempo"
 
 #: parse-options.h:154
 msgid "time"
 msgstr "tiempo"
 

-#: builtin/clone.c:123
+#: builtin/clone.c:125

 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:124 builtin/fetch.c:155
+#: builtin/clone.c:126 builtin/fetch.c:154

 msgid "revision"
 msgstr "revision"
 
 msgid "revision"
 msgstr "revision"
 

-#: builtin/clone.c:125 builtin/fetch.c:156
+#: builtin/clone.c:127 builtin/fetch.c:155

 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:127
+#: builtin/clone.c:129

 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:129
+#: builtin/clone.c:131

 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:131
+#: builtin/clone.c:133

 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:132 builtin/init-db.c:485
+#: builtin/clone.c:134 builtin/init-db.c:485

 msgid "gitdir"
 msgstr "gitdir"
 
 msgid "gitdir"
 msgstr "gitdir"
 

-#: builtin/clone.c:133 builtin/init-db.c:486
+#: builtin/clone.c:135 builtin/init-db.c:486

 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:134
+#: builtin/clone.c:136

 msgid "key=value"
 msgstr "llave=valor"
 
 msgid "key=value"
 msgstr "llave=valor"
 

-#: builtin/clone.c:135
+#: builtin/clone.c:137

 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:136 builtin/fetch.c:173 builtin/pull.c:224
-#: builtin/push.c:567
+#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
+#: builtin/push.c:583

 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 

-#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
-#: builtin/push.c:569
+#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
+#: builtin/push.c:585

 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 

-#: builtin/clone.c:276
+#: builtin/clone.c:278

 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"


@@ -7124,42 +7455,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:329
+#: builtin/clone.c:331

 #, 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:401
+#: builtin/clone.c:403

 #, c-format
 msgid "failed to open '%s'"
 #, c-format
 msgid "failed to open '%s'"

-msgstr "fallo al abrir '%s'"
+msgstr "falló al abrir '%s'"

 
 

-#: builtin/clone.c:409
+#: builtin/clone.c:411

 #, 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:423
+#: builtin/clone.c:425

 #, 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:445
+#: builtin/clone.c:447

 #, c-format
 msgid "failed to create link '%s'"
 #, c-format
 msgid "failed to create link '%s'"

-msgstr "fallo al crear link '%s'"
+msgstr "falló al crear link '%s'"

 
 

-#: builtin/clone.c:449
+#: builtin/clone.c:451

 #, c-format
 msgid "failed to copy file to '%s'"
 #, c-format
 msgid "failed to copy file to '%s'"

-msgstr "fallo al copiar archivo a '%s'"
+msgstr "falló al copiar archivo a '%s'"

 
 

-#: builtin/clone.c:475
+#: builtin/clone.c:477

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

-#: builtin/clone.c:489
+#: builtin/clone.c:491

 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"


@@ -7169,100 +7500,100 @@ 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:566
+#: builtin/clone.c:568

 #, 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:661
+#: builtin/clone.c:663

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

-#: builtin/clone.c:677
+#: builtin/clone.c:679

 #, 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:726
+#: builtin/clone.c:728

 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:756
+#: builtin/clone.c:758

 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:801
+#: builtin/clone.c:803

 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:864
+#: builtin/clone.c:866

 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:866
+#: builtin/clone.c:868

 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:906 builtin/receive-pack.c:1946
+#: builtin/clone.c:907 builtin/receive-pack.c:1947

 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 
 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 

-#: builtin/clone.c:910
+#: builtin/clone.c:911

 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:923
+#: builtin/clone.c:924

 #, 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:926
+#: builtin/clone.c:927

 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:939
+#: builtin/clone.c:940

 #, 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:945 builtin/fetch.c:1455
+#: builtin/clone.c:946 builtin/fetch.c:1460

 #, 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:955
+#: builtin/clone.c:956

 #, 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:965
+#: builtin/clone.c:966

 #, 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:980 builtin/clone.c:1001 builtin/difftool.c:270
-#: builtin/worktree.c:255 builtin/worktree.c:285
+#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
+#: builtin/worktree.c:246 builtin/worktree.c:276

 #, 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:985
+#: builtin/clone.c:986

 #, 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:1005
+#: builtin/clone.c:1006

 #, 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:1007
+#: builtin/clone.c:1008

 #, 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:1031
+#: builtin/clone.c:1032

 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"


@@ -7331,7 +7662,7 @@ msgstr "Realizando padding en el borde derecho"
 msgid "Padding space between columns"
 msgstr "Realizando padding entre columnas"
 
 msgid "Padding space between columns"
 msgstr "Realizando padding entre columnas"
 

-#: builtin/column.c:52
+#: builtin/column.c:51

 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"
 


@@ -7388,61 +7719,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:284
+#: builtin/commit.c:293

 msgid "failed to unpack HEAD tree object"
 msgid "failed to unpack HEAD tree object"

-msgstr "fallo al desempaquetar objeto del árbol HEAD"
+msgstr "falló al desempaquetar objeto del árbol HEAD"

 
 

-#: builtin/commit.c:325
+#: builtin/commit.c:334

 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:331
+#: builtin/commit.c:340

 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 

-#: builtin/commit.c:344
+#: builtin/commit.c:353

 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:346
+#: builtin/commit.c:355

 msgid "Failed to update main cache tree"
 msgid "Failed to update main cache tree"

-msgstr "Fallo al actualizar el cache principal del árbol"
+msgstr "Falló al actualizar el cache principal del árbol"

 
 

-#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
+#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449

 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:427
+#: builtin/commit.c:432

 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:429
+#: builtin/commit.c:434

 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:437
+#: builtin/commit.c:442

 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:456
+#: builtin/commit.c:461

 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:553
+#: builtin/commit.c:558

 #, 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:555
+#: builtin/commit.c:560

 #, 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:574
+#: builtin/commit.c:579

 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 

-#: builtin/commit.c:626
+#: builtin/commit.c:631

 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"


@@ -7450,38 +7781,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:663 builtin/commit.c:696 builtin/commit.c:1024
+#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029

 #, 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:675 builtin/shortlog.c:309
+#: builtin/commit.c:680 builtin/shortlog.c:316

 #, 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:677
+#: builtin/commit.c:682

 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:681
+#: builtin/commit.c:686

 #, 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:710 builtin/commit.c:718
+#: builtin/commit.c:715 builtin/commit.c:723

 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:715
+#: builtin/commit.c:720

 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:769
+#: builtin/commit.c:774

 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:787
+#: builtin/commit.c:792

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


@@ -7496,7 +7827,7 @@ msgstr ""
 "\t%s\n"
 "y vuelve a intentar.\n"
 
 "\t%s\n"
 "y vuelve a intentar.\n"
 

-#: builtin/commit.c:792
+#: builtin/commit.c:797

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


@@ -7511,7 +7842,7 @@ msgstr ""
 "\t%s\n"
 "y vuelva a intentar.\n"
 
 "\t%s\n"
 "y vuelva a intentar.\n"
 

-#: builtin/commit.c:805
+#: builtin/commit.c:810

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


@@ -7521,7 +7852,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:813
+#: builtin/commit.c:818

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


@@ -7533,150 +7864,150 @@ 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:830
+#: builtin/commit.c:835

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 

-#: builtin/commit.c:838
+#: builtin/commit.c:843

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

-#: builtin/commit.c:845
+#: builtin/commit.c:850

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 

-#: builtin/commit.c:862
+#: builtin/commit.c:867

 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:928
+#: builtin/commit.c:933

 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 

-#: builtin/commit.c:942 builtin/tag.c:256
+#: builtin/commit.c:947 builtin/tag.c:257

 #, 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:986
+#: builtin/commit.c:991

 #, 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:1000
+#: builtin/commit.c:1005

 #, 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:1014 builtin/commit.c:1264
+#: builtin/commit.c:1019 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:1052
+#: builtin/commit.c:1057

 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:1085
+#: builtin/commit.c:1090

 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:1094
+#: builtin/commit.c:1099

 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:1097
+#: builtin/commit.c:1102

 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:1099
+#: builtin/commit.c:1104

 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:1102
+#: builtin/commit.c:1107

 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:1112
+#: builtin/commit.c:1117

 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:1114
+#: builtin/commit.c:1119

 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:1122
+#: builtin/commit.c:1127

 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:1139
+#: builtin/commit.c:1144

 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:1141
+#: builtin/commit.c:1146

 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:1155 builtin/tag.c:542
+#: builtin/commit.c:1160 builtin/tag.c:543

 #, 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:1160
+#: builtin/commit.c:1165

 msgid "Paths with -a does not make sense."
 msgstr "Rutas con -a no tiene sentido."
 
 msgid "Paths with -a does not make sense."
 msgstr "Rutas con -a no tiene sentido."
 

-#: builtin/commit.c:1278 builtin/commit.c:1443
+#: builtin/commit.c:1303 builtin/commit.c:1480

 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 

-#: builtin/commit.c:1280 builtin/commit.c:1445
+#: builtin/commit.c:1305 builtin/commit.c:1482

 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 

-#: builtin/commit.c:1282
+#: builtin/commit.c:1307

 msgid "show stash information"
 msgstr "mostrar información del stash"
 
 msgid "show stash information"
 msgstr "mostrar información del stash"
 

-#: builtin/commit.c:1284 builtin/commit.c:1447
+#: builtin/commit.c:1309 builtin/commit.c:1484

 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 
 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 

-#: builtin/commit.c:1286
+#: builtin/commit.c:1311

 msgid "version"
 msgstr "version"
 
 msgid "version"
 msgstr "version"
 

-#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
-#: builtin/worktree.c:541
+#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
+#: builtin/worktree.c:581

 msgid "machine-readable output"
 msgstr "output formato-maquina"
 
 msgid "machine-readable output"
 msgstr "output formato-maquina"
 

-#: builtin/commit.c:1289 builtin/commit.c:1451
+#: builtin/commit.c:1314 builtin/commit.c:1488

 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 

-#: builtin/commit.c:1292 builtin/commit.c:1454
+#: builtin/commit.c:1317 builtin/commit.c:1491

 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 

-#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
+#: 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

 msgid "mode"
 msgstr "modo"
 
 msgid "mode"
 msgstr "modo"
 

-#: builtin/commit.c:1295 builtin/commit.c:1457
+#: builtin/commit.c:1320 builtin/commit.c:1494

 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 

-#: builtin/commit.c:1299
+#: builtin/commit.c:1324

 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"


@@ -7684,11 +8015,11 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 

-#: builtin/commit.c:1301 parse-options.h:167
+#: builtin/commit.c:1326 parse-options.h:167

 msgid "when"
 msgstr "cuando"
 
 msgid "when"
 msgstr "cuando"
 

-#: builtin/commit.c:1302
+#: builtin/commit.c:1327

 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"


@@ -7696,187 +8027,195 @@ msgstr ""
 "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 
 "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 

-#: builtin/commit.c:1304
+#: builtin/commit.c:1329

 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 

-#: builtin/commit.c:1323
+#: builtin/commit.c:1330
+msgid "do not detect renames"
+msgstr "no detectar renombrados"
+
+#: builtin/commit.c:1332
+msgid "detect renames, optionally set similarity index"
+msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
+
+#: builtin/commit.c:1352

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinación de argumentos de archivos ignorados y no rastreados no soportada"
 
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinación de argumentos de archivos ignorados y no rastreados no soportada"
 

-#: builtin/commit.c:1413
+#: builtin/commit.c:1450

 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 
 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 

-#: builtin/commit.c:1414
+#: builtin/commit.c:1451

 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 

-#: builtin/commit.c:1416
+#: builtin/commit.c:1453

 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:1417 builtin/tag.c:393
+#: builtin/commit.c:1454 builtin/tag.c:394

 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 

-#: builtin/commit.c:1418
+#: builtin/commit.c:1455

 msgid "author"
 msgstr "autor"
 
 msgid "author"
 msgstr "autor"
 

-#: builtin/commit.c:1418
+#: builtin/commit.c:1455

 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:1419 builtin/gc.c:359
+#: builtin/commit.c:1456 builtin/gc.c:501

 msgid "date"
 msgstr "fecha"
 
 msgid "date"
 msgstr "fecha"
 

-#: builtin/commit.c:1419
+#: builtin/commit.c:1456

 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:1420 builtin/merge.c:226 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:391
+#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:392

 msgid "message"
 msgstr "mensaje"
 
 msgid "message"
 msgstr "mensaje"
 

-#: builtin/commit.c:1420
+#: builtin/commit.c:1457

 msgid "commit message"
 msgstr "mensaje del commit"
 
 msgid "commit message"
 msgstr "mensaje del commit"
 

-#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
-#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
+#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
+#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92

 msgid "commit"
 msgstr "confirmar"
 
 msgid "commit"
 msgstr "confirmar"
 

-#: builtin/commit.c:1421
+#: builtin/commit.c:1458

 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 
 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 

-#: builtin/commit.c:1422
+#: builtin/commit.c:1459

 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 
 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 

-#: builtin/commit.c:1423
+#: builtin/commit.c:1460

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquash para arreglar el commit especificado"
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquash para arreglar el commit especificado"
 

-#: builtin/commit.c:1424
+#: builtin/commit.c:1461

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar el mensaje de formato autosquash para realizar squash  al commit "
 "especificado"
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar el mensaje de formato autosquash para realizar squash  al commit "
 "especificado"
 

-#: builtin/commit.c:1425
+#: builtin/commit.c:1462

 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:1426 builtin/log.c:1446 builtin/merge.c:240
-#: builtin/pull.c:149 builtin/revert.c:105
+#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241
+#: builtin/pull.c:154 builtin/revert.c:105

 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 

-#: builtin/commit.c:1427
+#: builtin/commit.c:1464

 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 

-#: builtin/commit.c:1428
+#: builtin/commit.c:1465

 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 

-#: builtin/commit.c:1429
+#: builtin/commit.c:1466

 msgid "default"
 msgstr "default"
 
 msgid "default"
 msgstr "default"
 

-#: builtin/commit.c:1429 builtin/tag.c:397
+#: builtin/commit.c:1466 builtin/tag.c:398

 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 
 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 

-#: builtin/commit.c:1430
+#: builtin/commit.c:1467

 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:1432 builtin/merge.c:238 builtin/pull.c:179
+#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184

 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 

-#: builtin/commit.c:1435
+#: builtin/commit.c:1472

 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 

-#: builtin/commit.c:1436
+#: builtin/commit.c:1473

 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 

-#: builtin/commit.c:1437
+#: builtin/commit.c:1474

 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 

-#: builtin/commit.c:1438
+#: builtin/commit.c:1475

 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 

-#: builtin/commit.c:1439
+#: builtin/commit.c:1476

 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 

-#: builtin/commit.c:1440
+#: builtin/commit.c:1477

 msgid "commit only specified files"
 msgstr "sólo confirmar archivos específicos"
 
 msgid "commit only specified files"
 msgstr "sólo confirmar archivos específicos"
 

-#: builtin/commit.c:1441
+#: builtin/commit.c:1478

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 

-#: builtin/commit.c:1442
+#: builtin/commit.c:1479

 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 
 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 

-#: builtin/commit.c:1455
+#: builtin/commit.c:1492

 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 

-#: builtin/commit.c:1456
+#: builtin/commit.c:1493

 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 
 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 

-#: builtin/commit.c:1461
+#: builtin/commit.c:1498

 msgid "ok to record an empty change"
 msgstr "ok al grabar un cambio vacío"
 
 msgid "ok to record an empty change"
 msgstr "ok al grabar un cambio vacío"
 

-#: builtin/commit.c:1463
+#: builtin/commit.c:1500

 msgid "ok to record a change with an empty message"
 msgstr "ok al grabar un cambio con un mensaje vacío"
 
 msgid "ok to record a change with an empty message"
 msgstr "ok al grabar un cambio con un mensaje vacío"
 

-#: builtin/commit.c:1536
+#: builtin/commit.c:1573

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 

-#: builtin/commit.c:1543
+#: builtin/commit.c:1580

 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 

-#: builtin/commit.c:1562
+#: builtin/commit.c:1599

 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 

-#: builtin/commit.c:1573
+#: builtin/commit.c:1610

 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje está en blanco.\n"
 
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje está en blanco.\n"
 

-#: builtin/commit.c:1578
+#: builtin/commit.c:1615

 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abortando commit; no se ha editado el mensaje\n"
 
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abortando commit; no se ha editado el mensaje\n"
 

-#: builtin/commit.c:1613
+#: builtin/commit.c:1650

 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"


@@ -7886,148 +8225,212 @@ msgstr ""
 "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
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <objdir>]"
+
+#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
+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
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
+"stdin-commits]"
+msgstr ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--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
+msgid "dir"
+msgstr "dir"
+
+#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
+#: builtin/commit-graph.c:148
+msgid "The object directory to store the graph"
+msgstr "El directorio de objetos para guardar el gráfico"
+
+#: builtin/commit-graph.c:95
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "escanear paquete de índices por stdin por commits"
+
+#: builtin/commit-graph.c:97
+msgid "start walk at commits listed by stdin"
+msgstr "comenzar a caminar a los commits listados por stdin"
+
+#: builtin/commit-graph.c:99
+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/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<opciones>]"
 
 #: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<opciones>]"
 

-#: builtin/config.c:58
+#: builtin/config.c:101
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argumento --type no reconocido, %s"
+
+#: builtin/config.c:123

 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:59
+#: builtin/config.c:124

 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:60
+#: builtin/config.c:125

 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:61
+#: builtin/config.c:126

 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:62
+#: builtin/config.c:127

 msgid "use given config file"
 msgstr "usar archivo config especificado"
 
 msgid "use given config file"
 msgstr "usar archivo config especificado"
 

-#: builtin/config.c:63
+#: builtin/config.c:128

 msgid "blob-id"
 msgstr "blob-id"
 
 msgid "blob-id"
 msgstr "blob-id"
 

-#: builtin/config.c:63
+#: builtin/config.c:128

 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:64
+#: builtin/config.c:129

 msgid "Action"
 msgstr "Acción"
 
 msgid "Action"
 msgstr "Acción"
 

-#: builtin/config.c:65
+#: builtin/config.c:130

 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:66
+#: builtin/config.c:131

 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:67
+#: builtin/config.c:132

 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:68
+#: builtin/config.c:133

 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:69
+#: builtin/config.c:134

 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:70
+#: builtin/config.c:135

 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:71
+#: builtin/config.c:136

 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:72
+#: builtin/config.c:137

 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:73
+#: builtin/config.c:138

 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:74
+#: builtin/config.c:139

 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:75
+#: builtin/config.c:140

 msgid "list all"
 msgstr "listar todo"
 
 msgid "list all"
 msgstr "listar todo"
 

-#: builtin/config.c:76
+#: builtin/config.c:141

 msgid "open an editor"
 msgstr "abrir el editor"
 
 msgid "open an editor"
 msgstr "abrir el editor"
 

-#: builtin/config.c:77
+#: builtin/config.c:142

 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:78
+#: builtin/config.c:143

 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:79
+#: builtin/config.c:144

 msgid "Type"
 msgstr "Tipo"
 
 msgid "Type"
 msgstr "Tipo"
 

-#: builtin/config.c:80
+#: builtin/config.c:145
+msgid "value is given this type"
+msgstr "al valor se ha dado este tipo"
+
+#: builtin/config.c:146

 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:81
+#: builtin/config.c:147

 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:82
+#: builtin/config.c:148

 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:83
+#: builtin/config.c:149

 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:84
+#: builtin/config.c:150

 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:85
+#: builtin/config.c:151

 msgid "Other"
 msgstr "Otro"
 
 msgid "Other"
 msgstr "Otro"
 

-#: builtin/config.c:86
+#: builtin/config.c:152

 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:87
+#: builtin/config.c:153

 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:88
+#: builtin/config.c:154

 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:89
+#: builtin/config.c:155

 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:335
+#: builtin/config.c:156
+msgid "value"
+msgstr "valor"
+
+#: builtin/config.c:156
+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
+#, 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

 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:479
+#: builtin/config.c:575

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -8042,16 +8445,20 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
 "#\tname = %s\n"
 "#\temail = %s\n"
 

-#: builtin/config.c:507
+#: builtin/config.c:603

 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:632
+#: builtin/config.c:606
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob solo puede ser usado dentro de un repositorio"
+
+#: builtin/config.c:735

 #, 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:645
+#: builtin/config.c:748

 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"


@@ -8060,11 +8467,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/count-objects.c:88
+#: builtin/count-objects.c:90

 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 

-#: builtin/count-objects.c:98
+#: builtin/count-objects.c:100

 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"
 


@@ -8369,153 +8776,149 @@ msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 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:26
+#: builtin/fast-export.c:27

 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:998
+#: builtin/fast-export.c:1000

 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:1000
+#: builtin/fast-export.c:1002

 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:1003
+#: builtin/fast-export.c:1005

 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:1006
+#: builtin/fast-export.c:1008

 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:1008
+#: builtin/fast-export.c:1010

 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:1010
+#: builtin/fast-export.c:1012

 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:1012
+#: builtin/fast-export.c:1014

 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:1014
+#: builtin/fast-export.c:1016

 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:1015
+#: builtin/fast-export.c:1017

 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:1016
+#: builtin/fast-export.c:1018

 msgid "refspec"
 msgstr "refspec"
 
 msgid "refspec"
 msgstr "refspec"
 

-#: builtin/fast-export.c:1017
+#: builtin/fast-export.c:1019

 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:1018
+#: builtin/fast-export.c:1020

 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 

-#: builtin/fetch.c:25
+#: builtin/fetch.c:26

 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:26
+#: builtin/fetch.c:27

 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 

-#: builtin/fetch.c:27
+#: builtin/fetch.c:28

 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:28
+#: builtin/fetch.c:29

 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 

-#: builtin/fetch.c:124 builtin/pull.c:188
+#: builtin/fetch.c:123 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:126 builtin/pull.c:191
+#: builtin/fetch.c:125 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:128 builtin/pull.c:194
+#: builtin/fetch.c:127 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:129 builtin/pull.c:196
+#: builtin/fetch.c:128 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:131
+#: builtin/fetch.c:130

 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:133 builtin/pull.c:198
+#: builtin/fetch.c:132 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:135
+#: builtin/fetch.c:134

 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:137
+#: builtin/fetch.c:136

 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:139 builtin/pull.c:201
+#: builtin/fetch.c:138 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:141
+#: builtin/fetch.c:140

 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:142 builtin/fetch.c:165 builtin/pull.c:126
+#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131

 msgid "on-demand"
 msgstr "en demanda"
 
 msgid "on-demand"
 msgstr "en demanda"
 

-#: builtin/fetch.c:143
+#: builtin/fetch.c:142

 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:147 builtin/pull.c:209
+#: builtin/fetch.c:146 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:149
+#: builtin/fetch.c:148

 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:152 builtin/fetch.c:158 builtin/pull.c:212
+#: builtin/fetch.c:151 builtin/fetch.c:157 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:154
+#: builtin/fetch.c:153

 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:160 builtin/pull.c:215
+#: builtin/fetch.c:159 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/log.c:1466
-msgid "dir"
-msgstr "dir"
-
-#: builtin/fetch.c:163
+#: builtin/fetch.c:162

 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:166
+#: builtin/fetch.c:165

 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"


@@ -8523,89 +8926,99 @@ 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:170 builtin/pull.c:218
+#: builtin/fetch.c:169 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:171 builtin/pull.c:220
+#: builtin/fetch.c:170 builtin/pull.c:225

 msgid "refmap"
 msgstr "refmap"
 
 msgid "refmap"
 msgstr "refmap"
 

-#: builtin/fetch.c:172 builtin/pull.c:221
+#: builtin/fetch.c:171 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:431
+#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: 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/send-pack.c:173
+msgid "option to transmit"
+msgstr "opción para trasmitir"
+
+#: builtin/fetch.c:442

 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:549
+#: builtin/fetch.c:560

 #, 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:642
+#: builtin/fetch.c:653

 #, 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:646
+#: builtin/fetch.c:657

 msgid "[up to date]"
 msgstr "[actualizado]"
 
 msgid "[up to date]"
 msgstr "[actualizado]"
 

-#: builtin/fetch.c:659 builtin/fetch.c:739
+#: builtin/fetch.c:670 builtin/fetch.c:750

 msgid "[rejected]"
 msgstr "[rechazado]"
 
 msgid "[rejected]"
 msgstr "[rechazado]"
 

-#: builtin/fetch.c:660
+#: builtin/fetch.c:671

 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:669
+#: builtin/fetch.c:680

 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 

-#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
-#: builtin/fetch.c:734
+#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
+#: builtin/fetch.c:745

 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:689
+#: builtin/fetch.c:700

 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 

-#: builtin/fetch.c:692
+#: builtin/fetch.c:703

 msgid "[new branch]"
 msgstr "[nueva rama]"
 
 msgid "[new branch]"
 msgstr "[nueva rama]"
 

-#: builtin/fetch.c:695
+#: builtin/fetch.c:706

 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 

-#: builtin/fetch.c:734
+#: builtin/fetch.c:745

 msgid "forced update"
 msgstr "actualización forzada"
 
 msgid "forced update"
 msgstr "actualización forzada"
 

-#: builtin/fetch.c:739
+#: builtin/fetch.c:750

 msgid "non-fast-forward"
 msgstr "avance lento"
 
 msgid "non-fast-forward"
 msgstr "avance lento"
 

-#: builtin/fetch.c:784
+#: builtin/fetch.c:795

 #, 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:804
+#: builtin/fetch.c:815

 #, 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:892 builtin/fetch.c:988
+#: builtin/fetch.c:903 builtin/fetch.c:999

 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 

-#: builtin/fetch.c:903
+#: builtin/fetch.c:914

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


@@ -8614,56 +9027,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:958
+#: builtin/fetch.c:969

 #, 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:959
+#: builtin/fetch.c:970

 #, 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:991
+#: builtin/fetch.c:1002

 msgid "[deleted]"
 msgstr "[eliminado]"
 
 msgid "[deleted]"
 msgstr "[eliminado]"
 

-#: builtin/fetch.c:992 builtin/remote.c:1024
+#: builtin/fetch.c:1003 builtin/remote.c:1033

 msgid "(none)"
 msgstr "(nada)"
 
 msgid "(none)"
 msgstr "(nada)"
 

-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1026

 #, 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:1034
+#: builtin/fetch.c:1045

 #, 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:1037
+#: builtin/fetch.c:1048

 #, 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:1277
+#: builtin/fetch.c:1287

 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 

-#: builtin/fetch.c:1279 builtin/remote.c:97
+#: builtin/fetch.c:1289 builtin/remote.c:98

 #, 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:1325 builtin/fetch.c:1498
+#: builtin/fetch.c:1335 builtin/fetch.c:1503

 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:1350
+#: builtin/fetch.c:1358

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


@@ -8671,40 +9084,40 @@ msgstr ""
 "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraídas."
 
 "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:1394
+#: builtin/fetch.c:1395

 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:1439
+#: builtin/fetch.c:1444

 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:1441
+#: builtin/fetch.c:1446

 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:1446
+#: builtin/fetch.c:1451

 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:1448
+#: builtin/fetch.c:1453

 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:1464
+#: builtin/fetch.c:1469

 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:1466
+#: builtin/fetch.c:1471

 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:1475
+#: builtin/fetch.c:1480

 #, 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:1482
+#: builtin/fetch.c:1487

 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"
 


@@ -8770,7 +9183,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:420
+#: builtin/for-each-ref.c:39 builtin/tag.c:421

 msgid "respect format colors"
 msgstr "respetar el formato de colores"
 
 msgid "respect format colors"
 msgstr "respetar el formato de colores"
 


@@ -8794,81 +9207,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:568
+#: builtin/fsck.c:569

 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 

-#: builtin/fsck.c:660
+#: builtin/fsck.c:661

 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 

-#: builtin/fsck.c:666
+#: builtin/fsck.c:667

 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 
 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 

-#: builtin/fsck.c:667
+#: builtin/fsck.c:668

 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 
 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 

-#: builtin/fsck.c:668
+#: builtin/fsck.c:669

 msgid "report tags"
 msgstr "reportar tags"
 
 msgid "report tags"
 msgstr "reportar tags"
 

-#: builtin/fsck.c:669
+#: builtin/fsck.c:670

 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 

-#: builtin/fsck.c:670
+#: builtin/fsck.c:671

 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:671
+#: builtin/fsck.c:672

 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:672
+#: builtin/fsck.c:673

 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:673
+#: builtin/fsck.c:674

 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 

-#: builtin/fsck.c:674
+#: builtin/fsck.c:675

 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:676
+#: builtin/fsck.c:677

 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:677 builtin/prune.c:108
+#: builtin/fsck.c:678 builtin/prune.c:109

 msgid "show progress"
 msgstr "mostrar progreso"
 
 msgid "show progress"
 msgstr "mostrar progreso"
 

-#: builtin/fsck.c:678
+#: builtin/fsck.c:679

 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:742
+#: builtin/fsck.c:745

 msgid "Checking objects"
 msgstr "Revisando objetos"
 
 msgid "Checking objects"
 msgstr "Revisando objetos"
 

-#: builtin/gc.c:27
+#: builtin/gc.c:33

 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 

-#: builtin/gc.c:80
+#: builtin/gc.c:88

 #, 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:312
+#: builtin/gc.c:452

 #, 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:321
+#: builtin/gc.c:461

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


@@ -8883,45 +9296,54 @@ msgstr ""
 "\n"
 "%s"
 
 "\n"
 "%s"
 

-#: builtin/gc.c:360
+#: builtin/gc.c:502

 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 
 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 

-#: builtin/gc.c:362
+#: builtin/gc.c:504

 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:363
+#: builtin/gc.c:505

 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 

-#: builtin/gc.c:366
+#: builtin/gc.c:508

 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:384
+#: builtin/gc.c:511
+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
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "falló al analizar valor %s de gc.logexpirity"
+
+#: builtin/gc.c:539

 #, c-format
 #, c-format

-msgid "Failed to parse gc.logexpiry value %s"
-msgstr "Falló al analizar valor %s de gc.logexpirity"
+msgid "failed to parse prune expiry value %s"
+msgstr "falló al analizar valor %s de prune expiry"

 
 

-#: builtin/gc.c:412
+#: builtin/gc.c:559

 #, 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:414
+#: builtin/gc.c:561

 #, 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:415
+#: builtin/gc.c:562

 #, 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:440
+#: builtin/gc.c:598

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


@@ -8929,23 +9351,23 @@ msgstr ""
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
 "es así)"
 
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
 "es así)"
 

-#: builtin/gc.c:487
+#: builtin/gc.c:645

 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
 "removerlos."
 
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
 "removerlos."
 

-#: builtin/grep.c:27
+#: builtin/grep.c:28

 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 

-#: builtin/grep.c:225
+#: builtin/grep.c:226

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 

-#: builtin/grep.c:283
+#: builtin/grep.c:284

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"


@@ -8954,17 +9376,17 @@ 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:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
+#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 

-#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
+#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  árbol (%s)"
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  árbol (%s)"
 

-#: builtin/grep.c:637
+#: builtin/grep.c:638

 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"


@@ -9167,7 +9589,7 @@ msgstr "--no-index o --untracked no se puede usar con revs"
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisión: %s"
 
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisión: %s"
 

-#: builtin/grep.c:1036 builtin/index-pack.c:1519
+#: builtin/grep.c:1036 builtin/index-pack.c:1527

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


@@ -9274,11 +9696,11 @@ msgstr "formato help no reconocido '%s'"
 
 #: builtin/help.c:94
 msgid "Failed to start emacsclient."
 
 #: builtin/help.c:94
 msgid "Failed to start emacsclient."

-msgstr "Fallo al iniciar emacsclient."
+msgstr "Falló al iniciar emacsclient."

 
 #: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 
 #: builtin/help.c:107
 msgid "Failed to parse emacsclient version."

-msgstr "Fallo al analizar la versión de emacsclient."
+msgstr "Falló al analizar la versión de emacsclient."

 
 #: builtin/help.c:115
 #, c-format
 
 #: builtin/help.c:115
 #, c-format


@@ -9288,7 +9710,7 @@ msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
 #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"
 #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
 #, c-format
 msgid "failed to exec '%s'"

-msgstr "fallo al ejecutar '%s'"
+msgstr "falló al ejecutar '%s'"

 
 #: builtin/help.c:211
 #, c-format
 
 #: builtin/help.c:211
 #, c-format


@@ -9367,299 +9789,303 @@ msgstr "'%s' tiene el alias '%s'"
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 

-#: builtin/index-pack.c:157
+#: builtin/index-pack.c:158

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

-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208

 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 

-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228

 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no se recibió el objeto esperado %s"
 
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no se recibió el objeto esperado %s"
 

-#: builtin/index-pack.c:230
+#: builtin/index-pack.c:231

 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 

-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273

 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no se puede llenar %d byte"
 msgstr[1] "no se pueden llenar %d bytes"
 
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no se puede llenar %d byte"
 msgstr[1] "no se pueden llenar %d bytes"
 

-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283

 msgid "early EOF"
 msgstr "EOF temprano"
 
 msgid "early EOF"
 msgstr "EOF temprano"
 

-#: builtin/index-pack.c:283
+#: builtin/index-pack.c:284

 msgid "read error on input"
 msgstr "leer error en input"
 
 msgid "read error on input"
 msgstr "leer error en input"
 

-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:296

 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:302
+#: builtin/index-pack.c:303

 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:305 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:93

 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 

-#: builtin/index-pack.c:320
+#: builtin/index-pack.c:321

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

-#: builtin/index-pack.c:326
+#: builtin/index-pack.c:327

 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "no se puede abrir el archivo de paquete '%s'"
 
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "no se puede abrir el archivo de paquete '%s'"
 

-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341

 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 
 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 

-#: builtin/index-pack.c:342
+#: builtin/index-pack.c:343

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 

-#: builtin/index-pack.c:360
+#: builtin/index-pack.c:361

 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
 
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
 

-#: builtin/index-pack.c:481
+#: builtin/index-pack.c:482

 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate retornó %d"
 
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate retornó %d"
 

-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531

 msgid "offset value overflow for delta base object"
 msgstr "valor de offset desbordado para el objeto base delta"
 
 msgid "offset value overflow for delta base object"
 msgstr "valor de offset desbordado para el objeto base delta"
 

-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:539

 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 
 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 

-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:547

 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 

-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578

 msgid "cannot pread pack file"
 msgstr "no se puede propagar el paquete"
 
 msgid "cannot pread pack file"
 msgstr "no se puede propagar el paquete"
 

-#: builtin/index-pack.c:579
+#: builtin/index-pack.c:580

 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
 msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
 msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 

-#: builtin/index-pack.c:605
+#: builtin/index-pack.c:606

 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 

-#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
-#: builtin/index-pack.c:818 builtin/index-pack.c:827
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
+#: builtin/index-pack.c:819 builtin/index-pack.c:828

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
 

-#: builtin/index-pack.c:753 builtin/pack-objects.c:182
-#: builtin/pack-objects.c:276
+#: builtin/index-pack.c:754 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:292

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

-#: builtin/index-pack.c:816
+#: builtin/index-pack.c:817

 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no se puede leer la información existente del objeto %s"
 
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no se puede leer la información existente del objeto %s"
 

-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:825

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

-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:839

 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 

-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:842 builtin/index-pack.c:860
+msgid "fsck error in packed object"
+msgstr "error de fsck en el objeto empaquetado"
+
+#: builtin/index-pack.c:857

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

-#: builtin/index-pack.c:856
-msgid "Error in object"
-msgstr "Error en el objeto"
-
-#: builtin/index-pack.c:858
+#: builtin/index-pack.c:862

 #, 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:930 builtin/index-pack.c:961
+#: builtin/index-pack.c:934 builtin/index-pack.c:965

 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 

-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135

 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 

-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135

 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 

-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169

 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:1170
+#: builtin/index-pack.c:1174

 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:1173
+#: builtin/index-pack.c:1177

 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:1185
+#: builtin/index-pack.c:1189

 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:1208
+#: builtin/index-pack.c:1212

 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 

-#: builtin/index-pack.c:1219
+#: builtin/index-pack.c:1223

 #, 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:1261
+#: builtin/index-pack.c:1265

 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:1267
+#: builtin/index-pack.c:1271

 #, 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:1279
+#: builtin/index-pack.c:1283

 #, 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:1283
+#: builtin/index-pack.c:1287

 #, 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:1307
+#: builtin/index-pack.c:1311

 #, 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:1383
+#: builtin/index-pack.c:1388

 #, 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:1397
+#: builtin/index-pack.c:1402

 #, 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:1422
+#: builtin/index-pack.c:1427

 #, 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:1430
+#: builtin/index-pack.c:1435

 #, 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:1454
+#: builtin/index-pack.c:1459

 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:1468
+#: builtin/index-pack.c:1473

 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:1476
+#: builtin/index-pack.c:1481

 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:1513
+#: builtin/index-pack.c:1521

 #, 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:1581
+#: builtin/index-pack.c:1590

 #, 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:1583
+#: builtin/index-pack.c:1592

 #, 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:1631
+#: builtin/index-pack.c:1640

 #, 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:1638
+#: builtin/index-pack.c:1647

 #, 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:1675
+#: builtin/index-pack.c:1684

 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:1724 builtin/index-pack.c:1727
-#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
+#: builtin/index-pack.c:1754 builtin/index-pack.c:1758

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

-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1774

 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:1765
+#: builtin/index-pack.c:1776

 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:1771
+#: builtin/index-pack.c:1782

 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:1832 builtin/unpack-objects.c:578
+msgid "fsck error in pack objects"
+msgstr "error de fsck en objetos paquete"
+

 #: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 #: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"


@@ -9757,11 +10183,6 @@ 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"
 
 msgstr ""
 "especifica que el repositorio de git será compartido entre varios usuarios"
 

-#: builtin/init-db.c:516 builtin/init-db.c:521
-#, c-format
-msgid "cannot mkdir %s"
-msgstr "no se pude crear directorio %s"
-

 #: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 #: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"


@@ -9945,7 +10366,7 @@ msgstr "Dos directorios de salida?"
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 

-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523

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


@@ -9968,7 +10389,7 @@ msgstr ""
 
 #: builtin/log.c:1318
 msgid "Failed to find exact merge base"
 
 #: builtin/log.c:1318
 msgid "Failed to find exact merge base"

-msgstr "Fallo al encontrar una base de fusión exacta"
+msgstr "Falló al encontrar una base de fusión exacta"

 
 #: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"
 
 #: builtin/log.c:1329
 msgid "base commit should be the ancestor of revision list"


@@ -10305,7 +10726,7 @@ msgstr ""
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 

-#: builtin/ls-remote.c:7
+#: builtin/ls-remote.c:9

 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"


@@ -10315,39 +10736,39 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repositorio> [<refs>...]]"
 
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repositorio> [<refs>...]]"
 

-#: builtin/ls-remote.c:52
+#: builtin/ls-remote.c:59

 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 

-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62

 msgid "exec"
 msgstr "ejecutar"
 
 msgid "exec"
 msgstr "ejecutar"
 

-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63

 msgid "path of git-upload-pack on the remote host"
 msgstr "ruta de git-upload-pack en el host remoto"
 
 msgid "path of git-upload-pack on the remote host"
 msgstr "ruta de git-upload-pack en el host remoto"
 

-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:65

 msgid "limit to tags"
 msgstr "limitar a tags"
 
 msgid "limit to tags"
 msgstr "limitar a tags"
 

-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:66

 msgid "limit to heads"
 msgstr "limitar a heads"
 
 msgid "limit to heads"
 msgstr "limitar a heads"
 

-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:67

 msgid "do not show peeled tags"
 msgstr "no mostrar tags pelados"
 
 msgid "do not show peeled tags"
 msgstr "no mostrar tags pelados"
 

-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:69

 msgid "take url.<base>.insteadOf into account"
 msgstr "tomar url.<base>.insteadOf en cuenta"
 
 msgid "take url.<base>.insteadOf into account"
 msgstr "tomar url.<base>.insteadOf en cuenta"
 

-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:73

 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 

-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:76

 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"
 


@@ -10393,153 +10814,153 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 

-#: builtin/merge.c:49
+#: builtin/merge.c:50

 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 

-#: builtin/merge.c:50
+#: builtin/merge.c:51

 msgid "git merge --abort"
 msgstr "git merge --abort"
 
 msgid "git merge --abort"
 msgstr "git merge --abort"
 

-#: builtin/merge.c:51
+#: builtin/merge.c:52

 msgid "git merge --continue"
 msgstr "git merge --continue"
 
 msgid "git merge --continue"
 msgstr "git merge --continue"
 

-#: builtin/merge.c:108
+#: builtin/merge.c:109

 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:145
+#: builtin/merge.c:146

 #, 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:146
+#: builtin/merge.c:147

 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 

-#: builtin/merge.c:151
+#: builtin/merge.c:152

 #, 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:201 builtin/pull.c:137
+#: builtin/merge.c:202 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:204 builtin/pull.c:140
+#: builtin/merge.c:205 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:205 builtin/pull.c:143
+#: builtin/merge.c:206 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:207 builtin/pull.c:146
+#: builtin/merge.c:208 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:210 builtin/pull.c:152
+#: builtin/merge.c:211 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:212 builtin/pull.c:155
+#: builtin/merge.c:213 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:214 builtin/pull.c:158
+#: builtin/merge.c:215 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:215
+#: builtin/merge.c:216

 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 

-#: builtin/merge.c:217 builtin/pull.c:164
+#: builtin/merge.c:218 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:221 builtin/pull.c:167
+#: builtin/merge.c:222 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:222 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176

 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "estrategia"
 
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr "estrategia"
 

-#: builtin/merge.c:223 builtin/pull.c:172
+#: builtin/merge.c:224 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:224 builtin/pull.c:175
+#: builtin/merge.c:225 builtin/pull.c:180

 msgid "option=value"
 msgstr "opción=valor"
 
 msgid "option=value"
 msgstr "opción=valor"
 

-#: builtin/merge.c:225 builtin/pull.c:176
+#: builtin/merge.c:226 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:227
+#: builtin/merge.c:228

 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:231
+#: builtin/merge.c:232

 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:233
+#: builtin/merge.c:234

 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:235 builtin/pull.c:183
+#: builtin/merge.c:236 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:241
+#: builtin/merge.c:242

 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:266
+#: builtin/merge.c:267

 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:271
+#: builtin/merge.c:272

 msgid "stash failed"
 msgstr "stash falló"
 
 msgid "stash failed"
 msgstr "stash falló"
 

-#: builtin/merge.c:276
+#: builtin/merge.c:277

 #, 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:298 builtin/merge.c:315
+#: builtin/merge.c:299 builtin/merge.c:316

 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 

-#: builtin/merge.c:345
+#: builtin/merge.c:346

 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 

-#: builtin/merge.c:356
+#: builtin/merge.c:357

 #, 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:406
+#: builtin/merge.c:407

 #, 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:456
+#: builtin/merge.c:457

 #, 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:546
+#: builtin/merge.c:547

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


@@ -10558,19 +10979,19 @@ msgstr "Opción desconocida para merge-recursive: -X%s"
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 

-#: builtin/merge.c:749
+#: builtin/merge.c:748

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

 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "No se realiza commit de la fusión; use 'git commit' para completar la "
 "fusión.\n"
 
 #, 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:763

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


@@ -10587,70 +11008,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:799

 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 

-#: builtin/merge.c:820
+#: builtin/merge.c:818

 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 

-#: builtin/merge.c:873
+#: builtin/merge.c:871

 #, 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:912
+#: builtin/merge.c:910

 msgid "No current branch."
 msgstr "No rama actual."
 
 msgid "No current branch."
 msgstr "No rama actual."
 

-#: builtin/merge.c:914
+#: builtin/merge.c:912

 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:916
+#: builtin/merge.c:914

 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:921
+#: builtin/merge.c:919

 #, 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:974
+#: builtin/merge.c:972

 #, 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:1076
+#: builtin/merge.c:1074

 #, 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:1110
+#: builtin/merge.c:1108

 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:1212
+#: builtin/merge.c:1210

 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 

-#: builtin/merge.c:1216
+#: builtin/merge.c:1214

 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:1228
+#: builtin/merge.c:1226

 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 

-#: builtin/merge.c:1232
+#: builtin/merge.c:1230

 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:1248
+#: builtin/merge.c:1246

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


@@ -10658,7 +11079,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:1255
+#: builtin/merge.c:1253

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


@@ -10666,113 +11087,113 @@ 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:1258
+#: builtin/merge.c:1256

 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:1267
+#: builtin/merge.c:1265

 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:1275
+#: builtin/merge.c:1273

 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:1292
+#: builtin/merge.c:1290

 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:1294
+#: builtin/merge.c:1292

 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:1299
+#: builtin/merge.c:1297

 #, 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:1301
+#: builtin/merge.c:1299

 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:1335
+#: builtin/merge.c:1333

 #, 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:1338
+#: builtin/merge.c:1336

 #, 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:1341
+#: builtin/merge.c:1339

 #, 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:1344
+#: builtin/merge.c:1342

 #, 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:1403
+#: builtin/merge.c:1401

 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:1412
+#: builtin/merge.c:1410

 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 

-#: builtin/merge.c:1422
+#: builtin/merge.c:1420

 #, 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:1463
+#: builtin/merge.c:1461

 #, 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:1470
+#: builtin/merge.c:1468

 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 

-#: builtin/merge.c:1495
+#: builtin/merge.c:1493

 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:1501
+#: builtin/merge.c:1499

 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:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601

 #, 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:1528
+#: builtin/merge.c:1526

 #, 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:1594
+#: builtin/merge.c:1592

 #, 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:1596
+#: builtin/merge.c:1594

 #, 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:1605
+#: builtin/merge.c:1603

 #, 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:1617
+#: builtin/merge.c:1615

 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""


@@ -10909,27 +11330,27 @@ msgstr "permitir la creación de más de un árbol"
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opciones>] <fuente>... <destino>"
 
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opciones>] <fuente>... <destino>"
 

-#: builtin/mv.c:83
+#: builtin/mv.c:82

 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Directorio %s está en el índice y no hay submódulo?"
 
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Directorio %s está en el índice y no hay submódulo?"
 

-#: builtin/mv.c:85 builtin/rm.c:289
+#: builtin/mv.c:84 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"
 
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 

-#: builtin/mv.c:103
+#: builtin/mv.c:102

 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está en el índice"
 
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está en el índice"
 

-#: builtin/mv.c:125
+#: builtin/mv.c:124

 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el objetivo existe"
 
 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el objetivo existe"
 

-#: builtin/mv.c:127
+#: builtin/mv.c:126

 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 
 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 


@@ -10994,7 +11415,7 @@ 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:712 builtin/repack.c:394
+#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409

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


@@ -11188,12 +11609,12 @@ msgstr "incapaz de escribir el objeto de nota"
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 
 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:506
+#: builtin/notes.c:234 builtin/tag.c:507

 #, 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:509
+#: builtin/notes.c:236 builtin/tag.c:510

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


@@ -11439,7 +11860,7 @@ msgstr "intentar remover una nota no existente no es un error"
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 

-#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
+#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151

 msgid "do not remove, show only"
 msgstr "no remover, solo mostrar"
 
 msgid "do not remove, show only"
 msgstr "no remover, solo mostrar"
 


@@ -11460,218 +11881,246 @@ msgstr "usar notas desde <referencia-de-notas>"
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 

-#: builtin/pack-objects.c:33
+#: builtin/pack-objects.c:48

 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
 "objetos>]"
 
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
 "objetos>]"
 

-#: builtin/pack-objects.c:34
+#: builtin/pack-objects.c:49

 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 

-#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:214

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

-#: builtin/pack-objects.c:791
+#: builtin/pack-objects.c:810

 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:804
+#: builtin/pack-objects.c:823

 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 

-#: builtin/pack-objects.c:1084
+#: builtin/pack-objects.c:1106

 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:2454
+#: builtin/pack-objects.c:1765
+msgid "Counting objects"
+msgstr "Contando objetos"
+
+#: builtin/pack-objects.c:1895
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaño de %s"
+
+#: builtin/pack-objects.c:1910
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "incapaz de analizar header del objeto %s"
+
+#: builtin/pack-objects.c:2564

 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 

-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2735

 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:2928
+#: builtin/pack-objects.c:3067

 #, 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:2932
+#: builtin/pack-objects.c:3071

 #, 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:2962
+#: builtin/pack-objects.c:3102

 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:2964
+#: builtin/pack-objects.c:3104

 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 
 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 

-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:3106

 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:2969
+#: builtin/pack-objects.c:3109

 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:2970
+#: builtin/pack-objects.c:3110

 msgid "version[,offset]"
 msgstr "versión[,offset]"
 
 msgid "version[,offset]"
 msgstr "versión[,offset]"
 

-#: builtin/pack-objects.c:2971
+#: builtin/pack-objects.c:3111

 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:2974
+#: builtin/pack-objects.c:3114

 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:2976
+#: builtin/pack-objects.c:3116

 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:2978
+#: builtin/pack-objects.c:3118

 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 
 msgid "ignore packed objects"
 msgstr "ignorar objetos paquete"
 

-#: builtin/pack-objects.c:2980
+#: builtin/pack-objects.c:3120

 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:2982
+#: builtin/pack-objects.c:3122

 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:2984
+#: builtin/pack-objects.c:3124

 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:2986
+#: builtin/pack-objects.c:3126

 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 

-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3128

 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 

-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3130

 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 

-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3132

 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:2994
+#: builtin/pack-objects.c:3134

 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:2996
+#: builtin/pack-objects.c:3136

 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:2998
+#: builtin/pack-objects.c:3138

 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:3001
+#: builtin/pack-objects.c:3141

 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:3004
+#: builtin/pack-objects.c:3144

 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:3007
+#: builtin/pack-objects.c:3147

 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:3010
+#: builtin/pack-objects.c:3150

 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 

-#: builtin/pack-objects.c:3012
+#: builtin/pack-objects.c:3152

 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:3014
+#: builtin/pack-objects.c:3154

 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 

-#: builtin/pack-objects.c:3016
+#: builtin/pack-objects.c:3156

 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 

-#: builtin/pack-objects.c:3018
+#: builtin/pack-objects.c:3158

 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:3021
+#: builtin/pack-objects.c:3161

 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 

-#: builtin/pack-objects.c:3023
+#: builtin/pack-objects.c:3163

 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:3025
+#: builtin/pack-objects.c:3165

 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:3027
+#: builtin/pack-objects.c:3167
+msgid "ignore this pack"
+msgstr "ignorar este paquete"
+
+#: builtin/pack-objects.c:3169

 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:3029
+#: builtin/pack-objects.c:3171

 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:3031
+#: builtin/pack-objects.c:3173

 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:3033
+#: builtin/pack-objects.c:3175

 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:3036
+#: builtin/pack-objects.c:3178

 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 

-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3181

 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:3178
-msgid "Counting objects"
-msgstr "Contando objetos"
+#: builtin/pack-objects.c:3205
+#, 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-refs.c:6
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
+
+#: builtin/pack-objects.c:3338
+msgid "Enumerating objects"
+msgstr "Enumerando objetos"
+
+#: builtin/pack-refs.c:7

 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opciones>]"
 
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opciones>]"
 

-#: builtin/pack-refs.c:14
+#: builtin/pack-refs.c:15

 msgid "pack everything"
 msgstr "empaquetar todo"
 
 msgid "pack everything"
 msgstr "empaquetar todo"
 

-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16

 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 
 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 


@@ -11687,78 +12136,78 @@ msgstr "Removiendo objetos duplicados"
 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:107
+#: builtin/prune.c:108

 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 
 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 

-#: builtin/prune.c:110
+#: builtin/prune.c:111

 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:112
+#: builtin/prune.c:113

 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:126
+#: builtin/prune.c:127

 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 
 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 

-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/pull.c:59 builtin/pull.c:61

 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido para %s: %s"
 
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido para %s: %s"
 

-#: builtin/pull.c:76
+#: builtin/pull.c:81

 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 

-#: builtin/pull.c:127
+#: builtin/pull.c:132

 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 
 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 

-#: builtin/pull.c:131
+#: builtin/pull.c:136

 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 
 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 

-#: builtin/pull.c:134
+#: builtin/pull.c:139

 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:161 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121

 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 

-#: builtin/pull.c:170
+#: builtin/pull.c:175

 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
 
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
 

-#: builtin/pull.c:186
+#: builtin/pull.c:191

 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 
 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 

-#: builtin/pull.c:204
+#: builtin/pull.c:209

 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 
 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 

-#: builtin/pull.c:299
+#: builtin/pull.c:304

 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido para pull.ff: %s"
 
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido para pull.ff: %s"
 

-#: builtin/pull.c:415
+#: builtin/pull.c:420

 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
 
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
 

-#: builtin/pull.c:417
+#: builtin/pull.c:422

 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hay candidatos para fusionar entre las refs que has bajado con fetch."
 
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hay candidatos para fusionar entre las refs que has bajado con fetch."
 

-#: builtin/pull.c:418
+#: builtin/pull.c:423

 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."


@@ -11767,7 +12216,7 @@ msgstr ""
 "tiene\n"
 "concordancia en el final remoto."
 
 "tiene\n"
 "concordancia en el final remoto."
 

-#: builtin/pull.c:421
+#: builtin/pull.c:426

 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"


@@ -11778,44 +12227,44 @@ msgstr ""
 "una rama. Porque este no es el remoto configurado por default\n"
 "para tu rama actual, tienes que especificar una rama en la línea de comando."
 
 "una rama. Porque este no es el remoto configurado por default\n"
 "para tu rama actual, tienes que especificar una rama en la línea de comando."
 

-#: builtin/pull.c:426 git-parse-remote.sh:73
+#: builtin/pull.c:431 git-parse-remote.sh:73

 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en la rama."
 
 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en la rama."
 

-#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
+#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79

 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 
 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 

-#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82

 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 
 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 

-#: builtin/pull.c:431 builtin/pull.c:446
+#: builtin/pull.c:436 builtin/pull.c:451

 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 

-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
+#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453

 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remoto>"
 
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remoto>"
 

-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523

 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"
 
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<rama>"
 

-#: builtin/pull.c:441 git-parse-remote.sh:75
+#: builtin/pull.c:446 git-parse-remote.sh:75

 msgid "There is no tracking information for the current branch."
 msgstr "No hay información de rastreo para la rama actual."
 
 msgid "There is no tracking information for the current branch."
 msgstr "No hay información de rastreo para la rama actual."
 

-#: builtin/pull.c:450 git-parse-remote.sh:95
+#: builtin/pull.c:455 git-parse-remote.sh:95

 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si deseas configurar el rastreo de información para esta rama, puedes "
 "hacerlo con:"
 
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si deseas configurar el rastreo de información para esta rama, puedes "
 "hacerlo con:"
 

-#: builtin/pull.c:455
+#: builtin/pull.c:460

 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"


@@ -11824,27 +12273,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:819
+#: builtin/pull.c:826

 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:867
+#: builtin/pull.c:874

 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:875
+#: builtin/pull.c:882

 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:878
+#: builtin/pull.c:885

 msgid "pull with rebase"
 msgstr "pull con rebase"
 
 msgid "pull with rebase"
 msgstr "pull con rebase"
 

-#: builtin/pull.c:879
+#: builtin/pull.c:886

 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:904
+#: builtin/pull.c:911

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -11855,7 +12304,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:909
+#: builtin/pull.c:916

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -11872,33 +12321,33 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
 "$ git reset --hard\n"
 "para recuperar."
 

-#: builtin/pull.c:924
+#: builtin/pull.c:931

 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:928
+#: builtin/pull.c:935

 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:935
+#: builtin/pull.c:942

 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"
 

-#: builtin/push.c:17
+#: builtin/push.c:19

 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
 
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
 

-#: builtin/push.c:92
+#: builtin/push.c:111

 msgid "tag shorthand without <tag>"
 msgstr "taquigrafía de tag sin <tag>"
 
 msgid "tag shorthand without <tag>"
 msgstr "taquigrafía de tag sin <tag>"
 

-#: builtin/push.c:102
+#: builtin/push.c:121

 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 

-#: builtin/push.c:146
+#: builtin/push.c:165

 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."


@@ -11907,7 +12356,7 @@ msgstr ""
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 

-#: builtin/push.c:149
+#: builtin/push.c:168

 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"


@@ -11932,7 +12381,7 @@ msgstr ""
 "\tgit push %s %s\n"
 "%s"
 
 "\tgit push %s %s\n"
 "%s"
 

-#: builtin/push.c:164
+#: builtin/push.c:183

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -11947,7 +12396,7 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 

-#: builtin/push.c:178
+#: builtin/push.c:197

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -11961,12 +12410,12 @@ msgstr ""
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
 "\n"
 "\tgit push --set-upstream %s %s\n"
 

-#: builtin/push.c:186
+#: builtin/push.c:205

 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
 
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
 

-#: builtin/push.c:189
+#: builtin/push.c:208

 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"


@@ -11977,13 +12426,13 @@ msgstr ""
 "su rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 
 "su rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 

-#: builtin/push.c:248
+#: builtin/push.c:267

 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
 
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
 

-#: builtin/push.c:255
+#: builtin/push.c:274

 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"


@@ -11995,7 +12444,7 @@ msgstr ""
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
 
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
 

-#: builtin/push.c:261
+#: builtin/push.c:280

 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"


@@ -12008,7 +12457,7 @@ msgstr ""
 "(ejem. 'git pull ...') antes de volver a hacer push.\n"
 "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
 
 "(ejem. 'git pull ...') antes de volver a hacer push.\n"
 "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
 

-#: builtin/push.c:267
+#: builtin/push.c:286

 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"


@@ -12022,12 +12471,12 @@ msgstr ""
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
 "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
 
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
 "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
 

-#: builtin/push.c:274
+#: builtin/push.c:293

 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 

-#: builtin/push.c:277
+#: builtin/push.c:296

 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"


@@ -12037,22 +12486,22 @@ msgstr ""
 "o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
 "sin usar la opción '--force'.\n"
 
 "o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
 "sin usar la opción '--force'.\n"
 

-#: builtin/push.c:337
+#: builtin/push.c:357

 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 

-#: builtin/push.c:341
+#: builtin/push.c:361

 #, c-format
 msgid "failed to push some refs to '%s'"
 #, c-format
 msgid "failed to push some refs to '%s'"

-msgstr "fallo el push de algunas referencias a '%s'"
+msgstr "falló el push de algunas referencias a '%s'"

 
 

-#: builtin/push.c:372
+#: builtin/push.c:395

 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 

-#: builtin/push.c:373
+#: builtin/push.c:396

 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "


@@ -12074,112 +12523,104 @@ msgstr ""
 "\n"
 "    git push <nombre>\n"
 
 "\n"
 "    git push <nombre>\n"
 

-#: builtin/push.c:391
-msgid "--all and --tags are incompatible"
-msgstr "--all y --tags son incompatibles"
+#: builtin/push.c:551
+msgid "repository"
+msgstr "repositorio"

 
 

-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
-msgstr "--all no puede ser combinada con refspecs"
-
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror y --tags son incompatibles"
-
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror no puede ser combinado con refspecs"
-
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
-msgstr "--all y --mirror son incompatibles"
-
-#: builtin/push.c:535
-msgid "repository"
-msgstr "repositorio"
-
-#: builtin/push.c:536 builtin/send-pack.c:163
+#: builtin/push.c:552 builtin/send-pack.c:164

 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 
 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 

-#: builtin/push.c:537 builtin/send-pack.c:165
+#: builtin/push.c:553 builtin/send-pack.c:166

 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 

-#: builtin/push.c:539
+#: builtin/push.c:555

 msgid "delete refs"
 msgstr "borrar refs"
 
 msgid "delete refs"
 msgstr "borrar refs"
 

-#: builtin/push.c:540
+#: builtin/push.c:556

 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
 
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
 

-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:559 builtin/send-pack.c:167

 msgid "force updates"
 msgstr "forzar actualizaciones"
 
 msgid "force updates"
 msgstr "forzar actualizaciones"
 

-#: builtin/push.c:545 builtin/send-pack.c:180
+#: builtin/push.c:561 builtin/send-pack.c:181

 msgid "refname>:<expect"
 msgstr "refname>:<expect"
 
 msgid "refname>:<expect"
 msgstr "refname>:<expect"
 

-#: builtin/push.c:546 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:182

 msgid "require old value of ref to be at this value"
 msgstr "requiere haber valor viejo de ref en este valor"
 
 msgid "require old value of ref to be at this value"
 msgstr "requiere haber valor viejo de ref en este valor"
 

-#: builtin/push.c:549
+#: builtin/push.c:565

 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 
 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 

-#: builtin/push.c:551 builtin/send-pack.c:174
+#: builtin/push.c:567 builtin/send-pack.c:175

 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 
 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 

-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162

 msgid "receive pack program"
 msgstr "recibir programa de paquete"
 
 msgid "receive pack program"
 msgstr "recibir programa de paquete"
 

-#: builtin/push.c:554
+#: builtin/push.c:570

 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pulll/status"
 
 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pulll/status"
 

-#: builtin/push.c:557
+#: builtin/push.c:573

 msgid "prune locally removed refs"
 msgstr "recortando refs removidas localmente"
 
 msgid "prune locally removed refs"
 msgstr "recortando refs removidas localmente"
 

-#: builtin/push.c:559
+#: builtin/push.c:575

 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 

-#: builtin/push.c:560
+#: builtin/push.c:576

 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 
 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 

-#: builtin/push.c:563 builtin/send-pack.c:168
+#: builtin/push.c:579 builtin/send-pack.c:169

 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 
 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 

-#: builtin/push.c:565 builtin/send-pack.c:175
+#: builtin/push.c:581 builtin/send-pack.c:176

 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 
 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 

-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
-msgstr "especifico-de-servidor"
-
-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
-msgstr "opción para trasmitir"
-
-#: builtin/push.c:583
+#: builtin/push.c:599

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 

-#: builtin/push.c:585
+#: builtin/push.c:601

 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
 #: builtin/push.c:604
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
 #: builtin/push.c:604

+msgid "--all and --tags are incompatible"
+msgstr "--all y --tags son incompatibles"
+
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
+msgstr "--all no puede ser combinada con refspecs"
+
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror y --tags son incompatibles"
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror no puede ser combinado con refspecs"
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr "--all y --mirror son incompatibles"
+
+#: builtin/push.c:634

 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"
 


@@ -12194,67 +12635,67 @@ msgstr ""
 "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
 "ismo2> [<árbol-ismo3>]])"
 
 "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
 "ismo2> [<árbol-ismo3>]])"
 

-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:120

 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 
 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 

-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:123

 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 
 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 

-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:125

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

-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:127

 msgid "perform a merge in addition to a read"
 msgstr "realizar un merge en adición a una lectura"
 
 msgid "perform a merge in addition to a read"
 msgstr "realizar un merge en adición a una lectura"
 

-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:129

 msgid "3-way merge if no file level merging required"
 msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
 
 msgid "3-way merge if no file level merging required"
 msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
 

-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:131

 msgid "3-way merge in presence of adds and removes"
 msgstr "fusión en 3-vías en presencia de adiciones y remociones"
 
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusión en 3-vías en presencia de adiciones y remociones"
 

-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:133

 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 
 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 

-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:134

 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 
 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 

-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:135

 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lea el árbol en el índice bajo <subdirectorio>/"
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lea el árbol en el índice bajo <subdirectorio>/"
 

-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:138

 msgid "update working tree with merge result"
 msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
 
 msgid "update working tree with merge result"
 msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
 

-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:140

 msgid "gitignore"
 msgstr "gitignore"
 
 msgid "gitignore"
 msgstr "gitignore"
 

-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:141

 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir sobrescritura de archivos explícitamente ignorados"
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir sobrescritura de archivos explícitamente ignorados"
 

-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:144

 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 
 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 

-#: builtin/read-tree.c:146
+#: builtin/read-tree.c:145

 msgid "don't update the index or the work tree"
 msgstr "no actualizar el índice o el árbol de trabajo"
 
 msgid "don't update the index or the work tree"
 msgstr "no actualizar el índice o el árbol de trabajo"
 

-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:147

 msgid "skip applying sparse checkout filter"
 msgstr "saltar aplicado de filtro de sparse checkout"
 
 msgid "skip applying sparse checkout filter"
 msgstr "saltar aplicado de filtro de sparse checkout"
 

-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:149

 msgid "debug unpack-trees"
 msgstr "debug de árboles-desempacados"
 
 msgid "debug unpack-trees"
 msgstr "debug de árboles-desempacados"
 


@@ -12271,46 +12712,58 @@ msgid "allow commits with empty messages"
 msgstr "permitir commits con mensajes vacíos"
 
 #: builtin/rebase--helper.c:27
 msgstr "permitir commits con mensajes vacíos"
 
 #: builtin/rebase--helper.c:27

+msgid "rebase merge commits"
+msgstr "rebasando commits de fusión"
+
+#: builtin/rebase--helper.c:29
+msgid "keep original branch points of cousins"
+msgstr "mantener puntos originales de la rama de sus primos"
+
+#: builtin/rebase--helper.c:30

 msgid "continue rebase"
 msgstr "continuar rebase"
 
 msgid "continue rebase"
 msgstr "continuar rebase"
 

-#: builtin/rebase--helper.c:29
+#: builtin/rebase--helper.c:32

 msgid "abort rebase"
 msgstr "abortar rebase"
 
 msgid "abort rebase"
 msgstr "abortar rebase"
 

-#: builtin/rebase--helper.c:32
+#: builtin/rebase--helper.c:35

 msgid "make rebase script"
 msgstr "generar script de rebase"
 
 msgid "make rebase script"
 msgstr "generar script de rebase"
 

-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:37

 msgid "shorten commit ids in the todo list"
 msgstr "ids de commits cortos en la lista de pendientes"
 
 msgid "shorten commit ids in the todo list"
 msgstr "ids de commits cortos en la lista de pendientes"
 

-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:39

 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 
 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 

-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:41

 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 
 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 

-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:43

 msgid "skip unnecessary picks"
 msgstr "saltar los picks innecesarios"
 
 msgid "skip unnecessary picks"
 msgstr "saltar los picks innecesarios"
 

-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:45

 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar líneas fixup/squash"
 
 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar líneas fixup/squash"
 

-#: builtin/rebase--helper.c:44
+#: builtin/rebase--helper.c:47

 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 
 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 

-#: builtin/receive-pack.c:30
+#: builtin/rebase--helper.c:68
+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

 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:841
+#: builtin/receive-pack.c:842

 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"


@@ -12343,7 +12796,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:861
+#: builtin/receive-pack.c:862

 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"


@@ -12364,11 +12817,11 @@ msgstr ""
 "\n"
 "Para suprimir este mensaje, puede configurarlo en 'refuse'."
 
 "\n"
 "Para suprimir este mensaje, puede configurarlo en 'refuse'."
 

-#: builtin/receive-pack.c:1934
+#: builtin/receive-pack.c:1935

 msgid "quiet"
 msgstr "tranquilo"
 
 msgid "quiet"
 msgstr "tranquilo"
 

-#: builtin/receive-pack.c:1948
+#: builtin/receive-pack.c:1949

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


@@ -12377,11 +12830,11 @@ msgstr "Se tiene que especificar un directorio."
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
 
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
 

-#: builtin/remote.c:13
+#: builtin/remote.c:14

 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 

-#: builtin/remote.c:14
+#: builtin/remote.c:15

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


@@ -12389,82 +12842,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:15 builtin/remote.c:35
+#: builtin/remote.c:16 builtin/remote.c:36

 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:16 builtin/remote.c:40
+#: builtin/remote.c:17 builtin/remote.c:41

 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 
 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 

-#: builtin/remote.c:17 builtin/remote.c:45
+#: builtin/remote.c:18 builtin/remote.c:46

 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:18
+#: builtin/remote.c:19

 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:19
+#: builtin/remote.c:20

 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:20
+#: builtin/remote.c:21

 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:21
+#: builtin/remote.c:22

 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:22 builtin/remote.c:71
+#: builtin/remote.c:23 builtin/remote.c:72

 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:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77

 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:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78

 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:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79

 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:30
+#: builtin/remote.c:31

 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:50
+#: builtin/remote.c:51

 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:51
+#: builtin/remote.c:52

 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:56
+#: builtin/remote.c:57

 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:61
+#: builtin/remote.c:62

 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:66
+#: builtin/remote.c:67

 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:95
+#: builtin/remote.c:96

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

-#: builtin/remote.c:127
+#: builtin/remote.c:128

 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"


@@ -12472,88 +12925,88 @@ 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:144
+#: builtin/remote.c:145

 #, 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:160
+#: builtin/remote.c:161

 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:162
+#: builtin/remote.c:163

 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:165
+#: builtin/remote.c:166

 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:167
+#: builtin/remote.c:168

 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 
 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 

-#: builtin/remote.c:168
+#: builtin/remote.c:169

 msgid "master branch"
 msgstr "rama master"
 
 msgid "master branch"
 msgstr "rama master"
 

-#: builtin/remote.c:169
+#: builtin/remote.c:170

 msgid "push|fetch"
 msgstr "push|fetch"
 
 msgid "push|fetch"
 msgstr "push|fetch"
 

-#: builtin/remote.c:170
+#: builtin/remote.c:171

 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:182
+#: builtin/remote.c:183

 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:184
+#: builtin/remote.c:185

 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:191 builtin/remote.c:631
+#: builtin/remote.c:192 builtin/remote.c:634

 #, 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:195 builtin/remote.c:635
+#: builtin/remote.c:196 builtin/remote.c:638

 #, 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:235
+#: builtin/remote.c:236

 #, 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:337
+#: builtin/remote.c:342

 #, 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:438 builtin/remote.c:446
+#: builtin/remote.c:441 builtin/remote.c:449

 msgid "(matching)"
 msgstr "(concordando)"
 
 msgid "(matching)"
 msgstr "(concordando)"
 

-#: builtin/remote.c:450
+#: builtin/remote.c:453

 msgid "(delete)"
 msgstr "(eliminar)"
 
 msgid "(delete)"
 msgstr "(eliminar)"
 

-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861

 #, 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:641
+#: builtin/remote.c:644

 #, 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:661
+#: builtin/remote.c:664

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -12564,17 +13017,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:697
+#: builtin/remote.c:700

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

-#: builtin/remote.c:731
+#: builtin/remote.c:734

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

-#: builtin/remote.c:796
+#: builtin/remote.c:799

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


@@ -12589,113 +13042,118 @@ msgstr[1] ""
 "removidas;\n"
 "para borrarlas, use:"
 
 "removidas;\n"
 "para borrarlas, use:"
 

-#: builtin/remote.c:810
+#: builtin/remote.c:813

 #, 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:911
+#: builtin/remote.c:914

 #, 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:914
+#: builtin/remote.c:917

 msgid " tracked"
 msgstr " rastreada"
 
 msgid " tracked"
 msgstr " rastreada"
 

-#: builtin/remote.c:916
+#: builtin/remote.c:919

 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:918
+#: builtin/remote.c:921

 msgid " ???"
 msgstr " ???"
 
 msgid " ???"
 msgstr " ???"
 

-#: builtin/remote.c:959
+#: builtin/remote.c:962

 #, 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:967
+#: builtin/remote.c:971

 #, 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:968
+#: builtin/remote.c:973
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "rebasa interactivamente (con fusiones) en remoto %s"
+
+#: builtin/remote.c:976

 #, 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:971
+#: builtin/remote.c:980

 #, 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:974
+#: builtin/remote.c:983

 #, 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:977
+#: builtin/remote.c:986

 #, 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:1020
+#: builtin/remote.c:1029

 msgid "create"
 msgstr "crear"
 
 msgid "create"
 msgstr "crear"
 

-#: builtin/remote.c:1023
+#: builtin/remote.c:1032

 msgid "delete"
 msgstr "borrar"
 
 msgid "delete"
 msgstr "borrar"
 

-#: builtin/remote.c:1027
+#: builtin/remote.c:1036

 msgid "up to date"
 msgstr "actualizado"
 
 msgid "up to date"
 msgstr "actualizado"
 

-#: builtin/remote.c:1030
+#: builtin/remote.c:1039

 msgid "fast-forwardable"
 msgstr "puede realizar fast-forward"
 
 msgid "fast-forwardable"
 msgstr "puede realizar fast-forward"
 

-#: builtin/remote.c:1033
+#: builtin/remote.c:1042

 msgid "local out of date"
 msgstr "desactualizado local"
 
 msgid "local out of date"
 msgstr "desactualizado local"
 

-#: builtin/remote.c:1040
+#: builtin/remote.c:1049

 #, 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:1043
+#: builtin/remote.c:1052

 #, 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:1047
+#: builtin/remote.c:1056

 #, 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:1050
+#: builtin/remote.c:1059

 #, 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:1118
+#: builtin/remote.c:1127

 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 

-#: builtin/remote.c:1145
+#: builtin/remote.c:1154

 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 

-#: builtin/remote.c:1146
+#: builtin/remote.c:1155

 #, 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:1147 builtin/remote.c:1163 builtin/remote.c:1302
+#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311

 msgid "(no URL)"
 msgstr "(sin URL)"
 
 msgid "(no URL)"
 msgstr "(sin URL)"
 


@@ -12703,185 +13161,185 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.

-#: builtin/remote.c:1161 builtin/remote.c:1163
+#: builtin/remote.c:1170 builtin/remote.c:1172

 #, 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:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178

 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 

-#: builtin/remote.c:1165
+#: builtin/remote.c:1174

 msgid "(not queried)"
 msgstr "(no consultado)"
 
 msgid "(not queried)"
 msgstr "(no consultado)"
 

-#: builtin/remote.c:1167
+#: builtin/remote.c:1176

 msgid "(unknown)"
 msgstr "(desconocido)"
 
 msgid "(unknown)"
 msgstr "(desconocido)"
 

-#: builtin/remote.c:1171
+#: builtin/remote.c:1180

 #, 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:1183
+#: builtin/remote.c:1192

 #, 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:1186 builtin/remote.c:1212
+#: builtin/remote.c:1195 builtin/remote.c:1221

 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 

-#: builtin/remote.c:1195
+#: builtin/remote.c:1204

 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:1203
+#: builtin/remote.c:1212

 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:1209
+#: builtin/remote.c:1218

 #, 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:1230
+#: builtin/remote.c:1239

 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:1232
+#: builtin/remote.c:1241

 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:1247
+#: builtin/remote.c:1256

 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:1249
+#: builtin/remote.c:1258

 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:1259
+#: builtin/remote.c:1268

 #, 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:1267
+#: builtin/remote.c:1276

 #, 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:1269
+#: builtin/remote.c:1278

 #, 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:1287
+#: builtin/remote.c:1296

 #, 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:1288
+#: builtin/remote.c:1297

 #, 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:1298
+#: builtin/remote.c:1307

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

-#: builtin/remote.c:1299
+#: builtin/remote.c:1308

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

-#: builtin/remote.c:1315
+#: builtin/remote.c:1324

 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ejecutará prune] %s"
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [ejecutará prune] %s"
 

-#: builtin/remote.c:1318
+#: builtin/remote.c:1327

 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 

-#: builtin/remote.c:1363
+#: builtin/remote.c:1372

 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:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557

 #, 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:1442
+#: builtin/remote.c:1451

 msgid "add branch"
 msgstr "agregar rama"
 
 msgid "add branch"
 msgstr "agregar rama"
 

-#: builtin/remote.c:1449
+#: builtin/remote.c:1458

 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 

-#: builtin/remote.c:1466
+#: builtin/remote.c:1475

 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:1468
+#: builtin/remote.c:1477

 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 

-#: builtin/remote.c:1496
+#: builtin/remote.c:1505

 #, 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:1522
+#: builtin/remote.c:1531

 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 
 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 

-#: builtin/remote.c:1524
+#: builtin/remote.c:1533

 msgid "add URL"
 msgstr "agregar URL"
 
 msgid "add URL"
 msgstr "agregar URL"
 

-#: builtin/remote.c:1526
+#: builtin/remote.c:1535

 msgid "delete URLs"
 msgstr "borrar URLs"
 
 msgid "delete URLs"
 msgstr "borrar URLs"
 

-#: builtin/remote.c:1533
+#: builtin/remote.c:1542

 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:1572
+#: builtin/remote.c:1581

 #, 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:1580
+#: builtin/remote.c:1589

 #, 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:1582
+#: builtin/remote.c:1591

 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:1598
+#: builtin/remote.c:1607

 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:1629
+#: builtin/remote.c:1638

 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"


@@ -12898,129 +13356,137 @@ 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:170
+#: builtin/repack.c:180

 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:172
+#: builtin/repack.c:182

 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:175
+#: builtin/repack.c:185

 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:177
+#: builtin/repack.c:187

 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:179
+#: builtin/repack.c:189

 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:181
+#: builtin/repack.c:191

 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:184
+#: builtin/repack.c:194

 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:186
+#: builtin/repack.c:196

 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 

-#: builtin/repack.c:187
+#: builtin/repack.c:197

 msgid "approxidate"
 msgstr "aproxime"
 
 msgid "approxidate"
 msgstr "aproxime"
 

-#: builtin/repack.c:188
+#: builtin/repack.c:198

 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:190
+#: builtin/repack.c:200

 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:192
+#: builtin/repack.c:202

 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:193 builtin/repack.c:199
+#: builtin/repack.c:203 builtin/repack.c:209

 msgid "bytes"
 msgstr "bytes"
 
 msgid "bytes"
 msgstr "bytes"
 

-#: builtin/repack.c:194
+#: builtin/repack.c:204

 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:196
+#: builtin/repack.c:206

 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:198
+#: builtin/repack.c:208

 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:200
+#: builtin/repack.c:210

 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:202
+#: builtin/repack.c:212

 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:212
+#: builtin/repack.c:214
+msgid "do not repack this pack"
+msgstr "no reempaquetar este paquete"
+
+#: builtin/repack.c:224

 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:216
+#: builtin/repack.c:228

 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:410 builtin/worktree.c:148
+#: builtin/repack.c:425 builtin/worktree.c:139

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

-#: builtin/replace.c:20
+#: builtin/replace.c:22

 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objeto> <remplazo>"
 
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objeto> <remplazo>"
 

-#: builtin/replace.c:21
+#: builtin/replace.c:23

 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objeto>"
 
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objeto>"
 

-#: builtin/replace.c:22
+#: builtin/replace.c:24

 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<padre>...]"
 
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<padre>...]"
 

-#: builtin/replace.c:23
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26

 msgid "git replace -d <object>..."
 msgstr "git replace -d <objeto>..."
 
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objeto>..."
 

-#: builtin/replace.c:24
+#: builtin/replace.c:27

 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:331 builtin/replace.c:369 builtin/replace.c:397
+#: 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'"
 
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "Nombre de objeto no válido: '%s'"
 

-#: builtin/replace.c:361
+#: builtin/replace.c:407

 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mal mergetag en commit '%s'"
 
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mal mergetag en commit '%s'"
 

-#: builtin/replace.c:363
+#: builtin/replace.c:409

 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag mal formado en commit '%s'"
 
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag mal formado en commit '%s'"
 

-#: builtin/replace.c:374
+#: builtin/replace.c:421

 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "


@@ -13029,45 +13495,58 @@ msgstr ""
 "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
 "en lugar de --graft"
 
 "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
 "en lugar de --graft"
 

-#: builtin/replace.c:407
+#: builtin/replace.c:460

 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "el commit original '%s' tiene una firma gpg."
 
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "el commit original '%s' tiene una firma gpg."
 

-#: builtin/replace.c:408
+#: builtin/replace.c:461

 msgid "the signature will be removed in the replacement commit!"
 msgstr "la firma será removida en el commit de reemplazo!"
 
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la firma será removida en el commit de reemplazo!"
 

-#: builtin/replace.c:414
+#: builtin/replace.c:471

 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 

-#: builtin/replace.c:438
+#: builtin/replace.c:514
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"no se pudo convertir el siguiente graft(s):\n"
+"%s"
+
+#: builtin/replace.c:535

 msgid "list replace refs"
 msgstr "listar replace refs"
 
 msgid "list replace refs"
 msgstr "listar replace refs"
 

-#: builtin/replace.c:439
+#: builtin/replace.c:536

 msgid "delete replace refs"
 msgstr "borrar replace refs"
 
 msgid "delete replace refs"
 msgstr "borrar replace refs"
 

-#: builtin/replace.c:440
+#: builtin/replace.c:537

 msgid "edit existing object"
 msgstr "editar objeto existente"
 
 msgid "edit existing object"
 msgstr "editar objeto existente"
 

-#: builtin/replace.c:441
+#: builtin/replace.c:538

 msgid "change a commit's parents"
 msgstr "cambiar un padre de commit"
 
 msgid "change a commit's parents"
 msgstr "cambiar un padre de commit"
 

-#: builtin/replace.c:442
+#: builtin/replace.c:539
+msgid "convert existing graft file"
+msgstr "convertir archivo graft existente"
+
+#: builtin/replace.c:540

 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 
 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 

-#: builtin/replace.c:444
+#: builtin/replace.c:542

 msgid "do not pretty-print contents for --edit"
 msgstr "no se puede imprimir contenidos para --edit"
 
 msgid "do not pretty-print contents for --edit"
 msgstr "no se puede imprimir contenidos para --edit"
 

-#: builtin/replace.c:445
+#: builtin/replace.c:543

 msgid "use this format"
 msgstr "usar este formato"
 
 msgid "use this format"
 msgstr "usar este formato"
 


@@ -13386,42 +13865,42 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 

-#: builtin/rm.c:243
+#: builtin/rm.c:241

 msgid "do not list removed files"
 msgstr "no listar archivos removidos"
 
 msgid "do not list removed files"
 msgstr "no listar archivos removidos"
 

-#: builtin/rm.c:244
+#: builtin/rm.c:242

 msgid "only remove from the index"
 msgstr "solo remover del índice"
 
 msgid "only remove from the index"
 msgstr "solo remover del índice"
 

-#: builtin/rm.c:245
+#: builtin/rm.c:243

 msgid "override the up-to-date check"
 msgstr "sobrescribir el check de actualizado"
 
 msgid "override the up-to-date check"
 msgstr "sobrescribir el check de actualizado"
 

-#: builtin/rm.c:246
+#: builtin/rm.c:244

 msgid "allow recursive removal"
 msgstr "permitir remover de forma recursiva"
 
 msgid "allow recursive removal"
 msgstr "permitir remover de forma recursiva"
 

-#: builtin/rm.c:248
+#: builtin/rm.c:246

 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:307
+#: builtin/rm.c:306

 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no removiendo '%s' de manera recursiva sin -r"
 
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no removiendo '%s' de manera recursiva sin -r"
 

-#: builtin/rm.c:346
+#: builtin/rm.c:345

 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible remover %s"
 
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible remover %s"
 

-#: builtin/rm.c:369
+#: builtin/rm.c:368

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

-#: builtin/send-pack.c:19
+#: builtin/send-pack.c:20

 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "


@@ -13433,50 +13912,70 @@ msgstr ""
 "[<ref>...]\n"
 "  --all y especificaciones <ref> explícitas son mutuamente exclusivas."
 
 "[<ref>...]\n"
 "  --all y especificaciones <ref> explícitas son mutuamente exclusivas."
 

-#: builtin/send-pack.c:162
+#: builtin/send-pack.c:163

 msgid "remote name"
 msgstr "nombre remoto"
 
 msgid "remote name"
 msgstr "nombre remoto"
 

-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177

 msgid "use stateless RPC protocol"
 msgstr "usar protocolo RPC sin estado"
 
 msgid "use stateless RPC protocol"
 msgstr "usar protocolo RPC sin estado"
 

-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178

 msgid "read refs from stdin"
 msgstr "leer refs de stdin"
 
 msgid "read refs from stdin"
 msgstr "leer refs de stdin"
 

-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:179

 msgid "print status from remote helper"
 msgstr "mostrar status del remote helper"
 
 msgid "print status from remote helper"
 msgstr "mostrar status del remote helper"
 

+#: builtin/serve.c:7
+msgid "git serve [<options>]"
+msgstr "git serve [<opciones>]"
+
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr "sale después de un intercambio petición/respuesta único"
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "salir inmediatamente tras anunciar capacidades"
+

 #: builtin/shortlog.c:14
 #: builtin/shortlog.c:14

-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]"
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shorlog [<opciones>]"

 
 

-#: builtin/shortlog.c:263
+#: builtin/shortlog.c:264

 msgid "Group by committer rather than author"
 msgstr "Agrupar por committer en lugar de autor"
 
 msgid "Group by committer rather than author"
 msgstr "Agrupar por committer en lugar de autor"
 

-#: builtin/shortlog.c:265
+#: builtin/shortlog.c:266

 msgid "sort output according to the number of commits per author"
 msgstr "ordenar salida de acuerdo al número de commits por autor"
 
 msgid "sort output according to the number of commits per author"
 msgstr "ordenar salida de acuerdo al número de commits por autor"
 

-#: builtin/shortlog.c:267
+#: builtin/shortlog.c:268

 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
 
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
 

-#: builtin/shortlog.c:269
+#: builtin/shortlog.c:270

 msgid "Show the email address of each author"
 msgstr "Mostrar la dirección de correo de cada autor"
 
 msgid "Show the email address of each author"
 msgstr "Mostrar la dirección de correo de cada autor"
 

-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:271

 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 

-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:272

 msgid "Linewrap output"
 msgstr "Salida de línea"
 
 msgid "Linewrap output"
 msgstr "Salida de línea"
 

+#: builtin/shortlog.c:298
+msgid "too many arguments given outside repository"
+msgstr "demasiados argumentos dados fuera del repositorio"
+

 #: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 #: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"


@@ -13673,39 +14172,39 @@ 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:35 builtin/submodule--helper.c:1669
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688

 #, 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:42 builtin/submodule--helper.c:1678
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 

-#: builtin/submodule--helper.c:59
+#: builtin/submodule--helper.c:61

 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:96
+#: builtin/submodule--helper.c:98

 #, 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:404 builtin/submodule--helper.c:1198
+#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211

 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:409
+#: builtin/submodule--helper.c:411

 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:460 builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485

 #, 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:498
+#: builtin/submodule--helper.c:500

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


@@ -13714,57 +14213,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:509
+#: builtin/submodule--helper.c:511

 #, 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:513
+#: builtin/submodule--helper.c:515

 #, 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:523
+#: builtin/submodule--helper.c:525

 #, 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:530
+#: builtin/submodule--helper.c:532

 #, 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:552
+#: builtin/submodule--helper.c:554

 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:557
+#: builtin/submodule--helper.c:559

 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:625 builtin/submodule--helper.c:747
+#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757

 #, 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:660
+#: builtin/submodule--helper.c:670

 #, 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:687 builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866

 #, 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:711 builtin/submodule--helper.c:1021
+#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031

 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:712
+#: builtin/submodule--helper.c:722

 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"


@@ -13772,51 +14271,51 @@ 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:713
+#: builtin/submodule--helper.c:723

 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:718
+#: builtin/submodule--helper.c:728

 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:742
+#: builtin/submodule--helper.c:752

 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:806
+#: builtin/submodule--helper.c:816

 #, 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:812
+#: builtin/submodule--helper.c:822

 #, 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:826
+#: builtin/submodule--helper.c:836

 #, 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:837
+#: builtin/submodule--helper.c:847

 #, 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:885
+#: builtin/submodule--helper.c:895

 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:887
+#: builtin/submodule--helper.c:897

 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:892
+#: builtin/submodule--helper.c:902

 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:946
+#: builtin/submodule--helper.c:956

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


@@ -13825,7 +14324,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:958
+#: builtin/submodule--helper.c:968

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


@@ -13834,81 +14333,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:966
+#: builtin/submodule--helper.c:976

 #, 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:968
+#: builtin/submodule--helper.c:978

 #, 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:977
+#: builtin/submodule--helper.c:987

 #, 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:993
+#: builtin/submodule--helper.c:1003

 #, 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:1022
+#: builtin/submodule--helper.c:1032

 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:1023
+#: builtin/submodule--helper.c:1033

 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 
 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 

-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1038

 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:1042
+#: builtin/submodule--helper.c:1052

 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:1133 builtin/submodule--helper.c:1136
+#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148

 #, 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:1172
+#: builtin/submodule--helper.c:1184

 #, 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:1179
+#: builtin/submodule--helper.c:1191

 #, 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:1201
+#: builtin/submodule--helper.c:1214

 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:1204
+#: builtin/submodule--helper.c:1217

 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:1207
+#: builtin/submodule--helper.c:1220

 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:1213
+#: builtin/submodule--helper.c:1228

 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 

-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606

 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 
 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 

-#: builtin/submodule--helper.c:1221
+#: builtin/submodule--helper.c:1236

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


@@ -13917,83 +14416,83 @@ msgstr ""
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 

-#: builtin/submodule--helper.c:1252
+#: builtin/submodule--helper.c:1267

 #, 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:1267
+#: builtin/submodule--helper.c:1281

 #, 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:1332
+#: builtin/submodule--helper.c:1347

 #, 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:1336
+#: builtin/submodule--helper.c:1351

 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:1365
+#: builtin/submodule--helper.c:1380

 #, 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:1394
+#: builtin/submodule--helper.c:1409

 #, 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:1527
+#: builtin/submodule--helper.c:1544

 #, 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:1538
+#: builtin/submodule--helper.c:1555

 #, 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:1568 builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808

 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:1571
+#: builtin/submodule--helper.c:1588

 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:1575
+#: builtin/submodule--helper.c:1592

 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:1579
+#: builtin/submodule--helper.c:1598

 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:1582
+#: builtin/submodule--helper.c:1601

 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 
 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 

-#: builtin/submodule--helper.c:1584
+#: builtin/submodule--helper.c:1603

 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:1585
+#: builtin/submodule--helper.c:1604

 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:1592
+#: builtin/submodule--helper.c:1611

 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:1605
+#: builtin/submodule--helper.c:1624

 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:1673
+#: builtin/submodule--helper.c:1692

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


@@ -14002,20 +14501,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:1789
+#: builtin/submodule--helper.c:1809

 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 

-#: builtin/submodule--helper.c:1795
+#: builtin/submodule--helper.c:1815

 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:1857
+#: builtin/submodule--helper.c:1901

 #, 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:1863
+#: builtin/submodule--helper.c:1907

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


@@ -14084,7 +14583,7 @@ msgstr "tag '%s' no encontrado."
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 

-#: builtin/tag.c:131
+#: builtin/tag.c:132

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


@@ -14097,7 +14596,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:135
+#: builtin/tag.c:136

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


@@ -14112,146 +14611,146 @@ 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:189
+#: builtin/tag.c:190

 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:191
+#: builtin/tag.c:192

 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:216
+#: builtin/tag.c:217

 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 

-#: builtin/tag.c:265
+#: builtin/tag.c:266

 msgid "no tag message?"
 msgstr "¿Sin mensaje de tag?"
 
 msgid "no tag message?"
 msgstr "¿Sin mensaje de tag?"
 

-#: builtin/tag.c:272
+#: builtin/tag.c:273

 #, 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:381
+#: builtin/tag.c:382

 msgid "list tag names"
 msgstr "listar nombres de tags"
 
 msgid "list tag names"
 msgstr "listar nombres de tags"
 

-#: builtin/tag.c:383
+#: builtin/tag.c:384

 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:385
+#: builtin/tag.c:386

 msgid "delete tags"
 msgstr "eliminar tags"
 
 msgid "delete tags"
 msgstr "eliminar tags"
 

-#: builtin/tag.c:386
+#: builtin/tag.c:387

 msgid "verify tags"
 msgstr "verificar tags"
 
 msgid "verify tags"
 msgstr "verificar tags"
 

-#: builtin/tag.c:388
+#: builtin/tag.c:389

 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:390
+#: builtin/tag.c:391

 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:392
+#: builtin/tag.c:393

 msgid "tag message"
 msgstr "mensaje de tag"
 
 msgid "tag message"
 msgstr "mensaje de tag"
 

-#: builtin/tag.c:394
+#: builtin/tag.c:395

 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:395
+#: builtin/tag.c:396

 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:399
+#: builtin/tag.c:400

 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:400
+#: builtin/tag.c:401

 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:401 builtin/update-ref.c:368
+#: builtin/tag.c:402 builtin/update-ref.c:368

 msgid "create a reflog"
 msgstr "crear un reflog"
 
 msgid "create a reflog"
 msgstr "crear un reflog"
 

-#: builtin/tag.c:403
+#: builtin/tag.c:404

 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 

-#: builtin/tag.c:404
+#: builtin/tag.c:405

 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:405 builtin/tag.c:407
+#: builtin/tag.c:406 builtin/tag.c:408

 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:406 builtin/tag.c:408
+#: builtin/tag.c:407 builtin/tag.c:409

 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:409
+#: builtin/tag.c:410

 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:410
+#: builtin/tag.c:411

 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:415
+#: builtin/tag.c:416

 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:459
+#: builtin/tag.c:460

 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:481
+#: builtin/tag.c:482

 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:483
+#: builtin/tag.c:484

 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:485
+#: builtin/tag.c:486

 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:487
+#: builtin/tag.c:488

 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:489
+#: builtin/tag.c:490

 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:500
+#: builtin/tag.c:501

 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:519
+#: builtin/tag.c:520

 msgid "too many params"
 msgstr "demasiados parámetros"
 
 msgid "too many params"
 msgstr "demasiados parámetros"
 

-#: builtin/tag.c:525
+#: builtin/tag.c:526

 #, 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:530
+#: builtin/tag.c:531

 #, 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:561
+#: builtin/tag.c:562

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


@@ -14263,27 +14762,27 @@ msgstr "Desempaquetando objetos"
 #: builtin/update-index.c:82
 #, c-format
 msgid "failed to create directory %s"
 #: builtin/update-index.c:82
 #, c-format
 msgid "failed to create directory %s"

-msgstr "fallo al crear directorio %s"
+msgstr "falló al crear directorio %s"

 
 #: builtin/update-index.c:88
 #, c-format
 msgid "failed to stat %s"
 
 #: builtin/update-index.c:88
 #, c-format
 msgid "failed to stat %s"

-msgstr "fallo al iniciar %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"

-msgstr "fallo al crear el archivo %s"
+msgstr "falló al crear el archivo %s"

 
 #: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 
 #: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"

-msgstr "fallo al eliminar el archivo %s"
+msgstr "falló al eliminar el archivo %s"

 
 #: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 
 #: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"

-msgstr "fallo al eliminar directorio %s"
+msgstr "falló al eliminar directorio %s"

 
 #: builtin/update-index.c:138
 #, c-format
 
 #: builtin/update-index.c:138
 #, c-format


@@ -14321,147 +14820,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:579
+#: builtin/update-index.c:589

 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 

-#: builtin/update-index.c:936
+#: builtin/update-index.c:946

 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:939
+#: builtin/update-index.c:949

 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 

-#: builtin/update-index.c:942
+#: builtin/update-index.c:952

 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:944
+#: builtin/update-index.c:954

 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:946
+#: builtin/update-index.c:956

 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:948
+#: builtin/update-index.c:958

 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:951
+#: builtin/update-index.c:961

 msgid "refresh stat information"
 msgstr "refresh información de estado"
 
 msgid "refresh stat information"
 msgstr "refresh información de estado"
 

-#: builtin/update-index.c:955
+#: builtin/update-index.c:965

 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:959
+#: builtin/update-index.c:969

 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 

-#: builtin/update-index.c:960
+#: builtin/update-index.c:970

 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:969
+#: builtin/update-index.c:979

 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:972
+#: builtin/update-index.c:982

 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 

-#: builtin/update-index.c:975
+#: builtin/update-index.c:985

 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:978
+#: builtin/update-index.c:988

 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 

-#: builtin/update-index.c:981
+#: builtin/update-index.c:991

 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:983
+#: builtin/update-index.c:993

 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:985
+#: builtin/update-index.c:995

 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:987
+#: builtin/update-index.c:997

 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:991
+#: builtin/update-index.c:1001

 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:995
+#: builtin/update-index.c:1005

 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:999
+#: builtin/update-index.c:1009

 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:1003
+#: builtin/update-index.c:1013

 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:1006
+#: builtin/update-index.c:1016

 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:1008
+#: builtin/update-index.c:1018

 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:1012
+#: builtin/update-index.c:1022

 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:1014
+#: builtin/update-index.c:1024

 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:1016
+#: builtin/update-index.c:1026

 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:1018
+#: builtin/update-index.c:1028

 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:1020
+#: builtin/update-index.c:1030

 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:1022
+#: builtin/update-index.c:1032

 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:1024
+#: builtin/update-index.c:1034

 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:1026
+#: builtin/update-index.c:1036

 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:1029
+#: builtin/update-index.c:1039

 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:1127
+#: builtin/update-index.c:1138

 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"


@@ -14469,7 +14968,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:1136
+#: builtin/update-index.c:1147

 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"


@@ -14477,7 +14976,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:1147
+#: builtin/update-index.c:1158

 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"


@@ -14485,11 +14984,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:1151
+#: builtin/update-index.c:1162

 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 

-#: builtin/update-index.c:1159
+#: builtin/update-index.c:1170

 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"


@@ -14497,29 +14996,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:1163
+#: builtin/update-index.c:1174

 #, 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:1171
+#: builtin/update-index.c:1182

 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:1175
+#: builtin/update-index.c:1186

 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 

-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1189

 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:1182
+#: builtin/update-index.c:1193

 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 


@@ -14561,6 +15060,22 @@ msgstr "git update-server-info [--force]"
 msgid "update the info files from scratch"
 msgstr "actualiza los archivos info desde cero"
 
 msgid "update the info files from scratch"
 msgstr "actualiza los archivos info desde cero"
 

+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opciones>] <directorio>"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "salir inmediatamente tras el anuncio inicial de ref"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interrumpir transferencia tras <n> segundos de inactividad"
+

 #: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 #: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."


@@ -14621,22 +15136,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:60
+#: builtin/worktree.c:58

 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio válido"
 
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio válido"
 

-#: builtin/worktree.c:66
+#: builtin/worktree.c:64

 #, 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:71 builtin/worktree.c:80
+#: builtin/worktree.c:69 builtin/worktree.c:78

 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
 
 #, 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:90
+#: builtin/worktree.c:88

 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "


@@ -14645,183 +15160,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:98
+#: builtin/worktree.c:96

 #, 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:114
+#: builtin/worktree.c:105

 #, 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:161
+#: builtin/worktree.c:152

 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:163
+#: builtin/worktree.c:154

 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:238
+#: builtin/worktree.c:229

 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 

-#: builtin/worktree.c:269
+#: builtin/worktree.c:260

 #, 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:308
+#: builtin/worktree.c:373 builtin/worktree.c:379
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Preparando árbol de trabajo (nueva rama '%s')"
+
+#: builtin/worktree.c:375
+#, 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
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
+
+#: builtin/worktree.c:390

 #, c-format
 #, c-format

-msgid "Preparing %s (identifier %s)"
-msgstr "Preparando %s (identificador %s)"
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"

 
 

-#: builtin/worktree.c:385
+#: builtin/worktree.c:431

 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:388
+#: builtin/worktree.c:434

 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 

-#: builtin/worktree.c:390
+#: builtin/worktree.c:436

 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:392
+#: builtin/worktree.c:438

 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:393
+#: builtin/worktree.c:439

 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:395
+#: builtin/worktree.c:441

 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:398
+#: builtin/worktree.c:444

 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:406
+#: builtin/worktree.c:452

 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:471
+#: builtin/worktree.c:511

 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:571
+#: builtin/worktree.c:611

 msgid "reason for locking"
 msgstr "razón para bloquear"
 
 msgid "reason for locking"
 msgstr "razón para bloquear"
 

-#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
-#: builtin/worktree.c:809
+#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
+#: builtin/worktree.c:850

 #, 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:585 builtin/worktree.c:618
+#: builtin/worktree.c:625 builtin/worktree.c:658

 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:590
+#: builtin/worktree.c:630

 #, 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:592
+#: builtin/worktree.c:632

 #, 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:620
+#: builtin/worktree.c:660

 #, 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:645
+#: builtin/worktree.c:685

 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:672 builtin/worktree.c:811
+#: builtin/worktree.c:712 builtin/worktree.c:852

 #, 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:677
+#: builtin/worktree.c:717

 #, 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:683
+#: builtin/worktree.c:723

 #, 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:690
+#: builtin/worktree.c:730

 #, 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:692
+#: builtin/worktree.c:732

 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:695
+#: builtin/worktree.c:735

 #, 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:700
+#: builtin/worktree.c:740

 #, c-format
 msgid "failed to move '%s' to '%s'"
 #, c-format
 msgid "failed to move '%s' to '%s'"

-msgstr "fallo al mover '%s' a '%s'"
+msgstr "falló al mover '%s' a '%s'"

 
 

-#: builtin/worktree.c:748
+#: builtin/worktree.c:788

 #, 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:752
+#: builtin/worktree.c:792

 #, 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:757
+#: builtin/worktree.c:797

 #, 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:768 builtin/worktree.c:782
+#: builtin/worktree.c:808 builtin/worktree.c:822

 #, c-format
 msgid "failed to delete '%s'"
 #, c-format
 msgid "failed to delete '%s'"

-msgstr "fallo al borrar '%s'"
+msgstr "falló al borrar '%s'"

 
 

-#: builtin/worktree.c:794
+#: builtin/worktree.c:834

 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:815
+#: builtin/worktree.c:856

 #, 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:817
+#: builtin/worktree.c:858

 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:820
+#: builtin/worktree.c:861

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


@@ -14842,26 +15372,6 @@ msgstr "escribir objeto de  árbol para un subdirectorio <prefijo>"
 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 
 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 

-#: upload-pack.c:27
-msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<opciones>] <directorio>"
-
-#: upload-pack.c:1070
-msgid "quit after a single request/response exchange"
-msgstr "sale después de un intercambio petición/respuesta único"
-
-#: upload-pack.c:1072
-msgid "exit immediately after initial ref advertisement"
-msgstr "salir inmediatamente tras el anuncio inicial de ref"
-
-#: upload-pack.c:1074
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
-
-#: upload-pack.c:1076
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "interrumpir transferencia tras <n> segundos de inactividad"
-

 #: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 #: credential-cache--daemon.c:222
 #, c-format
 msgid ""


@@ -14880,21 +15390,23 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 
 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 

-#: git.c:8
+#: git.c:26

 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

-"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"

 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
 "           [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
 "           [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"

-"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"

 "           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
 "           <comando> [<args>]"
 
 "           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
 "           <comando> [<args>]"
 

-#: git.c:15
+#: git.c:33

 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"


@@ -14904,65 +15416,65 @@ msgstr ""
 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico."
 
 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico."
 

-#: git.c:95
+#: git.c:113

 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no se entregó directorio para --git-dir\n"
 
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no se entregó directorio para --git-dir\n"
 

-#: git.c:109
+#: git.c:127

 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no se entregó namespace para --namespace\n"
 
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no se entregó namespace para --namespace\n"
 

-#: git.c:123
+#: git.c:141

 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "no se entregó directorio para --work-tree\n"
 
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "no se entregó directorio para --work-tree\n"
 

-#: git.c:137
+#: git.c:155

 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "no se entregó prefijo para --super-prefix\n"
 
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "no se entregó prefijo para --super-prefix\n"
 

-#: git.c:159
+#: git.c:177

 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera un string de configuración\n"
 
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera un string de configuración\n"
 

-#: git.c:197
+#: git.c:215

 #, c-format
 msgid "no directory given for -C\n"
 msgstr "no se entregó directorio para -C\n"
 
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "no se entregó directorio para -C\n"
 

-#: git.c:212
+#: git.c:233

 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 

-#: git.c:687
+#: git.c:698

 #, 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:699
+#: git.c:710

 #, c-format
 msgid "failed to run command '%s': %s\n"
 #, c-format
 msgid "failed to run command '%s': %s\n"

-msgstr "fallo al ejecutar comando '%s': %s\n"
+msgstr "falló al ejecutar comando '%s': %s\n"

 
 

-#: http.c:342
+#: http.c:348

 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
 
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
 

-#: http.c:363
+#: http.c:369

 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegación de control no es soportada con cURL < 7.22.0"
 
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegación de control no es soportada con cURL < 7.22.0"
 

-#: http.c:372
+#: http.c:378

 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
 
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
 

-#: http.c:1857
+#: http.c:1854

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -14973,7 +15485,7 @@ msgstr ""
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 

-#: remote-curl.c:345
+#: remote-curl.c:401

 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"


@@ -15098,15 +15610,15 @@ msgstr "fecha de expiración"
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 

-#: parse-options.h:250
+#: parse-options.h:251

 msgid "be more verbose"
 msgstr "ser mas verboso"
 
 msgid "be more verbose"
 msgstr "ser mas verboso"
 

-#: parse-options.h:252
+#: parse-options.h:253

 msgid "be more quiet"
 msgstr "ser mas discreto"
 
 msgid "be more quiet"
 msgstr "ser mas discreto"
 

-#: parse-options.h:258
+#: parse-options.h:259

 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> dígitos para mostrar SHA-1s"
 
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> dígitos para mostrar SHA-1s"
 


@@ -15339,7 +15851,7 @@ msgstr "Intentando fusión simple con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 

-#: git-rebase.sh:60
+#: git-rebase.sh:61

 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"


@@ -15354,42 +15866,42 @@ 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:163 git-rebase.sh:409
+#: git-rebase.sh:173 git-rebase.sh:442

 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No se puede regresar a $head_name"
 
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No se puede regresar a $head_name"
 

-#: git-rebase.sh:174
+#: git-rebase.sh:184

 msgid "Applied autostash."
 msgstr "Autostash aplicado."
 
 msgid "Applied autostash."
 msgstr "Autostash aplicado."
 

-#: git-rebase.sh:177
+#: git-rebase.sh:187

 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No se puede almacenar $stash_sha1"
 
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "No se puede almacenar $stash_sha1"
 

-#: git-rebase.sh:218
+#: git-rebase.sh:229

 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:223
+#: git-rebase.sh:234

 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:370
+#: git-rebase.sh:403

 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:381
+#: git-rebase.sh:414

 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:388
+#: git-rebase.sh:421

 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:391
+#: git-rebase.sh:424

 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"


@@ -15397,7 +15909,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:435
+#: git-rebase.sh:468

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


@@ -15418,76 +15930,80 @@ 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:491
+#: git-rebase.sh:509
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'"
+
+#: git-rebase.sh:537

 #, 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:515
+#: git-rebase.sh:561

 #, 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:518 git-rebase.sh:522
+#: git-rebase.sh:564 git-rebase.sh:568

 #, 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:527
+#: git-rebase.sh:573

 #, 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:553
+#: git-rebase.sh:599

 #, 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:586
+#: git-rebase.sh:632

 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 

-#: git-rebase.sh:591
+#: git-rebase.sh:637

 #, 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:595
+#: git-rebase.sh:641

 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:618
+#: git-rebase.sh:664

 #, 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:620
+#: git-rebase.sh:666

 #, 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:628
+#: git-rebase.sh:674

 #, 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:630
+#: git-rebase.sh:676

 #, 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:642
+#: git-rebase.sh:688

 #, 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:651
+#: git-rebase.sh:697

 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:661
+#: git-rebase.sh:707

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


@@ -15555,111 +16071,111 @@ msgstr "No se puede guardar el estado actual"
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
 
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
 

-#: git-stash.sh:340
+#: git-stash.sh:342

 msgid "Cannot remove worktree changes"
 msgstr "No se pueden remover cambios del árbol de trabajo"
 
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden remover cambios del árbol de trabajo"
 

-#: git-stash.sh:488
+#: git-stash.sh:490

 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opción desconocida: $opt"
 
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opción desconocida: $opt"
 

-#: git-stash.sh:501
+#: git-stash.sh:503

 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 

-#: git-stash.sh:508
+#: git-stash.sh:510

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 

-#: git-stash.sh:523
+#: git-stash.sh:525

 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia válida"
 
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia válida"
 

-#: git-stash.sh:551
+#: git-stash.sh:553

 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 

-#: git-stash.sh:562
+#: git-stash.sh:564

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 

-#: git-stash.sh:570
+#: git-stash.sh:572

 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el índice"
 
 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el índice"
 

-#: git-stash.sh:574
+#: git-stash.sh:576

 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No se puede aplicar un stash en medio de una fusión"
 
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No se puede aplicar un stash en medio de una fusión"
 

-#: git-stash.sh:582
+#: git-stash.sh:584

 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en índice. Intente sin --index."
 
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en índice. Intente sin --index."
 

-#: git-stash.sh:584
+#: git-stash.sh:586

 msgid "Could not save index tree"
 msgstr "No se puede guardar el índice del árbol"
 
 msgid "Could not save index tree"
 msgstr "No se puede guardar el índice del árbol"
 

-#: git-stash.sh:593
+#: git-stash.sh:595

 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 
 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 

-#: git-stash.sh:618
+#: git-stash.sh:620

 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 
 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 

-#: git-stash.sh:633
+#: git-stash.sh:635

 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 

-#: git-stash.sh:647
+#: git-stash.sh:649

 msgid "The stash entry is kept in case you need it again."
 msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
 
 msgid "The stash entry is kept in case you need it again."
 msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
 

-#: git-stash.sh:656
+#: git-stash.sh:658

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 

-#: git-stash.sh:657
+#: git-stash.sh:659

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 

-#: git-stash.sh:665
+#: git-stash.sh:667

 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 
 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 

-#: git-stash.sh:744
+#: git-stash.sh:746

 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 

-#: git-submodule.sh:181
+#: git-submodule.sh:188

 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
 "trabajo"
 
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
 "trabajo"
 

-#: git-submodule.sh:191
+#: git-submodule.sh:198

 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
 
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
 

-#: git-submodule.sh:210
+#: git-submodule.sh:217

 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ya existe en el índice"
 
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' ya existe en el índice"
 

-#: git-submodule.sh:213
+#: git-submodule.sh:220

 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
 
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
 

-#: git-submodule.sh:219
+#: git-submodule.sh:226

 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"


@@ -15670,24 +16186,24 @@ msgstr ""
 "$sm_path\n"
 "Usa -f si en verdad quieres agregarlo."
 
 "$sm_path\n"
 "Usa -f si en verdad quieres agregarlo."
 

-#: git-submodule.sh:237
+#: git-submodule.sh:249

 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Agregando el repositorio existente en '$sm_path' al índice"
 
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Agregando el repositorio existente en '$sm_path' al índice"
 

-#: git-submodule.sh:239
+#: git-submodule.sh:251

 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ya existe y no es un repositorio git válido"
 
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ya existe y no es un repositorio git válido"
 

-#: git-submodule.sh:247
+#: git-submodule.sh:259

 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Se encontró localmente un directorio git para '$sm_name' con el(los) "
 "remoto(s):"
 
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Se encontró localmente un directorio git para '$sm_name' con el(los) "
 "remoto(s):"
 

-#: git-submodule.sh:249
+#: git-submodule.sh:261

 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"


@@ -15704,50 +16220,50 @@ msgstr ""
 "o no está seguro de lo que esto significa, escoja otro nombre con la opción "
 "'--name'."
 
 "o no está seguro de lo que esto significa, escoja otro nombre con la opción "
 "'--name'."
 

-#: git-submodule.sh:255
+#: git-submodule.sh:267

 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
 
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
 

-#: git-submodule.sh:267
+#: git-submodule.sh:279

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "No es posible hacer checkout al submódulo '$sm_path'"
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "No es posible hacer checkout al submódulo '$sm_path'"
 

-#: git-submodule.sh:272
+#: git-submodule.sh:284

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"

-msgstr "Fallo al agregar el submódulo '$sm_path'"
+msgstr "Falló al agregar el submódulo '$sm_path'"

 
 

-#: git-submodule.sh:281
+#: git-submodule.sh:293

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"

-msgstr "Fallo al registrar el submódulo '$sm_path'"
+msgstr "Falló al registrar el submódulo '$sm_path'"

 
 

-#: git-submodule.sh:342
+#: git-submodule.sh:354

 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "Entrando a '$displaypath'"
 
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "Entrando a '$displaypath'"
 

-#: git-submodule.sh:362
+#: 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."
 
 #, 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:584
+#: git-submodule.sh:600

 #, 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:594
+#: git-submodule.sh:610

 #, 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:599
+#: git-submodule.sh:615

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


@@ -15756,12 +16272,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:617
+#: git-submodule.sh:633

 #, 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:623
+#: git-submodule.sh:639

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


@@ -15770,75 +16286,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:630
+#: git-submodule.sh:646

 #, 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:631
+#: git-submodule.sh:647

 #, 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:635
+#: git-submodule.sh:651

 #, 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:636
+#: git-submodule.sh:652

 #, 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:641
+#: git-submodule.sh:657

 #, 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:642
+#: git-submodule.sh:658

 #, 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:647
+#: git-submodule.sh:663

 #, 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:648
+#: git-submodule.sh:664

 #, 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:679
+#: git-submodule.sh:695

 #, 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:775
+#: git-submodule.sh:791

 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:827
+#: git-submodule.sh:843

 #, 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:847
+#: git-submodule.sh:863

 #, 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:850
+#: git-submodule.sh:866

 #, 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:853
+#: git-submodule.sh:869

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


@@ -15849,39 +16365,52 @@ 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:140
+#: git-rebase--interactive.sh:142

 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr "Rebasando ($new_count/$total)"
 
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr "Rebasando ($new_count/$total)"
 

-#: git-rebase--interactive.sh:156
+#: git-rebase--interactive.sh:158

 msgid ""
 "\n"
 "Commands:\n"
 msgid ""
 "\n"
 "Commands:\n"

-"p, pick = use commit\n"
-"r, reword = use commit, but edit the commit message\n"
-"e, edit = use commit, but stop for amending\n"
-"s, squash = use commit, but meld into previous commit\n"
-"f, fixup = like \"squash\", but discard this commit's log message\n"
-"x, exec = run command (the rest of the line) using shell\n"
-"d, drop = remove commit\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"
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 "\n"
 "Comandos:\n"

-" p, pick = usar commit\n"
-" r, reword = usar commit, pero editar el mensaje\n"
-" e, edit = usar commit, pero detener para enmendar\n"
-" s, squash = usar commit, pero unirlo al commit previo\n"
-" f, fixup = como \"squash\", pero descartar el mensaje del commit en el log\n"
-" x, exec = ejecutar comando (el resto de la línea) usando un shell\n"
-" d, drop = borrar commit\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"
 "\n"

-"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia "
+"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "

 "abajo.\n"
 
 "abajo.\n"
 

-#: git-rebase--interactive.sh:171
+#: git-rebase--interactive.sh:179

 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"


@@ -15889,7 +16418,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:175
+#: git-rebase--interactive.sh:183

 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"


@@ -15897,7 +16426,7 @@ 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:213
+#: git-rebase--interactive.sh:221

 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -15916,83 +16445,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
 "\n"
 "\tgit rebase --continue"
 

-#: git-rebase--interactive.sh:238
+#: git-rebase--interactive.sh:246

 #, 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:277
+#: git-rebase--interactive.sh:285

 #, 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:319
+#: git-rebase--interactive.sh:325

 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:371
+#: git-rebase--interactive.sh:376

 #, 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:373
+#: git-rebase--interactive.sh:378

 #, 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:382
+#: git-rebase--interactive.sh:387

 #, 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:387
+#: git-rebase--interactive.sh:392

 #, 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:405
+#: git-rebase--interactive.sh:410

 #, 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:414
+#: git-rebase--interactive.sh:419

 #, 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:423
+#: git-rebase--interactive.sh:428

 #, 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:428
+#: git-rebase--interactive.sh:433

 #, 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:439
+#: git-rebase--interactive.sh:444

 #, 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:448
+#: git-rebase--interactive.sh:453

 #, 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:451
+#: git-rebase--interactive.sh:456

 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:492 git-rebase--interactive.sh:535
-#: git-rebase--interactive.sh:538
+#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
+#: git-rebase--interactive.sh:543

 #, 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:567
+#: git-rebase--interactive.sh:572

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


@@ -16009,31 +16538,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:582
+#: git-rebase--interactive.sh:587

 #, 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:597
+#: git-rebase--interactive.sh:602

 #, 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:639
+#: git-rebase--interactive.sh:644

 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 

-#: git-rebase--interactive.sh:647
+#: git-rebase--interactive.sh:652

 #, 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:649
+#: git-rebase--interactive.sh:654

 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:651
+#: git-rebase--interactive.sh:656

 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"


@@ -16044,7 +16573,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:664
+#: git-rebase--interactive.sh:669

 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"


@@ -16059,29 +16588,29 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
 "\n"
 "\tgit rebase --continue"
 

-#: git-rebase--interactive.sh:675
+#: git-rebase--interactive.sh:680

 #, 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:676
+#: git-rebase--interactive.sh:681

 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:711
+#: git-rebase--interactive.sh:716

 #, 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:735
+#: git-rebase--interactive.sh:740

 msgid "could not detach HEAD"
 msgstr "no se puede desacoplar HEAD"
 
 msgid "could not detach HEAD"
 msgstr "no se puede desacoplar HEAD"
 

-#: git-rebase--interactive.sh:771
+#: git-rebase--interactive.sh:778

 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:776
+#: git-rebase--interactive.sh:783

 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"


@@ -16112,12 +16641,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
 "\n"
 "  git rebase --continue\n"
 

-#: git-rebase--interactive.sh:793
+#: git-rebase--interactive.sh:800

 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:798
+#: git-rebase--interactive.sh:805

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


@@ -16125,11 +16654,11 @@ msgstr ""
 "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
 "primero y entonces ejecuta 'git rebase --continue' de nuevo."
 
 "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:803 git-rebase--interactive.sh:807
+#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814

 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:836
+#: git-rebase--interactive.sh:843

 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"


@@ -16143,57 +16672,59 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
 "    git rebase --continue\n"
 "\n"
 

-#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937

 msgid "Could not execute editor"
 msgstr "No se pudo ejecutar el editor"
 
 msgid "Could not execute editor"
 msgstr "No se pudo ejecutar el editor"
 

-#: git-rebase--interactive.sh:860
+#: 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"
 
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
 

-#: git-rebase--interactive.sh:865
+#: git-rebase--interactive.sh:879

 msgid "No HEAD?"
 msgstr "¿Sin HEAD?"
 
 msgid "No HEAD?"
 msgstr "¿Sin HEAD?"
 

-#: git-rebase--interactive.sh:866
+#: git-rebase--interactive.sh:880

 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "No se pudo crear $state_dir temporalmente"
 
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "No se pudo crear $state_dir temporalmente"
 

-#: git-rebase--interactive.sh:869
+#: git-rebase--interactive.sh:883

 msgid "Could not mark as interactive"
 msgstr "No se pudo marcar como interactivo"
 
 msgid "Could not mark as interactive"
 msgstr "No se pudo marcar como interactivo"
 

-#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
-msgid "Could not init rewritten commits"
-msgstr "No se puede inicializar los commits reescritos"
-
-#: git-rebase--interactive.sh:910
-msgid "Could not generate todo list"
-msgstr "No se pudo generar lista de pendientes"
-
-#: git-rebase--interactive.sh:986
+#: 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)"
 
 #, 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:991
+#: git-rebase--interactive.sh:920

 msgid ""
 "\n"
 msgid ""
 "\n"

-"However, if you remove everything, the rebase will be aborted.\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"

 "\n"
 "\n"

+"\t"

 msgstr ""
 "\n"
 msgstr ""
 "\n"

-"Como sea, si se remueve todo, el rebase sera abortado.\n"
+"\tComo sea, si quieres borrar todo, el rebase será abortado.\n"

 "\n"
 "\n"

+"\t"

 
 

-#: git-rebase--interactive.sh:998
+#: 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"
 
 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
+msgid "Could not init rewritten commits"
+msgstr "No se puede inicializar los commits reescritos"
+

 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"


@@ -16277,68 +16808,68 @@ msgstr "rastreado"
 msgid "unstaged"
 msgstr "no rastreado"
 
 msgid "unstaged"
 msgstr "no rastreado"
 

-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278

 msgid "binary"
 msgstr "binario"
 
 msgid "binary"
 msgstr "binario"
 

-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316

 msgid "nothing"
 msgstr "nada"
 
 msgid "nothing"
 msgstr "nada"
 

-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313

 msgid "unchanged"
 msgstr "sin cambios"
 
 msgid "unchanged"
 msgstr "sin cambios"
 

-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609

 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "agregada %d ruta\n"
 msgstr[1] "agregadas %d rutas\n"
 
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "agregada %d ruta\n"
 msgstr[1] "agregadas %d rutas\n"
 

-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612

 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "actualizada %d ruta\n"
 msgstr[1] "actualizadas %d rutas\n"
 
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "actualizada %d ruta\n"
 msgstr[1] "actualizadas %d rutas\n"
 

-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615

 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "revertida %d ruta\n"
 msgstr[1] "revertidas %d rutas\n"
 
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "revertida %d ruta\n"
 msgstr[1] "revertidas %d rutas\n"
 

-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618

 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "touch hecho a %d ruta\n"
 msgstr[1] "touch hecho a %d rutas\n"
 
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "touch hecho a %d ruta\n"
 msgstr[1] "touch hecho a %d rutas\n"
 

-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627

 msgid "Update"
 msgstr "Actualizar"
 
 msgid "Update"
 msgstr "Actualizar"
 

-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639

 msgid "Revert"
 msgstr "Revertir"
 
 msgid "Revert"
 msgstr "Revertir"
 

-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662

 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s no es rastreado ahora.\n"
 
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s no es rastreado ahora.\n"
 

-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673

 msgid "Add untracked"
 msgstr "Agregar no rastreados"
 
 msgid "Add untracked"
 msgstr "Agregar no rastreados"
 

-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679

 msgid "No untracked files.\n"
 msgstr "No hay archivos sin rastrear.\n"
 
 msgid "No untracked files.\n"
 msgstr "No hay archivos sin rastrear.\n"
 

-#: git-add--interactive.perl:1026
+#: git-add--interactive.perl:1033

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."


@@ -16346,7 +16877,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para el área de stage."
 
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para el área de stage."
 

-#: git-add--interactive.perl:1029
+#: git-add--interactive.perl:1036

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."


@@ -16354,7 +16885,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para aplicar stash."
 
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para aplicar stash."
 

-#: git-add--interactive.perl:1032
+#: git-add--interactive.perl:1039

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."


@@ -16362,7 +16893,7 @@ msgstr ""
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para sacar del área de stage."
 
 "Si el parche aplica limpiamente, el hunk editado sera marcado\n"
 "inmediatamente para sacar del área de stage."
 

-#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."


@@ -16370,7 +16901,7 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
 "inmediatamente para aplicar."
 
 "Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
 "inmediatamente para aplicar."
 

-#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."


@@ -16378,16 +16909,16 @@ msgstr ""
 "Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
 "inmediatamente para descarte."
 
 "Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
 "inmediatamente para descarte."
 

-#: git-add--interactive.perl:1078
+#: git-add--interactive.perl:1085

 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"

-msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s"
+msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"

 
 

-#: git-add--interactive.perl:1079
+#: git-add--interactive.perl:1086

 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
 
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
 

-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1092

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


@@ -16401,7 +16932,7 @@ msgstr ""
 "Lineas comenzando con  %s serán removidas.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
 "Lineas comenzando con  %s serán removidas.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

-#: git-add--interactive.perl:1093
+#: git-add--interactive.perl:1100

 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"


@@ -16411,10 +16942,10 @@ msgstr ""
 "editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
 "la edición es abortada y el hunk queda sin cambios.\n"
 
 "editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
 "la edición es abortada y el hunk queda sin cambios.\n"
 

-#: git-add--interactive.perl:1107
+#: git-add--interactive.perl:1114

 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"

-msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s"
+msgstr "falló al abrir el archivo de edición del hunk para lectura: %s"

 
 #. TRANSLATORS: do not translate [y/n]
 #. The program will only accept that input
 
 #. TRANSLATORS: do not translate [y/n]
 #. The program will only accept that input


@@ -16422,13 +16953,13 @@ msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.

-#: git-add--interactive.perl:1206
+#: git-add--interactive.perl:1213

 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
 
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
 

-#: git-add--interactive.perl:1215
+#: git-add--interactive.perl:1222

 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"


@@ -16443,7 +16974,7 @@ msgstr ""
 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
 "archivo"
 
 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
 "archivo"
 

-#: git-add--interactive.perl:1221
+#: git-add--interactive.perl:1228

 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"


@@ -16457,7 +16988,7 @@ msgstr ""
 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
 
 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
 

-#: git-add--interactive.perl:1227
+#: git-add--interactive.perl:1234

 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"


@@ -16472,7 +17003,7 @@ msgstr ""
 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
 "archivo"
 
 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
 "archivo"
 

-#: git-add--interactive.perl:1233
+#: git-add--interactive.perl:1240

 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"


@@ -16486,7 +17017,7 @@ msgstr ""
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunko ninguno de los posteriores en el archivo"
 
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunko ninguno de los posteriores en el archivo"
 

-#: git-add--interactive.perl:1239
+#: git-add--interactive.perl:1246

 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"


@@ -16500,7 +17031,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno de los posteriores en el archivo"
 
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno de los posteriores en el archivo"
 

-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1252

 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"


@@ -16514,7 +17045,7 @@ msgstr ""
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno posterior en el archivo"
 
 "a - descartar este hunk y todos los posteriores en este archivo\n"
 "d - no descartar este hunk o ninguno posterior en el archivo"
 

-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1258

 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"


@@ -16528,7 +17059,7 @@ msgstr ""
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunk o ninguno de los siguientes en este archivo"
 
 "a - aplicar este hunk y todos los posteriores en el archivo\n"
 "d - no aplicar este hunk o ninguno de los siguientes en este archivo"
 

-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1273

 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"


@@ -16550,213 +17081,213 @@ msgstr ""
 "e - editar manualmente el hunk actual\n"
 "? - imprimir ayuda\n"
 
 "e - editar manualmente el hunk actual\n"
 "? - imprimir ayuda\n"
 

-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1304

 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Los hunks seleccionados no aplican al índice!\n"
 
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Los hunks seleccionados no aplican al índice!\n"
 

-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1305

 msgid "Apply them to the worktree anyway? "
 msgstr "Aplicarlos al árbol de trabajo de todas maneras? "
 
 msgid "Apply them to the worktree anyway? "
 msgstr "Aplicarlos al árbol de trabajo de todas maneras? "
 

-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl:1308

 msgid "Nothing was applied.\n"
 msgstr "Nada fue aplicado.\n"
 
 msgid "Nothing was applied.\n"
 msgstr "Nada fue aplicado.\n"
 

-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1319

 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 

-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1328

 msgid "Only binary files changed.\n"
 msgstr "Solo cambiaron archivos binarios.\n"
 
 msgid "Only binary files changed.\n"
 msgstr "Solo cambiaron archivos binarios.\n"
 

-#: git-add--interactive.perl:1323
+#: git-add--interactive.perl:1330

 msgid "No changes.\n"
 msgstr "Sin cambios.\n"
 
 msgid "No changes.\n"
 msgstr "Sin cambios.\n"
 

-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1338

 msgid "Patch update"
 msgstr "Actualización del parche"
 
 msgid "Patch update"
 msgstr "Actualización del parche"
 

-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1390

 #, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1391

 #, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1392

 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1395

 #, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1396

 #, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1397

 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1393
+#: git-add--interactive.perl:1400

 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1394
+#: git-add--interactive.perl:1401

 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1402

 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1398
+#: git-add--interactive.perl:1405

 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1399
+#: git-add--interactive.perl:1406

 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1407

 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1403
+#: git-add--interactive.perl:1410

 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1404
+#: git-add--interactive.perl:1411

 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1412

 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1408
+#: git-add--interactive.perl:1415

 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1409
+#: git-add--interactive.perl:1416

 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1417

 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1413
+#: git-add--interactive.perl:1420

 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1414
+#: git-add--interactive.perl:1421

 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1422

 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
 
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
 

-#: git-add--interactive.perl:1515
+#: git-add--interactive.perl:1522

 msgid "No other hunks to goto\n"
 msgstr "No hay más pedazos para el ir\n"
 
 msgid "No other hunks to goto\n"
 msgstr "No hay más pedazos para el ir\n"
 

-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1529

 msgid "go to which hunk (<ret> to see more)? "
 msgstr "a que hunk ir (<enter> para ver mas)? "
 
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "a que hunk ir (<enter> para ver mas)? "
 

-#: git-add--interactive.perl:1524
+#: git-add--interactive.perl:1531

 msgid "go to which hunk? "
 msgstr "a que hunk ir? "
 
 msgid "go to which hunk? "
 msgstr "a que hunk ir? "
 

-#: git-add--interactive.perl:1533
+#: git-add--interactive.perl:1540

 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero invalido: '%s'\n"
 
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero invalido: '%s'\n"
 

-#: git-add--interactive.perl:1538
+#: git-add--interactive.perl:1545

 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 

-#: git-add--interactive.perl:1564
+#: git-add--interactive.perl:1571

 msgid "No other hunks to search\n"
 msgstr "No hay más pedazos para buscar\n"
 
 msgid "No other hunks to search\n"
 msgstr "No hay más pedazos para buscar\n"
 

-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1575

 msgid "search for regex? "
 msgstr "buscar para regexp? "
 
 msgid "search for regex? "
 msgstr "buscar para regexp? "
 

-#: git-add--interactive.perl:1581
+#: git-add--interactive.perl:1588

 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 

-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1598

 msgid "No hunk matches the given pattern\n"
 msgstr "No hay hunks que concuerden con el patrón entregado.\n"
 
 msgid "No hunk matches the given pattern\n"
 msgstr "No hay hunks que concuerden con el patrón entregado.\n"
 

-#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632

 msgid "No previous hunk\n"
 msgstr "No el anterior hunk\n"
 
 msgid "No previous hunk\n"
 msgstr "No el anterior hunk\n"
 

-#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638

 msgid "No next hunk\n"
 msgstr "No el siguiente hunk\n"
 
 msgid "No next hunk\n"
 msgstr "No el siguiente hunk\n"
 

-#: git-add--interactive.perl:1637
+#: git-add--interactive.perl:1644

 msgid "Sorry, cannot split this hunk\n"
 msgstr "Perdón, no se puede dividir este pedazo\n"
 
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Perdón, no se puede dividir este pedazo\n"
 

-#: git-add--interactive.perl:1643
+#: git-add--interactive.perl:1650

 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Cortar en %d hunk.\n"
 msgstr[1] "Cortar en  %d hunks.\n"
 
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Cortar en %d hunk.\n"
 msgstr[1] "Cortar en  %d hunks.\n"
 

-#: git-add--interactive.perl:1653
+#: git-add--interactive.perl:1660

 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Perdón, no se puede editar este pedazo\n"
 
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Perdón, no se puede editar este pedazo\n"
 

-#: git-add--interactive.perl:1699
+#: git-add--interactive.perl:1706

 msgid "Review diff"
 msgstr "Revisión de  diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
 msgid "Review diff"
 msgstr "Revisión de  diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.

-#: git-add--interactive.perl:1718
+#: git-add--interactive.perl:1725

 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"


@@ -16776,18 +17307,18 @@ msgstr ""
 "add untracked - agrega contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 
 "add untracked - agrega contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 

-#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
-#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
-#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767

 msgid "missing --"
 msgstr "falta --"
 
 msgid "missing --"
 msgstr "falta --"
 

-#: git-add--interactive.perl:1756
+#: git-add--interactive.perl:1763

 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 

-#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775

 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento invalido %s, se esperaba --"
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento invalido %s, se esperaba --"


@@ -16880,7 +17411,7 @@ msgstr ""
 #: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"
 #: git-send-email.perl:625
 #, perl-format
 msgid "Failed to opendir %s: %s"

-msgstr "Fallo al abrir directorio %s: %s"
+msgstr "Falló al abrir directorio %s: %s"

 
 #: git-send-email.perl:649
 #, perl-format
 
 #: git-send-email.perl:649
 #, perl-format


@@ -16909,7 +17440,7 @@ msgstr "No hay línea de subject en %s?"
 #: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 #: git-send-email.perl:683
 #, perl-format
 msgid "Failed to open for writing %s: %s"

-msgstr "Fallo al abrir para escritura %s: %s"
+msgstr "Falló al abrir para escritura %s: %s"

 
 #: git-send-email.perl:694
 msgid ""
 
 #: git-send-email.perl:694
 msgid ""


@@ -16928,12 +17459,12 @@ msgstr ""
 #: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"
 #: git-send-email.perl:718
 #, perl-format
 msgid "Failed to open %s: %s"

-msgstr "Fallo al abrir %s: %s"
+msgstr "Falló al abrir %s: %s"

 
 #: git-send-email.perl:735
 #, perl-format
 msgid "Failed to open %s.final: %s"
 
 #: git-send-email.perl:735
 #, perl-format
 msgid "Failed to open %s.final: %s"

-msgstr "Fallo al abrir %s.final: %s"
+msgstr "Falló al abrir %s.final: %s"

 
 #: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"
 
 #: git-send-email.perl:778
 msgid "Summary email is empty, skipping it\n"


@@ -17002,7 +17533,7 @@ msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
 msgid "CA path \"%s\" does not exist"
 msgstr "Ruta CA \"%s\" no existe"
 
 msgid "CA path \"%s\" does not exist"
 msgstr "Ruta CA \"%s\" no existe"
 

-#: git-send-email.perl:1395
+#: git-send-email.perl:1400

 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"


@@ -17027,137 +17558,164 @@ msgstr ""
 "    ejecuta 'git config --global sendemail.confirm auto'.\n"
 "\n"
 
 "    ejecuta 'git config --global sendemail.confirm auto'.\n"
 "\n"
 

-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your

 #. translation. The program will only accept English input
 #. at this point.
 #. translation. The program will only accept English input
 #. at this point.

-#: git-send-email.perl:1410
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
-msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo): "
+#: git-send-email.perl:1415
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "

 
 

-#: git-send-email.perl:1413
+#: git-send-email.perl:1418

 msgid "Send this email reply required"
 msgstr "Necesitas mandar esta respuesta de email"
 
 msgid "Send this email reply required"
 msgstr "Necesitas mandar esta respuesta de email"
 

-#: git-send-email.perl:1439
+#: git-send-email.perl:1446

 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP no esta definido adecuadamente."
 
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP no esta definido adecuadamente."
 

-#: git-send-email.perl:1486
+#: git-send-email.perl:1493

 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servidor no soporta STARTTLS! %s"
 
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servidor no soporta STARTTLS! %s"
 

-#: git-send-email.perl:1491 git-send-email.perl:1495
+#: git-send-email.perl:1498 git-send-email.perl:1502

 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Falló STARTTLS! %s"
 
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Falló STARTTLS! %s"
 

-#: git-send-email.perl:1505
+#: git-send-email.perl:1512

 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:1523
+#: git-send-email.perl:1530

 #, perl-format
 msgid "Failed to send %s\n"
 #, perl-format
 msgid "Failed to send %s\n"

-msgstr "Fallo al enviar %s\n"
+msgstr "Falló al enviar %s\n"

 
 

-#: git-send-email.perl:1526
+#: git-send-email.perl:1533

 #, 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:1526
+#: git-send-email.perl:1533

 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 

-#: git-send-email.perl:1528
+#: git-send-email.perl:1535

 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:1528
+#: git-send-email.perl:1535

 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 

-#: git-send-email.perl:1540
+#: git-send-email.perl:1547

 msgid "Result: "
 msgstr "Resultado: "
 
 msgid "Result: "
 msgstr "Resultado: "
 

-#: git-send-email.perl:1543
+#: git-send-email.perl:1550

 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 

-#: git-send-email.perl:1556
+#: git-send-email.perl:1568

 #, 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:1603 git-send-email.perl:1623
+#: git-send-email.perl:1615 git-send-email.perl:1635

 #, 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:1609
+#: git-send-email.perl:1621

 #, 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:1657
+#: git-send-email.perl:1674

 #, 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:1682
+#: git-send-email.perl:1699

 #, 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:1788
+#: git-send-email.perl:1817

 #, 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:1795
+#: git-send-email.perl:1824

 #, 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:1799
+#: git-send-email.perl:1828

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"

-msgstr "(%s) fallo al cerrar el pipe para '%s'"
+msgstr "(%s) falló al cerrar el pipe para '%s'"

 
 

-#: git-send-email.perl:1826
+#: git-send-email.perl:1855

 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:1834
+#: git-send-email.perl:1863

 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia invalida"
 
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia invalida"
 

-#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
+#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962

 #, 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:1875
+#: git-send-email.perl:1904

 #, 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:1891
+#: git-send-email.perl:1920

 #, 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:1895
+#: git-send-email.perl:1924

 #, 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 "Could not open '%s' for writing"
+#~ msgstr "No se pudo abrir '%s' para escritura"
+
+#~ msgid ""
+#~ "unexpected 1st line of squash message:\n"
+#~ "\n"
+#~ "\t%.*s"
+#~ msgstr ""
+#~ "1ra línea del mensaje squash no esperada:\n"
+#~ "\n"
+#~ "\t%.*s"
+
+#~ msgid ""
+#~ "invalid 1st line of squash message:\n"
+#~ "\n"
+#~ "\t%.*s"
+#~ msgstr ""
+#~ "1ra línea del mensaje squash inválida:\n"
+#~ "\n"
+#~ "\t%.*s"
+
+#~ msgid "BUG: returned path string doesn't match cwd?"
+#~ msgstr "BUG: string de ruta recibido no concuerda con cwd?"
+
+#~ msgid "Error in object"
+#~ msgstr "Error en el objeto"
+

 #~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
 #~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
 
 #~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
 #~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"