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

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

diff --git a/po/es.po b/po/es.po
index 8939f28324778774119889bff88932cc2a370dfb..769b634e5f37fac14445a53de8bb7b6fdc388b6f 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-05-31 23:32+0800\n"
-"PO-Revision-Date: 2018-05-31 23:07-0500\n"
+"POT-Creation-Date: 2018-06-08 09:03+0800\n"
+"PO-Revision-Date: 2018-06-10 13:59-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"


@@ -61,7 +61,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 

-#: advice.c:168 builtin/merge.c:1249
+#: advice.c:168 builtin/merge.c:1250

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


@@ -771,23 +771,23 @@ msgstr "git archive --remote <repo> [--exec <comando>] --list"
 msgid "pathspec '%s' did not match any files"
 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
 
 msgid "pathspec '%s' did not match any files"
 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
 

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

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

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

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

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

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

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

 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:813 builtin/blame.c:814 builtin/config.c:127
+#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119


@@ -795,69 +795,69 @@ msgstr "anteponer prefijo a cada ruta en el archivo"
 msgid "file"
 msgstr "carpeta"
 
 msgid "file"
 msgstr "carpeta"
 

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

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

-#: archive.c:442
+#: archive.c:440

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

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

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

-#: archive.c:444
+#: archive.c:442

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

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

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

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

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

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

 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:110 builtin/clone.c:113
+#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
 msgid "repo"
 msgstr "repo"
 
 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
 msgid "repo"
 msgstr "repo"
 

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

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

-#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

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

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

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

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

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

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

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

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

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

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

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

-#: archive.c:501
+#: archive.c:499

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


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

-#: 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
+#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
+#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

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


@@ -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:2080 sequencer.c:2557 builtin/commit.c:755
+#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 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'"


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

-#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465
+#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
 #: builtin/replace.c:448
 #, c-format
 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
 #: builtin/replace.c:448
 #, c-format


@@ -1479,11 +1479,11 @@ msgstr "no se pudo configurar '%s' a '%s'"
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 

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

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

-#: connect.c:62
+#: connect.c:63

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


@@ -2012,20 +2012,81 @@ msgstr "falló al marcar '%s'"
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
 
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
 

-#: help.c:179
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comienza un área de trabajo (ver también: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examina el historial y el estado (ver también: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "crece, marca y ajusta tu historial común"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "colabora (mira también: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Comandos de Porcelana principales"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Comandos auxiliares / Manipuladores"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Comandos auxiliares / Interrogadores"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Interactuando con Otros"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Comandos de bajo nivel / Manipuladores"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Comandos de bajo nivel / Interrogadores"
+
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr "Comandos de bajo nivel / Sincronización de repositorios"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Comandos de bajo nivel / Auxiliares internos"
+
+#: help.c:293

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

-#: help.c:186
+#: help.c:300

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

-#: help.c:217
+#: help.c:309

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

-#: help.c:281
+#: help.c:358 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "comando de listado de tipos no soportado '%s'"
+
+#: help.c:405
+msgid "The common Git guides are:"
+msgstr "Las guías comunes de Git son:"
+
+#: help.c:467

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


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

-#: help.c:336
+#: help.c:526

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

-#: help.c:358
+#: help.c:548

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

-#: help.c:363
+#: help.c:553

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

-#: help.c:368
+#: help.c:558

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

-#: help.c:376
+#: help.c:566

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

-#: help.c:380
+#: help.c:570

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


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

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

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

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

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

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

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


@@ -2597,7 +2658,7 @@ msgstr "la fusión no devolvió ningún commit"
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 

-#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815
+#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

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


@@ -2802,12 +2863,12 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 

-#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047
+#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

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

-#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233
+#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

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


@@ -2822,7 +2883,7 @@ msgstr "no es posible abrir el directorio de git: %s"
 msgid "unable to unlink: %s"
 msgstr "no es posible remover el vinculo: %s"
 
 msgid "unable to unlink: %s"
 msgstr "no es posible remover el vinculo: %s"
 

-#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395
+#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"


@@ -3278,34 +3339,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:174
+#: sequencer.c:175

 #, 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:274
+#: sequencer.c:275

 #, c-format
 msgid "could not delete '%s'"
 #, c-format
 msgid "could not delete '%s'"

-msgstr "No se pudo borrar '%s'"
+msgstr "no se pudo borrar '%s'"

 
 

-#: sequencer.c:300
+#: sequencer.c:301

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

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

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

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

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

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

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

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

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


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

 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"


@@ -3323,45 +3384,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:379 sequencer.c:2467
+#: sequencer.c:380 sequencer.c:2468

 #, 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:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485
-#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656
+#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
+#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

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

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

 #, 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:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487
-#: sequencer.c:2701
+#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
+#: sequencer.c:2702

 #, 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: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
+#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
+#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
+#: builtin/merge.c:1046

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

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

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

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


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

 #, 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:578
+#: sequencer.c:579

 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:591
+#: sequencer.c:592

 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 
 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 

-#: sequencer.c:748
+#: sequencer.c:749

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


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

-#: sequencer.c:817
+#: sequencer.c:818

 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 
 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 

-#: sequencer.c:1042
+#: sequencer.c:1043

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

 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"


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

-#: sequencer.c:1062
+#: sequencer.c:1063

 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"


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

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

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

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

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

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

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

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

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

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

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

 #, 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:1183 builtin/commit.c:1528
+#: sequencer.c:1184 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:1234 sequencer.c:1831
+#: sequencer.c:1235 sequencer.c:1832

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

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

 #, 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:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824
-#: builtin/merge.c:849
+#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
+#: builtin/merge.c:850

 msgid "failed to write commit object"
 msgstr "falló al escribir el objeto commit"
 
 msgid "failed to write commit object"
 msgstr "falló al escribir el objeto commit"
 

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

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

 #, 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:1499 sequencer.c:1524
+#: sequencer.c:1500 sequencer.c:1525

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

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

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

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

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

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

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

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

 #, 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:1552
+#: sequencer.c:1553

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

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

 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:1637
+#: sequencer.c:1638

 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 
 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 

-#: sequencer.c:1656
+#: sequencer.c:1657

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

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

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

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

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

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

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

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

 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:1873
+#: sequencer.c:1874

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 

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

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 

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

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

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

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

 #, 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:2084 sequencer.c:4137 sequencer.c:4172
+#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

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

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

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

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

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

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

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

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

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

 #, 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:2268
+#: sequencer.c:2269

 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 

-#: sequencer.c:2284
+#: sequencer.c:2285

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

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

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

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

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

-#: sequencer.c:2395 sequencer.c:3402
+#: sequencer.c:2396 sequencer.c:3403

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

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

-#: sequencer.c:2399 sequencer.c:2434
+#: sequencer.c:2400 sequencer.c:2435

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

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

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

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

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

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

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

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

-#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639
+#: sequencer.c:2618 sequencer.c:2622 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:2640
+#: sequencer.c:2641

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

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

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


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

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

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

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


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

-#: sequencer.c:2770
+#: sequencer.c:2771

 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 
 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 

-#: sequencer.c:2775
+#: sequencer.c:2776

 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 

-#: sequencer.c:2810
+#: sequencer.c:2811

 #, c-format
 msgid "failed to find tree of %s"
 msgstr "falló al encontrar árbol de %s"
 
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "falló al encontrar árbol de %s"
 

-#: sequencer.c:2828
+#: sequencer.c:2829

 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 
 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 

-#: sequencer.c:2860
+#: sequencer.c:2861

 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 
 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 

-#: sequencer.c:2883
+#: sequencer.c:2884

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

-#: sequencer.c:2905
+#: sequencer.c:2906

 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 

-#: sequencer.c:2915 sequencer.c:2940
+#: sequencer.c:2916 sequencer.c:2941

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

-#: sequencer.c:3004
+#: sequencer.c:3005

 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no se pudo intentar fusionar '%.*s'"
 
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no se pudo intentar fusionar '%.*s'"
 

-#: sequencer.c:3020
+#: sequencer.c:3021

 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 
 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 

-#: sequencer.c:3087
+#: sequencer.c:3088

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

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

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

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


@@ -3880,7 +3941,7 @@ msgstr ""
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 

-#: sequencer.c:3133
+#: sequencer.c:3134

 #, c-format
 msgid ""
 "Could not execute the todo command\n"
 #, c-format
 msgid ""
 "Could not execute the todo command\n"


@@ -3901,48 +3962,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 

-#: sequencer.c:3201
+#: sequencer.c:3202

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

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

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

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

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

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

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

 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:3422
+#: sequencer.c:3423

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

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

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

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

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

 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"


@@ -3953,54 +4014,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:3454 sequencer.c:3492
+#: sequencer.c:3455 sequencer.c:3493

 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 

-#: sequencer.c:3507
+#: sequencer.c:3508

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede remover CHERRY_PICK_HEAD"
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede remover CHERRY_PICK_HEAD"
 

-#: sequencer.c:3514
+#: sequencer.c:3515

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

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

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

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

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

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

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

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

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

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

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


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

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


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

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

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


@@ -4038,12 +4099,12 @@ 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:4374
+#: sequencer.c:4375

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

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


@@ -4311,27 +4372,27 @@ msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref valido."
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref valido."
 

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

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

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

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

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

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


@@ -4339,18 +4400,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:1728 submodule.c:1784
+#: submodule.c:1730 submodule.c:1786

 #, 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:1732 builtin/submodule--helper.c:1261
+#: submodule.c:1734 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'"
 
 #: builtin/submodule--helper.c:1271
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"
 

-#: submodule.c:1735
+#: submodule.c:1737

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


@@ -4361,16 +4422,16 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
 "'%s' hacia\n"
 "'%s'\n"
 

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

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

 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:1902
+#: submodule.c:1904

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


@@ -4832,7 +4893,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:1042
+#: builtin/am.c:862 builtin/merge.c:1043

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


@@ -5371,7 +5432,7 @@ msgstr "remover '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 

-#: builtin/add.c:233 builtin/rev-parse.c:888
+#: builtin/add.c:233 builtin/rev-parse.c:892

 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 
 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 


@@ -5825,7 +5886,7 @@ msgid "pass it through git-apply"
 msgstr "pasarlo a través de git-apply"
 
 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
 msgstr "pasarlo a través de git-apply"
 
 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

-#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207
+#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208

 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
 #: builtin/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


@@ -5878,7 +5939,7 @@ msgstr "mentir sobre la fecha del committer"
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 

-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239

 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
 msgid "key-id"
 msgstr "key-id"
 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
 msgid "key-id"
 msgstr "key-id"


@@ -7057,7 +7118,7 @@ msgstr "forzar el checkout (descartar modificaciones locales)"
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusión de tres vías con la rama nueva"
 
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusión de tres vías con la rama nueva"
 

-#: builtin/checkout.c:1131 builtin/merge.c:240
+#: builtin/checkout.c:1131 builtin/merge.c:241

 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 


@@ -7082,7 +7143,7 @@ msgid "do not check if another worktree is holding the given ref"
 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
 
 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
 
 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149

-#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572
+#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572

 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"


@@ -8076,7 +8137,7 @@ msgstr "fecha"
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 

-#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402
+#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402

 #: builtin/notes.c:565 builtin/tag.c:392
 msgid "message"
 msgstr "mensaje"
 #: builtin/notes.c:565 builtin/tag.c:392
 msgid "message"
 msgstr "mensaje"


@@ -8113,7 +8174,7 @@ msgstr ""
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
 
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
 

-#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241
+#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242

 #: builtin/pull.c:154 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 #: builtin/pull.c:154 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"


@@ -8138,7 +8199,7 @@ msgstr "cómo quitar espacios y #comentarios de mensajes"
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 

-#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184
+#: builtin/commit.c:1469 builtin/merge.c:240 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"


@@ -8735,24 +8796,24 @@ msgstr "realizar un diff de todo el directorio"
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 

-#: builtin/difftool.c:705
+#: builtin/difftool.c:704

 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 

-#: builtin/difftool.c:706
+#: builtin/difftool.c:705

 msgid "<tool>"
 msgstr "<herramienta>"
 
 msgid "<tool>"
 msgstr "<herramienta>"
 

-#: builtin/difftool.c:707
+#: builtin/difftool.c:706

 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 

-#: builtin/difftool.c:709
+#: builtin/difftool.c:708

 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 

-#: builtin/difftool.c:712
+#: builtin/difftool.c:711

 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"


@@ -8760,19 +8821,19 @@ msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 

-#: builtin/difftool.c:714
+#: builtin/difftool.c:713

 msgid "<command>"
 msgstr "<comando>"
 
 msgid "<command>"
 msgstr "<comando>"
 

-#: builtin/difftool.c:715
+#: builtin/difftool.c:714

 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 

-#: builtin/difftool.c:739
+#: builtin/difftool.c:738

 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 

-#: builtin/difftool.c:746
+#: builtin/difftool.c:745

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


@@ -9661,58 +9722,62 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 

-#: builtin/help.c:43
+#: builtin/help.c:45

 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 
 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 

-#: builtin/help.c:44
+#: builtin/help.c:46

 msgid "exclude guides"
 msgstr "excluir las guias"
 
 msgid "exclude guides"
 msgstr "excluir las guias"
 

-#: builtin/help.c:45
+#: builtin/help.c:47

 msgid "print list of useful guides"
 msgstr "mostrar una lista de nociones utiles"
 
 msgid "print list of useful guides"
 msgstr "mostrar una lista de nociones utiles"
 

-#: builtin/help.c:46
+#: builtin/help.c:48

 msgid "show man page"
 msgstr "mostrar la pagina del manual"
 
 msgid "show man page"
 msgstr "mostrar la pagina del manual"
 

-#: builtin/help.c:47
+#: builtin/help.c:49

 msgid "show manual in web browser"
 msgstr "mostrar la pagina del manual en un navegador web"
 
 msgid "show manual in web browser"
 msgstr "mostrar la pagina del manual en un navegador web"
 

-#: builtin/help.c:49
+#: builtin/help.c:51

 msgid "show info page"
 msgstr "mostrar la pagina de info"
 
 msgid "show info page"
 msgstr "mostrar la pagina de info"
 

-#: builtin/help.c:55
+#: builtin/help.c:53
+msgid "print command description"
+msgstr "imprimir descripción del comando"
+
+#: builtin/help.c:58

 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
 
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
 

-#: builtin/help.c:67
+#: builtin/help.c:70

 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 

-#: builtin/help.c:94
+#: builtin/help.c:97

 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 
 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 

-#: builtin/help.c:107
+#: builtin/help.c:110

 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 
 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 

-#: builtin/help.c:115
+#: builtin/help.c:118

 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
 
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
 

-#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
+#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176

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

-#: builtin/help.c:211
+#: builtin/help.c:214

 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"


@@ -9721,7 +9786,7 @@ msgstr ""
 "'%s': ruta para el visualizador del manual no soportada.\n"
 "Por favor considere usar 'man.<herramienta.cmd'."
 
 "'%s': ruta para el visualizador del manual no soportada.\n"
 "Por favor considere usar 'man.<herramienta.cmd'."
 

-#: builtin/help.c:223
+#: builtin/help.c:226

 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"


@@ -9730,61 +9795,25 @@ msgstr ""
 "'%s': comando no soportado para man viewer.\n"
 "Por favor considere usar 'man.<herramienta>.path."
 
 "'%s': comando no soportado para man viewer.\n"
 "Por favor considere usar 'man.<herramienta>.path."
 

-#: builtin/help.c:340
+#: builtin/help.c:343

 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 

-#: builtin/help.c:357
+#: builtin/help.c:360

 msgid "no man viewer handled the request"
 msgstr "ningún visualizador de manual proceso la petición"
 
 msgid "no man viewer handled the request"
 msgstr "ningún visualizador de manual proceso la petición"
 

-#: builtin/help.c:365
+#: builtin/help.c:368

 msgid "no info viewer handled the request"
 msgstr "ningún visor de info manejo la petición"
 
 msgid "no info viewer handled the request"
 msgstr "ningún visor de info manejo la petición"
 

-#: builtin/help.c:407
-msgid "Defining attributes per path"
-msgstr "Definiendo atributos por ruta"
-
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
-msgstr "Git diario con 20 comandos o algo así"
-
-#: builtin/help.c:409
-msgid "A Git glossary"
-msgstr "Un glosario de Git"
-
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
-msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-
-#: builtin/help.c:411
-msgid "Defining submodule properties"
-msgstr "Definiendo las propiedades del submódulo"
-
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
-msgstr "Especificando revisiones y rangos para Git"
-
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr "Un tutorial de introducción para Git ( para versiones 1.5.1 o mayores)"
-
-#: builtin/help.c:414
-msgid "An overview of recommended workflows with Git"
-msgstr "Una visión general de flujos de trabajo recomendados con Git"
-
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
-msgstr "Las guías comunes de Git son:\n"
-
-#: builtin/help.c:444
+#: builtin/help.c:415

 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 

-#: builtin/help.c:466 builtin/help.c:483
+#: builtin/help.c:442 builtin/help.c:459

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


@@ -10123,8 +10152,8 @@ msgstr "ignorando template %s"
 
 #: builtin/init-db.c:120
 #, c-format
 
 #: builtin/init-db.c:120
 #, c-format

-msgid "templates not found %s"
-msgstr "no se encontraron templates %s"
+msgid "templates not found in %s"
+msgstr "template no encontrado en %s"

 
 #: builtin/init-db.c:135
 #, c-format
 
 #: builtin/init-db.c:135
 #, c-format


@@ -10814,184 +10843,184 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 

-#: builtin/merge.c:50
+#: builtin/merge.c:51

 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 

-#: builtin/merge.c:51
+#: builtin/merge.c:52

 msgid "git merge --abort"
 msgstr "git merge --abort"
 
 msgid "git merge --abort"
 msgstr "git merge --abort"
 

-#: builtin/merge.c:52
+#: builtin/merge.c:53

 msgid "git merge --continue"
 msgstr "git merge --continue"
 
 msgid "git merge --continue"
 msgstr "git merge --continue"
 

-#: builtin/merge.c:109
+#: builtin/merge.c:110

 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:146
+#: builtin/merge.c:147

 #, 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:147
+#: builtin/merge.c:148

 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 

-#: builtin/merge.c:152
+#: builtin/merge.c:153

 #, 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:202 builtin/pull.c:142
+#: builtin/merge.c:203 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:205 builtin/pull.c:145
+#: builtin/merge.c:206 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:206 builtin/pull.c:148
+#: builtin/merge.c:207 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:208 builtin/pull.c:151
+#: builtin/merge.c:209 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:211 builtin/pull.c:157
+#: builtin/merge.c:212 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:213 builtin/pull.c:160
+#: builtin/merge.c:214 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:215 builtin/pull.c:163
+#: builtin/merge.c:216 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:216
+#: builtin/merge.c:217

 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 

-#: builtin/merge.c:218 builtin/pull.c:169
+#: builtin/merge.c:219 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:222 builtin/pull.c:172
+#: builtin/merge.c:223 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:223 builtin/notes.c:777 builtin/pull.c:176
+#: builtin/merge.c:224 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:224 builtin/pull.c:177
+#: builtin/merge.c:225 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:225 builtin/pull.c:180
+#: builtin/merge.c:226 builtin/pull.c:180

 msgid "option=value"
 msgstr "opción=valor"
 
 msgid "option=value"
 msgstr "opción=valor"
 

-#: builtin/merge.c:226 builtin/pull.c:181
+#: builtin/merge.c:227 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:228
+#: builtin/merge.c:229

 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:232
+#: builtin/merge.c:233

 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:234
+#: builtin/merge.c:235

 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:236 builtin/pull.c:188
+#: builtin/merge.c:237 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:242
+#: builtin/merge.c:243

 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:267
+#: builtin/merge.c:268

 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:272
+#: builtin/merge.c:273

 msgid "stash failed"
 msgstr "stash falló"
 
 msgid "stash failed"
 msgstr "stash falló"
 

-#: builtin/merge.c:277
+#: builtin/merge.c:278

 #, 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:299 builtin/merge.c:316
+#: builtin/merge.c:300 builtin/merge.c:317

 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 

-#: builtin/merge.c:346
+#: builtin/merge.c:347

 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 

-#: builtin/merge.c:357
+#: builtin/merge.c:358

 #, 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:407
+#: builtin/merge.c:408

 #, 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:457
+#: builtin/merge.c:458

 #, 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:547
+#: builtin/merge.c:548

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 

-#: builtin/merge.c:668
+#: builtin/merge.c:669

 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 

-#: builtin/merge.c:682
+#: builtin/merge.c:683

 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 

-#: builtin/merge.c:697
+#: builtin/merge.c:698

 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 

-#: builtin/merge.c:748
+#: builtin/merge.c:749

 #, 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:757
+#: builtin/merge.c:758

 #, 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:763
+#: builtin/merge.c:764

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


@@ -11008,70 +11037,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:799
+#: builtin/merge.c:800

 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 

-#: builtin/merge.c:818
+#: builtin/merge.c:819

 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 

-#: builtin/merge.c:871
+#: builtin/merge.c:872

 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Fusión automática falló; arregle los conflictos y luego realice un commit "
 "con el resultado.\n"
 
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Fusión automática falló; arregle los conflictos y luego realice un commit "
 "con el resultado.\n"
 

-#: builtin/merge.c:910
+#: builtin/merge.c:911

 msgid "No current branch."
 msgstr "No rama actual."
 
 msgid "No current branch."
 msgstr "No rama actual."
 

-#: builtin/merge.c:912
+#: builtin/merge.c:913

 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 

-#: builtin/merge.c:914
+#: builtin/merge.c:915

 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 
 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 

-#: builtin/merge.c:919
+#: builtin/merge.c:920

 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hay rama de rastreo remoto para %s de %s"
 
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hay rama de rastreo remoto para %s de %s"
 

-#: builtin/merge.c:972
+#: builtin/merge.c:973

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mal valor '%s' en el entorno '%s'"
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mal valor '%s' en el entorno '%s'"
 

-#: builtin/merge.c:1074
+#: builtin/merge.c:1075

 #, 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:1108
+#: builtin/merge.c:1109

 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:1210
+#: builtin/merge.c:1211

 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 

-#: builtin/merge.c:1214
+#: builtin/merge.c:1215

 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:1226
+#: builtin/merge.c:1227

 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 

-#: builtin/merge.c:1230
+#: builtin/merge.c:1231

 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:1246
+#: builtin/merge.c:1247

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


@@ -11079,7 +11108,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:1253
+#: builtin/merge.c:1254

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


@@ -11087,113 +11116,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:1256
+#: builtin/merge.c:1257

 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:1265
+#: builtin/merge.c:1266

 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:1273
+#: builtin/merge.c:1274

 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:1290
+#: builtin/merge.c:1291

 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:1292
+#: builtin/merge.c:1293

 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:1297
+#: builtin/merge.c:1298

 #, 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:1299
+#: builtin/merge.c:1300

 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:1333
+#: builtin/merge.c:1334

 #, 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:1336
+#: builtin/merge.c:1337

 #, 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:1339
+#: builtin/merge.c:1340

 #, 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:1342
+#: builtin/merge.c:1343

 #, 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:1401
+#: builtin/merge.c:1402

 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:1410
+#: builtin/merge.c:1411

 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 

-#: builtin/merge.c:1420
+#: builtin/merge.c:1421

 #, 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:1461
+#: builtin/merge.c:1462

 #, 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:1468
+#: builtin/merge.c:1469

 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 

-#: builtin/merge.c:1493
+#: builtin/merge.c:1494

 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:1499
+#: builtin/merge.c:1500

 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:1522 builtin/merge.c:1601
+#: builtin/merge.c:1523 builtin/merge.c:1602

 #, 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:1526
+#: builtin/merge.c:1527

 #, 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:1592
+#: builtin/merge.c:1593

 #, 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:1594
+#: builtin/merge.c:1595

 #, 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:1603
+#: builtin/merge.c:1604

 #, 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:1615
+#: builtin/merge.c:1616

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


@@ -13707,23 +13736,23 @@ msgstr "rev-list no soporta mostrar notas"
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
 
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
 

-#: builtin/rev-parse.c:402
+#: builtin/rev-parse.c:406

 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 

-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:411

 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 
 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 

-#: builtin/rev-parse.c:409
+#: builtin/rev-parse.c:413

 msgid "stop parsing after the first non-option argument"
 msgstr "detener análisis tras el primer argumento que no es opción"
 
 msgid "stop parsing after the first non-option argument"
 msgstr "detener análisis tras el primer argumento que no es opción"
 

-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:416

 msgid "output in stuck long form"
 msgstr "salida en formulario largo de atasco"
 
 msgid "output in stuck long form"
 msgstr "salida en formulario largo de atasco"
 

-#: builtin/rev-parse.c:545
+#: builtin/rev-parse.c:549

 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"


@@ -15390,7 +15419,7 @@ 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:26
+#: git.c:27

 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"


@@ -15406,7 +15435,7 @@ msgstr ""
 "           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
 "           <comando> [<args>]"
 
 "           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
 "           <comando> [<args>]"
 

-#: git.c:33
+#: git.c:34

 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"


@@ -15416,47 +15445,47 @@ 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:113
+#: git.c:173

 #, 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:127
+#: git.c:187

 #, 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:141
+#: git.c:201

 #, 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:155
+#: git.c:215

 #, 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:177
+#: git.c:237

 #, 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:215
+#: git.c:275

 #, 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:233
+#: git.c:300

 #, 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:698
+#: git.c:765

 #, 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:710
+#: git.c:777

 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"


@@ -15498,129 +15527,669 @@ msgstr "args"
 msgid "object filtering"
 msgstr "filtrado de objeto"
 
 msgid "object filtering"
 msgstr "filtrado de objeto"
 

-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
-msgstr "comienza un área de trabajo (ver también: git help tutorial)"
+#: parse-options.h:157
+msgid "expiry-date"
+msgstr "fecha de expiración"

 
 

-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
-msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+#: parse-options.h:172
+msgid "no-op (backward compatibility)"
+msgstr "no-op (compatibilidad con versiones anteriores)"

 
 

-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "examina el historial y el estado (ver también: git help revisions)"
+#: parse-options.h:251
+msgid "be more verbose"
+msgstr "ser mas verboso"

 
 

-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
-msgstr "crece, marca y ajusta tu historial común"
+#: parse-options.h:253
+msgid "be more quiet"
+msgstr "ser mas discreto"

 
 

-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
-msgstr "colabora (mira también: git help workflows)"
+#: parse-options.h:259
+msgid "use <n> digits to display SHA-1s"
+msgstr "usa <n> dígitos para mostrar SHA-1s"

 
 

-#: common-cmds.h:17
+#: command-list.h:50

 msgid "Add file contents to the index"
 msgstr "Agrega contenido de carpetas al índice"
 
 msgid "Add file contents to the index"
 msgstr "Agrega contenido de carpetas al índice"
 

-#: common-cmds.h:18
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Aplicar una serie de parches de un mailbox"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Anotar líneas de archivo con información de commit"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Aplicar un parche a archivos y/o  el índice"
+
+#: command-list.h:54
+msgid "Import an Arch repository into Git"
+msgstr "Importar un repositorio Arch en Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Crear un archivo o archivos de un árbol nombrado"
+
+#: command-list.h:56

 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
 
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
 

-#: common-cmds.h:19
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+"Mostrar qué revisión y autor modificaron al último cada línea de un archivo"
+
+#: command-list.h:58

 msgid "List, create, or delete branches"
 msgstr "Lista, crea, o borra ramas"
 
 msgid "List, create, or delete branches"
 msgstr "Lista, crea, o borra ramas"
 

-#: common-cmds.h:20
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "Mover objetos y referencias por archivo"
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+"Proveer contenido o tipo y tamaño de información para objetos de repositorio"
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "Mostrar información de gitattributes"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "Debug a gitignore / excluir archivos"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Mostrar nombres canónicos y direcciones de correo de contactos"
+
+#: command-list.h:64

 msgid "Switch branches or restore working tree files"
 msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
 
 msgid "Switch branches or restore working tree files"
 msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
 

-#: common-cmds.h:21
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "Copiar archivos del índice al árbol de trabajo"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "Asegura que un nombre de referencia esté bien formado"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "Encuentra commits que faltan aplicar en upstream"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Aplica los cambios introducidos por algunos commits existentes"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "Opción gráfica a git-commit"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "Remueve archivos del árbol de trabajo no rastreados"
+
+#: command-list.h:71

 msgid "Clone a repository into a new directory"
 msgstr "Clona un repositorio dentro de un nuevo directorio"
 
 msgid "Clone a repository into a new directory"
 msgstr "Clona un repositorio dentro de un nuevo directorio"
 

-#: common-cmds.h:22
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "Mostrar data en columnas"
+
+#: command-list.h:73

 msgid "Record changes to the repository"
 msgstr "Graba los cambios en tu repositorio"
 
 msgid "Record changes to the repository"
 msgstr "Graba los cambios en tu repositorio"
 

-#: common-cmds.h:23
+#: command-list.h:74
+msgid "Write and verify Git commit graph files"
+msgstr "Escribe y verifica los archivos de Git commit graph"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "Crea un nuevo objeto commit"
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "Configurar repositorio u opciones globales"
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Contar número de objetos no empaquetados y su consumo en disco"
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "Obtener y guardar credenciales de usuario"
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Auxiliar para almacenar temporalmente claves en memoria"
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "Auxiliar para guardar credenciales en disco"
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "Exporta un commit único a CVS checkout"
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "Salva tus datos de otro SCM que la gente adora odiar"
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "Un servidor emulador de CVS para Git"
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "Un servidor realmente simple para repositorios Git"
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+"Dar a un objeto un nombre legible por humanos basado en una referencia "
+"disponible"
+
+#: command-list.h:86

 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 

-#: common-cmds.h:24
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "Compara archivos del árbol de trabajo y del índice"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "Compara un árbol con el árbol de trabajo o índice"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
+"de árbol"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr "Mostrar cambios usando herramientas de diff comunes"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Exportador de data Git"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Backend para importadores de data de Git rápidos"
+
+#: command-list.h:93

 msgid "Download objects and refs from another repository"
 msgstr "Descarga objetos y referencias de otro repositorio"
 
 msgid "Download objects and refs from another repository"
 msgstr "Descarga objetos y referencias de otro repositorio"
 

-#: common-cmds.h:25
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "Descarga objetos faltantes de otro repositorio"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "Reescribir ramas"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "Produce un mensaje de commit para fusión"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "Información de output en cada ref"
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "Prepara parches para ser enviados por e-mail"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Extrae el ID de commit de un archivo creado usando git-archive"
+
+#: command-list.h:102

 msgid "Print lines matching a pattern"
 msgstr "Imprime las líneas que concuerdan con el patron"
 
 msgid "Print lines matching a pattern"
 msgstr "Imprime las líneas que concuerdan con el patron"
 

-#: common-cmds.h:26
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "Una interfaz gráfica portátil para Git"
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "Mostrar información sobre Git"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Implementación de lado de servidor de Git por HTTP"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Descarga de un repositorio Git remoto vía HTTP"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "Constuye un archivo de índice para un archivo empaquetado existente"
+
+#: command-list.h:111

 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
 
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
 

-#: common-cmds.h:27
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
+
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
+msgstr "agregar o analizar información estructurada en mensajes de commit"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "El navegador de repositorio Git"
+
+#: command-list.h:115

 msgid "Show commit logs"
 msgstr "Muestra los logs de los commits"
 
 msgid "Show commit logs"
 msgstr "Muestra los logs de los commits"
 

-#: common-cmds.h:28
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "Lista referencias en un repositorio remoto"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "Lista los contenidos de un objeto árbol"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Extraer parche y autoría de un único mensaje de e-mail"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "Programa divisor de mbox simple de UNIX"
+
+#: command-list.h:121

 msgid "Join two or more development histories together"
 msgstr "Junta dos o mas historiales de desarrollo juntos"
 
 msgid "Join two or more development histories together"
 msgstr "Junta dos o mas historiales de desarrollo juntos"
 

-#: common-cmds.h:29
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Encuentra un ancestro común bueno para una posible fusión"
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "Ejecuta una fusión de tres vías en un archivo"
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "Ejecuta una fusión para archivos que la necesitan"
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "El programa de ayuda estándar para usar con git-merge-index"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
+"conflictos de fusión"
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "Mostrar fusión de tres vías sin tocar el índice"
+
+#: command-list.h:128
+msgid "Creates a tag object"
+msgstr "Crea un objeto tag"
+
+#: command-list.h:129
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Construir un objeto árbol de un texto en formato ls-tree"
+
+#: command-list.h:130

 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
 
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
 

-#: common-cmds.h:30
+#: command-list.h:131
+msgid "Find symbolic names for given revs"
+msgstr "Encontrar nombres simbólicos para revs dados"
+
+#: command-list.h:132
+msgid "Add or inspect object notes"
+msgstr "Agrega o inspecciona objetos nota"
+
+#: command-list.h:133
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importar desde y enviar a repositorios Perforce"
+
+#: command-list.h:134
+msgid "Create a packed archive of objects"
+msgstr "Crea un archivo de objetos empaquetados"
+
+#: command-list.h:135
+msgid "Find redundant pack files"
+msgstr "Encuentra archivos empaquetados de manera redundante"
+
+#: command-list.h:136
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
+
+#: command-list.h:137
+msgid "Routines to help parsing remote repository access parameters"
+msgstr ""
+"Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
+"remoto"
+
+#: command-list.h:138
+msgid "Compute unique ID for a patch"
+msgstr "Calcular ID único para un parche"
+
+#: command-list.h:139
+msgid "Prune all unreachable objects from the object database"
+msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
+
+#: command-list.h:140
+msgid "Remove extra objects that are already in pack files"
+msgstr "Remover objetos extra que ya están en archivos empaquetados"
+
+#: command-list.h:141

 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Realiza un fetch e integra con otro repositorio o rama local"
 
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Realiza un fetch e integra con otro repositorio o rama local"
 

-#: common-cmds.h:31
+#: command-list.h:142

 msgid "Update remote refs along with associated objects"
 msgstr "Actualiza referencias remotas junto con sus objetos asociados"
 
 msgid "Update remote refs along with associated objects"
 msgstr "Actualiza referencias remotas junto con sus objetos asociados"
 

-#: common-cmds.h:32
+#: command-list.h:143
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Aplica un parche quilt en la rama actual"
+
+#: command-list.h:144
+msgid "Reads tree information into the index"
+msgstr "Lee información del ábol en el índice"
+
+#: command-list.h:145

 msgid "Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 
 msgid "Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 

-#: common-cmds.h:33
+#: command-list.h:146
+msgid "Receive what is pushed into the repository"
+msgstr "Recibir lo que es empujado en el respositorio"
+
+#: command-list.h:147
+msgid "Manage reflog information"
+msgstr "Gestionar información de reflog"
+
+#: command-list.h:148
+msgid "Manage set of tracked repositories"
+msgstr "Gestiona un conjunto de repositorios rastreados"
+
+#: command-list.h:149
+msgid "Pack unpacked objects in a repository"
+msgstr "empaquetar objetos no empaquetados en un repositorio"
+
+#: command-list.h:150
+msgid "Create, list, delete refs to replace objects"
+msgstr "Crea, lista, borra referencias para reemplazar objetos"
+
+#: command-list.h:151
+msgid "Generates a summary of pending changes"
+msgstr "Genera un resumen de cambios pendientes"
+
+#: command-list.h:152
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
+
+#: command-list.h:153

 msgid "Reset current HEAD to the specified state"
 msgstr "Reinicia el HEAD actual a un estado especifico"
 
 msgid "Reset current HEAD to the specified state"
 msgstr "Reinicia el HEAD actual a un estado especifico"
 

-#: common-cmds.h:34
+#: command-list.h:154
+msgid "Revert some existing commits"
+msgstr "Revierte algunos commits existentes"
+
+#: command-list.h:155
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Lista objetos commit en orden cronológico inverso"
+
+#: command-list.h:156
+msgid "Pick out and massage parameters"
+msgstr "Seleccionar y masajear los parámetros"
+
+#: command-list.h:157

 msgid "Remove files from the working tree and from the index"
 msgstr "Borra archivos del árbol de trabajo y del índice"
 
 msgid "Remove files from the working tree and from the index"
 msgstr "Borra archivos del árbol de trabajo y del índice"
 

-#: common-cmds.h:35
+#: command-list.h:158
+msgid "Send a collection of patches as emails"
+msgstr "Envía una colección de parches como e-mails"
+
+#: command-list.h:159
+msgid "Push objects over Git protocol to another repository"
+msgstr "Empujar objetos por protocolo Git a otro repositorio"
+
+#: command-list.h:160
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
+
+#: command-list.h:161
+msgid "Summarize 'git log' output"
+msgstr "Resumir la salida 'git log'"
+
+#: command-list.h:162

 msgid "Show various types of objects"
 msgstr "Muestra varios tipos de objetos"
 
 msgid "Show various types of objects"
 msgstr "Muestra varios tipos de objetos"
 

-#: common-cmds.h:36
+#: command-list.h:163
+msgid "Show branches and their commits"
+msgstr "Mostrar ramas y sus commits"
+
+#: command-list.h:164
+msgid "Show packed archive index"
+msgstr "Mostrar el índice de archivo empaquetado"
+
+#: command-list.h:165
+msgid "List references in a local repository"
+msgstr "Listar referencias en el repositorio local"
+
+#: command-list.h:166
+msgid "Git's i18n setup code for shell scripts"
+msgstr "El código de configuración i18n de Git para scripts de shell"
+
+#: command-list.h:167
+msgid "Common Git shell script setup code"
+msgstr "Código de configuración de script de shell común de Git"
+
+#: command-list.h:168
+msgid "Stash the changes in a dirty working directory away"
+msgstr ""
+"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
+"maneras"
+
+#: command-list.h:169
+msgid "Add file contents to the staging area"
+msgstr "Agrega contenidos de un archivo al área de staging"
+
+#: command-list.h:170

 msgid "Show the working tree status"
 msgstr "Muestra el estado del árbol de trabajo"
 
 msgid "Show the working tree status"
 msgstr "Muestra el estado del árbol de trabajo"
 

-#: common-cmds.h:37
+#: command-list.h:171
+msgid "Remove unnecessary whitespace"
+msgstr "Eliminar el espacio en blanco innecesario"
+
+#: command-list.h:172
+msgid "Initialize, update or inspect submodules"
+msgstr "Inicializa, actualiza o inspecciona submódulos"
+
+#: command-list.h:173
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Operación bidireccional entre un repositorio Subversion y Git"
+
+#: command-list.h:174
+msgid "Read, modify and delete symbolic refs"
+msgstr "Lee, modifica y borra referencias simbólicas"
+
+#: command-list.h:175

 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 

-#: parse-options.h:157
-msgid "expiry-date"
-msgstr "fecha de expiración"
+#: command-list.h:176
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Crea un archivo temporal con contenidos de un blob"

 
 

-#: parse-options.h:172
-msgid "no-op (backward compatibility)"
-msgstr "no-op (compatibilidad con versiones anteriores)"
+#: command-list.h:177
+msgid "Unpack objects from a packed archive"
+msgstr "Desempaqueta objetos de un archivo empaquetado"

 
 

-#: parse-options.h:251
-msgid "be more verbose"
-msgstr "ser mas verboso"
+#: command-list.h:178
+msgid "Register file contents in the working tree to the index"
+msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"

 
 

-#: parse-options.h:253
-msgid "be more quiet"
-msgstr "ser mas discreto"
+#: command-list.h:179
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+"Actualiza el nombre del objeto almacenado en una referencia de forma segura"

 
 

-#: parse-options.h:259
-msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> dígitos para mostrar SHA-1s"
+#: command-list.h:180
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+"Actualiza el archivo de información auxiliar para ayudar a los servidores "
+"dumb"
+
+#: command-list.h:181
+msgid "Send archive back to git-archive"
+msgstr "Enviar archivo a git-archive"
+
+#: command-list.h:182
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Enviar objetos empaquetados a git-fetch-pack"
+
+#: command-list.h:183
+msgid "Show a Git logical variable"
+msgstr "Mostrar una variable lógica de Git"
+
+#: command-list.h:184
+msgid "Check the GPG signature of commits"
+msgstr "Verificar firma GPG de commits"
+
+#: command-list.h:185
+msgid "Validate packed Git archive files"
+msgstr "Valida archivos Git empaquetados"
+
+#: command-list.h:186
+msgid "Check the GPG signature of tags"
+msgstr "Verifica la firma GPG de etiquetas"
+
+#: command-list.h:187
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfaz web Git (interfaz web para repositorios Git)"
+
+#: command-list.h:188
+msgid "Show logs with difference each commit introduces"
+msgstr "Muestra logs con las diferencias que cada commit introduce"
+
+#: command-list.h:189
+msgid "Manage multiple working trees"
+msgstr "Gestiona múltiples árboles de trabajo"
+
+#: command-list.h:190
+msgid "Create a tree object from the current index"
+msgstr "Crea un objeto árbol del índice actual"
+
+#: command-list.h:191
+msgid "Defining attributes per path"
+msgstr "Definiendo atributos por ruta"
+
+#: command-list.h:192
+msgid "Git command-line interface and conventions"
+msgstr "Interfaz y convenciones de línea de comandos de Git"
+
+#: command-list.h:193
+msgid "A Git core tutorial for developers"
+msgstr "Un tutorial básico de Git para desarrolladores"
+
+#: command-list.h:194
+msgid "Git for CVS users"
+msgstr "Git para usuarios CVS"
+
+#: command-list.h:195
+msgid "Tweaking diff output"
+msgstr "Afinar la salida de diff"
+
+#: command-list.h:196
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Un conjunto mínimo útil de comandos diarios de Git"
+
+#: command-list.h:197
+msgid "A Git Glossary"
+msgstr "Un Glosario de Git"
+
+#: command-list.h:198
+msgid "Hooks used by Git"
+msgstr "Hooks utilizados por Git"
+
+#: command-list.h:199
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+
+#: command-list.h:200
+msgid "Defining submodule properties"
+msgstr "Definiendo las propiedades del submódulo"
+
+#: command-list.h:201
+msgid "Git namespaces"
+msgstr "namespaces de Git"
+
+#: command-list.h:202
+msgid "Git Repository Layout"
+msgstr "Disposición del repositorio Git"
+
+#: command-list.h:203
+msgid "Specifying revisions and ranges for Git"
+msgstr "Especificando revisiones y rangos para Git"
+
+#: command-list.h:204
+msgid "A tutorial introduction to Git: part two"
+msgstr "Un tutorial de introducción a Git: parte dos"
+
+#: command-list.h:205
+msgid "A tutorial introduction to Git"
+msgstr "Un tutorial de introducción para Git"
+
+#: command-list.h:206
+msgid "An overview of recommended workflows with Git"
+msgstr "Una visión general de flujos de trabajo recomendados con Git"

 
 #: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
 
 #: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"


@@ -16379,7 +16948,7 @@ msgid ""
 "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"
 "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"
+"x, exec <command> = 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"
 "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"


@@ -17689,6 +18258,9 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 

+#~ msgid "Everyday Git With 20 Commands Or So"
+#~ msgstr "Git diario con 20 comandos o algo así"
+

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