msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-20 22:24-0500\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-16 21:15-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
#: advice.c:86
msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
+msgstr ""
+"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
#: advice.c:88
msgid "Committing is not possible because you have unmerged files."
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
"otro checkout.\n"
"\n"
"Si quieres crear una nueva rama para mantener los commits que has creado,\n"
-"puedes hacerlo (ahora o después) usando -b con el comando checkout. Ejemplo:\n"
+"puedes hacerlo (ahora o después) usando -b con el comando checkout. "
+"Ejemplo:\n"
"\n"
" git checkout -b <nombre-de-nueva-rama>\n"
"\n"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opcion de ignorar espacios en blanco no reconocida '%s'"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject y --3way no se pueden utilizar juntas."
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached y --3way no se pueden utilizar juntas."
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way esta fuera de un repositorio"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "--index esta fuera de un repositorio"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached esta fuera de un repositorio"
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No se puede preparar una marca de tiempo para la expresion regular %s"
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec retorno %d para la entrada: %s"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr "no se puede encontrar el nombre del archivo en el parche en la linea %d"
+msgstr ""
+"no se puede encontrar el nombre del archivo en el parche en la linea %d"
-#: apply.c:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: mal git-diff - se esperaba /dev/null, se encontro %s en la linea %d"
+msgstr ""
+"git apply: mal git-diff - se esperaba /dev/null, se encontro %s en la linea "
+"%d"
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: mal git-diff - nuevo nombre de archivo inconsistente en la linea %d"
+msgstr ""
+"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la linea "
+"%d"
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: mal git-diff - viejo nombre de archivo inconsistente en la linea %d"
+msgstr ""
+"git apply: mal git-diff - viejo nombre de archivo inconsistente en la linea "
+"%d"
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: mal git-diff - se esperaba /dev/null en la linea %d"
-#: apply.c:1008
+#: apply.c:1007
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "modo invalido en la linea %d: %s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "header inconsistente en las lineas %d y %d"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: linea inesperada: %.*s"
-#: apply.c:1567
+#: apply.c:1566
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de parche sin header en la linea %d: %.*s"
-#: apply.c:1587
+#: apply.c:1586
#, c-format
-msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)"
-msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)"
-msgstr[0] "al header de git diff carece de informacion del nombre del archivo %d cuando lo remueve de la ruta principalcomponente (linea %d)"
-msgstr[1] "los headers de git diff carecen de informacion de los nombres de los archivos %d cuando los remueven de la ruta principalcomponentes (linea %d)"
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"al header de git diff carece de informacion del nombre del archivo %d cuando "
+"lo remueve de la ruta principalcomponente (linea %d)"
+msgstr[1] ""
+"los headers de git diff carecen de informacion de los nombres de los "
+"archivos %d cuando los remueven de la ruta principalcomponentes (linea %d)"
-#: apply.c:1600
+#: apply.c:1599
#, c-format
msgid "git diff header lacks filename information (line %d)"
-msgstr "el header de git diff carece de informacion del nombre del archivo (linea %d)"
+msgstr ""
+"el header de git diff carece de informacion del nombre del archivo (linea %d)"
-#: apply.c:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "el nuevo archivo depende de contenidos viejos"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "el archivo eliminado todavia tiene contenido"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "parche corrupto en la linea %d"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "nuevo archivo %s depende en contenidos viejos"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "el archivo borrado %s todavia tiene contenido"
-#: apply.c:1848
+#: apply.c:1865
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** peligro: el archivo %s esta vacio pero no es borrado"
-#: apply.c:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "parche binario corrupto en la linea %d: %.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "parche binario no reconocido en la linea %d"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "parche que solo contiene basura en la linea %d"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "no es posible leer el symlink %s"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "no es posible abrir o leer %s"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "comienzo invalido de linea: '%c'"
-#: apply.c:3052
+#: apply.c:3077
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Hunk #%d tuvo exito en %d (%d linea compensada)."
msgstr[1] "Hunk #%d tuvo exito en %d (%d lineas compensadas)."
-#: apply.c:3064
+#: apply.c:3089
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
-#: apply.c:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"Mientras se busca:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "data perdida en parche binario para '%s'"
-#: apply.c:3100
+#: apply.c:3125
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
+msgstr ""
+"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
-#: apply.c:3146
+#: apply.c:3171
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "no se puede aplcar el parche binario a '%s' sin un indice completo"
-#: apply.c:3156
+#: apply.c:3181
#, c-format
-msgid "the patch applies to '%s' (%s), which does not match the current contents."
-msgstr "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos actuales."
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
+"actuales."
-#: apply.c:3164
+#: apply.c:3189
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el parche aplica a un '%s' vacio, pero este no lo esta"
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "la postimagen necesaria %s para '%s' no se puede leer"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el parche binario no aplica para '%s'"
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se obtuvo %s)"
+msgstr ""
+"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
+"obtuvo %s)"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el parche fallo: %s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "leyendo de '%s' tras un symbolic link"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "la ruta %s ha sido renombrada/suprimida"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existe en el indice"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el indice"
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "el repositorio carece del blob necesario para regresar en un merge de tres-vias"
+msgstr ""
+"el repositorio carece del blob necesario para regresar en un merge de tres-"
+"vias"
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retrocediendo en un merge de tres-vias...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no se pueden leer los contenidos actuales de '%s'"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Fallo el merge en retroceso de tres-vias...\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Parche aplicado a '%s' con conflictos.\n"
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Parche aplicado a '%s' limpiamente\n"
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "parche de remocion deja contenidos en el archivo"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo incorrecto"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
msgstr "ruta invalida '%s'"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el indice"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3941
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3946
+#: apply.c:3972
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:3966
+#: apply.c:3992
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' esta tras un symbolic link"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta informacion del sha1 o es inutil para el submodulo %s"
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informacion sha1 o es inutil (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry fallo para la ruta '%s'"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo anadir %s al indice temporal"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un indice temporal para %s"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede remover %s del indice"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submodulo %s"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible establecer el archivo recien creado '%s'"
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
-msgstr "no es posible crear una copia de seguridad para el archivo recien creado %s"
+msgstr ""
+"no es posible crear una copia de seguridad para el archivo recien creado %s"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
msgstr "fallo escribir para '%s'"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente"
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "Error interno"
-#: apply.c:4522
+#: apply.c:4548
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej "
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente"
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "hunk #%d rechazado"
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "no es posible leer el archivo indice"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco aplastado"
msgstr[1] "%d errores de espacios en blanco aplastados"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d linea agrega errores de espacios en blanco."
msgstr[1] "%d lineas agregan erroes de espacios en blanco."
-#: apply.c:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] "%d linea aplicada despues de arreglar los errores de espacios en blanco."
-msgstr[1] "%d lineas aplicadas despues de arreglar los errores de espacios en blanco."
+msgstr[0] ""
+"%d linea aplicada despues de arreglar los errores de espacios en blanco."
+msgstr[1] ""
+"%d lineas aplicadas despues de arreglar los errores de espacios en blanco."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo indice"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 builtin/submodule--helper.c:304
-#: builtin/submodule--helper.c:629 builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "ruta"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "num"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar elparche, mostrar diffstat para la entrada"
-#: apply.c:4937
+#: apply.c:4963
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el numero de lineas agregadas y elminadas en notacion decimal"
-#: apply.c:4939
+#: apply.c:4965
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:4941
+#: apply.c:4967
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche es aplicable al indice actual"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el arbol de trabajo"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toca fuera del area de trabajo"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tambien aplicar el parche ( usar con --stat/--summary/--check"
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr "intentar merge de tres-vias si el parche no aplica"
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
-msgstr "construir un indice temporal basado en la informacion del indice incrustado"
+msgstr ""
+"construir un indice temporal basado en la informacion del indice incrustado"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "rutas estan separadas con un caracter NULL "
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "asegure que por lo menos <n> lineas del contexto concuerden"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "accion"
-#: apply.c:4960
+#: apply.c:4986
msgid "detect new or modified lines that have whitespace errors"
-msgstr "detectar lineas nuevas o modificadas que contienen errores de espacios en blanco"
+msgstr ""
+"detectar lineas nuevas o modificadas que contienen errores de espacios en "
+"blanco"
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
-msgstr "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
+msgstr ""
+"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "no espera al menos una linea del contexto"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 builtin/log.c:1877 builtin/mv.c:123
-#: builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:4978
+#: apply.c:5004
msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "tolerar nuevas lineas faltantes detectadas incorrectamente al final del archivo"
+msgstr ""
+"tolerar nuevas lineas faltantes detectadas incorrectamente al final del "
+"archivo"
-#: apply.c:4981
+#: apply.c:5007
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de lineas en los headers del hunk"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "raiz"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
msgstr "git archive --list"
#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-arbol> [<ruta>...]"
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"
+"arbol> [<ruta>...]"
#: archive.c:16
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <comando>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ruta especificada '%s' no concordo con ninguna carpeta"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "fmt"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "formato del archivo"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "prefijo"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en el archivo"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 parse-options.h:153
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
+#: parse-options.h:153
msgid "file"
msgstr "carpeta"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escribe el archivo en esta carpeta"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "leer .gitatributes en el directorio de trabajo"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "reportar archivos archivados por stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "solo guardar"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "comprimir mas rapido"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "comprimir mejor"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "repo"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "comando"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archivo remoto "
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "opcion inesperada --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "Opcion --exec solo puede ser utilizada con --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Opcion inesperada --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de carpeta desconocido '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soprtado para formato '%s': -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no es un nombre de atributo valido"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisectando: una base de fusion debe ser probada\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "una %s revision es necesaria"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "fallo leer las refs de bisect"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s fue tanto %s como %s\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"No se encontró confirmación que se pueda probar.\n"
"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#: bisect.c:1000
+#.
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
#: blame.c:1788
msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "--reverse y --first-parent juntos requieren especificar el ultimo commit"
+msgstr ""
+"--reverse y --first-parent juntos requieren especificar el ultimo commit"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 builtin/log.c:1357
-#: builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "fallo la configuracion del camino de revision"
#: blame.c:1815
-msgid "--reverse --first-parent together require range along first-parent chain"
-msgstr "--reverse --first-parent jutnos requieren un rango a lo largo de la cadena del primer padre"
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent jutnos requieren un rango a lo largo de la cadena "
+"del primer padre"
#: blame.c:1826
#, c-format
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Rama %s configurada para hacerle seguimiento a la rama remota %s de %s rebasándola."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
+"por rebase."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Rama %s configurada para hacerle seguimiento a la rama remota %s de %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Rama %s configurada para hacerle seguimiento a la rama local %s rebasándola."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "Rama %s configurada para hacerle seguimiento a la rama local %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Rama %s configurada para hacerle seguimiento a la referencia remota %s rebasándola."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
+"rebase."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Rama %s configurada para hacerle seguimiento a la referencia remota %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "Rama %s configurada para hacerle seguimiento a la referencia local %s rebasándola."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
+"rebase."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Rama %s configurada para hacerle seguimiento a la referencia local %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgid "A branch named '%s' already exists."
msgstr "Una rama llamada '%s' ya existe."
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "No se puede forzar la actualizacion de la rama actual."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "No se puede configurar el rastreo de informacion; el punto de partida '%s' no es una rama"
+msgstr ""
+"No se puede configurar el rastreo de informacion; el punto de partida '%s' "
+"no es una rama"
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la rama de upstream solicitada '%s' no existe"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\n"
"Si estás planeando hacer push a una nueva rama local que\n"
"va a rastrear a su contraparte remota, tal vez quieras usar\n"
-"\"git push -u\" para configurar tu upstream predeterminado cuando realizas el push."
+"\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
+"el push."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nombre de objeto no valido: '%s'."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nombre de objeto ambiguo: '%s'."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Punto de rama no valido: '%s'."
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ya ha sido marcado en '%s'"
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositorio le falta estos commits prerequisito:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El bundle contiene esta referencia:"
msgstr[1] "El bundle contiene estas %d referencias:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "El bundle registra una historia completa."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El bundle requiere esta referencia:"
msgstr[1] "El bundle requiere estas %d referencias:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "no se pudo engendrar el pack-objetcts"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects muerio"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list muerio"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Rechazando crear un bundle vacio."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "no se puede crear '%s'"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack murio"
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "no se puede anazliar %s"
msgid "%s %s is not a commit!"
msgstr "%s %s no es un commit!"
-#: commit.c:1511
+#: commit.c:1517
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgstr ""
"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
"Tal vez quiera enmendarlo despues de arreglar el mensaje, o arreglar la\n"
-"variable de configuracion i18n.commitencoding para el codificacion que usa su proyecto.\n"
+"variable de configuracion i18n.commitencoding para el codificacion que usa "
+"su proyecto.\n"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
-msgstr "la configuracion relativa incluye condicionales que deben venir de archivos"
+msgstr ""
+"la configuracion relativa incluye condicionales que deben venir de archivos"
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala linea de config %d en el blob %s"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala linea de config %d en el archivo %s"
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala linea de config %d en la entrada standard"
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "mala linea de config %d en el submodulo-blob %s"
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr "mala linea de config %d en la linea de comando %s"
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "mala linea de config %d en %s"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "unidad invalida"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numerica '%s' para '%s': %s"
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "mal valor de config numerica '%s' para '%s' en el blob %s: %s"
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "mal valor de config numerica '%s' para '%s' en el archivo %s: %s"
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "mal valor de config numerica '%s' para '%s' en la entrada standard: %s"
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr "mal valor de config numerica '%s' para '%s' en el submodulo-blob %s: %s"
+msgstr ""
+"mal valor de config numerica '%s' para '%s' en el submodulo-blob %s: %s"
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "mal valor de config numerica '%s' para '%s' en la linea de comando %s: %s"
+msgstr ""
+"mal valor de config numerica '%s' para '%s' en la linea de comando %s: %s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "mal valor de config numerica '%s' para '%s' en %s: %s"
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "fallo al expandir el directorio de usuario en: '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr "mala compresion zlib en nivel %d"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo invalido de creacion de objetos: %s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "mala compresion pack en el nivel %d"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuracion de la linea de comando"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
-msgstr "error desconocido ocurrio mientras se leian los archivos de configuracion"
+msgstr ""
+"error desconocido ocurrio mientras se leian los archivos de configuracion"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Invalido %s: '%s'"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"
+msgstr ""
+"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuracion de la linea de comando"
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la linea %d"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene multiples valores"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s fallo"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
"Por favor asegurese que tiene los permisos de acceso correctos\n"
"y que el repositorio existe."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "fallo escribir a rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "fallo al cerrar la entrada standard de rev-list"
"The file will have its original line endings in your working directory."
msgstr ""
"LF sera reemplazado por CRLF en %s.\n"
-"El archivo tendra sus finales de linea originales en tu directorio de trabajo."
+"El archivo tendra sus finales de linea originales en tu directorio de "
+"trabajo."
#: convert.c:219
#, c-format
#: date.c:167
#, c-format
msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> años"
-msgstr[0] "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> año"
msgstr[1] "%<PRIuMAX> años"
#. TRANSLATORS: "%s" is "<n> years"
msgid "Performing inexact rename detection"
msgstr "Realizando una deteccion de cambios de nombre inexacta"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "opcion '%s' requiere un valor"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " parametro '%s' de dirstat desconocido\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, "
+"'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "digg externo murio, deteniendo en %s"
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Fallo al analizar parametro de opcion --dirstat/-X:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fallo al analizar parametro de opcion --submodule: '%s'"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
-msgstr "deteccion de cambio de nombre inexacta fue saltada por haber muchos archivos"
+msgstr ""
+"deteccion de cambio de nombre inexacta fue saltada por haber muchos archivos"
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
-msgstr "solo se encontraron copias de rutas modificadas por haber muchos archivos"
+msgstr ""
+"solo se encontraron copias de rutas modificadas por haber muchos archivos"
-#: diff.c:4722
+#: diff.c:5511
#, c-format
-msgid "you may want to set your %s variable to at least %d and retry the command."
-msgstr "tal vez quiera configurar la variable %s para por lo menos %d y volver a intentar el comando."
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"tal vez quiera configurar la variable %s para por lo menos %d y volver a "
+"intentar el comando."
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr "fallo al conseguir la informacion y nombre del kernel"
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr "Untracked cache esta desactivado en este sistema o ubicacion"
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "Filtrando contenido"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo establecer el archivo '%s'"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista poco profunda esperada"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "error remoto: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "linea poco profunda invalida: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "rindiendose"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "listo"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "error de protocolo: mal paquete de header"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede quitar %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "%s fallo"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "Servidor no soporta clientes superficiales"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "Servidor soporta ulti_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "Servidor soporta no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "Servidor soporta multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "Servidor soporta side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "Servidor soporta side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servidor soporta allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servidor soporta allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "Servidor soporta ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "Version de servidor es %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Servidor no soporta --shalow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "Servidor no soporta --shalow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "Servidor no soporta --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch fallo"
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servidor no permite solicitudes de objetos inadvertidos %s"
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "fallo al escribir la firma separada para '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora color invalido '%.*s' en log.graphColors"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "fallo al marcar '%s'"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
#: ident.c:381
msgid "no name was given and auto-detection is disabled"
-msgstr "no se entreogo ningun nombre y la deteccion automatica esta desactivada"
+msgstr ""
+"no se entreogo ningun nombre y la deteccion automatica esta desactivada"
#: ident.c:387
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha invalido: %s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"No se puede crear '%s.lock': %s.\n"
"\n"
"Otro proceso git parece estar corriendo en el repositorio, es decir\n"
-"un editor abierto con 'git commit'. Por favor asegurese de que todos los procesos\n"
+"un editor abierto con 'git commit'. Por favor asegurese de que todos los "
+"procesos\n"
"estan terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
"puede haber roto el repositorio antes:\n"
"borra el archivo manualmente para continuar."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "No se pudo crear '%s.lock': %s"
msgid "failed to read the cache"
msgstr "fallo al leer la cache"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo indice"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(mal commit)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache fallo para la ruta '%s'"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "error construyendo arboles"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "fallo al crear la ruta '%s'%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": tal vez un conflicto D/F?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "rehusando perder el archivo rastreado en '%s'"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no se puede leer el objeto %s '%s'"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "se esperaba blob para %s '%s'"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "fallo al abrir '%s': %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "fallo al crear symlink '%s': %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se que hacer con %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Fallo al ejectura fusion interna"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "No es posible agregar %s a la base de datos"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree."
-msgstr "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta version %s de %s en el arbol"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta version %s de %s "
+"en el arbol"
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree."
-msgstr "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s permanece en el arbol"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s "
+"permanece en el arbol"
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s."
-msgstr "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s dejada en el árbol, en %s."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
+"dejada en el árbol, en %s."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree at %s."
-msgstr "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s permanece en el arbol en %s."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Version %s de %s "
+"permanece en el arbol en %s."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "renombrar"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s es un directorio en %s agregando como %s más bien"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
-msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s"
-msgstr "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" renombrar \"%s\"->\"%s\" en \"%s\"%s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
+"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en %s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
+"%s"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renombrando %s a %s y %s a %s más bien"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
+msgstr ""
+"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Agregar %s fusionado"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "contenido"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-fusionando %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como %s"
+msgstr ""
+"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
+"%s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "¡Ya está actualizado!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "la fusión no devolvió ninguna confirmación"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
"No has concluido tus notas previas de fusion (%s existe).\n"
-"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para confirmar/abortar la fusion previa antes de que puedas comenzar una nueva nota de fusion."
+"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
+"confirmar/abortar la fusion previa antes de que puedas comenzar una nueva "
+"nota de fusion."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No has terminado tus notas de fusion (%s existe)."
#: notes-utils.c:42
msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "No se puede realizar commit, notas del arbol no inicializadas o no referenciadas."
+msgstr ""
+"No se puede realizar commit, notas del arbol no inicializadas o no "
+"referenciadas."
#: notes-utils.c:101
#, c-format
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
+#.
#: notes-utils.c:141
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Mal valor para %s: '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "incapaz de analizar objeto: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes del final del paquete (broken .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"offset más allá del índice de fin de paquete para %s (índice truncado?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
-#: parse-options.c:597
+#.
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nombre de objeto malformado '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "No se pudo hacer que %s fuera escribible por el grupo"
#: pathspec.c:129
msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "Caracter de escape '\\' no permitido como ultimo caracter en el valor attr"
+msgstr ""
+"Caracter de escape '\\' no permitido como ultimo caracter en el valor attr"
#: pathspec.c:147
msgid "Only one 'attr:' specification is allowed."
#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles "
+msgstr ""
+"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles "
#: pathspec.c:265
-msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings"
-msgstr "la configuración global de 'literal' para patrones de ruta es incompatible con las demás configuraciones globales de patrones de ruta"
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"la configuración global de 'literal' para patrones de ruta es incompatible "
+"con las demás configuraciones globales de patrones de ruta"
#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magic pathspec no soportado por este comando: %s"
-#: pathspec.c:575
-msgid "empty strings as pathspecs will be made invalid in upcoming releases. please use . instead if you meant to match all paths"
-msgstr "los strings vacíos como pathspecs serán inválidas en las próximas versiones. por favor use . si quería hacer coincidir todas las rutas"
+#: pathspec.c:571
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"los strings vacíos como pathspecs serán inválidas en las próximas versiones. "
+"por favor use . si quería hacer coincidir todas las rutas"
-#: pathspec.c:599
+#: pathspec.c:595
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato --pretty"
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible remover el vinculo: %s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No sepudo abrir '%s' para escritura"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo remover la referencia %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no se pudo eliminar la referencia %s: %s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
msgstr "no se pudo eliminar la referencia: %s"
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no se pudo remover la referencia %s"
-
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
msgstr "desaparecido"
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento: %s no reconocido %%(%s)"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no toma ningún argumento"
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) no toma argumentos"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "%%(trailers) desconocidos, argumento: %s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %s no reconocido %%(contents)"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positivo esperado objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argumento: %s no reconocido %%(objectname)"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento: %s no reconocido %%(if)"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre malformado de campo: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: atomo %%(if) usado sin un atomo %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: atomo %%(then) usado sin atomo %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: atomo %%(then) usado mas de una vez"
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: atomo %%(then) usado despues de %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: atomo %%(else) usado sin un atomo %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: atomo %%(else) usado sin un atomo %%(then) "
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: atomo %%(else) usado mas de una vez"
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: atomo %%(end) usado sin atomo correspondiente"
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena malformado %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(no hay rama, rebasando %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(no hay rama, comenzando bisectado en %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
-#: ref-filter.c:1265
+#.
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD desascoplado en %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
-#: ref-filter.c:1272
+#.
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD desacoplado de %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(sin rama)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "objeto %s faltante para %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado en '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta atomo %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto malformado %s"
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No se pueden traer ambos %s y %s a %s"
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s por lo general hace seguimiento a %s, no a %s"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hace seguimiento tanto a %s como a %s"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "Error interno"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD no apunta a ninguna rama"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
msgstr "no existe tal rama: '%s'"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "no se ha configurado upstream para la rama '%s'"
-#: remote.c:1698
+#: remote.c:1699
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
-#: remote.c:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
+msgstr ""
+"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la rama '%s' no tiene remoto para enviar"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "refspecs del push para '%s' no incluyen '%s'"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no tiene destino (push.default es 'nada')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no se puede resolver push 'simple' para un destino unico"
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Tu rama está actualizada con '%s'.\n"
#: remote.c:2087
#: remote.c:2096
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Tu rama está detrás de '%s' por %d confirmación, y puede ser avanzada rápido.\n"
-msgstr[1] "Tu rama está detrás de '%s' por %d confirmaciones, y puede ser avanzada rápido.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Tu rama está detrás de '%s' por %d confirmación, y puede ser avanzada "
+"rápido.\n"
+msgstr[1] ""
+"Tu rama está detrás de '%s' por %d confirmaciones, y puede ser avanzada "
+"rápido.\n"
#: remote.c:2104
msgid " (use \"git pull\" to update your local branch)\n"
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent es incompatible con --bisect"
msgstr "el final receptor no soporta --signed push"
#: send-pack.c:431
-msgid "not sending a push certificate since the receiving end does not support --signed push"
-msgstr "no se manda un certificado de push ya que el destino no soporta push firmado (--signed )"
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"no se manda un certificado de push ya que el destino no soporta push firmado "
+"(--signed )"
#: send-pack.c:443
msgid "the receiving end does not support --atomic push"
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revertir"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Accion desconocida: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"despues de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"con 'git add <rutas>' o 'git rm <rutas>'\n"
"y haz un commit del resultado con 'git commit'"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
msgstr "No se pudo bloquear '%s'"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
msgstr "No se pudo escribir en '%s'"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "No se pudo escribir EOL en '%s'"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
msgstr "Fallo al finalizar '%s'."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
msgstr "No se pudo leer '%s'"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Tus cambios locales seran sobreescritos por %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "Realiza un commit con tus cambios o aplica un stash para proceder."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
-#: sequencer.c:472
+#.
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "No se pudo resolver el commit de HEAD\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "no es posible actualizar el árbol de la caché\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
"se ha aplicado un stage a los cambios en el arbol de trabajo\n"
-"si estos cambios estan destinados a ser aplastados en el commit previo, ejecuta:\n"
+"si estos cambios estan destinados a ser aplastados en el commit previo, "
+"ejecuta:\n"
"\n"
" git commit --amend %s\n"
"\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "No se pudo analizar commit %s.\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "No se pudo analizar el commit padre %s\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinacion de %d commits."
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje de la 1ra confirmación:"
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "este es el mensaje del commit #%d:"
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d sera saltado: "
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "tu archivo indice no esta fusionado."
-#: sequencer.c:973
+#: sequencer.c:975
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusion pero no se entrego la opcion -m."
-#: sequencer.c:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "linea principal especificada pero el commit %s no es una fusion."
-#: sequencer.c:991
+#: sequencer.c:993
#, 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:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar la confirmación padre %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "No se puede renombrar '%s' a '%s'"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "conjunto de confirmación vacío aprobado"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: fallo al leer el índice"
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: fallo al refrescar el índice"
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
msgstr "no se puede leer '%s'."
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "ningun commit analizado."
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick"
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "llave invalida: %s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor invalido para %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "un cherry-pick o rever ya esta en progreso"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s' "
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "ningun cherry-pick o revert en progreso"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archiv HEAD de pre-cherry-pick guardado '%s' esta corrompido"
-#: sequencer.c:1658
+#: sequencer.c:1677
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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "no se pudo leer indice"
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al indice y/o arbol de trabajo\n"
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1948
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
msgstr ""
"Aplicando autostash resultó en conflictos.\n"
"Tus cambios estan seguros en el stash.\n"
-"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:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "no se puede leer orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "no se puede leer 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr "no se puede actualizar %s"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se puede actualizar HEAD a %s"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realziar rebase: Tienes cambios fuera del area de stage."
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se puede remover CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo invalido: '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
-"Tienes cambios fuera de un commit en tu arbol de trabajo. Por favor, realiza un commit con estos\n"
+"Tienes cambios fuera de un commit en tu arbol de trabajo. Por favor, realiza "
+"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr "no se pudo realiar commit con los cambios en el area de stage."
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr "%s: mala revision"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: opciones desconocidas"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: error preparando revisiones"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista de pendientes inutilizable: '%s'"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "No se pudo abrir '%s' para escritura"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ingorando."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
+"Commits botados (empezando con el mas nuevo):\n"
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Para evitar este mensaje, use \"drop\" para remover de forma explícita un "
+"commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"advertencias.\n"
+"Los posibles comportamientos son: ignore,warn,error.\n"
+"\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "No se pudo analizar commit '%s'"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "no se pudo truncar '%s'"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "este script ya fue reorganizado."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no se pudo finalizar '%s'"
+
#: setup.c:171
#, c-format
msgid ""
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no existe la ruta en el arbol de trabajo.\n"
-"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen localmente."
+"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"localmente."
#: setup.c:184
#, c-format
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de trabajo.\n"
+"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
+"trabajo.\n"
"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
"Use '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Se esperaba version de git repo <= %d, encontrada %d"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "se encontro extension de repositorio desconocida:"
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "No es un repositorio git (ni ninguno de los directorios superiores): %s"
+msgstr ""
+"No es un repositorio git (ni ninguno de los directorios superiores): %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "Incapaz de leer el directorio de trabajo actual"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
msgstr "No se puede cambiar a '%s'"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"No es un repositorio git ( o ningún padre en el punto de montado %s)\n"
-"Parando en el límite del sistema de archivos (GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
+"Parando en el límite del sistema de archivos "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
msgstr "ruta '%s' no existe"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "repositorio de referencia '%s' como un checkout vinculado no es soportado todavía."
+msgstr ""
+"repositorio de referencia '%s' como un checkout vinculado no es soportado "
+"todavía."
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositorio de referencia '%s' no es un repositorio local."
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repositorio de referencia '%s' es superficial (shallow)"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset antes del final del paquete (broken .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset más allá del índice de fin de paquete para %s (índice truncado?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "SHA1 %s corta es ambigua"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "Los candidatos son:"
-#: sha1_name.c:589
+#: sha1_name.c:590
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
-"donde \"$br\" est'a de alguna manera vacía y una ref de 40-hex es creada. Por favor\n"
+"donde \"$br\" est'a de alguna manera vacía y una ref de 40-hex es creada. "
+"Por favor\n"
"examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
"ejecutando \"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
+msgstr ""
+"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No se pudo actualizar la entrada %s de .gitmodules"
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No se pudo remover la entrada %s de .gitmodules"
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "falló realizar stage a los .gitmodules actualizados"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "no se permiten valores negativos para submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:309
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "en el submódulo no poblado '%s'"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Fallo al resolver HEAD como un ref valido."
+
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' no reconocido como un repositorio git"
-#: submodule.c:1475
+#: submodule.c:1442
#, 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:1488
+#: submodule.c:1455
#, 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:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submódulo '%s' tiene un índice corrupto"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
-msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no soportado"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
+"soportado"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:1861 builtin/submodule--helper.c:678 builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "No pudo recursar en el submódulo '%s'"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG: string de ruta recibido no concuerda con cwd?"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree retornó un código %d inesperado"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "valor inválido para %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "no se pudo ejecutar el comando de remolque '%s'"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valor '%s' desconocido para la clave '%s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "más de un %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "token de remolque vacío en el trailer '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "no se pudo leer el archivo de entrada '%s'"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "no se pudo definir %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "el archivo %s no es un archivo regular"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "el archivo %s no puede ser escrito por el usuario "
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "no se pudo abrir el archivo temporal"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no se pudo renombrar el archivo temporal a %s"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción inválida '%s'"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "Abortando."
msgid "empty filename in tree entry"
msgstr "nombre de archivo vacío en la entrada de árbol"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "archivo de árbol muy corto"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-"Los cambios locales de los siguientes archivos serán sobrescritos al actualizar el árbol de trabajo:\n"
-"%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar ramas."
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"actualizar el árbol de trabajo:\n"
+"%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar "
+"ramas."
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Los cambios locales de los siguientes archivos seran sobreescritos por checkout:\n"
+"Los cambios locales de los siguientes archivos seran sobreescritos por "
+"checkout:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-"Los cambios locales de los siguientes archivos serán sobrescritos al fusionar:\n"
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"fusionar:\n"
"%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar."
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Los cambios locales de los siguientes archivos seran sobreescritos por merge:\n"
+"Los cambios locales de los siguientes archivos seran sobreescritos por "
+"merge:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
"%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Los cambios locales de los siguientes archivos seran sobreescritos por %s:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-"Al actualizar los siguientes directorios se perderán los archivos sin seguimiento en ellos:\n"
+"Al actualizar los siguientes directorios se perderán los archivos sin "
+"seguimiento en ellos:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán removidos al actualizar el árbol de trabajo:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos al actualizar el árbol de trabajo:\n"
+"Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos "
+"al actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán removidos al fusionar:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos al fusionar:\n"
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos "
+"al fusionar:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán removidos al %s:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán removidos al ejecutar %s:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al ejecutar %s:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán sobrescritos al actualizar el árbol de trabajo:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
"%%s"
msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán sobrescritos al actualizar el árbol de trabajo:\n"
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán sobrescritos al fusionar:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán sobrescritos al fusionar:\n"
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Los siguientes archivos sin seguimiento en el árbol de trabajo serán sobrescritos al %s:\n"
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Los siguientes archivos no rastreados en el arbol de trabajo seran removidos por %s:\n"
+"Los siguientes archivos no rastreados en el arbol de trabajo seran removidos "
+"por %s:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Entrda '%s' se superpone con '%s'. No se pueden unir"
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-"No se puede actualizar el sparse checkout: las siguientes entradas no están actualizadas:\n"
+"No se puede actualizar el sparse checkout: las siguientes entradas no están "
+"actualizadas:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout update:\n"
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
"%s"
msgstr ""
-"Los siguientes archivos del árbol de trabajo serán sobrescritos por la actualización sparse checkout:\n"
+"Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
+"actualización sparse checkout:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
-"The following working tree files would be removed by sparse checkout update:\n"
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
"%s"
msgstr ""
-"Los siguientes archivos del árbol de trabajo serán removidos por la actualización sparse checkout:\n"
+"Los siguientes archivos del árbol de trabajo serán removidos por la "
+"actualización sparse checkout:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"No se puede actualizar le submodulo:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "Abortando\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "estrategia de actualización de submódulo no soportada para submódulo '%s'"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "Revisando archivos"
msgid "could not open '%s' for reading and writing"
msgstr "no se pudo abrir '%s' para lectura y escritura"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no se pudo abrir '%s' para escritura"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
msgid "could not close %s"
msgstr "no se pudo cerrar %s"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "rutas no fusionadas:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (usa \"git reset %s <archivo>...\" para sacar del area de stage)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (usa \"git rm --cached <archivo>...\" para sacar del area de stage)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (usa \"git add <archivo>...\" para marcar una resolucion)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la resolucion)"
+msgstr ""
+" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
+"resolucion)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (usa \"git rm <file>...\" para marcar la resolucion)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "Cambios a ser confirmados:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "Cambios no rastreados para el commit:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
+msgstr ""
+" (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (usa \"git add/rm <archivo>...\" para actuailzar a lo que se le va a hacer commit)"
+msgstr ""
+" (usa \"git add/rm <archivo>...\" para actuailzar a lo que se le va a hacer "
+"commit)"
-#: wt-status.c:225
-msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " (usa \"git checkout -- <archivo>...\" para descartar los cambios en el directorio de trabajo)"
+#: wt-status.c:223
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
+"directorio de trabajo)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " (confirmar o descartar el contenido sin seguimiento o modificado en los sub-módulos)"
+msgstr ""
+" (confirmar o descartar el contenido sin seguimiento o modificado en los "
+"sub-módulos)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
+msgstr ""
+" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "ambos borrados:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "agregado por nosotros:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "borrados por ellso:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "agregado por ellos:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "borrado por nosotros:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "ambos agregados:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "ambos modificados:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "nuevo archivo:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "copiado:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "borrado:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "modificado:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "renombrado:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "cambio de tipo:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "desconocido:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "desfusionado:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "nuevos commits, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "contenido modificado, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contenido no rastreado, "
-#: wt-status.c:821
+#: wt-status.c:819
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Tu stash actualmente tine %d entrada"
msgstr[1] "Tu stash actualmente tiene %d entradas"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "Submodulos cambiados pero no actualizados:"
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "Submodulos cambiados listos para realizar commit:"
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"No toques la linea de encima.\n"
-"Todo lo que este abajo sera removido."
+"No modifique o borre la linea de encima.\n"
+"Todo lo que este por abajo será removido."
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "tienes rutas no fusionadas"
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregla los conflictos y corre \"git commit\""
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (usa \"git merge --abort\" para abortar la fusion)"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "Todos los conflictos resueltos pero sigues fusionando."
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" para concluir la fusion)"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "Estas en medio de una sesion am."
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "El parche actual esta vacio."
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregla los conflictos y luego corre \"git am --continue\""
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (usa \"git am --skip\" para saltar este parche)"
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
#: wt-status.c:1292
#, c-format
-msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en '%s'."
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
+"'%s'."
#: wt-status.c:1297
msgid "You are currently splitting a commit during a rebase."
#: wt-status.c:1300
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --continue\")"
+msgstr ""
+" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
+"continue\")"
#: wt-status.c:1304
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Estas editando un commit mientras se aplica un rebase de la rama '%s' en '%s'."
+msgstr ""
+"Estas editando un commit mientras se aplica un rebase de la rama '%s' en "
+"'%s'."
#: wt-status.c:1309
msgid "You are currently editing a commit during a rebase."
msgstr " (usa \"git commit --amend\" para enmendar la confirmación actual)"
#: wt-status.c:1314
-msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " (usa \"git rebase --continue\" una vez que estés satisfecho con tus cambios)"
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
+"cambios)"
#: wt-status.c:1324
#, c-format
#: wt-status.c:1332
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
+msgstr ""
+" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
#: wt-status.c:1334
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (use \"git cherry-pick --abort\" para cancelar la operacion cherry-pick)"
+msgstr ""
+" (use \"git cherry-pick --abort\" para cancelar la operacion cherry-pick)"
#: wt-status.c:1343
#, c-format
#: wt-status.c:1646
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "sin cambios agregados a la confirmación (usa \"git add\" y/o \"git commit -a\")\n"
+msgstr ""
+"sin cambios agregados a la confirmación (usa \"git add\" y/o \"git commit -a"
+"\")\n"
#: wt-status.c:1649
#, c-format
#: wt-status.c:1652
#, c-format
-msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n"
-msgstr "no hay nada agregado a la confirmación pero hay archivos sin seguimiento presentes (usa \"git add\" para hacerles seguimiento)\n"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hay nada agregado a la confirmación pero hay archivos sin seguimiento "
+"presentes (usa \"git add\" para hacerles seguimiento)\n"
#: wt-status.c:1655
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "no hay nada agregado para confirmar, pero hay archivos sin seguimiento presentes\n"
+msgstr ""
+"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
+"presentes\n"
#: wt-status.c:1658
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para hacerles seguimiento)\n"
+msgstr ""
+"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
+"hacerles seguimiento)\n"
#: wt-status.c:1661 wt-status.c:1666
#, c-format
#: wt-status.c:1664
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
+msgstr ""
+"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
#: wt-status.c:1668
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu indice contiene cambios que no estan en un commit."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "fallo al desvincular '%s'"
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "fallo la actualizacion de carpetas"
msgid "remove '%s'\n"
msgstr "remover '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "No se pudo leer el indice"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No se pudo abrir '%s' para escritura."
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "No se puede escribir el parche"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "fallo la edicion del parche"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
msgstr "No se pudo definir '%s'"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "Parche vacio. Abortado."
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
msgstr "No se pudo aplicar '%s'"
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
+msgstr ""
+"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 builtin/remote.c:1332
-#: builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "dry run ( ejecucion en seco)"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "seleccion interactiva"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "editar diff actual y aplicar"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "permitir agregar caso contrario ignorar archivos"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "actualizado las carpetas rastreadas"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr "grabar solo el hecho de que la ruta será agregada después"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
-#: builtin/add.c:281
+#: builtin/add.c:283
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorar rutas removidas en el arbol de trabajo (lo mismo que --no-all)"
-#: builtin/add.c:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "no agregar, solo actualizar el indice"
-#: builtin/add.c:284
+#: builtin/add.c:286
msgid "just skip files which cannot be added because of errors"
msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
-#: builtin/add.c:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "sobrescribir el bit ejecutable de los archivos listados"
-#: builtin/add.c:288
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
msgstr "avisar cuando se agrega un repositorio incrustado"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"Vea \"git help submodule\" para mas informacion."
-#: builtin/add.c:331
+#: builtin/add.c:333
#, c-format
msgid "adding embedded git repository: %s"
msgstr "agregando repositorio embebido: %s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Use -f si realmente quiere agregarlos.\n"
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "fallo al agregar archivos"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A y -u son mutuamente incompatibles"
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
-#: builtin/add.c:405
+#: builtin/add.c:407
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nada especificado, nada agregado.\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Tal vez quiso decir 'git add .'?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 builtin/mv.c:144
-#: builtin/reset.c:238 builtin/rm.c:272 builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "archivo indice corrompido"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "no se pudo analizar el script del autor"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' fue borrado por el hook de applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "linea mal formada: '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fallo al copiar notas de '%s' a '%s'"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fall de fseek"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
msgstr "no se pudo analizar el parche '%s'"
-#: builtin/am.c:842
+#: builtin/am.c:851
msgid "Only one StGIT patch series can be applied at once"
msgstr "Solo un parche StGIT puede ser aplicado de una vez "
-#: builtin/am.c:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "timestamp invalido"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "linea Date invalida"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "offset de zona horaria inválido"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "fallo al crear el directorio '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "Fallo al dividir parches"
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "no es posible escribir en el archivo indice"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
-#: builtin/am.c:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort\"."
+msgstr ""
+"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
+"\"."
-#: builtin/am.c:1304
+#: builtin/am.c:1302
msgid "Patch is empty."
msgstr "El parche esta vacio."
-#: builtin/am.c:1370
+#: builtin/am.c:1368
#, c-format
msgid "invalid ident line: %.*s"
msgstr "sangría no válida: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "Repositorio carece de los blobs necesarios para retroceder en una fusión de 3-vías"
+msgstr ""
+"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
+"3-vías"
-#: builtin/am.c:1588
+#: builtin/am.c:1586
msgid "Using index info to reconstruct a base tree..."
msgstr "Usando la información del índice para reconstruir un árbol base..."
-#: builtin/am.c:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Editaste el parche a mano?\n"
"No aplica a blobs guardados en su índice."
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocediento para parchar base y fusión de 3-vías..."
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "Falló al fusionar en los cambios."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "aplicando a un historial vacio"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "fallo al escribir el objeto commit"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe"
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "no se puede ser interactivo sin stdin conectado a un terminal"
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#: builtin/am.c:1750
+#.
+#: builtin/am.c:1748
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- parche ya aplicado."
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche fallo en %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copia del parche que fallido se encuentra en: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Si no hay nada en el area de stage, las posibilidad es que algo mas\n"
"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
-#: builtin/am.c:1922
+#: builtin/am.c:1920
msgid ""
"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as such.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Todavía tiene rutas sin fusionar en su índice.\n"
-"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos como tal.\n"
-"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en él."
+"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
+"como tal.\n"
+"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
+"él."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "fallo al limpiar el indice"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Parece haber movido HEAD desde el último fallo 'am'.\n"
"No rebobinando a ORIG_HEAD "
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "valor invalido para --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "opcion historica -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3-vías si es necesario"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 builtin/repack.c:180
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
+msgstr ""
+"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 builtin/pull.c:197
-#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:399 parse-options.h:132
-#: parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "formato"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "formatear el parche(s)"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "sinonimos para --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr "restaurar la rama original y abortar la operación de parchado."
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "commits con firma GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
"será removida. Por favor no la use más."
-#: builtin/am.c:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "fallo al leer el indice"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"Directorio extraviado %s encontrado.\n"
"Use \"git am --abort\" para borrarlo."
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
+#.
#: builtin/blame.c:795
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opciones>] [-r | -a] [--formato]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"borrando la rama '%s' que ha sido fusionada en\n"
" '%s', pero aún no ha sido fusionada a HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"no borrando rama '%s' que todavía no ha sido fusionada \n"
"\ta '%s', aunque se fusione con HEAD."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No se pudo encontrar el objeto commit para '%s'"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"La rama '%s' no ha sido fusionada completamente.\n"
"Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Fallo de actualizacion de config-file"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "no se puede usar-a con -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "No se pudo revisar el objeto commit para HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "rama de rastreo remoto '%s' no encontrada."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "rama '%s' no encontrada."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error al eliminar la rama de rastreo remota '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error al eliminar la rama '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s)..\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no es posible analizar el string de formato"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama invalido: '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "Copiado de rama fallido"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "Copiada una rama mal llamada '%s' afuera"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
-msgstr "La rama está renombrada, pero falló la actualización del archivo de configuración"
+msgstr ""
+"La rama está renombrada, pero falló la actualización del archivo de "
+"configuración"
+
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"La rama está copiada, pero falló la actualización del archivo de "
+"configuración"
-#: builtin/branch.c:522
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
"%s\n"
"Las líneas que comiencen con '%c' serán removidas.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "Opciones genericas"
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "Suprimir mensajes informativos"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "cambie info de upstream"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "no usar"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr "Desconfigurando la info de upstream"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de traqueo remoto"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contienen el commit"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contienen el commit"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "borar rama (incluso si no esta fusionada)"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copiar una rama y su reflog"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copiar una rama, incluso si el objetivo existe"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "crea el reflog de la rama"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "edita la descripcion de la rama"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "fuerza la creacion,movimiento/renombrado,borrado"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "muestra solo ramas que han sido fusionadas"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "muestra solo ramas que no han sido fusionadas"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "muestra las ramas en columnas"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "clave"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "nombre del campo por el cuál ordenar"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "imprimir sólo las ramas del objeto"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filstrado son case-insensitive"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Fallo al resolver HEAD como un ref valido."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no encontrado abajo de refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr "no se puede editar la descripción de más de una rama"
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay confirmaciones en la rama '%s'."
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "demasiadas ramas para la operación de renombrar"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "demasiadas ramas para una operación de copiado"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "muchas ramas para definir un nuevo upstream"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "demasiados argumentos para una operación de renombrado"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "demasiados argumentos para configurar un nuevo upstream"
+
+#: builtin/branch.c:756
#, c-format
-msgid "could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna rama."
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
+"rama."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "demasiadas ramas para desconfigurar upstream"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna rama."
+msgstr ""
+"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
+"rama."
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene informacion de upstream"
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "No tiene sentido crear 'HEAD' manualmente"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
-
-#: builtin/branch.c:772
-#, c-format
-msgid "The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"
-msgstr "El flag --set-upstream ha sido deprecado y será removido. Considere usar --track o --set-upstream-to\n"
+msgstr ""
+"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"\n"
-"Si querías hacer que '%s' rastree '%s', haz esto:\n"
-"\n"
+"La opción --set-upstream ya no es soportada. Considere usar '--track' o '--"
+"set-upstream-to' en cambio."
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/cat-file.c:519
-msgid "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
+#: builtin/cat-file.c:521
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:520
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:522
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "mostrar el tamanio del objeto"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "use una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "salida buffer --batch "
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar info y content de los objetos alimentados por standard input"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "seguir symlinks en el árbol (usado con --batch o --batch-check)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un caracter NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
#: builtin/checkout-index.c:164
msgid "no warning for existing files and files not in index"
-msgstr "no hay advertencias para los archivos existentes y los archivos no están en el índice"
+msgstr ""
+"no hay advertencias para los archivos existentes y los archivos no están en "
+"el índice"
#: builtin/checkout-index.c:166
msgid "don't checkout new files"
msgid "write the content to temporary files"
msgstr "escribir el contenido en un archivo temporal"
-#: builtin/checkout-index.c:175 builtin/column.c:31 builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 builtin/submodule--helper.c:644
-#: builtin/submodule--helper.c:980 builtin/worktree.c:478
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "string"
msgid "Unable to add merge result for '%s'"
msgstr "Incapaz de agregar resultados de fusión a '%s'"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 builtin/checkout.c:262
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no puede ser usada con rutas actualizadas"
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "necesita resolver su índice actual primero"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "error interno en camino de reivison"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "La posicion previa de HEAD era"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "Estas en una rama por nacer"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "referencia invalida: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n arbol: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra version para archivos sin fusionar"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su version para los archivos sin fusionar"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "realizar una fusion de tres vias con la rama nueva"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "conflicto de estilos (merge o diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a dispersar entradas solamente"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
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:1172 builtin/clone.c:80 builtin/fetch.c:114 builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 builtin/send-pack.c:173
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forzar el reporte de progreso"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "Falta nombre de rama; prueba -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "Especificacion de ruta invalida"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"se revisa fuera del índice."
#: builtin/clean.c:26
-msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
#: builtin/clean.c:30
#, c-format
msgid "failed to remove %s"
msgstr "fallo al borrar %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
"foo - selecciona un objeto basado en un prefijo unico\n"
" - (vacio) no elegir nada\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
"* - escoger todos los objetos\n"
" - (vacio) terminar seleccion\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547 git-add--interactive.perl:552
+#: builtin/clean.c:521 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Ahh (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "Input ignora los patrones >> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "Seleccionar objetos para borrar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Borrar %s [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Bye.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - esta ventana\n"
"? - ayuda para seleccion de opciones"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "Ahora que"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Se removera el siguiente objeto"
msgstr[1] "Se removeran los siguientes objetos:"
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "No hay mas archivos para limpiar, saliendo."
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "no imprimir nombres de archivos borrados"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "forzar"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "limpieza interactiva"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "borrar directorios completos"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 builtin/name-rev.c:399
-#: builtin/show-ref.c:176
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "patron"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "agregar <patron> para ignorar reglas"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "borrar archivos ignorados, tambien"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x y -X no pueden ser usadas juntas"
-#: builtin/clean.c:938
-msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; rehusando el clean"
-
#: builtin/clean.c:941
-msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; rehusando el clean"
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
-#: builtin/clone.c:38
+#: builtin/clean.c:944
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
+
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "no crear checkout"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "crear un repositorio vacio"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "crear un repositorio espejo (implica vacio)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "clonar de un repositorio local"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "no usar hardlinks, siempre copiar"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "inicializar submodulos en el clonado"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "numero de submodulos clonados en paralelo"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates seran usados"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "usa--reference sólo al clonar"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nombre"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
+#: builtin/pull.c:205
msgid "depth"
msgstr "profundidad"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 parse-options.h:142
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
+#: parse-options.h:142
msgid "time"
msgstr "tiempo"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar niun tag, y hacer que los subsiguientes fetch no los sigan"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "llave=valor"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "fallo al abrir '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "falló al analizar %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "fallo al crear link '%s'"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "fallo al copiar archivo a '%s'"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git checkout -f HEAD'\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar"
-#: builtin/clone.c:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necsarios"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n"
+msgstr ""
+"HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el arbol de trabajo"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parametors al arhivo config"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar"
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacio"
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un arbol de trabajo '%s'"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacio '%s'...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1005
-msgid "clone --recursive is not compatible with both --reference and --reference-if-able"
-msgstr "clone --recursive no es compatible con --reference y --reference-if-able al mismo tiempo"
+#: builtin/clone.c:1009
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive no es compatible con --reference y --reference-if-able al "
+"mismo tiempo"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sabe como clonar %s"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
msgstr ""
"Tu nombre y correo fueron configurados automaticamente basados\n"
"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
-"Tu puedes suprimir este mensaje configurandolos de forma explicita. Ejecuta el \n"
+"Tu puedes suprimir este mensaje configurandolos de forma explicita. Ejecuta "
+"el \n"
"siguiente comando y sigue las instrucciones de tu editor\n"
" para modificar tu archivo de configuracion:\n"
"\n"
" git commit --allow-empty\n"
"\n"
msgstr ""
-"El cherry-pick anterior ahora esta vacio, posiblemente por un conflicto de resolucion.\n"
+"El cherry-pick anterior ahora esta vacio, posiblemente por un conflicto de "
+"resolucion.\n"
"Si desea realizar un commit de todas maneras, use:\n"
"\n"
" git commit --allow-empty\n"
"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
"para los commits restantes.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "fallo al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "no es posible crear un indice temporal"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "adicion interactiva fallida"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "no es posible actualizar el indice temporal"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Fallo al actualizar el cache principal del arbol"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "no es posible escribir archiv new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusion."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no se puede realizar un commit parcial durante un cherry-pick."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "no se puede leer el indice."
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "no es posible escribir el indice temporal "
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "falta header de autor al commit '%s'"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una linea de autor mal formada"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "parametro --author mal formado"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"no es posible seleccionar un caracter de comentario que no es usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "no se pudo escribit el template del commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"\t%s\n"
"y vuelve a intentar.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"\t%s\n"
"y vuelva a intentar.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que comiencen\n"
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que comiencen\n"
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
"con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún autor existente"
+msgstr ""
+"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
+"autor existente"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de los archivos no rastreados '%s'"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
+msgstr ""
+"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "No hay rutas con --include/--only no tiene sentido."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup invalido %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "Rutas con -a no tiene sentido."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "mostrar informacion de la rama"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
msgid "show stash information"
msgstr "mostrar informacion del stash"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "version"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "output formato-maquina"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. (Predeterminado: all)"
+msgstr ""
+"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
+"(Predeterminado: all)"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "mostrar archivos ignorados"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1362
-msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"
-msgstr "ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. (Default: all)"
+#: builtin/commit.c:1369
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. "
+"(Default: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr "(commit-raiz)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "suprime summary tras un commit exitoso"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "Opciones para el mensaje de la confirmación"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "sobrescribe el autor de la confirmación"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "sobrescribe la fecha de la confirmación"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "mensaje"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "mensaje de la confirmación"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit especifico"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit especifico"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
-msgstr "usar mensaje de formato autosquash para arreglar el commit especificado"
+msgstr ""
+"usar mensaje de formato autosquash para arreglar el commit especificado"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
-msgstr "usar el mensaje de formato autosquash para realizar squash al commit especificado"
+msgstr ""
+"usar el mensaje de formato autosquash para realizar squash al commit "
+"especificado"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "agregar Signed-off-by: (firmado por)"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "usar archivo template especificado"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "forzar la edición de la confirmación"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "default"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 builtin/revert.c:113
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
+#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "firmar confirmación con GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "Opciones para el contenido de la confirmación"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "sólo confirmar archivos específicos"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
-msgstr "evitar los capturadores (hooks) de pre-confirmación (pre-commit) y mensaje de confirmación (commit-msg)"
+msgstr ""
+"evitar los capturadores (hooks) de pre-confirmación (pre-commit) y mensaje "
+"de confirmación (commit-msg)"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "mostrar lo que sería confirmado"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "enmendar confirmación previa"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr "gancho bypass post reescritura"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "ok al grabar un cambio vacio"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "ok al grabar un cambio con un mensaje vacio"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Abortando commit; no se ha editado el mensaje\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1756
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando confirmación debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1761
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Abortando commit; no se ha editado el mensaje\n"
+
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
#: builtin/config.c:68
msgid "replace all matching variables: name value [value_regex]"
-msgstr "remplazar todas las variables que concuerden: nombre valor [valor_regex]"
+msgstr ""
+"remplazar todas las variables que concuerden: nombre valor [valor_regex]"
#: builtin/config.c:69
msgid "add a new variable: name value"
msgid "--local can only be used inside a git repository"
msgstr "--local solo puedo ser usado dentro de un repositorio"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
msgstr "no se puede crear el archivo de configuración %s"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"no se puede sobrescribir múltiples valores con un único valor\n"
"\tUse una regexp, --add o --replace-all para cambiar %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "mostrar tamaños en formato legible para humano"
msgid "annotated"
msgstr "anotado"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "tag anotado %s no disponible"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "tag anotado %s no tiene nombre embebido "
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "tag '%s' es realmente '%s' aquí"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "Nombre de objeto %s no válido"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "no hay tag que concuerde exactamente con '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "buscanado para describir %s\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "busqueda finalizada a las %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"No hay tags anotados que puedan describir '%s'.\n"
"Sin embargo, hubieron tags no anotados: intente --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Ningún tag puede describit '%s'.\n"
"Intente --always, o cree algunos tags."
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits cruzados\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"se encontró más de %i tags; se mostró %i más reciente\n"
"fin de la búsqueda en %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "encontrar el tag que viene después del commit"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "hacer debug a la estrategia de búsqueda en stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "use cualquier ref"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "use cualquier tag, incluso los no anotados"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "siempre usar formato largo"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "solo seguir el primer patrón"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "solo mostrar concordancias exactas"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr "considerar <n> tags más recientes (default:10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "solo considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "no considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "mostrar el objeto commit abreviado como fallback"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long es incompatible con --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "No se encontraron nombres, no se puede describir nada."
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty es imcompatible con commit-ismos"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken es incompatible con commit-ismos"
msgid "invalid option: %s"
msgstr "opción inválida: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido"
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "más de dos blobs entregados: '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "falló: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "tal vez desee limpiar o recuperar estos."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use `diff.guitool` en lugar de `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "usar symlinks en modo dir-diff"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<herramienta>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
+msgstr ""
+"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:706
-msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code"
-msgstr "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un código de salida distinto de cero"
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
+"código de salida distinto de cero"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<comando>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha entragado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Volcar marcas a este archivo"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Importar marcas de este archivo"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Use el feature done para terminar el stream"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Saltar el output de data blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opciones>] <grupo>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opciones>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "extraer de todos los remotos"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "ruta para cargar el paquete al final del remoto"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "forzar sobrescritura de la rama local"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "extraer de múltiples remotos"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "extraer todos los tags y objetos asociados"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "no extraer todos los tags (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos extraídos en paralelo"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "en demanda"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "controlar extracción recursiva de submódulos"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "mantener el paquete descargado"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "permitir actualizar la ref HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "historia profunda de un clon superficial"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "historia profunda de un repositorio superficial basado en tiempo"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "convertir a un repositorio completo"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "dir"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "anteponer esto a salida de la ruta del submódulo "
-#: builtin/fetch.c:130
-msgid "default for recursive fetching of submodules (lower priority than config files)"
-msgstr "default para extracción recursiva de submódulos (menor prioridad que archivos de configuración)"
+#: builtin/fetch.c:152
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"default para extracción recursiva de submódulos (menor prioridad que "
+"archivos de configuración)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "aceptar refs que actualicen .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "especificar extracción de refmap"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "No se puedo encontrar ref remota HEAD"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[actualización de etiqueta]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "no se posible actualizar el ref local"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[nueva etiqueta]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "avance lento"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
" 'git remote prune %s' para remover cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se pondrá colgado)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha colgado)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sabe como extraer de %s"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "Tiene que especificar un nombre de tag."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no es soportada"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "--depen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
#: builtin/fmt-merge-msg.c:15
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
msgid "populate log with at most <n> entries from shortlog"
msgstr "poblar el log con máximo <n> entradas del shorlog"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "alias para --log (deprecado)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "texto"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "use <text> como comienzo de mensaje"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "archivo del cual leer"
msgid "show only <n> matched refs"
msgstr "mostrar solo <n> refs encontradas"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respetar el formato de colores"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "mostrar solo refs que apunten al objeto dado"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "mostrar solo refs que son fusionadas"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "mostrar solo refs que no son fusionadas"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "mostrar solo refs que contienen el commit"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "mostrar solo refs que no contienen el commit"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "mostrar objetos ilegibles"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "mostrar objetos colgados"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "revisar solo connectividad"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgados en .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "mostrar prograso"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verboso para objetos alcanzables"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Revisando objetos"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<opciones>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Falló el fstat %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "No se puede definir %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "limpiar objetos no referenciados"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "ser más exhaustivo (aumentar runtime)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "habilitar modo auto-gc"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Falló al analizar valor %s de gc.logexpirity"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "Auto empaquetado del repositorio en segundo plano para un performance óptimo.\n"
+msgstr ""
+"Auto empaquetado del repositorio en segundo plano para un performance "
+"óptimo.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vea \"git help gc\" para limpieza manual.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
-msgid "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no es así)"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
+"es así)"
-#: builtin/gc.c:480
-msgid "There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para removerlos."
+#: builtin/gc.c:481
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
+"removerlos."
#: builtin/grep.c:27
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falló al crear el hilo: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "número inválido de hilos especificado (%d) para %s"
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#.
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "encontrar en contenidos no manejados por git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "ingnorar archivos especificados via '.gitignore'"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nombre base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "anteponer el nombre base del proyecto padre a la salida"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerdan"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv "
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings arreglados"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
msgid "show the number of matches instead of matching lines"
msgstr "Mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr "emprimir una línea vacía entre concordancias de diferentes archivos"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
msgid "show filename only once above matches from same file"
-msgstr "mostrar el nombre de archivo solo una vez para concordancias en el mismo archivo"
+msgstr ""
+"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
+"archivo"
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
msgid "show a line with the function name before matches"
-msgstr "mostrar una línea con el nombre de la función antes de las concordancias"
+msgstr ""
+"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
msgid "show only matches from files that match all patterns"
-msgstr "mostrar solo concordancias con archivos que concuerdan todos los patrones"
+msgstr ""
+"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr "mostrar árbol analizado para la expresión grep"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "no se ha entregado patrón"
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no se posible resolver revisión: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "opción no soportada con --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no pueden ser usadas con --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "--cached y árboles han sido entregados."
#: builtin/hash-object.c:82
-msgid "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."
-msgstr "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] [--] <archivo>..."
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
+"[--] <archivo>..."
#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths"
msgstr "guardar el archivo como es sin filtros"
#: builtin/hash-object.c:101
-msgid "just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "solo realizar un hash a cualquier basura random para crear un objeto corrupto para hacer debugging de Gti"
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"solo realizar un hash a cualquier basura random para crear un objeto "
+"corrupto para hacer debugging de Gti"
#: builtin/hash-object.c:102
msgid "process file as it were from this path"
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version '%d' de emacsclient es muy antigua (<22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "fallo al ejecutar '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s': ruta para el visualizador del manual no soportada.\n"
"Por favor considere usar 'man.<herramienta.cmd'."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': comando no soportado para man viewer.\n"
"Por favor considere usar 'man.<herramienta>.path."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de man desconocido"
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "ningun visualizador de manual proceso la peticion"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "ningun visualizador de info manejo la peticion"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Defininiendo atributos por ruta"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git diario con 20 comandos o algo asi"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Un glosario de Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submodulo"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Un tutorial de introduccion para Git ( para versiones 1.5.1 o mayores)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Un repaso de flujos de trabajo recomendadoes con Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Las guias communes de Git son:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' tendra el siguiente alias `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "leer error en input"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la difinición actual de off_t"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "no se puede crear '%s'"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no se puede abrir el archivo de paquete '%s'"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "inflate retornó %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "no se puede propagar el paquete"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISIÓN SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167 builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Error en el objeto"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "tail checksum para %s inesperada (corrupción de disco?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "error mientras se cierra el archivo paquete"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "no se puede escribir el archivo guardado '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "no se puede cerrar el archivo guardado escrito '%s'"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "no se puede guardar el archivo paquete"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el índice del archivo paquete para '%s'"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
msgstr "Inicializado repositorio Git vacío en %s%s\n"
#: builtin/init-db.c:458
-msgid "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--shared[=<permisos>]] [<directorio>]"
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
+"shared[=<permisos>]] [<directorio>]"
#: builtin/init-db.c:481
msgid "permissions"
#: builtin/init-db.c:482
msgid "specify that the git repository is to be shared amongst several users"
-msgstr "especifica que el repositorio de git será compartido entre varios usuarios"
+msgstr ""
+"especifica que el repositorio de git será compartido entre varios usuarios"
#: builtin/init-db.c:516 builtin/init-db.c:521
#, c-format
#: builtin/init-db.c:546
#, c-format
-msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)"
-msgstr "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-dir=<directorio>)"
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
+"dir=<directorio>)"
#: builtin/init-db.c:574
#, c-format
msgstr "No se puede acceder al árbol de trabajo '%s'"
#: builtin/interpret-trailers.c:15
-msgid "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"
-msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<valor>])...] [<archivo>...]"
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<valor>])...] [<archivo>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "editar archivos en el lugar"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "cortar trailers vacíos"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "donde colocar el nuevo trailer"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "acción if trailer ya existe"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "acción si falta el trailer"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "mostrar solo los trailers"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "no aplicar reglas de configuración"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "juntar valores con espacios en blanco contiguos"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "configurar opciones de análisis"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "trailer"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "trailer(s) para agregar"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer con --only-input no tiene sentido"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "no se entregó archivo de entrada para edición en lugar"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<opciones>] <objeto>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opción --decorate inválida: %s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "mostrar fuente"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "usar archivo de mapa de mail"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "opciones de decorado"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "Salida final: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: mal archivo"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "No se pudo leer objeto %s"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "Tipo desconocido: %d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "formate.headers. sin valor"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "nombre del directorio de salida es muy largo"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "No se puede abrir archivo patch %s"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "Exactamente un rango necesario."
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "No es un rango."
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "Letras de portada necesita formato email"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "insano in-reply-to: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "dos directorios de salida?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "Commit desconocido %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "No se pudo encontrar una base de fusión."
-#: builtin/log.c:1284
+#: builtin/log.c:1288
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-"Falló al conseguir upstream, si quiere grabar un commit base de manera automática,\n"
+"Falló al conseguir upstream, si quiere grabar un commit base de manera "
+"automática,\n"
"por favor use git branch --set-upstream-to para rastrear una rama remota.\n"
-"O puede especificar un commit base mediante --base=<id-commit-base> manualmente."
+"O puede especificar un commit base mediante --base=<id-commit-base> "
+"manualmente."
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "Fallo al encontrar una base de fusión exacta"
-#: builtin/log.c:1315
+#: builtin/log.c:1319
msgid "base commit should be the ancestor of revision list"
msgstr "el commit base debe ser el ancestro de la lista de revisión"
-#: builtin/log.c:1319
+#: builtin/log.c:1323
msgid "base commit shouldn't be in revision list"
msgstr "el commit base no debe estar en la lista de revisión"
-#: builtin/log.c:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "no se puede obtener id de patch"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
msgid "use [PATCH n/m] even with a single patch"
msgstr "use [PATCH n/m] incluso con un único parche"
-#: builtin/log.c:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "use [PATCH] incluso con múltiples parches"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "mostrar parches en standard out"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "generar letra de cover"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
msgid "use simple number sequence for output file names"
-msgstr "usar una secuencia simple de números para salida de nombres de archivos"
+msgstr ""
+"usar una secuencia simple de números para salida de nombres de archivos"
-#: builtin/log.c:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "use <sfx> en lugar de '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
msgid "start numbering patches at <n> instead of 1"
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
-#: builtin/log.c:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "marcar las series como Nth re-roll"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Use [RFC PATCH] en lugar de [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Use [<prefijo>] en lugar de [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "guardar archivos resultantes en <dir>"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "no cortar/agregar [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "no mostrar diffs binarios"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "salida como hash de todos-ceros en la cabecera From "
-#: builtin/log.c:1460
+#: builtin/log.c:1466
msgid "don't include a patch matching a commit upstream"
msgstr "no incluya un parche que coincida con un commit en upstream"
-#: builtin/log.c:1462
+#: builtin/log.c:1468
msgid "show patch format instead of default (patch + stat)"
msgstr "mostrar formato de parche en lugar del default (parche + stat)"
-#: builtin/log.c:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "Mensajeando"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "cabezal"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr "agregar cabecera email"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "email"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "agregar cabecera To:"
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "agregar cabecera Cc:"
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "configurar dirección From a <ident> ( o identidad de committer si está ausente)"
+msgstr ""
+"configurar dirección From a <ident> ( o identidad de committer si está "
+"ausente)"
-#: builtin/log.c:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "id de mensaje"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
msgid "make first mail a reply to <message-id>"
msgstr "hacer primer mail una respuesta a <id de mensaje>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "límite"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr "adjuntar el parche"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "poner el parche en línea"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "agregar una firma"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr "agregar pre requisito información de árbol a la serie de parches"
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "agregar una firma de un archivo"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "no mostrar los nombres de archivos de los parches"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "mostrar medidor de progreso mientras se generan los parches"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "línea de ident inválida: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n y -k son mutuamente exclusivas."
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos."
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only no tiene sentido"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status no tiene sentido"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check no tiene sentido"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "salida standard, o directorio, cual? "
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
msgstr "No se pudo crear el directorio '%s'"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no se puede leer la firma del archivo '%s'"
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "Generando parches"
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "Falló al crear los archivos de salida"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
-msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "No se pudo encontrar una rama remota rastreada, por favor especifique <upstream> manualmente.\n"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"No se pudo encontrar una rama remota rastreada, por favor especifique "
+"<upstream> manualmente.\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "identifique el estado del archivo con tags"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
msgid "show cached files in the output (default)"
msgstr "mostrar archivos en caché en la salida (default)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
-msgstr "mostrar contenido de nombres de objetos en el área de stage en la salida"
+msgstr ""
+"mostrar contenido de nombres de objetos en el área de stage en la salida"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
msgid "show files on the filesystem that need to be removed"
msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'directorios otros'"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "excluir patrones leídos de <archivo>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
-msgstr "leer patrones de exclusión de manera adicional por directorio en <archivo>"
+msgstr ""
+"leer patrones de exclusión de manera adicional por directorio en <archivo>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
msgid "make the output relative to the project top directory"
msgstr "hacer la salidad relativa al directorio principal del proyecto"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "arbol-ismo"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "fingir que las rutas han sido borradas ya que todavía hay <arbol-ismos> presentes"
+msgstr ""
+"fingir que las rutas han sido borradas ya que todavía hay <arbol-ismos> "
+"presentes"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "mostrar data de debug"
#: builtin/ls-tree.c:144
msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
+msgstr ""
+"mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "cambiar `m' requiere un valor"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
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"
+msgstr ""
+"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
+"fusión"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
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:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "permitir fast-forwars (default)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
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:218 builtin/notes.c:776 builtin/pull.c:165 builtin/revert.c:109
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
+#: builtin/revert.c:109
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
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:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "verificar el hook commit-msg"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (nada para hacer squash)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no apunta a ninguna confirmación"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opción desconocida para merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribit %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
msgstr "No se puedo leer de '%s'"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, 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"
+msgstr ""
+"No se realiza commit de la fusión; use 'git commit' para completar la "
+"fusión.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-"Por favor ingrese un mensaje de commit que explique por qué es necesaria esta fusión,\n"
-"especialmente si esto fusiona un upstream actualizado en una rama de tópico.\n"
+"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"esta fusión,\n"
+"especialmente si esto fusiona un upstream actualizado en una rama de "
+"tópico.\n"
"\n"
"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
"el commit.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "Fusión automática falló; arregle los conflictos y luego realice un commit con el resultado.\n"
+msgstr ""
+"Fusión automática falló; arregle los conflictos y luego realice un commit "
+"con el resultado.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr "No hay upstream default definido para la rama actual."
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hay rama de rastreo remoto para %s de %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mal valor '%s' en el entorno '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"No ha concluido la fusión (existe MERGE_HEAD).\n"
"Por favor, realice un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"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:1191
+#: builtin/merge.c:1218
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:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "No hay commit especificado y merge.defaultToUpstream no está configurado."
+msgstr ""
+"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
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:1227
+#: builtin/merge.c:1254
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:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
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:1268
+#: builtin/merge.c:1295
#, 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:1271
+#: builtin/merge.c:1298
#, 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:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s titene una buena firma GPG por %s\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "Ya está actualizado."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "Nop.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
-msgstr "Ya está actualizado. ¡Oh, sí!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
+msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "No es posible hacer fast-forward, abortando."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, 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:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "Fusión automática fue bien; detenida antes del commit como se solicitó\n"
+msgstr ""
+"Fusión automática fue bien; detenida antes del commit como se solicitó\n"
#: builtin/merge-base.c:30
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "encontrar donde <commit> forjó del reflog de <ref>"
#: builtin/merge-file.c:9
-msgid "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"
-msgstr "git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] <archivo1> <archivo-origen> <archivo2>"
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
+"<archivo1> <archivo-origen> <archivo2>"
#: builtin/merge-file.c:33
msgid "send results to standard output"
msgid "Directory %s is in index and no submodule?"
msgstr "Directorio %s está en el índice y no hay submódulo?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash para proceder"
+msgstr ""
+"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
+"para proceder"
#: builtin/mv.c:103
#, c-format
msgid "skip move/rename errors"
msgstr "saltar errores de mover/renombrar"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' no es un directorio"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "mala fuente"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "no se pude mover un directorio en sí mismo"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "no se puede mover un directorio dentro de un archivo"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "directorio de fuente está vacío"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "no se encuentra bajo control de versión "
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "destino existe"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "sobrescribiendo '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "No se puede sobrescribir"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "múltiples fuentes para el mismo objetivo"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "el directorio de destino no existe"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, fuente=%s, destino=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "fallo al renombrar '%s'"
#: builtin/name-rev.c:402
msgid "list all commits reachable from all refs"
-msgstr "listar todas las confirmaciones alcanzables desde todas las referencias"
+msgstr ""
+"listar todas las confirmaciones alcanzables desde todas las referencias"
#: builtin/name-rev.c:403
msgid "read from stdin"
msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
#: builtin/notes.c:27
-msgid "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m <mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
+"<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-destino>"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
+"destino>"
#: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
+"| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
#: builtin/notes.c:31
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] <referencia-de-notas>"
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
+"<referencia-de-notas>"
#: builtin/notes.c:33
msgid "git notes merge --commit [-v | -q]"
msgid "the note contents have been left in %s"
msgstr "los contenidos de nota han sido dejados en %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 builtin/notes.c:521 builtin/notes.c:599
-#: builtin/notes.c:661
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "falló al resolver '%s' como ref válida."
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:348
+#.
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 builtin/notes.c:804 builtin/notes.c:951
-#: builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "demasiados parámetros"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "no se encontraron notas para objeto %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "contenidos de la nota como cadena"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "contenidos de la nota en un archivo"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "reutilizar y editar el objeto de nota especificada"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "reutilizar el objeto de nota especificado"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "permitir almacenar nota vacía"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "reemplazar notas existentes"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
-msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
-msgstr "No se puede agregar notas. Se encontró notas existentes para objeto %s. Use '-f' para sobrescribir las notas existentes"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
+"'-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Sobrescribiendo notas existentes para objeto %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Removiendo nota para objeto %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "leer objetos desde stdin"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "muy pocos parámetros"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
-msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
-msgstr "No se puede copiar notas. Se encontró notas existentes para el objeto %s. Use '-f' para sobrescribir las notes existentes"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
+"Use '-f' para sobrescribir las notes existentes"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falló al borrar ref NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falló al resolver NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "falló al finalizar las notas de fusión"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estrategia de fusión de notas %s desconocida"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Opciones generales"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Opciones de fusión"
-#: builtin/notes.c:777
-msgid "resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)"
-msgstr "resolver conflictos de notas usando la estrategia entregadas (manual/ours/theirs/union/cat_sort_uniq)"
+#: builtin/notes.c:778
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
+"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Realizando commit a las notas no fusionadas"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
-msgstr "finalizar fusión de notas realizando un commit de las notas no fusionadas"
+msgstr ""
+"finalizar fusión de notas realizando un commit de las notas no fusionadas"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Abortando notas de resolución de fusión"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "abortar notas de fusión"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "debe espeficiar una ref de notas a fusionar"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "--strategy/-s desconocida: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusión de notas en %s ya está en progreso en %s"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "falló al guardar un link para el ref de notas actual (%s)"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
-msgid "Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.\n"
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
msgstr ""
-"Fusión automática de notas falló. Arregle conflictos en %s y realice un commit con el resultado 'git notes merge --commit', o aborte la fusión con 'git notes merge "
-"--abort'.\n"
+"Fusión automática de notas falló. Arregle conflictos en %s y realice un "
+"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
+"'git notes merge --abort'.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "El objeto %s no tiene notas\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "intentar remover una nota no existente no es un error"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "no remover, solo mostrar"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "reportar notas recortadas"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "referencia-de-notas"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
-#: builtin/pack-objects.c:30
-msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-objetos>]"
-
#: builtin/pack-objects.c:31
-msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-de-objetos>]"
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
+"objetos>]"
+
+#: builtin/pack-objects.c:32
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
+"de-objetos>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "error al desinflar (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "deshabilitando escritura bitmap, paquetes son divididos debido a pack.packSizeLimit"
+msgstr ""
+"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
+"packSizeLimit"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "deshabilitando escritura bitmap, ya que algunos objetos no están siendo empaquetados"
+msgstr ""
+"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
+"empaquetados"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "versión[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
msgid "write the pack index file in the specified idx format version"
-msgstr "escribir el índice de paquete en la versión de formato idx especificado"
+msgstr ""
+"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
msgid "use a bitmap index if available to speed up counting objects"
-msgstr "usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
+msgstr ""
+"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "Contando objetos"
msgid "prune loose refs (default)"
msgstr "recortar refs perdidos (default)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Removiendo objetos duplicados"
#: builtin/pull.c:76
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opciones>] [<repositorio> [<especificacion-de-referencia>...]]"
+msgstr ""
+"git pull [<opciones>] [<repositorio> [<especificacion-de-referencia>...]]"
#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "permitir fast-forward"
msgid "Invalid value for pull.ff: %s"
msgstr "valor inválido para pull.ff: %s"
-#: builtin/pull.c:399
-msgid "There is no candidate for rebasing against among the refs that you just fetched."
+#: builtin/pull.c:403
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
-#: builtin/pull.c:401
-msgid "There are no candidates for merging among the refs that you just fetched."
-msgstr "No hay candidatos para fusionar entre las refs que has bajado con fetch."
+#: builtin/pull.c:405
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"No hay candidatos para fusionar entre las refs que has bajado con fetch."
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-"Generalmente esto significa que has proveído un wildcard de refspec que no tiene\n"
+"Generalmente esto significa que has proveído un wildcard de refspec que no "
+"tiene\n"
"concordancia en el final remoto."
-#: builtin/pull.c:405
+#: builtin/pull.c:409
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en la rama."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Por favor especifica a qué rama quieres rebasar."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Por favor especifica a qué rama quieres fusionar."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "Ver git-pull(1) para detalles."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 git-parse-remote.sh:64
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
+#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 git-parse-remote.sh:65
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
-#: builtin/pull.c:434 git-parse-remote.sh:95
-msgid "If you wish to set tracking information for this branch you can do so with:"
-msgstr "Si deseas configurar el rastreo de información para esta rama, puedes hacerlo con:"
+#: builtin/pull.c:438 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Si deseas configurar el rastreo de información para esta rama, puedes "
+"hacerlo con:"
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"Tu configuración especifica fusionar con la ref '%s'\n"
"de tu remoto, pero no se pudo hacer fetch a esa ref."
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "La opción --[no-]autostash sólo es válida con --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:852
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nata con cambios agregados al índice."
-#: builtin/pull.c:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en multiples ramas."
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "no se puede rebasar con modificaciones de submódulos grabadas localmente"
+msgstr ""
+"no se puede rebasar con modificaciones de submódulos grabadas localmente"
#: builtin/push.c:17
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opciones>] [<repositorio> [<especificaciones-de-refrencia>...]]"
+msgstr ""
+"git push [<opciones>] [<repositorio> [<especificaciones-de-refrencia>...]]"
#: builtin/push.c:90
msgid "tag shorthand without <tag>"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
-"Para elegir si la opcion es permanente, mira push.default en 'git help config'."
+"Para elegir si la opcion es permanente, mira push.default en 'git help "
+"config'."
#: builtin/push.c:147
#, c-format
" git push --set-upstream %s %s\n"
msgstr ""
"La rama actual %s no tiene una rama upstream.\n"
-"Para realizar un push de la rama actual y configurar el remoto como upstream, use\n"
+"Para realizar un push de la rama actual y configurar el remoto como "
+"upstream, use\n"
"\n"
"\tgit push --set-upstream %s %s\n"
"para actualizar en qué rama de remoto."
#: builtin/push.c:246
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
#: builtin/push.c:253
msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"Actualizaciones fueron rechazadas porque una punta de rama en el push está \n"
-"detrás de su contraparte remota. Verifique esta rama e integre los cambios remotos\n"
+"detrás de su contraparte remota. Verifique esta rama e integre los cambios "
+"remotos\n"
"(ejem. 'git pull ...') antes de volver a hacer push.\n"
"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
#: builtin/push.c:272
msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
+msgstr ""
+"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
#: builtin/push.c:275
msgid ""
#: builtin/push.c:371
msgid ""
"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote repository using\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
" git push <name>\n"
msgstr ""
"No se ha configurado un destino para el push.\n"
-"Puedes o especificar una URL desde la linea de comandos o configurar unrepositorio remoto usando\n"
+"Puedes o especificar una URL desde la linea de comandos o configurar "
+"unrepositorio remoto usando\n"
"\n"
" git remote add <nombre> <url>\n"
"\n"
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 builtin/send-pack.c:161
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "recibir programa de paquete"
#: builtin/read-tree.c:40
msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-"
-"output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-"
-"output=<archivo>] (--empty | <arbol-ismo1> [<arbol-ismo2> [<arbol-ismo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<archivo>] (--empty | <arbol-ismo1> [<arbol-"
+"ismo2> [<arbol-ismo3>]])"
#: builtin/read-tree.c:121
msgid "write resulting index to <file>"
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<opciones>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "mantener commits vacíos"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "continuar rebase"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "abortar rebase"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "generar script de rebase"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "SHA-1s cortos en la lista de pendientes"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "SHA-1s expandidos en la lista de pendientes"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "revisar la lista de pendientes"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "saltar los picks innecesarios"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "reorganizar líneas fixup/squash"
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
"Por default, actualizar la rama actual en un repositorio no vacío\n"
-"está denegado, porque eso haría el índice y el árbol de trabajo inconsistentes\n"
-"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para arreglar\n"
+"está denegado, porque eso haría el índice y el árbol de trabajo "
+"inconsistentes\n"
+"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para "
+"arreglar\n"
"el árbol de trabajo con HEAD.\n"
"\n"
"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n"
"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n"
-"se haya organizado para actualizar su árbol de trabajo para que coincida con lo que\n"
+"se haya organizado para actualizar su árbol de trabajo para que coincida con "
+"lo que\n"
"enviará con el push de otra manera.\n"
"\n"
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configure 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"Por default, borrar la rama actual está denegado, porque el siguiente\n"
"'git clone' no serultará en ningún archivo revisado, causando confusión.\n"
"\n"
-"Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o 'ignore'\n"
+"Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o "
+"'ignore'\n"
"en el repositorio remoto para permitir borrar la rama actual.\n"
"con o sin mensaje de advertencia.\n"
"\n"
"Para suprimir este mensaje, puede configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:14
-msgid "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>"
-msgstr "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nombre> <url>"
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nombre> <url>"
#: builtin/remote.c:15 builtin/remote.c:35
msgid "git remote rename <old> <new>"
msgstr "git remote prune [-n | --dry-run] <nombre>"
#: builtin/remote.c:20
-msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
#: builtin/remote.c:21
msgid "git remote set-branches [--add] <name> <branch>..."
#: builtin/remote.c:170
msgid "set up remote as a mirror to push to or fetch from"
-msgstr "configurar remote como mirror para realizar push o desde el cual realizar fetch"
+msgstr ""
+"configurar remote como mirror para realizar push o desde el cual realizar "
+"fetch"
#: builtin/remote.c:182
msgid "specifying a master branch makes no sense with --mirror"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "remoto %s ya existe."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' no es un nombre remoto válido"
msgid "(delete)"
msgstr "(eliminar)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "No existe el remoto: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPor favor actualice la configuración manualmente si es necesario."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "borrando '%s' falló"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "creando '%s' falló"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n"
"para borrarla, use:"
msgstr[1] ""
-"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron removidas;\n"
+"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
+"removidas;\n"
"para borrarlas, use:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No se pudo borrar la sección de configuración '%s'"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " rastreada"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " viejo ( use 'git remote prune' para remover)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebasa interactivamente en remoto %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "rebasa sobre el remoto %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " se fusiona con remoto %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "fusiona con remoto %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s y con el remoto %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "crear"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "borrar"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "actualizado"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "puede realizar fast-forward"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "desactualizado local"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s fuerza a %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica a %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s fuerza a %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica a %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "no consultar remotos"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL para obtener: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(sin URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#.
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL para publicar: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Rama HEAD: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(no consultado)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(desconocido)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
-msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+" HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Rama remota:%s"
msgstr[1] " Ramas remotas:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (estado no consultado)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Rama local configurada para 'git pull':"
msgstr[1] " Ramas locales configuradas para 'git pull':"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Las referencias locales serán reflejadas por 'git push'"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referencia local configurada para 'git push'%s:"
msgstr[1] " Referencias locales configuradas para 'git push'%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "borrar refs/remotos/<nombre>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "No se puede determinar el HEAD remoto"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "No se pudo borrar %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "No es un ref válido: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "No se pudo configurar %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s será colgado!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s ha sido colgado!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Recortando %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [ejecutará prune] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [prune realizado] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "recortar remotos tras realizar fetch"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "agregar rama"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "no hay remotos especificados"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de push en lugar de URLs de fetch"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "retornar todos los URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "no hay URLs configurados para remoto '%s'"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipular URLs de push"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "agregar URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "borrar URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no tiene sentido"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patrón de URL viejo inválido: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "No se encontró URL: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "No borrará todos los URLs de no-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sub-comando desconocido: %s"
#: builtin/repack.c:192
msgid "same as the above, but limit memory size instead of entries count"
-msgstr "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar entradas"
+msgstr ""
+"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
+"entradas"
#: builtin/repack.c:194
msgid "limits the maximum delta depth"
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
msgstr "falló al remover '%s'"
#: builtin/replace.c:374
#, c-format
-msgid "original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --graft"
-msgstr "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit en lugar de --graft"
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
+"en lugar de --graft"
#: builtin/replace.c:407
#, c-format
msgstr "registrar resoluciones limpias en el índice"
#: builtin/reset.c:29
-msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:30
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido"
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el HEAD del árbol"
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "no se puede realziar un reset %s en medio de una fusión."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e index"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "reiniciar HEAD, índice y árbol de trabajo"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
-msgstr "grabar solo el hecho de que las rutas removidas serán agregadas después"
+msgstr ""
+"grabar solo el hecho de que las rutas removidas serán agregadas después"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Falló al resolver '%s' como una revisión válida."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Falló al resolver '%s' como un árbol válido."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
+msgstr ""
+"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No se puede hacer un reset %s con rutas."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset no está permitido en un repositorio vacío"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N sólo puede ser usada con --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No se puede reiniciar el índice a la revisión '%s'."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "rev-list no soporta mostrar notas"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "mantener el `--` pasado como un arg"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
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:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "salida en formulario largo de atasco"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<opciones>] [<arg>...]\n"
"\n"
-"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer uso."
+"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
+"uso."
#: builtin/revert.c:23
msgid "git revert [<options>] <commit-ish>..."
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
msgid "exit with a zero status even if nothing matched"
msgstr "salir con stado cero incluso si nada concuerda"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no removiendo '%s' de manera recursiva sin -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no es posible remover %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "no se pudo remover '%s'"
#: builtin/send-pack.c:19
msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
" --all y especificaciones <ref> explícitas son mutuamente exclusivas."
#: builtin/send-pack.c:162
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Agrupar por committer en lugar de autor"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "ordenar salida de acuerdo al número de commits por autor"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Mostrar la dirección de correo de cada autor"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Salida de línea"
msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
#: builtin/show-branch.c:690
-msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog no es compatible con --all, --remotes, --independent o --merge-base"
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
#: builtin/show-branch.c:714
msgid "no branches given, and HEAD is not valid"
msgstr "no se puede encontrar el commit %s (%s)"
#: builtin/show-ref.c:10
-msgid "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=<pattern>]"
#: builtin/stripspace.c:36
msgid "skip and remove all lines starting with comment character"
-msgstr "saltar y borrar todas las líneas que comienzan con un caracter de comentario"
+msgstr ""
+"saltar y borrar todas las líneas que comienzan con un caracter de comentario"
#: builtin/stripspace.c:39
msgid "prepend comment character and space to each line"
msgstr "anteponer caracter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
-msgid "could not lookup configuration '%s'. Assuming this repository is its own authoritative upstream."
-msgstr "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es su propio upstream autoritativo."
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
+"su propio upstream autoritativo."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
+msgstr ""
+"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Error al registrar el modo de actualización para la ruta del submódulo '%s'"
+msgstr ""
+"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "suprime la salida para inicializar un submódulo"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<ruta>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "No se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
+msgstr ""
+"No se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "forzar el proceso de clonado"
-#: builtin/submodule--helper.c:653
-msgid "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference <repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path <ruta>"
+#: builtin/submodule--helper.c:646
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
+"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
+"<ruta>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "Tal vez quiere usar 'update --init'?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "ruta hacia el árbol de trabajo"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
msgid "path into the working tree, across nested submodule boundaries"
-msgstr "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
+msgstr ""
+"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncado al número especificado de revisión"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "trabajos paralelos"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación superficial"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonado"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
-msgid "Submodule (%s) branch configured to inherit branch from superproject, but the superproject is not on any branch"
-msgstr "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero el superproyecto no está en ninguna rama"
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Rama de submódulo (%s) configurada para heredar rama del superproyecto, "
+"pero el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<ruta>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper valido"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nombre>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "eliminar referencia simbólica"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "salida de referencia más corta"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "razón"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "razón de la actualización"
#: builtin/tag.c:24
-msgid "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"
-msgstr "git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] <nombre-de-etiqueta> [<head>]"
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
+"<nombre-de-etiqueta> [<head>]"
#: builtin/tag.c:25
msgid "git tag -d <tagname>..."
#: builtin/tag.c:26
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objeto>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objeto>]\n"
"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
#: builtin/tag.c:28
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "etiqueta '%s' no encontrada."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' eliminada (era %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
" %s\n"
"Las líneas que comienzan con '%c' serán ignoradas.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
msgstr ""
"\n"
"Escribe un mensaje para la etiqueta:\n"
" %s\n"
-"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por ti mismo si quieres hacerlo.\n"
+"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
+"ti mismo si quieres hacerlo.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "incapaz de firmar etiqueta"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "incapaz de escribir el archivo de etiqueta"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "¿Sin mensaje de etiqueta?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "El mensaje de la etiqueta ha sido dejado en %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "listar nombres de etiquetas"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de etiqueta"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "eliminar etiquetas"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "verificar etiquetas"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Opciones de creación de etiquetas"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "etiquetas anotadas necesitan un mensaje"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "mensaje de etiqueta"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada y firmada con GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar la etiqueta"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "remplazar etiqueta si existe"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Opciones de listado de etiqueta"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "mostrar lista de etiquetas en columnas"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contienen el commit"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contienen el commit"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "sólo imprimir las etiquetas que están fusionadas"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "sólo imprimir las etiquetas que no están fusionadas"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "sólo imprimir etiquetas de el objeto"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en moso lista"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "sólo se permite una de las opciones, -m ó -F."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "demasiados parámetros"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de etiqueta válido."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "la etiqueta '%s' ya existe"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
#: builtin/update-index.c:163
msgid "directory stat info does not change after adding a new directory"
-msgstr "info de estado del directorio no cambia tras agregar un nuevo directorio"
+msgstr ""
+"info de estado del directorio no cambia tras agregar un nuevo directorio"
#: builtin/update-index.c:176
msgid "directory stat info changes after updating a file"
#: builtin/update-index.c:187
msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr "info de estado del directorio cambia tras agregar un archivo dentro del subdirectorio"
+msgstr ""
+"info de estado del directorio cambia tras agregar un archivo dentro del "
+"subdirectorio"
#: builtin/update-index.c:198
msgid "directory stat info does not change after deleting a file"
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opciones>] [--] [<archivo>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr "continuar refresh incluso cuando el índice necesita actualizar"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "refresh: ignora submódulos"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "no ignorar archivos nuevos"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "permitir que archivos remplacen directorios y vice-versa"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "avisar de archivos faltando en el árbol de trabajo"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "refresh información de estado"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, pero ignora configuración assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<ruta>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "agregar la entrada especificada al índice"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "marcar archivos como \"not changing\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "limpiar bit assumed-unchanged"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "marcar archivos como \"index-only\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "limpiar bit skip-worktree"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
msgid "add to index only; do not add content to object database"
-msgstr "agregar solo al índice; no agregar contenido a la base de datos de objetos"
+msgstr ""
+"agregar solo al índice; no agregar contenido a la base de datos de objetos"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
msgid "remove named paths even if present in worktree"
-msgstr "remover rutas nombradas incluso si están presentes en el árbol de trabajo"
+msgstr ""
+"remover rutas nombradas incluso si están presentes en el árbol de trabajo"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "con --stdin: línas de entrada son terminadas con bytes null"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
msgid "read list of paths to be updated from standard input"
msgstr "leer la lista de rutas para ser actualizada desde standard input"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
msgid "add entries from standard input to the index"
msgstr "agregar entradas de standard input al índice"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repoblar stages #2 y #3 para las rutas listadas"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "solo actualizar entradas que difieren de HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "ignorar archivos faltantes en el árbol de trabajo"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "reportar acciones por standard output"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "escribir índice en este formato"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "activar o desactivar índice dividido"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "habilitar o deshabilitar caché no rastreado"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
msgid "test if the filesystem supports untracked cache"
msgstr "probar si el filesystem soporta caché no rastreado"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "enable untracked cache without testing the filesystem"
msgstr "habilitar caché no rastreado sin probar el filesystem"
-#: builtin/update-index.c:1108
-msgid "core.splitIndex is set to false; remove or change it, if you really want to enable split index"
-msgstr "core.splitIndex está configurado en false; remuévelo o cámbialo, si realmente quieres habilitar el índice partido"
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el índice partido"
-#: builtin/update-index.c:1117
-msgid "core.splitIndex is set to true; remove or change it, if you really want to disable split index"
-msgstr "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente quieres deshabilitar el índice partido"
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
+"quieres deshabilitar el índice partido"
-#: builtin/update-index.c:1128
-msgid "core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache"
-msgstr "core.untrackedCache está configurado en true; remuévelo o cámbialo, si realmente quieres deshabilitar el chaché no rastreado"
+#: builtin/update-index.c:1127
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
+"realmente quieres deshabilitar el chaché no rastreado"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Caché no rastreado deshabilitado"
-#: builtin/update-index.c:1140
-msgid "core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache"
-msgstr "core.untrackedCache está configurado en false; remuévelo o cámbialo, si realmente quieres habilitar el caché no rastreado"
+#: builtin/update-index.c:1139
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el caché no rastreado"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Caché no rastreado habilitado para '%s'"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-anterior>]"
+msgstr ""
+"git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-"
+"anterior>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opciones>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "eliminar la referencia"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "actualiza <refname> no a lo que apunta"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "stdin tiene argumentos terminados en NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "lee actualizaciones de stdin"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Removiendo el worktrees/%s: no es un directorio válido"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
+"bytes, %<PRIuMAX> leídos)"
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
+msgstr ""
+"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "reporta árboles de trabajo recortados"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "expirar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Preparando %s (identificador %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de trabajo"
+msgstr ""
+"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
+"trabajo"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opciones>] <directorio>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "sale después de un intercambio petición/respuesta único"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "salir inmediatamente tras el anuncio inicial de ref"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\tchmod 0700 %s"
msgstr ""
"Los permisos en su directorio de socket son demasiado flojos; otros\n"
-"usuarios pueden leer sus credenciales almacenadas en caché. Considere ejecutar:\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considere "
+"ejecutar:\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "mostrar mensajes de debug en stderr"
"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
"para leer sobre un subcomando o concepto específico."
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
-#: http.c:358
+#: http.c:359
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegación de control no es soportada con cURL < 7.22.0"
-#: http.c:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
-msgstr "actualizar el índice con la resolución de conflictos reutilizada si es posible"
+msgstr ""
+"actualizar el índice con la resolución de conflictos reutilizada si es "
+"posible"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
#: git-bisect.sh:167
#, sh-format
-msgid "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr ""
+"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD"
+msgstr ""
+"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD"
#: git-bisect.sh:636
msgid "no terms defined"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"argumento inválido $arg para 'git bisect terms'.\n"
-"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-new."
+"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-"
+"new."
#: git-merge-octopus.sh:46
-msgid "Error: Your local changes to the following files would be overwritten by merge"
-msgstr "Error: Sus cambios locales de los siguientes archivos serán sobrescritos por la fusión"
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por "
+"la fusión"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Ya actualizado con $pretty_name"
#: git-merge-octopus.sh:89
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"Cuando haya resuelto el problema, ejecute \"git rebase --continue\".\n"
+"Resuelva todos los conflictos manualmente ya sea con \n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"\".\n"
"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n"
-"Para revisar la rama original y detener el rebase, ejecute \"git rebase --abort\"."
+"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
+"rebase --abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "No se puede regresar a $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Autostash aplicado."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No se puede almacenar $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Parece que git-am está en progreso. No se puede hacer rebase."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "No hay rebase en progreso?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
+msgstr ""
+"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Tienes que editar todos los conflictos de fusion y luego\n"
"marcarlos como resueltos usando git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
"algo de valor ahí."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "upstream inválido $upstream_name"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: hay más de una base de fusión"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hay base de fusión"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No apunta a una confirmación válida: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no existe la rama: $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "No se puede ejecutar autostash"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autostash creado: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o salvaguárdalos."
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La rama actual $branch_name está actualizada."
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Rama actual $branch_name está actualizada, rebase forzado."
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Cambios desde $mb a $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Primero, rebobinando head para reproducir tu trabajo en la cima de él..."
+msgstr ""
+"Primero, rebobinando head para reproducir tu trabajo en la cima de él..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Avance rápido de $branch_name a $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear con parámetros no está implementado"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes una confirmación inicial."
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "No se puede remover el índice temporal (no puede suceder)"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No se puede actualizar $ref_stash con $w_commit"
#. up the second line with however many characters the
#. translation of "error: " takes in your language. E.g. in
#. English this is:
+#.
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"error: opción desconocida para 'stash save': $option\n"
" Esto provee un mensaje , use git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "No se pueden remover cambios del árbol de trabajo"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "opción desconocida: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:495
msgid "No stash entries found."
msgstr "No se encontraron entradas de stash."
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Se especificaron demasiadas revisiones: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no es una referencia válida"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no es un commit estilo stash"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no es una referencia stash"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "incapaz de refrescar el índice"
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No se puede aplicar un stash en medio de una fusión"
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "Conflictos en índice. Intente sin --index."
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "No se puede guardar el índice del árbol"
-#: git-stash.sh:579
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "No se puede sacar de stage archivos modificados"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "El índice no fue sacado de stash."
-#: git-stash.sh:633
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Botado ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No se pudo borrar entrada stash"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama."
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para restaurarlos, escribe \"git stash apply\")"
#: git-submodule.sh:181
msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "La ruta relativa sólo se puede usar desde el nivel superior del árbol de trabajo"
+msgstr ""
+"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
+"trabajo"
#: git-submodule.sh:191
#, sh-format
#: git-submodule.sh:247
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "Se encontró localmente un directorio git para '$sm_name' con el(los) remoto(s):"
+msgstr ""
+"Se encontró localmente un directorio git para '$sm_name' con el(los) "
+"remoto(s):"
#: git-submodule.sh:249
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct repo\n"
-"or you are unsure what this means choose another name with the '--name' option."
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
" $realrepo\n"
-"use la opción '--force'. Si el directorio git local no es el repositorio correcto\n"
-"o no está seguro de lo que esto significa, escoja otro nombre con la opción '--name'."
+"use la opción '--force'. Si el directorio git local no es el repositorio "
+"correcto\n"
+"o no está seguro de lo que esto significa, escoja otro nombre con la opción "
+"'--name'."
#: git-submodule.sh:255
#, sh-format
#: git-submodule.sh:362
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr "Deteniendo en '$displaypath'; script retornó un status distinto de cero."
+msgstr ""
+"Deteniendo en '$displaypath'; script retornó un status distinto de cero."
#: git-submodule.sh:433
#, sh-format
"Submodule work tree '$displaypath' contains a .git directory\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"El árbol de trabajo del submódulo '$displaypath' contiene un directorio .git \n"
+"El árbol de trabajo del submódulo '$displaypath' contiene un directorio ."
+"git \n"
"(use 'rm -rf' si realmente quiere removerlo incluyendo todo en su historia)"
#: git-submodule.sh:466
#, sh-format
-msgid "Submodule work tree '$displaypath' contains local modifications; use '-f' to discard them"
-msgstr "El árbol de trabajo '$displaypath' contiene modificaciones locales; usa '-f' para descartarlos"
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
+msgstr ""
+"El árbol de trabajo '$displaypath' contiene modificaciones locales; usa '-f' "
+"para descartarlos"
#: git-submodule.sh:469
#, sh-format
#: git-submodule.sh:482
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "Anulado el registro del submódulo '$name' ($url) para la ruta '$displaypath'"
+msgstr ""
+"Anulado el registro del submódulo '$name' ($url) para la ruta '$displaypath'"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "No se pudo encontrar la revisión actual en la ruta de submódulo '$displaypath'"
+msgstr ""
+"No se pudo encontrar la revisión actual en la ruta de submódulo "
+"'$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
-msgid "Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'"
-msgstr "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta de submódulo '$sm_path'"
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
+"de submódulo '$sm_path'"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
-msgid "Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching of that commit failed."
-msgstr "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. Fetch directo del commit falló."
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
+"Fetch directo del commit falló."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo '$displaypath'"
+msgstr ""
+"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
+"'$displaypath'"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "Falló la ejecución de '$command $sha1' en la ruta de submódulo '$displaypath'"
+msgstr ""
+"Falló la ejecución de '$command $sha1' en la ruta de submódulo "
+"'$displaypath'"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "La opción --cached no puede ser usada con la opción --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo $mod_dst inesperado"
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Advertencia: $display_name no contiene la confirmación $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Advertencia: $display_name no contiene la confirmación $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr "Advertencia: $display_name no contiene las confirmaciones $sha1_src y $sha1_dst"
+msgstr ""
+"Advertencia: $display_name no contiene las confirmaciones $sha1_src y "
+"$sha1_dst"
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Sincronizando url de submódulo para '$displaypath'"
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
" x, exec = ejecutar comando (el resto de la línea) usando un shell\n"
" d, drop = borrar commit\n"
"\n"
-"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia abajo.\n"
+"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia "
+"abajo.\n"
#: git-rebase--interactive.sh:171
msgid ""
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"No eliminar ninguna línea. Usa 'drop' explícitamente para eliminar una confirmación.\n"
+"No eliminar ninguna línea. Usa 'drop' explícitamente para eliminar una "
+"confirmación.\n"
#: git-rebase--interactive.sh:175
msgid ""
msgid "Refusing to squash a merge: $sha1"
msgstr "Rehusando a ejecutar squash en fusión: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error rehaciendo fusión $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "No se pudo coger $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Este es el mensaje de la confirmación #${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El mensaje de confirmación #${n} será ignorado:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Esta es una combinación de $count confirmación."
msgstr[1] "Esta es la combinación de $count confirmaciones."
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No se puede escribir $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Esto es una combinación de 2 confirmaciones."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No se puede aplicar $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
"you are able to reword the commit."
msgstr ""
-"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... $rest\n"
-"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el problema antes\n"
+"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
+"$rest\n"
+"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
+"commit\n"
+"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el "
+"problema antes\n"
"de que sea capaz de reformular el commit."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Detenido en $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "no se puede '$squash_style' sin una confirmación previa"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Ejecutando: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ejecución fallida: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Comando desconocido: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "$head_name rebasado y actualizado satisfactoriamente."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "No se pudo saltar comandos pick innecesarios"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Peligro: el comando no es reconocido en la siguiente línea:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
-"Commits botados (empezando con el mas nuevo):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Para evitar este mensaje, use \"drop\" para remover de forma explicita un commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de advertencias.\n"
-"Los posibles comportamientos son: ignore,warn,error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid "Unrecognized setting $check_level for option rebase.missingCommitsCheck. Ignoring."
-msgstr "Opcion $check_level no reconocida para la opcion rebase.missingCommitsCheck. Ingorando."
-
-#: git-rebase--interactive.sh:1054
-msgid "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'."
-msgstr "Se puede arreglar esto con 'git rebase --edit-todo' y despues correr 'git rebase --continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No se pudo remover CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
-msgstr "Error tratando de encontrar la identidad del autor para remediar el commit "
+msgstr ""
+"Error tratando de encontrar la identidad del autor para remediar el commit "
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr "No se pudo realizar el commit con los cambios en el area de stage"
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "No se pudo ejecutar el editor"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "¿Sin HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No se pudo crear $state_dir temporalmente"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "No se pudo marcar como interactivo"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr "No se puede inicializar los commits reescritos"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Como sea, si se remueve todo, el rebase sera abortado.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "Nota que los commits vacios estan comentados"
#: git-sh-setup.sh:190
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
+msgstr ""
+"No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
#: git-sh-setup.sh:199 git-sh-setup.sh:206
#, sh-format
#: git-sh-setup.sh:220
msgid "Cannot rebase: You have unstaged changes."
-msgstr "No se puede aplicar rebase: Tienes cambios que no estan en el area de stage."
+msgstr ""
+"No se puede aplicar rebase: Tienes cambios que no estan en el area de stage."
#: git-sh-setup.sh:223
msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "No se puede reescribir las ramas: Tienes cambios que no estan en el area de stage"
+msgstr ""
+"No se puede reescribir las ramas: Tienes cambios que no estan en el area de "
+"stage"
#: git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No se puede aplicar pull con rebase: Tienes cambios que no estan en el area de stage."
+msgstr ""
+"No se puede aplicar pull con rebase: Tienes cambios que no estan en el area "
+"de stage."
#: git-sh-setup.sh:229
#, sh-format
#: git-sh-setup.sh:242
msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "No se puede hacer rebase: Tu indice contiene cambios que no estan en un commit."
+msgstr ""
+"No se puede hacer rebase: Tu indice contiene cambios que no estan en un "
+"commit."
#: git-sh-setup.sh:245
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "No se puede hacer pull con rebase: Tu indice contiene cambios que no estan en un commit."
+msgstr ""
+"No se puede hacer pull con rebase: Tu indice contiene cambios que no estan "
+"en un commit."
#: git-sh-setup.sh:248
#, sh-format
#: git-sh-setup.sh:372
msgid "You need to run this command from the toplevel of the working tree."
-msgstr "Necesitas ejecutar este comando desde el nivel superior de tu árbol de trabajo."
+msgstr ""
+"Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
+"trabajo."
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#: git-add--interactive.perl:1134
-msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
#: git-add--interactive.perl:1143
msgid ""
"n - no aplicar stage a este hunk\n"
"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"
"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
-"d - no aplicar stage a este hunk o a ninguno de los posteriores en este archivo"
+"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"archivo"
#: git-add--interactive.perl:1149
msgid ""
"n - no sacar este hunk del area de stage\n"
"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n"
"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este hunk o ninguno de los posteriores en el archivo"
+"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
+"archivo"
#: git-add--interactive.perl:1161
msgid ""
#: git-add--interactive.perl:1330
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar cambio de modo del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar cambio de modo del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
#: git-add--interactive.perl:1331
#, perl-format
#: git-add--interactive.perl:1332
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar este hunk del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar este hunk del indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
#: git-add--interactive.perl:1335
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar cambio de modo para el indice y el arbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Aplicar cambio de modo para el indice y el arbol de trabajo [y,n,q,a,d,/"
+"%s,?]? "
#: git-add--interactive.perl:1336
#, perl-format
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of changes\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
msgstr ""
"status - muestra las rutas con cambioss\n"
-"update - agrega el estado del arbol de trabajo al set de cambios en el area de stage\n"
-"revert - revierte los cambios en el area de stage de regreso a la version HEAD\n"
+"update - agrega el estado del arbol de trabajo al set de cambios en "
+"el area de stage\n"
+"revert - revierte los cambios en el area de stage de regreso a la "
+"version HEAD\n"
"patch - selecciona los hunks y actualiza de forma selectiva\n"
"diff - mirar la diff entre HEAD y el indice\n"
-"add untracked - agrega contenidos de archivos no rastreados al grupo de cambios del area de stage\n"
+"add untracked - agrega contenidos de archivos no rastreados al grupo de "
+"cambios del area de stage\n"
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 git-add--interactive.perl:1649 git-add--interactive.perl:1656 git-add--interactive.perl:1660
-#: git-add--interactive.perl:1666
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
msgid "missing --"
msgstr "falta --"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "el editor se cerro inapropiadamente, abortando todo"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
-msgid "'%s' contains an intermediate version of the email you were composing.\n"
-msgstr "'%s' contiene una version intermedia del correo que se estaba generando.\n"
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contiene una version intermedia del correo que se estaba generando.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contiene el email generado.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases no es compatible con otras opciones.\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "campo --suppress-cc desconocido: '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Configuracion --confirm desconocida: '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "peligro: `:include:` no soportado: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "peligro: redireccion `/file` or `|pipe` no soportada : %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "peligro: linea sendmail no reconocida: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
" * Agregando la opcion --format-patch si se quiere decir un rango.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fallo al abrir directorio %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal: %s: %s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"No se especificaron parches!\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "No hay linea de subject en %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fallo al abir para escritura %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Limpiar el contenido de body si usted no desea mandar un resumen.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fallo al abrir %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fallo al abrir %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-msgstr "Campos Para/Cc/Bcc no han sido interpretados todavia, han sido ignorados\n"
+msgstr ""
+"Campos Para/Cc/Bcc no han sido interpretados todavia, han sido ignorados\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "Archivo de resumen esta vacio, saltando al siguiente\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esta seguro de que desea usar <%s> [y/N]?"
-#: git-send-email.perl:820
-msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n"
-msgstr "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-Encoding.\n"
+#: git-send-email.perl:815
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
+"Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Que codificacion de 8bit deberia declarar [UTF-8]?"
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
msgstr ""
"Rehusando mandar el parche porque\n"
"\t%s\n"
-"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo deseas mandar.\n"
+"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
+"deseas mandar.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "A quien se deben mandar los correos (si existe)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' se expande a si mismo\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr "que id de mensaje sera usado como En-Respuesta-Para en el primer email (si existe alguno)?"
+msgstr ""
+"que id de mensaje sera usado como En-Respuesta-Para en el primer email (si "
+"existe alguno)?"
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no es posible extraer una direccion valida de %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que hacer con esta direccion? ([q]salir|[d]botar|[e]ditar):"
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "ruta CA \"%s\" no existe"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
"La lista Cc ha sido expandida por direcciones adicionales\n"
"encontradas en el mensaje de commit parchado.. Por defecto\n"
"send-email se muestra antes de mandar cualquier cada vez que esto sucede.\n"
-"Este comportamiento is controlado por el valor de configuracion sendemail.confirm.\n"
+"Este comportamiento is controlado por el valor de configuracion sendemail."
+"confirm.\n"
"\n"
"Para mas informacion, corre 'git sen-email --help'.\n"
"Para mantener el comportamiento actual, pero evitar este mensaje,\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):"
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr "Necesitas mandar esta respuesta de email"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP no esta definido adecuadamente."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servidor no soporta STARTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "fallo de STARTTLS! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---smtp-debug."
+msgstr ""
+"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
+"smtp-debug."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fallo al enviar %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Dry-Sent %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Log dice:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "OK. Log dice:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "Resultado:"
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Agregando cc: %s de linea '%s'\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Agregando para: %s de la linea '%s'\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Agregando cc: %s de la linea '%s'\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la linea '%s'\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) fallo al cerrar el pipe para '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr "codificacion de transferencia invalida"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no es posible abrir %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el parche contiene una linea con mas de 998 caracteres"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Realmente deseas mandar %s?[y|N]"
+
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no toma argumentos"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "cambie info de upstream"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nombre base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "anteponer el nombre base del proyecto padre a la salida"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: el comando no es reconocido en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'."