mirror of
https://github.com/git/git.git
synced 2024-05-19 19:56:08 +02:00
l10n: es.po: Spanish translation 2.16.0 round 2
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
This commit is contained in:
Christopher Díaz Riveros
parent
005c62fe46
commit
521437fe7c
378
po/es.po
378
po/es.po
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2017-12-31 10:45+0800\n"
|
||||
"PO-Revision-Date: 2018-01-04 15:57-0500\n"
|
||||
"POT-Creation-Date: 2018-01-07 07:50+0800\n"
|
||||
"PO-Revision-Date: 2018-01-07 12:14-0500\n"
|
||||
"Last-Translator: christopher.diaz.riv@gmail.com\n"
|
||||
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
|
||||
"Language: es\n"
|
||||
|
|
@ -612,7 +612,7 @@ msgstr[1] ""
|
|||
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
|
||||
#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
|
||||
#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
|
||||
#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
|
||||
#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
|
||||
|
|
@ -629,7 +629,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada"
|
|||
msgid "apply changes matching the given path"
|
||||
msgstr "aplicar cambios que concuerden con la ruta suministrada"
|
||||
|
||||
#: apply.c:4927 builtin/am.c:2266
|
||||
#: apply.c:4927 builtin/am.c:2229
|
||||
msgid "num"
|
||||
msgstr "num"
|
||||
|
||||
|
|
@ -690,7 +690,7 @@ msgstr "rutas están separadas con un carácter NULL "
|
|||
msgid "ensure at least <n> lines of context match"
|
||||
msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
|
||||
|
||||
#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95
|
||||
#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
|
||||
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
|
||||
#: builtin/pack-objects.c:3009
|
||||
msgid "action"
|
||||
|
|
@ -739,7 +739,7 @@ msgstr ""
|
|||
msgid "do not trust the line counts in the hunk headers"
|
||||
msgstr "no confiar en el conteo de líneas en los headers del hunk"
|
||||
|
||||
#: apply.c:4983 builtin/am.c:2254
|
||||
#: apply.c:4983 builtin/am.c:2217
|
||||
msgid "root"
|
||||
msgstr "raiz"
|
||||
|
||||
|
|
@ -1007,8 +1007,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
|
|||
msgstr ""
|
||||
"--reverse y --first-parent juntos requieren especificar el ultimo commit"
|
||||
|
||||
#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179
|
||||
#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
|
||||
#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
|
||||
#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
|
||||
#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
|
||||
#: builtin/shortlog.c:191
|
||||
msgid "revision walk setup failed"
|
||||
|
|
@ -1190,8 +1190,8 @@ msgstr "'%s' no se ve como un archivo bundle v2"
|
|||
msgid "unrecognized header: %s%s (%d)"
|
||||
msgstr "header no reconocido %s%s (%d)"
|
||||
|
||||
#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631
|
||||
#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782
|
||||
#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
|
||||
#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
|
||||
#, c-format
|
||||
msgid "could not open '%s'"
|
||||
msgstr "no se pudo abrir '%s'"
|
||||
|
|
@ -1258,8 +1258,8 @@ msgstr "index-pack murio"
|
|||
msgid "invalid color value: %.*s"
|
||||
msgstr "color inválido: %.*s"
|
||||
|
||||
#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465
|
||||
#: builtin/am.c:1471 builtin/am.c:2106
|
||||
#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
|
||||
#: builtin/am.c:1434 builtin/am.c:2069
|
||||
#, c-format
|
||||
msgid "could not parse %s"
|
||||
msgstr "no se puede analizar %s"
|
||||
|
|
@ -2088,11 +2088,11 @@ msgstr ""
|
|||
msgid "Unable to create '%s.lock': %s"
|
||||
msgstr "No se pudo crear '%s.lock': %s"
|
||||
|
||||
#: merge.c:41
|
||||
#: merge.c:74
|
||||
msgid "failed to read the cache"
|
||||
msgstr "fallo al leer la cache"
|
||||
|
||||
#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379
|
||||
#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
|
||||
#: builtin/checkout.c:600 builtin/clone.c:754
|
||||
msgid "unable to write new index file"
|
||||
msgstr "no es posible escribir el archivo indice"
|
||||
|
|
@ -2323,36 +2323,41 @@ msgstr ""
|
|||
msgid "Adding %s"
|
||||
msgstr "Agregando %s"
|
||||
|
||||
#: merge-recursive.c:1955
|
||||
#: merge-recursive.c:1958
|
||||
#, c-format
|
||||
msgid "Dirty index: cannot merge (dirty: %s)"
|
||||
msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
|
||||
|
||||
#: merge-recursive.c:1962
|
||||
msgid "Already up to date!"
|
||||
msgstr "¡Ya está actualizado!"
|
||||
|
||||
#: merge-recursive.c:1964
|
||||
#: merge-recursive.c:1971
|
||||
#, c-format
|
||||
msgid "merging of trees %s and %s failed"
|
||||
msgstr "falló la fusión de los árboles %s y %s"
|
||||
|
||||
#: merge-recursive.c:2061
|
||||
#: merge-recursive.c:2068
|
||||
msgid "Merging:"
|
||||
msgstr "Fusionando:"
|
||||
|
||||
#: merge-recursive.c:2074
|
||||
#: merge-recursive.c:2081
|
||||
#, 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:2113
|
||||
#: merge-recursive.c:2120
|
||||
msgid "merge returned no commit"
|
||||
msgstr "la fusión no devolvió ningun commit"
|
||||
|
||||
#: merge-recursive.c:2176
|
||||
#: merge-recursive.c:2183
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'"
|
||||
msgstr "No se pudo analizar el objeto '%s'"
|
||||
|
||||
#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815
|
||||
#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
|
||||
msgid "Unable to write index."
|
||||
msgstr "Incapaz de escribir el índice."
|
||||
|
||||
|
|
@ -2552,12 +2557,12 @@ msgstr ""
|
|||
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
|
||||
"Usando versión %i"
|
||||
|
||||
#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048
|
||||
#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
|
||||
#, c-format
|
||||
msgid "could not close '%s'"
|
||||
msgstr "no se pudo cerrar '%s'"
|
||||
|
||||
#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093
|
||||
#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
|
||||
#, c-format
|
||||
msgid "could not stat '%s'"
|
||||
msgstr "no se pudo definir '%s'"
|
||||
|
|
@ -2973,25 +2978,25 @@ msgstr ""
|
|||
"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
|
||||
"false`."
|
||||
|
||||
#: send-pack.c:151
|
||||
#: send-pack.c:141
|
||||
#, c-format
|
||||
msgid "unable to parse remote unpack status: %s"
|
||||
msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
|
||||
|
||||
#: send-pack.c:153
|
||||
#: send-pack.c:143
|
||||
#, c-format
|
||||
msgid "remote unpack failed: %s"
|
||||
msgstr "desempaquetado remoto falló: %s"
|
||||
|
||||
#: send-pack.c:316
|
||||
#: send-pack.c:306
|
||||
msgid "failed to sign the push certificate"
|
||||
msgstr "falló al firmar el certificado de push"
|
||||
|
||||
#: send-pack.c:429
|
||||
#: send-pack.c:419
|
||||
msgid "the receiving end does not support --signed push"
|
||||
msgstr "el final receptor no soporta --signed push"
|
||||
|
||||
#: send-pack.c:431
|
||||
#: send-pack.c:421
|
||||
msgid ""
|
||||
"not sending a push certificate since the receiving end does not support --"
|
||||
"signed push"
|
||||
|
|
@ -2999,11 +3004,11 @@ msgstr ""
|
|||
"no se manda un certificado de push ya que el destino no soporta push firmado "
|
||||
"(--signed )"
|
||||
|
||||
#: send-pack.c:443
|
||||
#: send-pack.c:433
|
||||
msgid "the receiving end does not support --atomic push"
|
||||
msgstr "el destino no soporta push atómicos (--atomic)"
|
||||
|
||||
#: send-pack.c:448
|
||||
#: send-pack.c:438
|
||||
msgid "the receiving end does not support push options"
|
||||
msgstr "el destino no soporta opciones de push"
|
||||
|
||||
|
|
@ -3042,13 +3047,13 @@ msgstr ""
|
|||
"con 'git add <rutas>' o 'git rm <rutas>'\n"
|
||||
"y haz un commit del resultado con 'git commit'"
|
||||
|
||||
#: sequencer.c:297 sequencer.c:1715
|
||||
#: sequencer.c:297 sequencer.c:1718
|
||||
#, c-format
|
||||
msgid "could not lock '%s'"
|
||||
msgstr "No se pudo bloquear '%s'"
|
||||
|
||||
#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734
|
||||
#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656
|
||||
#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
|
||||
#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
|
||||
#, c-format
|
||||
msgid "could not write to '%s'"
|
||||
msgstr "No se pudo escribir en '%s'"
|
||||
|
|
@ -3058,12 +3063,12 @@ msgstr "No se pudo escribir en '%s'"
|
|||
msgid "could not write eol to '%s'"
|
||||
msgstr "No se pudo escribir EOL en '%s'"
|
||||
|
||||
#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722
|
||||
#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
|
||||
#, c-format
|
||||
msgid "failed to finalize '%s'."
|
||||
msgstr "Fallo al finalizar '%s'."
|
||||
|
||||
#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259
|
||||
#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
|
||||
#: builtin/commit.c:754 builtin/merge.c:1046
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
|
|
@ -3092,12 +3097,12 @@ msgid "%s: Unable to write new index file"
|
|||
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
|
||||
|
||||
#: sequencer.c:496
|
||||
msgid "could not resolve HEAD commit\n"
|
||||
msgstr "No se pudo resolver el commit de HEAD\n"
|
||||
msgid "could not resolve HEAD commit"
|
||||
msgstr "No se pudo resolver el commit de HEAD"
|
||||
|
||||
#: sequencer.c:516
|
||||
msgid "unable to update cache tree\n"
|
||||
msgstr "no es posible actualizar el árbol de la caché\n"
|
||||
msgid "unable to update cache tree"
|
||||
msgstr "no es posible actualizar el árbol de la caché"
|
||||
|
||||
#: sequencer.c:600
|
||||
#, c-format
|
||||
|
|
@ -3131,13 +3136,13 @@ msgstr ""
|
|||
|
||||
#: sequencer.c:702
|
||||
#, c-format
|
||||
msgid "could not parse commit %s\n"
|
||||
msgstr "No se pudo analizar commit %s.\n"
|
||||
msgid "could not parse commit %s"
|
||||
msgstr "No se pudo analizar commit %s"
|
||||
|
||||
#: sequencer.c:707
|
||||
#, c-format
|
||||
msgid "could not parse parent commit %s\n"
|
||||
msgstr "No se pudo analizar el commit padre %s\n"
|
||||
msgid "could not parse parent commit %s"
|
||||
msgstr "No se pudo analizar el commit padre %s"
|
||||
|
||||
#: sequencer.c:836
|
||||
#, c-format
|
||||
|
|
@ -3166,7 +3171,7 @@ msgstr ""
|
|||
msgid "This is a combination of %d commits."
|
||||
msgstr "Esta es una combinación de %d commits."
|
||||
|
||||
#: sequencer.c:857 sequencer.c:2742
|
||||
#: sequencer.c:857 sequencer.c:2748
|
||||
msgid "need a HEAD to fixup"
|
||||
msgstr "se necesita un HEAD para arreglar"
|
||||
|
||||
|
|
@ -3233,158 +3238,168 @@ 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:1025
|
||||
#: sequencer.c:1023
|
||||
#, c-format
|
||||
msgid "%s: cannot parse parent commit %s"
|
||||
msgstr "%s: no se puede analizar el commit padre %s"
|
||||
|
||||
#: sequencer.c:1088 sequencer.c:1864
|
||||
#: sequencer.c:1086 sequencer.c:1867
|
||||
#, c-format
|
||||
msgid "could not rename '%s' to '%s'"
|
||||
msgstr "No se puede renombrar '%s' a '%s'"
|
||||
|
||||
#: sequencer.c:1139
|
||||
#: sequencer.c:1137
|
||||
#, c-format
|
||||
msgid "could not revert %s... %s"
|
||||
msgstr "no se pudo revertir %s... %s"
|
||||
|
||||
#: sequencer.c:1140
|
||||
#: sequencer.c:1138
|
||||
#, c-format
|
||||
msgid "could not apply %s... %s"
|
||||
msgstr "no se pudo aplicar %s... %s"
|
||||
|
||||
#: sequencer.c:1182
|
||||
#: sequencer.c:1180
|
||||
msgid "empty commit set passed"
|
||||
msgstr "conjunto de commits vacío entregado"
|
||||
|
||||
#: sequencer.c:1192
|
||||
#: sequencer.c:1190
|
||||
#, c-format
|
||||
msgid "git %s: failed to read the index"
|
||||
msgstr "git %s: fallo al leer el índice"
|
||||
|
||||
#: sequencer.c:1198
|
||||
#: sequencer.c:1196
|
||||
#, c-format
|
||||
msgid "git %s: failed to refresh the index"
|
||||
msgstr "git %s: fallo al refrescar el índice"
|
||||
|
||||
#: sequencer.c:1319
|
||||
#: sequencer.c:1270
|
||||
#, c-format
|
||||
msgid "%s does not accept arguments: '%s'"
|
||||
msgstr "%s no acepta los argumentos: '%s'"
|
||||
|
||||
#: sequencer.c:1279
|
||||
#, c-format
|
||||
msgid "missing arguments for %s"
|
||||
msgstr "faltan argumentos para para %s"
|
||||
|
||||
#: sequencer.c:1322
|
||||
#, c-format
|
||||
msgid "invalid line %d: %.*s"
|
||||
msgstr "línea inválida %d: %.*s"
|
||||
|
||||
#: sequencer.c:1327
|
||||
#: sequencer.c:1330
|
||||
#, c-format
|
||||
msgid "cannot '%s' without a previous commit"
|
||||
msgstr "no se puede '%s' sin un commit previo"
|
||||
|
||||
#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636
|
||||
#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853
|
||||
#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
|
||||
#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
|
||||
#, c-format
|
||||
msgid "could not read '%s'."
|
||||
msgstr "no se puede leer '%s'."
|
||||
|
||||
#: sequencer.c:1372
|
||||
#: sequencer.c:1375
|
||||
msgid "please fix this using 'git rebase --edit-todo'."
|
||||
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
|
||||
|
||||
#: sequencer.c:1374
|
||||
#: sequencer.c:1377
|
||||
#, c-format
|
||||
msgid "unusable instruction sheet: '%s'"
|
||||
msgstr "hoja de instrucciones inutilízale: '%s'"
|
||||
|
||||
#: sequencer.c:1379
|
||||
#: sequencer.c:1382
|
||||
msgid "no commits parsed."
|
||||
msgstr "ningún commit analizado."
|
||||
|
||||
#: sequencer.c:1390
|
||||
#: sequencer.c:1393
|
||||
msgid "cannot cherry-pick during a revert."
|
||||
msgstr "no se puede realizar cherry-pick durante un revert."
|
||||
|
||||
#: sequencer.c:1392
|
||||
#: sequencer.c:1395
|
||||
msgid "cannot revert during a cherry-pick."
|
||||
msgstr "no se puede realizar un revert durante un cherry-pick"
|
||||
|
||||
#: sequencer.c:1459
|
||||
#: sequencer.c:1462
|
||||
#, c-format
|
||||
msgid "invalid key: %s"
|
||||
msgstr "llave invalida: %s"
|
||||
|
||||
#: sequencer.c:1462
|
||||
#: sequencer.c:1465
|
||||
#, c-format
|
||||
msgid "invalid value for %s: %s"
|
||||
msgstr "valor invalido para %s: %s"
|
||||
|
||||
#: sequencer.c:1528
|
||||
#: sequencer.c:1531
|
||||
#, c-format
|
||||
msgid "malformed options sheet: '%s'"
|
||||
msgstr "hoja de opciones mal formada: '%s'"
|
||||
|
||||
#: sequencer.c:1566
|
||||
#: sequencer.c:1569
|
||||
msgid "a cherry-pick or revert is already in progress"
|
||||
msgstr "un cherry-pick o rever ya esta en progreso"
|
||||
|
||||
#: sequencer.c:1567
|
||||
#: sequencer.c:1570
|
||||
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
||||
msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
|
||||
|
||||
#: sequencer.c:1570
|
||||
#: sequencer.c:1573
|
||||
#, c-format
|
||||
msgid "could not create sequencer directory '%s'"
|
||||
msgstr "no se pudo crear un directorio secuenciador '%s' "
|
||||
|
||||
#: sequencer.c:1585
|
||||
#: sequencer.c:1588
|
||||
msgid "could not lock HEAD"
|
||||
msgstr "no se pudo bloquear HEAD"
|
||||
|
||||
#: sequencer.c:1643 sequencer.c:2227
|
||||
#: sequencer.c:1646 sequencer.c:2230
|
||||
msgid "no cherry-pick or revert in progress"
|
||||
msgstr "ningún cherry-pick o revert en progreso"
|
||||
|
||||
#: sequencer.c:1645
|
||||
#: sequencer.c:1648
|
||||
msgid "cannot resolve HEAD"
|
||||
msgstr "no se puede resolver HEAD"
|
||||
|
||||
#: sequencer.c:1647 sequencer.c:1682
|
||||
#: sequencer.c:1650 sequencer.c:1685
|
||||
msgid "cannot abort from a branch yet to be born"
|
||||
msgstr "no se puede abortar de una rama por nacer"
|
||||
|
||||
#: sequencer.c:1668 builtin/grep.c:713
|
||||
#: sequencer.c:1671 builtin/grep.c:713
|
||||
#, c-format
|
||||
msgid "cannot open '%s'"
|
||||
msgstr "no se puede abrir '%s'"
|
||||
|
||||
#: sequencer.c:1670
|
||||
#: sequencer.c:1673
|
||||
#, c-format
|
||||
msgid "cannot read '%s': %s"
|
||||
msgstr "no se puede leer '%s': %s"
|
||||
|
||||
#: sequencer.c:1671
|
||||
#: sequencer.c:1674
|
||||
msgid "unexpected end of file"
|
||||
msgstr "final de archivo inesperado"
|
||||
|
||||
#: sequencer.c:1677
|
||||
#: sequencer.c:1680
|
||||
#, c-format
|
||||
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
||||
msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
|
||||
|
||||
#: sequencer.c:1688
|
||||
#: sequencer.c:1691
|
||||
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:1829 sequencer.c:2125
|
||||
#: sequencer.c:1832 sequencer.c:2128
|
||||
msgid "cannot read HEAD"
|
||||
msgstr "no se puede leer HEAD"
|
||||
|
||||
#: sequencer.c:1869 builtin/difftool.c:639
|
||||
#: sequencer.c:1872 builtin/difftool.c:639
|
||||
#, c-format
|
||||
msgid "could not copy '%s' to '%s'"
|
||||
msgstr "no se pudo copiar '%s' a '%s'"
|
||||
|
||||
#: sequencer.c:1888
|
||||
#: sequencer.c:1891
|
||||
msgid "could not read index"
|
||||
msgstr "no se pudo leer indice"
|
||||
|
||||
#: sequencer.c:1893
|
||||
#: sequencer.c:1896
|
||||
#, c-format
|
||||
msgid ""
|
||||
"execution failed: %s\n"
|
||||
|
|
@ -3399,11 +3414,11 @@ msgstr ""
|
|||
" git rebase --continue\n"
|
||||
"\n"
|
||||
|
||||
#: sequencer.c:1899
|
||||
#: sequencer.c:1902
|
||||
msgid "and made changes to the index and/or the working tree\n"
|
||||
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
|
||||
|
||||
#: sequencer.c:1905
|
||||
#: sequencer.c:1908
|
||||
#, c-format
|
||||
msgid ""
|
||||
"execution succeeded: %s\n"
|
||||
|
|
@ -3420,17 +3435,17 @@ msgstr ""
|
|||
" git rebase --continue\n"
|
||||
"\n"
|
||||
|
||||
#: sequencer.c:1964
|
||||
#: sequencer.c:1967
|
||||
#, c-format
|
||||
msgid "Applied autostash.\n"
|
||||
msgstr "Autostash aplicado.\n"
|
||||
|
||||
#: sequencer.c:1976
|
||||
#: sequencer.c:1979
|
||||
#, c-format
|
||||
msgid "cannot store %s"
|
||||
msgstr "no se puede guardar %s"
|
||||
|
||||
#: sequencer.c:1979 git-rebase.sh:175
|
||||
#: sequencer.c:1982 git-rebase.sh:175
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Applying autostash resulted in conflicts.\n"
|
||||
|
|
@ -3442,57 +3457,57 @@ msgstr ""
|
|||
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
|
||||
"momento.\n"
|
||||
|
||||
#: sequencer.c:2061
|
||||
#: sequencer.c:2064
|
||||
#, c-format
|
||||
msgid "Stopped at %s... %.*s\n"
|
||||
msgstr "Detenido en %s... %.*s\n"
|
||||
|
||||
#: sequencer.c:2103
|
||||
#: sequencer.c:2106
|
||||
#, c-format
|
||||
msgid "unknown command %d"
|
||||
msgstr "comando desconocido %d"
|
||||
|
||||
#: sequencer.c:2133
|
||||
#: sequencer.c:2136
|
||||
msgid "could not read orig-head"
|
||||
msgstr "no se puede leer orig-head"
|
||||
|
||||
#: sequencer.c:2138 sequencer.c:2739
|
||||
#: sequencer.c:2141 sequencer.c:2745
|
||||
msgid "could not read 'onto'"
|
||||
msgstr "no se puede leer 'onto'"
|
||||
|
||||
#: sequencer.c:2145
|
||||
#: sequencer.c:2148
|
||||
#, c-format
|
||||
msgid "could not update %s"
|
||||
msgstr "no se puede actualizar %s"
|
||||
|
||||
#: sequencer.c:2152
|
||||
#: sequencer.c:2155
|
||||
#, c-format
|
||||
msgid "could not update HEAD to %s"
|
||||
msgstr "no se puede actualizar HEAD a %s"
|
||||
|
||||
#: sequencer.c:2236
|
||||
#: sequencer.c:2239
|
||||
msgid "cannot rebase: You have unstaged changes."
|
||||
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
|
||||
|
||||
#: sequencer.c:2241
|
||||
#: sequencer.c:2244
|
||||
msgid "could not remove CHERRY_PICK_HEAD"
|
||||
msgstr "no se puede remover CHERRY_PICK_HEAD"
|
||||
|
||||
#: sequencer.c:2250
|
||||
#: sequencer.c:2253
|
||||
msgid "cannot amend non-existing commit"
|
||||
msgstr "no se puede arreglar un commit no existente"
|
||||
|
||||
#: sequencer.c:2252
|
||||
#: sequencer.c:2255
|
||||
#, c-format
|
||||
msgid "invalid file: '%s'"
|
||||
msgstr "archivo invalido: '%s'"
|
||||
|
||||
#: sequencer.c:2254
|
||||
#: sequencer.c:2257
|
||||
#, c-format
|
||||
msgid "invalid contents: '%s'"
|
||||
msgstr "contenido inválido: '%s'"
|
||||
|
||||
#: sequencer.c:2257
|
||||
#: sequencer.c:2260
|
||||
msgid ""
|
||||
"\n"
|
||||
"You have uncommitted changes in your working tree. Please, commit them\n"
|
||||
|
|
@ -3503,45 +3518,45 @@ msgstr ""
|
|||
"un commit con estos\n"
|
||||
"primero y luego ejecuta 'git rebase --continue' de nuevo."
|
||||
|
||||
#: sequencer.c:2267
|
||||
#: sequencer.c:2270
|
||||
msgid "could not commit staged changes."
|
||||
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
|
||||
|
||||
#: sequencer.c:2347
|
||||
#: sequencer.c:2350
|
||||
#, c-format
|
||||
msgid "%s: can't cherry-pick a %s"
|
||||
msgstr "%s: no se puede aplicar cherry-pick a un %s"
|
||||
|
||||
#: sequencer.c:2351
|
||||
#: sequencer.c:2354
|
||||
#, c-format
|
||||
msgid "%s: bad revision"
|
||||
msgstr "%s: mala revision"
|
||||
|
||||
#: sequencer.c:2384
|
||||
#: sequencer.c:2387
|
||||
msgid "can't revert as initial commit"
|
||||
msgstr "no se puede revertir como commit inicial"
|
||||
|
||||
#: sequencer.c:2489
|
||||
#: sequencer.c:2492
|
||||
msgid "make_script: unhandled options"
|
||||
msgstr "make_script: opciones desconocidas"
|
||||
|
||||
#: sequencer.c:2492
|
||||
#: sequencer.c:2495
|
||||
msgid "make_script: error preparing revisions"
|
||||
msgstr "make_script: error preparando revisiones"
|
||||
|
||||
#: sequencer.c:2526 sequencer.c:2561
|
||||
#: sequencer.c:2529 sequencer.c:2564
|
||||
#, c-format
|
||||
msgid "unusable todo list: '%s'"
|
||||
msgstr "lista de pendientes inutilízale: '%s'"
|
||||
|
||||
#: sequencer.c:2609
|
||||
#: sequencer.c:2615
|
||||
#, c-format
|
||||
msgid ""
|
||||
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
|
||||
msgstr ""
|
||||
"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
|
||||
|
||||
#: sequencer.c:2689
|
||||
#: sequencer.c:2695
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: some commits may have been dropped accidentally.\n"
|
||||
|
|
@ -3550,7 +3565,7 @@ msgstr ""
|
|||
"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
|
||||
"Commits botados (empezando con el mas nuevo):\n"
|
||||
|
||||
#: sequencer.c:2696
|
||||
#: sequencer.c:2702
|
||||
#, c-format
|
||||
msgid ""
|
||||
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
|
||||
|
|
@ -3568,7 +3583,7 @@ msgstr ""
|
|||
"Los posibles comportamientos son: ignore,warn,error.\n"
|
||||
"\n"
|
||||
|
||||
#: sequencer.c:2708
|
||||
#: sequencer.c:2714
|
||||
#, c-format
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
|
|
@ -3579,18 +3594,18 @@ msgstr ""
|
|||
"rebase --continue'.\n"
|
||||
"O se puede abortar el rebase con 'git rebase --abort'.\n"
|
||||
|
||||
#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395
|
||||
#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
|
||||
#: builtin/am.c:779
|
||||
#, c-format
|
||||
msgid "could not open '%s' for writing"
|
||||
msgstr "no se pudo abrir '%s' para escritura"
|
||||
|
||||
#: sequencer.c:2769
|
||||
#: sequencer.c:2775
|
||||
#, c-format
|
||||
msgid "could not parse commit '%s'"
|
||||
msgstr "No se pudo analizar commit '%s'"
|
||||
|
||||
#: sequencer.c:2891
|
||||
#: sequencer.c:2897
|
||||
msgid "the script was already rearranged."
|
||||
msgstr "este script ya fue reorganizado."
|
||||
|
||||
|
|
@ -5037,48 +5052,48 @@ msgstr "Fallo al dividir parches"
|
|||
msgid "unable to write index file"
|
||||
msgstr "no es posible escribir en el archivo indice"
|
||||
|
||||
#: builtin/am.c:1197
|
||||
#: builtin/am.c:1160
|
||||
#, c-format
|
||||
msgid "When you have resolved this problem, run \"%s --continue\"."
|
||||
msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
|
||||
|
||||
#: builtin/am.c:1198
|
||||
#: builtin/am.c:1161
|
||||
#, 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:1199
|
||||
#: builtin/am.c:1162
|
||||
#, c-format
|
||||
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
||||
msgstr ""
|
||||
"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
|
||||
"\"."
|
||||
|
||||
#: builtin/am.c:1306
|
||||
#: builtin/am.c:1269
|
||||
msgid "Patch is empty."
|
||||
msgstr "El parche esta vacío."
|
||||
|
||||
#: builtin/am.c:1372
|
||||
#: builtin/am.c:1335
|
||||
#, c-format
|
||||
msgid "invalid ident line: %.*s"
|
||||
msgstr "sangría no válida: %.*s"
|
||||
|
||||
#: builtin/am.c:1394
|
||||
#: builtin/am.c:1357
|
||||
#, c-format
|
||||
msgid "unable to parse commit %s"
|
||||
msgstr "no es posible analizar el commit %s"
|
||||
|
||||
#: builtin/am.c:1587
|
||||
#: builtin/am.c:1550
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
|
||||
"3-vías"
|
||||
|
||||
#: builtin/am.c:1589
|
||||
#: builtin/am.c:1552
|
||||
msgid "Using index info to reconstruct a base tree..."
|
||||
msgstr "Usando la información del índice para reconstruir un árbol base..."
|
||||
|
||||
#: builtin/am.c:1608
|
||||
#: builtin/am.c:1571
|
||||
msgid ""
|
||||
"Did you hand edit your patch?\n"
|
||||
"It does not apply to blobs recorded in its index."
|
||||
|
|
@ -5086,37 +5101,37 @@ msgstr ""
|
|||
"Editaste el parche a mano?\n"
|
||||
"No aplica a blobs guardados en su índice."
|
||||
|
||||
#: builtin/am.c:1614
|
||||
#: builtin/am.c:1577
|
||||
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:1639
|
||||
#: builtin/am.c:1602
|
||||
msgid "Failed to merge in the changes."
|
||||
msgstr "Falló al fusionar en los cambios."
|
||||
|
||||
#: builtin/am.c:1663 builtin/merge.c:642
|
||||
#: builtin/am.c:1626 builtin/merge.c:642
|
||||
msgid "git write-tree failed to write a tree"
|
||||
msgstr "git write-tree falló al escribir el árbol"
|
||||
|
||||
#: builtin/am.c:1670
|
||||
#: builtin/am.c:1633
|
||||
msgid "applying to an empty history"
|
||||
msgstr "aplicando a un historial vacio"
|
||||
|
||||
#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825
|
||||
#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
|
||||
#: builtin/merge.c:850
|
||||
msgid "failed to write commit object"
|
||||
msgstr "fallo al escribir el objeto commit"
|
||||
|
||||
#: builtin/am.c:1716 builtin/am.c:1720
|
||||
#: builtin/am.c:1679 builtin/am.c:1683
|
||||
#, c-format
|
||||
msgid "cannot resume: %s does not exist."
|
||||
msgstr "no se puede continuar: %s no existe"
|
||||
|
||||
#: builtin/am.c:1736
|
||||
#: builtin/am.c:1699
|
||||
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:1741
|
||||
#: builtin/am.c:1704
|
||||
msgid "Commit Body is:"
|
||||
msgstr "Cuerpo de commit es:"
|
||||
|
||||
|
|
@ -5124,35 +5139,35 @@ msgstr "Cuerpo de commit es:"
|
|||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
#.
|
||||
#: builtin/am.c:1751
|
||||
#: builtin/am.c:1714
|
||||
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:1801
|
||||
#: builtin/am.c:1764
|
||||
#, c-format
|
||||
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
||||
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
|
||||
|
||||
#: builtin/am.c:1841 builtin/am.c:1913
|
||||
#: builtin/am.c:1804 builtin/am.c:1876
|
||||
#, c-format
|
||||
msgid "Applying: %.*s"
|
||||
msgstr "Aplicando: %.*s"
|
||||
|
||||
#: builtin/am.c:1857
|
||||
#: builtin/am.c:1820
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "Sin cambios -- parche ya aplicado."
|
||||
|
||||
#: builtin/am.c:1865
|
||||
#: builtin/am.c:1828
|
||||
#, c-format
|
||||
msgid "Patch failed at %s %.*s"
|
||||
msgstr "El parche fallo en %s %.*s"
|
||||
|
||||
#: builtin/am.c:1871
|
||||
#: builtin/am.c:1834
|
||||
#, 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:1916
|
||||
#: builtin/am.c:1879
|
||||
msgid ""
|
||||
"No changes - did you forget to use 'git add'?\n"
|
||||
"If there is nothing left to stage, chances are that something else\n"
|
||||
|
|
@ -5162,7 +5177,7 @@ msgstr ""
|
|||
"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
|
||||
"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
|
||||
|
||||
#: builtin/am.c:1923
|
||||
#: builtin/am.c:1886
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index.\n"
|
||||
"You should 'git add' each file with resolved conflicts to mark them as "
|
||||
|
|
@ -5175,17 +5190,17 @@ msgstr ""
|
|||
"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
|
||||
"él."
|
||||
|
||||
#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332
|
||||
#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 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:2082
|
||||
#: builtin/am.c:2045
|
||||
msgid "failed to clean index"
|
||||
msgstr "fallo al limpiar el indice"
|
||||
|
||||
#: builtin/am.c:2117
|
||||
#: builtin/am.c:2080
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
|
|
@ -5193,76 +5208,76 @@ msgstr ""
|
|||
"Parece haber movido HEAD desde el último fallo 'am'.\n"
|
||||
"No rebobinando a ORIG_HEAD "
|
||||
|
||||
#: builtin/am.c:2180
|
||||
#: builtin/am.c:2143
|
||||
#, c-format
|
||||
msgid "Invalid value for --patch-format: %s"
|
||||
msgstr "valor invalido para --patch-format: %s"
|
||||
|
||||
#: builtin/am.c:2213
|
||||
#: builtin/am.c:2176
|
||||
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
||||
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
|
||||
|
||||
#: builtin/am.c:2214
|
||||
#: builtin/am.c:2177
|
||||
msgid "git am [<options>] (--continue | --skip | --abort)"
|
||||
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
|
||||
|
||||
#: builtin/am.c:2220
|
||||
#: builtin/am.c:2183
|
||||
msgid "run interactively"
|
||||
msgstr "ejecutar de manera interactiva"
|
||||
|
||||
#: builtin/am.c:2222
|
||||
#: builtin/am.c:2185
|
||||
msgid "historical option -- no-op"
|
||||
msgstr "opción histórica -- no-op"
|
||||
|
||||
#: builtin/am.c:2224
|
||||
#: builtin/am.c:2187
|
||||
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/am.c:2188 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:2190
|
||||
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:2193
|
||||
msgid "recode into utf8 (default)"
|
||||
msgstr "recodificar en utf8 (default)"
|
||||
|
||||
#: builtin/am.c:2232
|
||||
#: builtin/am.c:2195
|
||||
msgid "pass -k flag to git-mailinfo"
|
||||
msgstr "pasar flag -k a git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2234
|
||||
#: builtin/am.c:2197
|
||||
msgid "pass -b flag to git-mailinfo"
|
||||
msgstr "pasar flag -b a git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2236
|
||||
#: builtin/am.c:2199
|
||||
msgid "pass -m flag to git-mailinfo"
|
||||
msgstr "pasar flag -m a git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2238
|
||||
#: builtin/am.c:2201
|
||||
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:2204
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr ""
|
||||
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
|
||||
|
||||
#: builtin/am.c:2244
|
||||
#: builtin/am.c:2207
|
||||
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:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
|
||||
#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
|
||||
#: builtin/am.c:2236
|
||||
msgid "pass it through git-apply"
|
||||
msgstr "pasarlo a través de git-apply"
|
||||
|
||||
#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
|
||||
#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
|
||||
#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
|
||||
#: 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
|
||||
|
|
@ -5270,57 +5285,57 @@ msgstr "pasarlo a través de git-apply"
|
|||
msgid "n"
|
||||
msgstr "n"
|
||||
|
||||
#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38
|
||||
#: builtin/am.c:2232 builtin/branch.c:629 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:2233
|
||||
msgid "format the patch(es) are in"
|
||||
msgstr "formatear el parche(s)"
|
||||
|
||||
#: builtin/am.c:2276
|
||||
#: builtin/am.c:2239
|
||||
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:2241
|
||||
msgid "continue applying patches after resolving a conflict"
|
||||
msgstr "continuar aplicando los parches tras resolver conflictos"
|
||||
|
||||
#: builtin/am.c:2281
|
||||
#: builtin/am.c:2244
|
||||
msgid "synonyms for --continue"
|
||||
msgstr "sinónimos para --continue"
|
||||
|
||||
#: builtin/am.c:2284
|
||||
#: builtin/am.c:2247
|
||||
msgid "skip the current patch"
|
||||
msgstr "saltar el parche actual"
|
||||
|
||||
#: builtin/am.c:2287
|
||||
#: builtin/am.c:2250
|
||||
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:2254
|
||||
msgid "lie about committer date"
|
||||
msgstr "mentir sobre la fecha del committer"
|
||||
|
||||
#: builtin/am.c:2293
|
||||
#: builtin/am.c:2256
|
||||
msgid "use current timestamp for author date"
|
||||
msgstr "usar el timestamp actual para la fecha del autor"
|
||||
|
||||
#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236
|
||||
#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
|
||||
#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
|
||||
msgid "key-id"
|
||||
msgstr "key-id"
|
||||
|
||||
#: builtin/am.c:2296
|
||||
#: builtin/am.c:2259
|
||||
msgid "GPG-sign commits"
|
||||
msgstr "commits con firma GPG"
|
||||
|
||||
#: builtin/am.c:2299
|
||||
#: builtin/am.c:2262
|
||||
msgid "(internal use for git-rebase)"
|
||||
msgstr "(uso interno para git-rebase)"
|
||||
|
||||
#: builtin/am.c:2317
|
||||
#: builtin/am.c:2280
|
||||
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."
|
||||
|
|
@ -5328,16 +5343,16 @@ msgstr ""
|
|||
"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:2287
|
||||
msgid "failed to read the index"
|
||||
msgstr "fallo al leer el indice"
|
||||
|
||||
#: builtin/am.c:2339
|
||||
#: builtin/am.c:2302
|
||||
#, 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:2326
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Stray %s directory found.\n"
|
||||
|
|
@ -5346,7 +5361,7 @@ msgstr ""
|
|||
"Directorio extraviado %s encontrado.\n"
|
||||
"Use \"git am --abort\" para borrarlo."
|
||||
|
||||
#: builtin/am.c:2369
|
||||
#: builtin/am.c:2332
|
||||
msgid "Resolve operation not in progress, we are not resuming."
|
||||
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
|
||||
|
||||
|
|
@ -15722,7 +15737,7 @@ msgstr ""
|
|||
" git rebase --continue\n"
|
||||
"\n"
|
||||
|
||||
#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994
|
||||
#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
|
||||
msgid "Could not execute editor"
|
||||
msgstr "No se pudo ejecutar el editor"
|
||||
|
||||
|
|
@ -15748,14 +15763,18 @@ msgstr "No se pudo marcar como interactivo"
|
|||
msgid "Could not init rewritten commits"
|
||||
msgstr "No se puede inicializar los commits reescritos"
|
||||
|
||||
#: git-rebase--interactive.sh:972
|
||||
#: git-rebase--interactive.sh:897
|
||||
msgid "Could not generate todo list"
|
||||
msgstr "No se pudo generar lista de pendientes"
|
||||
|
||||
#: git-rebase--interactive.sh:973
|
||||
#, 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:977
|
||||
#: git-rebase--interactive.sh:978
|
||||
msgid ""
|
||||
"\n"
|
||||
"However, if you remove everything, the rebase will be aborted.\n"
|
||||
|
|
@ -15765,7 +15784,7 @@ msgstr ""
|
|||
"Como sea, si se remueve todo, el rebase sera abortado.\n"
|
||||
"\n"
|
||||
|
||||
#: git-rebase--interactive.sh:984
|
||||
#: git-rebase--interactive.sh:985
|
||||
msgid "Note that empty commits are commented out"
|
||||
msgstr "Tenga en cuenta que los commits vacíos están comentados"
|
||||
|
||||
|
|
@ -16731,9 +16750,6 @@ msgstr "Realmente deseas mandar %s?[y|N]"
|
|||
#~ msgid "could not finish '%s'"
|
||||
#~ msgstr "no se pudo finalizar '%s'"
|
||||
|
||||
#~ msgid "could not write to %s"
|
||||
#~ msgstr "no se pudo escribir en %s"
|
||||
|
||||
#~ msgid "could not close %s"
|
||||
#~ msgstr "no se pudo cerrar %s"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue