@matheusbsbs / matheus-bagliano / commits / 425e504c7c

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

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

Christopher Diaz Riveros committed Jun 10, 2018 at 14:08 UTC 425e504c7c8bef2244828c6f6951749bae0604e9
1 file changed +994 -422
po/es.po
+994 -422
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2018-05-31 23:32+0800\n"
11 -"PO-Revision-Date: 2018-05-31 23:07-0500\n"
10 +"POT-Creation-Date: 2018-06-08 09:03+0800\n"
11 +"PO-Revision-Date: 2018-06-10 13:59-0500\n"
12 "Last-Translator: christopher.diaz.riv@gmail.com\n"
13 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
14 "Language: es\n"
@@ -61,7 +61,7 @@ msgstr ""
61 msgid "Exiting because of an unresolved conflict."
62 msgstr "Saliendo porque existe un conflicto sin resolver."
63
64 -#: advice.c:168 builtin/merge.c:1249
64 +#: advice.c:168 builtin/merge.c:1250
65 msgid "You have not concluded your merge (MERGE_HEAD exists)."
66 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
67
@@ -771,23 +771,23 @@ msgstr "git archive --remote <repo> [--exec <comando>] --list"
771 msgid "pathspec '%s' did not match any files"
772 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
773
774 -#: archive.c:436
774 +#: archive.c:434
775 msgid "fmt"
776 msgstr "fmt"
777
778 -#: archive.c:436
778 +#: archive.c:434
779 msgid "archive format"
780 msgstr "formato del archivo"
781
782 -#: archive.c:437 builtin/log.c:1462
782 +#: archive.c:435 builtin/log.c:1462
783 msgid "prefix"
784 msgstr "prefijo"
785
786 -#: archive.c:438
786 +#: archive.c:436
787 msgid "prepend prefix to each pathname in the archive"
788 msgstr "anteponer prefijo a cada ruta en el archivo"
789
790 -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
790 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
791 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
792 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
793 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
@@ -795,69 +795,69 @@ msgstr "anteponer prefijo a cada ruta en el archivo"
795 msgid "file"
796 msgstr "carpeta"
797
798 -#: archive.c:440 builtin/archive.c:89
798 +#: archive.c:438 builtin/archive.c:89
799 msgid "write the archive to this file"
800 msgstr "escribe el archivo en esta carpeta"
801
802 -#: archive.c:442
802 +#: archive.c:440
803 msgid "read .gitattributes in working directory"
804 msgstr "leer .gitattributes en el directorio de trabajo"
805
806 -#: archive.c:443
806 +#: archive.c:441
807 msgid "report archived files on stderr"
808 msgstr "reportar archivos archivados por stderr"
809
810 -#: archive.c:444
810 +#: archive.c:442
811 msgid "store only"
812 msgstr "solo guardar"
813
814 -#: archive.c:445
814 +#: archive.c:443
815 msgid "compress faster"
816 msgstr "comprimir mas rápido"
817
818 -#: archive.c:453
818 +#: archive.c:451
819 msgid "compress better"
820 msgstr "comprimir mejor"
821
822 -#: archive.c:456
822 +#: archive.c:454
823 msgid "list supported archive formats"
824 msgstr "listar los formatos de carpeta soportados"
825
826 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
826 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
827 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
828 msgid "repo"
829 msgstr "repo"
830
831 -#: archive.c:459 builtin/archive.c:91
831 +#: archive.c:457 builtin/archive.c:91
832 msgid "retrieve the archive from remote repository <repo>"
833 msgstr "obtener la carpeta del repositorio remoto <repo>"
834
835 -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
835 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
836 msgid "command"
837 msgstr "comando"
838
839 -#: archive.c:461 builtin/archive.c:93
839 +#: archive.c:459 builtin/archive.c:93
840 msgid "path to the remote git-upload-archive command"
841 msgstr "ruta para el comando git-upload-archivo remoto"
842
843 -#: archive.c:468
843 +#: archive.c:466
844 msgid "Unexpected option --remote"
845 msgstr "Opción inesperada --remote"
846
847 -#: archive.c:470
847 +#: archive.c:468
848 msgid "Option --exec can only be used together with --remote"
849 msgstr "Opción --exec solo puede ser utilizada con --remote"
850
851 -#: archive.c:472
851 +#: archive.c:470
852 msgid "Unexpected option --output"
853 msgstr "Opción inesperada --output"
854
855 -#: archive.c:494
855 +#: archive.c:492
856 #, c-format
857 msgid "Unknown archive format '%s'"
858 msgstr "Formato de carpeta desconocido '%s'"
859
860 -#: archive.c:501
860 +#: archive.c:499
861 #, c-format
862 msgid "Argument not supported for format '%s': -%d"
863 msgstr "Argumento no soportado para formato '%s': -%d"
@@ -1007,9 +1007,9 @@ msgid "--reverse and --first-parent together require specified latest commit"
1007 msgstr ""
1008 "--reverse y --first-parent juntos requieren especificar el último commit"
1009
1010 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860
1011 -#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
1012 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371
1010 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
1011 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
1012 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
1013 #: builtin/shortlog.c:192
1014 msgid "revision walk setup failed"
1015 msgstr "falló la configuración del camino de revisión"
@@ -1190,7 +1190,7 @@ msgstr "'%s' no se ve como un archivo bundle v2"
1190 msgid "unrecognized header: %s%s (%d)"
1191 msgstr "header no reconocido %s%s (%d)"
1192
1193 -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755
1193 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
1194 #, c-format
1195 msgid "could not open '%s'"
1196 msgstr "no se pudo abrir '%s'"
@@ -1257,7 +1257,7 @@ msgstr "index-pack murió"
1257 msgid "invalid color value: %.*s"
1258 msgstr "color inválido: %.*s"
1259
1260 -#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465
1260 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
1261 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
1262 #: builtin/replace.c:448
1263 #, c-format
@@ -1479,11 +1479,11 @@ msgstr "no se pudo configurar '%s' a '%s'"
1479 msgid "could not unset '%s'"
1480 msgstr "no se pudo desactivar '%s'"
1481
1482 -#: connect.c:60
1482 +#: connect.c:61
1483 msgid "The remote end hung up upon initial contact"
1484 msgstr "El remoto se colgó en el contacto inicial"
1485
1486 -#: connect.c:62
1486 +#: connect.c:63
1487 msgid ""
1488 "Could not read from remote repository.\n"
1489 "\n"
@@ -2012,20 +2012,81 @@ msgstr "falló al marcar '%s'"
2012 msgid "'%s': short read"
2013 msgstr "'%s': lectura corta"
2014
2015 -#: help.c:179
2015 +#: help.c:23
2016 +msgid "start a working area (see also: git help tutorial)"
2017 +msgstr "comienza un área de trabajo (ver también: git help tutorial)"
2018 +
2019 +#: help.c:24
2020 +msgid "work on the current change (see also: git help everyday)"
2021 +msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
2022 +
2023 +#: help.c:25
2024 +msgid "examine the history and state (see also: git help revisions)"
2025 +msgstr "examina el historial y el estado (ver también: git help revisions)"
2026 +
2027 +#: help.c:26
2028 +msgid "grow, mark and tweak your common history"
2029 +msgstr "crece, marca y ajusta tu historial común"
2030 +
2031 +#: help.c:27
2032 +msgid "collaborate (see also: git help workflows)"
2033 +msgstr "colabora (mira también: git help workflows)"
2034 +
2035 +#: help.c:31
2036 +msgid "Main Porcelain Commands"
2037 +msgstr "Comandos de Porcelana principales"
2038 +
2039 +#: help.c:32
2040 +msgid "Ancillary Commands / Manipulators"
2041 +msgstr "Comandos auxiliares / Manipuladores"
2042 +
2043 +#: help.c:33
2044 +msgid "Ancillary Commands / Interrogators"
2045 +msgstr "Comandos auxiliares / Interrogadores"
2046 +
2047 +#: help.c:34
2048 +msgid "Interacting with Others"
2049 +msgstr "Interactuando con Otros"
2050 +
2051 +#: help.c:35
2052 +msgid "Low-level Commands / Manipulators"
2053 +msgstr "Comandos de bajo nivel / Manipuladores"
2054 +
2055 +#: help.c:36
2056 +msgid "Low-level Commands / Interrogators"
2057 +msgstr "Comandos de bajo nivel / Interrogadores"
2058 +
2059 +#: help.c:37
2060 +msgid "Low-level Commands / Synching Repositories"
2061 +msgstr "Comandos de bajo nivel / Sincronización de repositorios"
2062 +
2063 +#: help.c:38
2064 +msgid "Low-level Commands / Internal Helpers"
2065 +msgstr "Comandos de bajo nivel / Auxiliares internos"
2066 +
2067 +#: help.c:293
2068 #, c-format
2069 msgid "available git commands in '%s'"
2070 msgstr "comandos disponibles de git en '%s'"
2071
2020 -#: help.c:186
2072 +#: help.c:300
2073 msgid "git commands available from elsewhere on your $PATH"
2074 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
2075
2024 -#: help.c:217
2076 +#: help.c:309
2077 msgid "These are common Git commands used in various situations:"
2078 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
2079
2028 -#: help.c:281
2080 +#: help.c:358 git.c:90
2081 +#, c-format
2082 +msgid "unsupported command listing type '%s'"
2083 +msgstr "comando de listado de tipos no soportado '%s'"
2084 +
2085 +#: help.c:405
2086 +msgid "The common Git guides are:"
2087 +msgstr "Las guías comunes de Git son:"
2088 +
2089 +#: help.c:467
2090 #, c-format
2091 msgid ""
2092 "'%s' appears to be a git command, but we were not\n"
@@ -2034,31 +2095,31 @@ msgstr ""
2095 "'%s' parece ser un comando de git, pero no hemos\n"
2096 "podido ejecutarlo. Tal vez git-%s se ha roto?"
2097
2037 -#: help.c:336
2098 +#: help.c:526
2099 msgid "Uh oh. Your system reports no Git commands at all."
2100 msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
2101
2041 -#: help.c:358
2102 +#: help.c:548
2103 #, c-format
2104 msgid "WARNING: You called a Git command named '%s', which does not exist."
2105 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
2106
2046 -#: help.c:363
2107 +#: help.c:553
2108 #, c-format
2109 msgid "Continuing under the assumption that you meant '%s'."
2110 msgstr "Continuando asumiendo que quisiste decir '%s'."
2111
2051 -#: help.c:368
2112 +#: help.c:558
2113 #, c-format
2114 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
2115 msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
2116
2056 -#: help.c:376
2117 +#: help.c:566
2118 #, c-format
2119 msgid "git: '%s' is not a git command. See 'git --help'."
2120 msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
2121
2061 -#: help.c:380
2122 +#: help.c:570
2123 msgid ""
2124 "\n"
2125 "The most similar command is"
@@ -2072,16 +2133,16 @@ msgstr[1] ""
2133 "\n"
2134 "Los comandos mas similares son"
2135
2075 -#: help.c:395
2136 +#: help.c:585
2137 msgid "git version [<options>]"
2138 msgstr "git versión [<opciones>]"
2139
2079 -#: help.c:462
2140 +#: help.c:652
2141 #, c-format
2142 msgid "%s: %s - %s"
2143 msgstr "%s: %s - %s"
2144
2084 -#: help.c:466
2145 +#: help.c:656
2146 msgid ""
2147 "\n"
2148 "Did you mean this?"
@@ -2597,7 +2658,7 @@ msgstr "la fusión no devolvió ningún commit"
2658 msgid "Could not parse object '%s'"
2659 msgstr "No se pudo analizar el objeto '%s'"
2660
2600 -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815
2661 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
2662 msgid "Unable to write index."
2663 msgstr "Incapaz de escribir el índice."
2664
@@ -2802,12 +2863,12 @@ msgstr ""
2863 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
2864 "Usando versión %i"
2865
2805 -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047
2866 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
2867 #, c-format
2868 msgid "could not close '%s'"
2869 msgstr "no se pudo cerrar '%s'"
2870
2810 -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233
2871 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
2872 #, c-format
2873 msgid "could not stat '%s'"
2874 msgstr "no se pudo definir '%s'"
@@ -2822,7 +2883,7 @@ msgstr "no es posible abrir el directorio de git: %s"
2883 msgid "unable to unlink: %s"
2884 msgstr "no es posible remover el vinculo: %s"
2885
2825 -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395
2886 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
2887 #: builtin/am.c:779
2888 #, c-format
2889 msgid "could not open '%s' for writing"
@@ -3278,34 +3339,34 @@ msgstr "el destino no soporta push atómicos (--atomic)"
3339 msgid "the receiving end does not support push options"
3340 msgstr "el destino no soporta opciones de push"
3341
3281 -#: sequencer.c:174
3342 +#: sequencer.c:175
3343 #, c-format
3344 msgid "invalid commit message cleanup mode '%s'"
3345 msgstr "mensaje de commit inválido, modo cleanup '%s'"
3346
3286 -#: sequencer.c:274
3347 +#: sequencer.c:275
3348 #, c-format
3349 msgid "could not delete '%s'"
3289 -msgstr "No se pudo borrar '%s'"
3350 +msgstr "no se pudo borrar '%s'"
3351
3291 -#: sequencer.c:300
3352 +#: sequencer.c:301
3353 msgid "revert"
3354 msgstr "revertir"
3355
3295 -#: sequencer.c:302
3356 +#: sequencer.c:303
3357 msgid "cherry-pick"
3358 msgstr "cherry-pick"
3359
3299 -#: sequencer.c:304
3360 +#: sequencer.c:305
3361 msgid "rebase -i"
3362 msgstr "rebase -i"
3363
3303 -#: sequencer.c:306
3364 +#: sequencer.c:307
3365 #, c-format
3366 msgid "Unknown action: %d"
3367 msgstr "Acción desconocida: %d"
3368
3308 -#: sequencer.c:363
3369 +#: sequencer.c:364
3370 msgid ""
3371 "after resolving the conflicts, mark the corrected paths\n"
3372 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3313,7 +3374,7 @@ msgstr ""
3374 "después de resolver los conflictos, marca las rutas corregidas\n"
3375 "con 'git add <rutas>' o 'git rm <rutas>'"
3376
3316 -#: sequencer.c:366
3377 +#: sequencer.c:367
3378 msgid ""
3379 "after resolving the conflicts, mark the corrected paths\n"
3380 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3323,45 +3384,45 @@ msgstr ""
3384 "con 'git add <rutas>' o 'git rm <rutas>'\n"
3385 "y haz un commit del resultado con 'git commit'"
3386
3326 -#: sequencer.c:379 sequencer.c:2467
3387 +#: sequencer.c:380 sequencer.c:2468
3388 #, c-format
3389 msgid "could not lock '%s'"
3390 msgstr "no se pudo bloquear '%s'"
3391
3331 -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485
3332 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656
3392 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
3393 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
3394 #, c-format
3395 msgid "could not write to '%s'"
3396 msgstr "no se pudo escribir en '%s'"
3397
3337 -#: sequencer.c:386
3398 +#: sequencer.c:387
3399 #, c-format
3400 msgid "could not write eol to '%s'"
3401 msgstr "no se pudo escribir EOL en '%s'"
3402
3342 -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487
3343 -#: sequencer.c:2701
3403 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
3404 +#: sequencer.c:2702
3405 #, c-format
3406 msgid "failed to finalize '%s'"
3407 msgstr "falló al finalizar '%s'"
3408
3348 -#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370
3349 -#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727
3350 -#: builtin/merge.c:1045
3409 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
3410 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
3411 +#: builtin/merge.c:1046
3412 #, c-format
3413 msgid "could not read '%s'"
3414 msgstr "no se pudo leer '%s'"
3415
3355 -#: sequencer.c:440
3416 +#: sequencer.c:441
3417 #, c-format
3418 msgid "your local changes would be overwritten by %s."
3419 msgstr "tus cambios locales serán sobreescritos por %s."
3420
3360 -#: sequencer.c:444
3421 +#: sequencer.c:445
3422 msgid "commit your changes or stash them to proceed."
3423 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
3424
3364 -#: sequencer.c:473
3425 +#: sequencer.c:474
3426 #, c-format
3427 msgid "%s: fast-forward"
3428 msgstr "%s: avance rápido"
@@ -3369,20 +3430,20 @@ msgstr "%s: avance rápido"
3430 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
3431 #. "rebase -i".
3432 #.
3372 -#: sequencer.c:562
3433 +#: sequencer.c:563
3434 #, c-format
3435 msgid "%s: Unable to write new index file"
3436 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
3437
3377 -#: sequencer.c:578
3438 +#: sequencer.c:579
3439 msgid "unable to update cache tree"
3440 msgstr "no es posible actualizar el árbol de la caché"
3441
3381 -#: sequencer.c:591
3442 +#: sequencer.c:592
3443 msgid "could not resolve HEAD commit"
3444 msgstr "no se pudo resolver el commit de HEAD"
3445
3385 -#: sequencer.c:748
3446 +#: sequencer.c:749
3447 #, c-format
3448 msgid ""
3449 "you have staged changes in your working tree\n"
@@ -3412,15 +3473,15 @@ msgstr ""
3473 "\n"
3474 " git rebase --continue\n"
3475
3415 -#: sequencer.c:817
3476 +#: sequencer.c:818
3477 msgid "writing root commit"
3478 msgstr "escribiendo commit raíz"
3479
3419 -#: sequencer.c:1042
3480 +#: sequencer.c:1043
3481 msgid "'prepare-commit-msg' hook failed"
3482 msgstr "hook 'prepare-commit-msg' falló"
3483
3423 -#: sequencer.c:1049
3484 +#: sequencer.c:1050
3485 msgid ""
3486 "Your name and email address were configured automatically based\n"
3487 "on your username and hostname. Please check that they are accurate.\n"
@@ -3447,7 +3508,7 @@ msgstr ""
3508 "\n"
3509 " git commit --amend --reset-author\n"
3510
3450 -#: sequencer.c:1062
3511 +#: sequencer.c:1063
3512 msgid ""
3513 "Your name and email address were configured automatically based\n"
3514 "on your username and hostname. Please check that they are accurate.\n"
@@ -3471,313 +3532,313 @@ msgstr ""
3532 "\n"
3533 " git commit --amend --reset-author\n"
3534
3474 -#: sequencer.c:1102
3535 +#: sequencer.c:1103
3536 msgid "couldn't look up newly created commit"
3537 msgstr "no se pudo revisar el commit recién creado"
3538
3478 -#: sequencer.c:1104
3539 +#: sequencer.c:1105
3540 msgid "could not parse newly created commit"
3541 msgstr "no se pudo analizar el commit recién creado"
3542
3482 -#: sequencer.c:1150
3543 +#: sequencer.c:1151
3544 msgid "unable to resolve HEAD after creating commit"
3545 msgstr "no se pudo resolver HEAD tras crear el commit"
3546
3486 -#: sequencer.c:1152
3547 +#: sequencer.c:1153
3548 msgid "detached HEAD"
3549 msgstr "HEAD desacoplado"
3550
3490 -#: sequencer.c:1156
3551 +#: sequencer.c:1157
3552 msgid " (root-commit)"
3553 msgstr " (commit-raíz)"
3554
3494 -#: sequencer.c:1177
3555 +#: sequencer.c:1178
3556 msgid "could not parse HEAD"
3557 msgstr "no se pudo analizar HEAD"
3558
3498 -#: sequencer.c:1179
3559 +#: sequencer.c:1180
3560 #, c-format
3561 msgid "HEAD %s is not a commit!"
3562 msgstr "HEAD %s no es un commit!"
3563
3503 -#: sequencer.c:1183 builtin/commit.c:1528
3564 +#: sequencer.c:1184 builtin/commit.c:1528
3565 msgid "could not parse HEAD commit"
3566 msgstr "no se pudo analizar el commit de HEAD"
3567
3507 -#: sequencer.c:1234 sequencer.c:1831
3568 +#: sequencer.c:1235 sequencer.c:1832
3569 msgid "unable to parse commit author"
3570 msgstr "no es posible analizar el autor del commit"
3571
3511 -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644
3572 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
3573 msgid "git write-tree failed to write a tree"
3574 msgstr "git write-tree falló al escribir el árbol"
3575
3515 -#: sequencer.c:1261 sequencer.c:1316
3576 +#: sequencer.c:1262 sequencer.c:1317
3577 #, c-format
3578 msgid "unable to read commit message from '%s'"
3579 msgstr "no se puede leer el mensaje del commit de '%s'"
3580
3520 -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824
3521 -#: builtin/merge.c:849
3581 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
3582 +#: builtin/merge.c:850
3583 msgid "failed to write commit object"
3584 msgstr "falló al escribir el objeto commit"
3585
3525 -#: sequencer.c:1343
3586 +#: sequencer.c:1344
3587 #, c-format
3588 msgid "could not parse commit %s"
3589 msgstr "no se pudo analizar commit %s"
3590
3530 -#: sequencer.c:1348
3591 +#: sequencer.c:1349
3592 #, c-format
3593 msgid "could not parse parent commit %s"
3594 msgstr "no se pudo analizar el commit padre %s"
3595
3535 -#: sequencer.c:1499 sequencer.c:1524
3596 +#: sequencer.c:1500 sequencer.c:1525
3597 #, c-format
3598 msgid "This is a combination of %d commits."
3599 msgstr "Esta es una combinación de %d commits."
3600
3540 -#: sequencer.c:1509 sequencer.c:4354
3601 +#: sequencer.c:1510 sequencer.c:4355
3602 msgid "need a HEAD to fixup"
3603 msgstr "se necesita un HEAD para arreglar"
3604
3544 -#: sequencer.c:1511 sequencer.c:2728
3605 +#: sequencer.c:1512 sequencer.c:2729
3606 msgid "could not read HEAD"
3607 msgstr "no se pudo leer HEAD"
3608
3548 -#: sequencer.c:1513
3609 +#: sequencer.c:1514
3610 msgid "could not read HEAD's commit message"
3611 msgstr "no se pudo leer el mensaje de commit de HEAD"
3612
3552 -#: sequencer.c:1519
3613 +#: sequencer.c:1520
3614 #, c-format
3615 msgid "cannot write '%s'"
3616 msgstr "no se puede escribir '%s'"
3617
3557 -#: sequencer.c:1526 git-rebase--interactive.sh:457
3618 +#: sequencer.c:1527 git-rebase--interactive.sh:457
3619 msgid "This is the 1st commit message:"
3620 msgstr "Este es el mensaje del 1er commit:"
3621
3561 -#: sequencer.c:1534
3622 +#: sequencer.c:1535
3623 #, c-format
3624 msgid "could not read commit message of %s"
3625 msgstr "no se puede leer el mensaje del commit de %s"
3626
3566 -#: sequencer.c:1541
3627 +#: sequencer.c:1542
3628 #, c-format
3629 msgid "This is the commit message #%d:"
3630 msgstr "Este es el mensaje del commit #%d:"
3631
3571 -#: sequencer.c:1547
3632 +#: sequencer.c:1548
3633 #, c-format
3634 msgid "The commit message #%d will be skipped:"
3635 msgstr "El mensaje del commit #%d será saltado:"
3636
3576 -#: sequencer.c:1552
3637 +#: sequencer.c:1553
3638 #, c-format
3639 msgid "unknown command: %d"
3640 msgstr "comando desconocido: %d"
3641
3581 -#: sequencer.c:1630
3642 +#: sequencer.c:1631
3643 msgid "your index file is unmerged."
3644 msgstr "tu archivo índice no esta fusionado."
3645
3585 -#: sequencer.c:1637
3646 +#: sequencer.c:1638
3647 msgid "cannot fixup root commit"
3648 msgstr "no se puede arreglar el commit raíz"
3649
3589 -#: sequencer.c:1656
3650 +#: sequencer.c:1657
3651 #, c-format
3652 msgid "commit %s is a merge but no -m option was given."
3653 msgstr "el commit %s es una fusión pero no se entrego la opción -m."
3654
3594 -#: sequencer.c:1664
3655 +#: sequencer.c:1665
3656 #, c-format
3657 msgid "commit %s does not have parent %d"
3658 msgstr "el commit %s no tiene un padre %d"
3659
3599 -#: sequencer.c:1668
3660 +#: sequencer.c:1669
3661 #, c-format
3662 msgid "mainline was specified but commit %s is not a merge."
3663 msgstr "línea principal especificada pero el commit %s no es una fusión."
3664
3604 -#: sequencer.c:1674
3665 +#: sequencer.c:1675
3666 #, c-format
3667 msgid "cannot get commit message for %s"
3668 msgstr "no se puede obtener el mensaje de commit para %s"
3669
3670 #. TRANSLATORS: The first %s will be a "todo" command like
3671 #. "revert" or "pick", the second %s a SHA1.
3611 -#: sequencer.c:1693
3672 +#: sequencer.c:1694
3673 #, c-format
3674 msgid "%s: cannot parse parent commit %s"
3675 msgstr "%s: no se puede analizar el commit padre %s"
3676
3616 -#: sequencer.c:1758
3677 +#: sequencer.c:1759
3678 #, c-format
3679 msgid "could not rename '%s' to '%s'"
3680 msgstr "no se puede renombrar '%s' a '%s'"
3681
3621 -#: sequencer.c:1812
3682 +#: sequencer.c:1813
3683 #, c-format
3684 msgid "could not revert %s... %s"
3685 msgstr "no se pudo revertir %s... %s"
3686
3626 -#: sequencer.c:1813
3687 +#: sequencer.c:1814
3688 #, c-format
3689 msgid "could not apply %s... %s"
3690 msgstr "no se pudo aplicar %s... %s"
3691
3631 -#: sequencer.c:1863
3692 +#: sequencer.c:1864
3693 msgid "empty commit set passed"
3694 msgstr "conjunto de commits vacío entregado"
3695
3635 -#: sequencer.c:1873
3696 +#: sequencer.c:1874
3697 #, c-format
3698 msgid "git %s: failed to read the index"
3699 msgstr "git %s: falló al leer el índice"
3700
3640 -#: sequencer.c:1880
3701 +#: sequencer.c:1881
3702 #, c-format
3703 msgid "git %s: failed to refresh the index"
3704 msgstr "git %s: falló al refrescar el índice"
3705
3645 -#: sequencer.c:1960
3706 +#: sequencer.c:1961
3707 #, c-format
3708 msgid "%s does not accept arguments: '%s'"
3709 msgstr "%s no acepta los argumentos: '%s'"
3710
3650 -#: sequencer.c:1969
3711 +#: sequencer.c:1970
3712 #, c-format
3713 msgid "missing arguments for %s"
3714 msgstr "faltan argumentos para para %s"
3715
3655 -#: sequencer.c:2028
3716 +#: sequencer.c:2029
3717 #, c-format
3718 msgid "invalid line %d: %.*s"
3719 msgstr "línea inválida %d: %.*s"
3720
3660 -#: sequencer.c:2036
3721 +#: sequencer.c:2037
3722 #, c-format
3723 msgid "cannot '%s' without a previous commit"
3724 msgstr "no se puede '%s' sin un commit previo"
3725
3665 -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172
3726 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
3727 #, c-format
3728 msgid "could not read '%s'."
3729 msgstr "no se puede leer '%s'."
3730
3670 -#: sequencer.c:2107
3731 +#: sequencer.c:2108
3732 msgid "please fix this using 'git rebase --edit-todo'."
3733 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
3734
3674 -#: sequencer.c:2109
3735 +#: sequencer.c:2110
3736 #, c-format
3737 msgid "unusable instruction sheet: '%s'"
3738 msgstr "hoja de instrucciones inutilizable: '%s'"
3739
3679 -#: sequencer.c:2114
3740 +#: sequencer.c:2115
3741 msgid "no commits parsed."
3742 msgstr "ningún commit analizado."
3743
3683 -#: sequencer.c:2125
3744 +#: sequencer.c:2126
3745 msgid "cannot cherry-pick during a revert."
3746 msgstr "no se puede realizar cherry-pick durante un revert."
3747
3687 -#: sequencer.c:2127
3748 +#: sequencer.c:2128
3749 msgid "cannot revert during a cherry-pick."
3750 msgstr "no se puede realizar un revert durante un cherry-pick."
3751
3691 -#: sequencer.c:2194
3752 +#: sequencer.c:2195
3753 #, c-format
3754 msgid "invalid key: %s"
3755 msgstr "llave invalida: %s"
3756
3696 -#: sequencer.c:2197
3757 +#: sequencer.c:2198
3758 #, c-format
3759 msgid "invalid value for %s: %s"
3760 msgstr "valor invalido para %s: %s"
3761
3701 -#: sequencer.c:2268
3762 +#: sequencer.c:2269
3763 msgid "unusable squash-onto"
3764 msgstr "squash-onto inservible"
3765
3705 -#: sequencer.c:2284
3766 +#: sequencer.c:2285
3767 #, c-format
3768 msgid "malformed options sheet: '%s'"
3769 msgstr "hoja de opciones mal formada: '%s'"
3770
3710 -#: sequencer.c:2322
3771 +#: sequencer.c:2323
3772 msgid "a cherry-pick or revert is already in progress"
3773 msgstr "un cherry-pick o revert ya esta en progreso"
3774
3714 -#: sequencer.c:2323
3775 +#: sequencer.c:2324
3776 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3777 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
3778
3718 -#: sequencer.c:2326
3779 +#: sequencer.c:2327
3780 #, c-format
3781 msgid "could not create sequencer directory '%s'"
3782 msgstr "no se pudo crear un directorio secuenciador '%s'"
3783
3723 -#: sequencer.c:2340
3784 +#: sequencer.c:2341
3785 msgid "could not lock HEAD"
3786 msgstr "no se pudo bloquear HEAD"
3787
3727 -#: sequencer.c:2395 sequencer.c:3402
3788 +#: sequencer.c:2396 sequencer.c:3403
3789 msgid "no cherry-pick or revert in progress"
3790 msgstr "ningún cherry-pick o revert en progreso"
3791
3731 -#: sequencer.c:2397
3792 +#: sequencer.c:2398
3793 msgid "cannot resolve HEAD"
3794 msgstr "no se puede resolver HEAD"
3795
3735 -#: sequencer.c:2399 sequencer.c:2434
3796 +#: sequencer.c:2400 sequencer.c:2435
3797 msgid "cannot abort from a branch yet to be born"
3798 msgstr "no se puede abortar de una rama por nacer"
3799
3739 -#: sequencer.c:2420 builtin/grep.c:720
3800 +#: sequencer.c:2421 builtin/grep.c:720
3801 #, c-format
3802 msgid "cannot open '%s'"
3803 msgstr "no se puede abrir '%s'"
3804
3744 -#: sequencer.c:2422
3805 +#: sequencer.c:2423
3806 #, c-format
3807 msgid "cannot read '%s': %s"
3808 msgstr "no se puede leer '%s': %s"
3809
3749 -#: sequencer.c:2423
3810 +#: sequencer.c:2424
3811 msgid "unexpected end of file"
3812 msgstr "final de archivo inesperado"
3813
3753 -#: sequencer.c:2429
3814 +#: sequencer.c:2430
3815 #, c-format
3816 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3817 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
3818
3758 -#: sequencer.c:2440
3819 +#: sequencer.c:2441
3820 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3821 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
3822
3762 -#: sequencer.c:2544 sequencer.c:3320
3823 +#: sequencer.c:2545 sequencer.c:3321
3824 #, c-format
3825 msgid "could not update %s"
3826 msgstr "no se puede actualizar %s"
3827
3767 -#: sequencer.c:2582 sequencer.c:3300
3828 +#: sequencer.c:2583 sequencer.c:3301
3829 msgid "cannot read HEAD"
3830 msgstr "no se puede leer HEAD"
3831
3771 -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639
3832 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
3833 #, c-format
3834 msgid "could not copy '%s' to '%s'"
3835 msgstr "no se pudo copiar '%s' a '%s'"
3836
3776 -#: sequencer.c:2640
3837 +#: sequencer.c:2641
3838 msgid "could not read index"
3839 msgstr "no se pudo leer índice"
3840
3780 -#: sequencer.c:2645
3841 +#: sequencer.c:2646
3842 #, c-format
3843 msgid ""
3844 "execution failed: %s\n"
@@ -3792,11 +3853,11 @@ msgstr ""
3853 " git rebase --continue\n"
3854 "\n"
3855
3795 -#: sequencer.c:2651
3856 +#: sequencer.c:2652
3857 msgid "and made changes to the index and/or the working tree\n"
3858 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
3859
3799 -#: sequencer.c:2657
3860 +#: sequencer.c:2658
3861 #, c-format
3862 msgid ""
3863 "execution succeeded: %s\n"
@@ -3813,62 +3874,62 @@ msgstr ""
3874 " git rebase --continue\n"
3875 "\n"
3876
3816 -#: sequencer.c:2770
3877 +#: sequencer.c:2771
3878 msgid "writing fake root commit"
3879 msgstr "escribiendo commit raíz falso"
3880
3820 -#: sequencer.c:2775
3881 +#: sequencer.c:2776
3882 msgid "writing squash-onto"
3883 msgstr "escribiendo squash-onto"
3884
3824 -#: sequencer.c:2810
3885 +#: sequencer.c:2811
3886 #, c-format
3887 msgid "failed to find tree of %s"
3888 msgstr "falló al encontrar árbol de %s"
3889
3829 -#: sequencer.c:2828
3890 +#: sequencer.c:2829
3891 msgid "could not write index"
3892 msgstr "no se pudo escribir índice"
3893
3833 -#: sequencer.c:2860
3894 +#: sequencer.c:2861
3895 msgid "cannot merge without a current revision"
3896 msgstr "no se puede fusionar sin una versión actual"
3897
3837 -#: sequencer.c:2883
3898 +#: sequencer.c:2884
3899 #, c-format
3900 msgid "could not resolve '%s'"
3901 msgstr "no se pudo resolver '%s'"
3902
3842 -#: sequencer.c:2905
3903 +#: sequencer.c:2906
3904 #, c-format
3905 msgid "could not get commit message of '%s'"
3906 msgstr "no se puede leer el mensaje del commit '%s'"
3907
3847 -#: sequencer.c:2915 sequencer.c:2940
3908 +#: sequencer.c:2916 sequencer.c:2941
3909 #, c-format
3910 msgid "could not write '%s'"
3911 msgstr "no se pudo escribir '%s'"
3912
3852 -#: sequencer.c:3004
3913 +#: sequencer.c:3005
3914 #, c-format
3915 msgid "could not even attempt to merge '%.*s'"
3916 msgstr "no se pudo intentar fusionar '%.*s'"
3917
3857 -#: sequencer.c:3020
3918 +#: sequencer.c:3021
3919 msgid "merge: Unable to write new index file"
3920 msgstr "fusión: No se puede escribir el nuevo archivo índice"
3921
3861 -#: sequencer.c:3087
3922 +#: sequencer.c:3088
3923 #, c-format
3924 msgid "Applied autostash.\n"
3925 msgstr "Autostash aplicado.\n"
3926
3866 -#: sequencer.c:3099
3927 +#: sequencer.c:3100
3928 #, c-format
3929 msgid "cannot store %s"
3930 msgstr "no se puede guardar %s"
3931
3871 -#: sequencer.c:3102 git-rebase.sh:188
3932 +#: sequencer.c:3103 git-rebase.sh:188
3933 #, c-format
3934 msgid ""
3935 "Applying autostash resulted in conflicts.\n"
@@ -3880,7 +3941,7 @@ msgstr ""
3941 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
3942 "momento.\n"
3943
3883 -#: sequencer.c:3133
3944 +#: sequencer.c:3134
3945 #, c-format
3946 msgid ""
3947 "Could not execute the todo command\n"
@@ -3901,48 +3962,48 @@ msgstr ""
3962 " git rebase --edit-todo\n"
3963 " git rebase --continue\n"
3964
3904 -#: sequencer.c:3201
3965 +#: sequencer.c:3202
3966 #, c-format
3967 msgid "Stopped at %s... %.*s\n"
3968 msgstr "Detenido en %s... %.*s\n"
3969
3909 -#: sequencer.c:3263
3970 +#: sequencer.c:3264
3971 #, c-format
3972 msgid "unknown command %d"
3973 msgstr "comando desconocido %d"
3974
3914 -#: sequencer.c:3308
3975 +#: sequencer.c:3309
3976 msgid "could not read orig-head"
3977 msgstr "no se puede leer orig-head"
3978
3918 -#: sequencer.c:3313 sequencer.c:4351
3979 +#: sequencer.c:3314 sequencer.c:4352
3980 msgid "could not read 'onto'"
3981 msgstr "no se puede leer 'onto'"
3982
3922 -#: sequencer.c:3327
3983 +#: sequencer.c:3328
3984 #, c-format
3985 msgid "could not update HEAD to %s"
3986 msgstr "no se puede actualizar HEAD a %s"
3987
3927 -#: sequencer.c:3413
3988 +#: sequencer.c:3414
3989 msgid "cannot rebase: You have unstaged changes."
3990 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
3991
3931 -#: sequencer.c:3422
3992 +#: sequencer.c:3423
3993 msgid "cannot amend non-existing commit"
3994 msgstr "no se puede arreglar un commit no existente"
3995
3935 -#: sequencer.c:3424
3996 +#: sequencer.c:3425
3997 #, c-format
3998 msgid "invalid file: '%s'"
3999 msgstr "archivo invalido: '%s'"
4000
3940 -#: sequencer.c:3426
4001 +#: sequencer.c:3427
4002 #, c-format
4003 msgid "invalid contents: '%s'"
4004 msgstr "contenido inválido: '%s'"
4005
3945 -#: sequencer.c:3429
4006 +#: sequencer.c:3430
4007 msgid ""
4008 "\n"
4009 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3953,54 +4014,54 @@ msgstr ""
4014 "un commit con estos\n"
4015 "primero y luego ejecuta 'git rebase --continue' de nuevo."
4016
3956 -#: sequencer.c:3454 sequencer.c:3492
4017 +#: sequencer.c:3455 sequencer.c:3493
4018 #, c-format
4019 msgid "could not write file: '%s'"
4020 msgstr "no se pudo escribir el archivo: '%s'"
4021
3961 -#: sequencer.c:3507
4022 +#: sequencer.c:3508
4023 msgid "could not remove CHERRY_PICK_HEAD"
4024 msgstr "no se puede remover CHERRY_PICK_HEAD"
4025
3965 -#: sequencer.c:3514
4026 +#: sequencer.c:3515
4027 msgid "could not commit staged changes."
4028 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
4029
3969 -#: sequencer.c:3611
4030 +#: sequencer.c:3612
4031 #, c-format
4032 msgid "%s: can't cherry-pick a %s"
4033 msgstr "%s: no se puede aplicar cherry-pick a un %s"
4034
3974 -#: sequencer.c:3615
4035 +#: sequencer.c:3616
4036 #, c-format
4037 msgid "%s: bad revision"
4038 msgstr "%s: mala revision"
4039
3979 -#: sequencer.c:3648
4040 +#: sequencer.c:3649
4041 msgid "can't revert as initial commit"
4042 msgstr "no se puede revertir como commit inicial"
4043
3983 -#: sequencer.c:4097
4044 +#: sequencer.c:4098
4045 msgid "make_script: unhandled options"
4046 msgstr "make_script: opciones desconocidas"
4047
3987 -#: sequencer.c:4100
4048 +#: sequencer.c:4101
4049 msgid "make_script: error preparing revisions"
4050 msgstr "make_script: error preparando revisiones"
4051
3991 -#: sequencer.c:4141 sequencer.c:4176
4052 +#: sequencer.c:4142 sequencer.c:4177
4053 #, c-format
4054 msgid "unusable todo list: '%s'"
4055 msgstr "lista de pendientes inutilizable: '%s'"
4056
3996 -#: sequencer.c:4235
4057 +#: sequencer.c:4236
4058 #, c-format
4059 msgid ""
4060 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
4061 msgstr ""
4062 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
4063
4003 -#: sequencer.c:4301
4064 +#: sequencer.c:4302
4065 #, c-format
4066 msgid ""
4067 "Warning: some commits may have been dropped accidentally.\n"
@@ -4009,7 +4070,7 @@ msgstr ""
4070 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
4071 "Commits botados (empezando con el mas nuevo):\n"
4072
4012 -#: sequencer.c:4308
4073 +#: sequencer.c:4309
4074 #, c-format
4075 msgid ""
4076 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4027,7 +4088,7 @@ msgstr ""
4088 "Los posibles comportamientos son: ignore,warn,error.\n"
4089 "\n"
4090
4030 -#: sequencer.c:4320
4091 +#: sequencer.c:4321
4092 #, c-format
4093 msgid ""
4094 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -4038,12 +4099,12 @@ msgstr ""
4099 "rebase --continue'.\n"
4100 "O se puede abortar el rebase con 'git rebase --abort'.\n"
4101
4041 -#: sequencer.c:4374
4102 +#: sequencer.c:4375
4103 #, c-format
4104 msgid "could not parse commit '%s'"
4105 msgstr "no se pudo analizar commit '%s'"
4106
4046 -#: sequencer.c:4489
4107 +#: sequencer.c:4490
4108 msgid "the script was already rearranged."
4109 msgstr "este script ya fue reorganizado."
4110
@@ -4311,27 +4372,27 @@ msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
4372 msgid "Failed to resolve HEAD as a valid ref."
4373 msgstr "Falló al resolver HEAD como un ref valido."
4374
4314 -#: submodule.c:1373
4375 +#: submodule.c:1375
4376 #, c-format
4377 msgid "'%s' not recognized as a git repository"
4378 msgstr "'%s' no reconocido como un repositorio git"
4379
4319 -#: submodule.c:1511
4380 +#: submodule.c:1513
4381 #, c-format
4382 msgid "could not start 'git status' in submodule '%s'"
4383 msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
4384
4324 -#: submodule.c:1524
4385 +#: submodule.c:1526
4386 #, c-format
4387 msgid "could not run 'git status' in submodule '%s'"
4388 msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
4389
4329 -#: submodule.c:1617
4390 +#: submodule.c:1619
4391 #, c-format
4392 msgid "submodule '%s' has dirty index"
4393 msgstr "submódulo '%s' tiene un índice corrupto"
4394
4334 -#: submodule.c:1716
4395 +#: submodule.c:1718
4396 #, c-format
4397 msgid ""
4398 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -4339,18 +4400,18 @@ msgstr ""
4400 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
4401 "soportado"
4402
4342 -#: submodule.c:1728 submodule.c:1784
4403 +#: submodule.c:1730 submodule.c:1786
4404 #, c-format
4405 msgid "could not lookup name for submodule '%s'"
4406 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
4407
4347 -#: submodule.c:1732 builtin/submodule--helper.c:1261
4408 +#: submodule.c:1734 builtin/submodule--helper.c:1261
4409 #: builtin/submodule--helper.c:1271
4410 #, c-format
4411 msgid "could not create directory '%s'"
4412 msgstr "no se pudo crear el directorio '%s'"
4413
4353 -#: submodule.c:1735
4414 +#: submodule.c:1737
4415 #, c-format
4416 msgid ""
4417 "Migrating git directory of '%s%s' from\n"
@@ -4361,16 +4422,16 @@ msgstr ""
4422 "'%s' hacia\n"
4423 "'%s'\n"
4424
4364 -#: submodule.c:1819
4425 +#: submodule.c:1821
4426 #, c-format
4427 msgid "could not recurse into submodule '%s'"
4428 msgstr "no pudo recursar en el submódulo '%s'"
4429
4369 -#: submodule.c:1863
4430 +#: submodule.c:1865
4431 msgid "could not start ls-files in .."
4432 msgstr "no se pudo comenzar ls-files en .."
4433
4373 -#: submodule.c:1902
4434 +#: submodule.c:1904
4435 #, c-format
4436 msgid "ls-tree returned unexpected return code %d"
4437 msgstr "ls-tree retornó un código %d inesperado"
@@ -4832,7 +4893,7 @@ msgid "could not open '%s' for reading and writing"
4893 msgstr "no se pudo abrir '%s' para lectura y escritura"
4894
4895 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
4835 -#: builtin/am.c:862 builtin/merge.c:1042
4896 +#: builtin/am.c:862 builtin/merge.c:1043
4897 #, c-format
4898 msgid "could not open '%s' for reading"
4899 msgstr "no se pudo abrir '%s' para lectura"
@@ -5371,7 +5432,7 @@ msgstr "remover '%s'\n"
5432 msgid "Unstaged changes after refreshing the index:"
5433 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
5434
5374 -#: builtin/add.c:233 builtin/rev-parse.c:888
5435 +#: builtin/add.c:233 builtin/rev-parse.c:892
5436 msgid "Could not read the index"
5437 msgstr "No se pudo leer el índice"
5438
@@ -5825,7 +5886,7 @@ msgid "pass it through git-apply"
5886 msgstr "pasarlo a través de git-apply"
5887
5888 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
5828 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207
5889 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
5890 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
5891 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
5892 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
@@ -5878,7 +5939,7 @@ msgstr "mentir sobre la fecha del committer"
5939 msgid "use current timestamp for author date"
5940 msgstr "usar el timestamp actual para la fecha del autor"
5941
5881 -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238
5942 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
5943 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
5944 msgid "key-id"
5945 msgstr "key-id"
@@ -7057,7 +7118,7 @@ msgstr "forzar el checkout (descartar modificaciones locales)"
7118 msgid "perform a 3-way merge with the new branch"
7119 msgstr "realizar una fusión de tres vías con la rama nueva"
7120
7060 -#: builtin/checkout.c:1131 builtin/merge.c:240
7121 +#: builtin/checkout.c:1131 builtin/merge.c:241
7122 msgid "update ignored files (default)"
7123 msgstr "actualizar archivos ignorados (default)"
7124
@@ -7082,7 +7143,7 @@ msgid "do not check if another worktree is holding the given ref"
7143 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
7144
7145 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
7085 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572
7146 +#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
7147 #: builtin/send-pack.c:174
7148 msgid "force progress reporting"
7149 msgstr "forzar el reporte de progreso"
@@ -8076,7 +8137,7 @@ msgstr "fecha"
8137 msgid "override date for commit"
8138 msgstr "sobrescribe la fecha del commit"
8139
8079 -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402
8140 +#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
8141 #: builtin/notes.c:565 builtin/tag.c:392
8142 msgid "message"
8143 msgstr "mensaje"
@@ -8113,7 +8174,7 @@ msgstr ""
8174 msgid "the commit is authored by me now (used with -C/-c/--amend)"
8175 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
8176
8116 -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241
8177 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
8178 #: builtin/pull.c:154 builtin/revert.c:105
8179 msgid "add Signed-off-by:"
8180 msgstr "agregar Signed-off-by: (firmado por)"
@@ -8138,7 +8199,7 @@ msgstr "cómo quitar espacios y #comentarios de mensajes"
8199 msgid "include status in commit message template"
8200 msgstr "incluir status en el template del mensaje de commit"
8201
8141 -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184
8202 +#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
8203 #: builtin/revert.c:113
8204 msgid "GPG sign commit"
8205 msgstr "Firmar commit con GPG"
@@ -8735,24 +8796,24 @@ msgstr "realizar un diff de todo el directorio"
8796 msgid "do not prompt before launching a diff tool"
8797 msgstr "no mostrar antes de lanzar una herramienta de diff"
8798
8738 -#: builtin/difftool.c:705
8799 +#: builtin/difftool.c:704
8800 msgid "use symlinks in dir-diff mode"
8801 msgstr "usar enlaces simbólicos en modo dir-diff"
8802
8742 -#: builtin/difftool.c:706
8803 +#: builtin/difftool.c:705
8804 msgid "<tool>"
8805 msgstr "<herramienta>"
8806
8746 -#: builtin/difftool.c:707
8807 +#: builtin/difftool.c:706
8808 msgid "use the specified diff tool"
8809 msgstr "usar la herramienta de diff especificada"
8810
8750 -#: builtin/difftool.c:709
8811 +#: builtin/difftool.c:708
8812 msgid "print a list of diff tools that may be used with `--tool`"
8813 msgstr ""
8814 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
8815
8755 -#: builtin/difftool.c:712
8816 +#: builtin/difftool.c:711
8817 msgid ""
8818 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8819 "code"
@@ -8760,19 +8821,19 @@ msgstr ""
8821 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
8822 "código de salida distinto de cero"
8823
8763 -#: builtin/difftool.c:714
8824 +#: builtin/difftool.c:713
8825 msgid "<command>"
8826 msgstr "<comando>"
8827
8767 -#: builtin/difftool.c:715
8828 +#: builtin/difftool.c:714
8829 msgid "specify a custom command for viewing diffs"
8830 msgstr "especificar un comando personalizado para ver diffs"
8831
8771 -#: builtin/difftool.c:739
8832 +#: builtin/difftool.c:738
8833 msgid "no <tool> given for --tool=<tool>"
8834 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
8835
8775 -#: builtin/difftool.c:746
8836 +#: builtin/difftool.c:745
8837 msgid "no <cmd> given for --extcmd=<cmd>"
8838 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
8839
@@ -9661,58 +9722,62 @@ msgstr ""
9722 msgid "process file as it were from this path"
9723 msgstr "procesar el archivo como si fuera de esta ruta"
9724
9664 -#: builtin/help.c:43
9725 +#: builtin/help.c:45
9726 msgid "print all available commands"
9727 msgstr "mostrar todos los comandos disponibles"
9728
9668 -#: builtin/help.c:44
9729 +#: builtin/help.c:46
9730 msgid "exclude guides"
9731 msgstr "excluir las guias"
9732
9672 -#: builtin/help.c:45
9733 +#: builtin/help.c:47
9734 msgid "print list of useful guides"
9735 msgstr "mostrar una lista de nociones utiles"
9736
9676 -#: builtin/help.c:46
9737 +#: builtin/help.c:48
9738 msgid "show man page"
9739 msgstr "mostrar la pagina del manual"
9740
9680 -#: builtin/help.c:47
9741 +#: builtin/help.c:49
9742 msgid "show manual in web browser"
9743 msgstr "mostrar la pagina del manual en un navegador web"
9744
9684 -#: builtin/help.c:49
9745 +#: builtin/help.c:51
9746 msgid "show info page"
9747 msgstr "mostrar la pagina de info"
9748
9688 -#: builtin/help.c:55
9749 +#: builtin/help.c:53
9750 +msgid "print command description"
9751 +msgstr "imprimir descripción del comando"
9752 +
9753 +#: builtin/help.c:58
9754 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
9755 msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
9756
9692 -#: builtin/help.c:67
9757 +#: builtin/help.c:70
9758 #, c-format
9759 msgid "unrecognized help format '%s'"
9760 msgstr "formato help no reconocido '%s'"
9761
9697 -#: builtin/help.c:94
9762 +#: builtin/help.c:97
9763 msgid "Failed to start emacsclient."
9764 msgstr "Falló al iniciar emacsclient."
9765
9701 -#: builtin/help.c:107
9766 +#: builtin/help.c:110
9767 msgid "Failed to parse emacsclient version."
9768 msgstr "Falló al analizar la versión de emacsclient."
9769
9705 -#: builtin/help.c:115
9770 +#: builtin/help.c:118
9771 #, c-format
9772 msgid "emacsclient version '%d' too old (< 22)."
9773 msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
9774
9710 -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
9775 +#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
9776 #, c-format
9777 msgid "failed to exec '%s'"
9778 msgstr "falló al ejecutar '%s'"
9779
9715 -#: builtin/help.c:211
9780 +#: builtin/help.c:214
9781 #, c-format
9782 msgid ""
9783 "'%s': path for unsupported man viewer.\n"
@@ -9721,7 +9786,7 @@ msgstr ""
9786 "'%s': ruta para el visualizador del manual no soportada.\n"
9787 "Por favor considere usar 'man.<herramienta.cmd'."
9788
9724 -#: builtin/help.c:223
9789 +#: builtin/help.c:226
9790 #, c-format
9791 msgid ""
9792 "'%s': cmd for supported man viewer.\n"
@@ -9730,61 +9795,25 @@ msgstr ""
9795 "'%s': comando no soportado para man viewer.\n"
9796 "Por favor considere usar 'man.<herramienta>.path."
9797
9733 -#: builtin/help.c:340
9798 +#: builtin/help.c:343
9799 #, c-format
9800 msgid "'%s': unknown man viewer."
9801 msgstr "'%s': visualizador de man desconocido."
9802
9738 -#: builtin/help.c:357
9803 +#: builtin/help.c:360
9804 msgid "no man viewer handled the request"
9805 msgstr "ningún visualizador de manual proceso la petición"
9806
9742 -#: builtin/help.c:365
9807 +#: builtin/help.c:368
9808 msgid "no info viewer handled the request"
9809 msgstr "ningún visor de info manejo la petición"
9810
9746 -#: builtin/help.c:407
9747 -msgid "Defining attributes per path"
9748 -msgstr "Definiendo atributos por ruta"
9749 -
9750 -#: builtin/help.c:408
9751 -msgid "Everyday Git With 20 Commands Or So"
9752 -msgstr "Git diario con 20 comandos o algo así"
9753 -
9754 -#: builtin/help.c:409
9755 -msgid "A Git glossary"
9756 -msgstr "Un glosario de Git"
9757 -
9758 -#: builtin/help.c:410
9759 -msgid "Specifies intentionally untracked files to ignore"
9760 -msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
9761 -
9762 -#: builtin/help.c:411
9763 -msgid "Defining submodule properties"
9764 -msgstr "Definiendo las propiedades del submódulo"
9765 -
9766 -#: builtin/help.c:412
9767 -msgid "Specifying revisions and ranges for Git"
9768 -msgstr "Especificando revisiones y rangos para Git"
9769 -
9770 -#: builtin/help.c:413
9771 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
9772 -msgstr "Un tutorial de introducción para Git ( para versiones 1.5.1 o mayores)"
9773 -
9774 -#: builtin/help.c:414
9775 -msgid "An overview of recommended workflows with Git"
9776 -msgstr "Una visión general de flujos de trabajo recomendados con Git"
9777 -
9778 -#: builtin/help.c:426
9779 -msgid "The common Git guides are:\n"
9780 -msgstr "Las guías comunes de Git son:\n"
9781 -
9782 -#: builtin/help.c:444
9811 +#: builtin/help.c:415
9812 #, c-format
9813 msgid "'%s' is aliased to '%s'"
9814 msgstr "'%s' tiene el alias '%s'"
9815
9787 -#: builtin/help.c:466 builtin/help.c:483
9816 +#: builtin/help.c:442 builtin/help.c:459
9817 #, c-format
9818 msgid "usage: %s%s"
9819 msgstr "uso: %s%s"
@@ -10123,8 +10152,8 @@ msgstr "ignorando template %s"
10152
10153 #: builtin/init-db.c:120
10154 #, c-format
10126 -msgid "templates not found %s"
10127 -msgstr "no se encontraron templates %s"
10155 +msgid "templates not found in %s"
10156 +msgstr "template no encontrado en %s"
10157
10158 #: builtin/init-db.c:135
10159 #, c-format
@@ -10814,184 +10843,184 @@ msgstr ""
10843 msgid "empty mbox: '%s'"
10844 msgstr "mbox vacío: '%s'"
10845
10817 -#: builtin/merge.c:50
10846 +#: builtin/merge.c:51
10847 msgid "git merge [<options>] [<commit>...]"
10848 msgstr "git merge [<opciones>] [<commit>...]"
10849
10821 -#: builtin/merge.c:51
10850 +#: builtin/merge.c:52
10851 msgid "git merge --abort"
10852 msgstr "git merge --abort"
10853
10825 -#: builtin/merge.c:52
10854 +#: builtin/merge.c:53
10855 msgid "git merge --continue"
10856 msgstr "git merge --continue"
10857
10829 -#: builtin/merge.c:109
10858 +#: builtin/merge.c:110
10859 msgid "switch `m' requires a value"
10860 msgstr "cambiar `m' requiere un valor"
10861
10833 -#: builtin/merge.c:146
10862 +#: builtin/merge.c:147
10863 #, c-format
10864 msgid "Could not find merge strategy '%s'.\n"
10865 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
10866
10838 -#: builtin/merge.c:147
10867 +#: builtin/merge.c:148
10868 #, c-format
10869 msgid "Available strategies are:"
10870 msgstr "Estrategias disponibles son:"
10871
10843 -#: builtin/merge.c:152
10872 +#: builtin/merge.c:153
10873 #, c-format
10874 msgid "Available custom strategies are:"
10875 msgstr "Estrategias personalizadas disponibles son:"
10876
10848 -#: builtin/merge.c:202 builtin/pull.c:142
10877 +#: builtin/merge.c:203 builtin/pull.c:142
10878 msgid "do not show a diffstat at the end of the merge"
10879 msgstr "no mostrar un diffstat al final de la fusión"
10880
10852 -#: builtin/merge.c:205 builtin/pull.c:145
10881 +#: builtin/merge.c:206 builtin/pull.c:145
10882 msgid "show a diffstat at the end of the merge"
10883 msgstr "mostrar un diffstat al final de la fusión"
10884
10856 -#: builtin/merge.c:206 builtin/pull.c:148
10885 +#: builtin/merge.c:207 builtin/pull.c:148
10886 msgid "(synonym to --stat)"
10887 msgstr "(sinónimo para --stat)"
10888
10860 -#: builtin/merge.c:208 builtin/pull.c:151
10889 +#: builtin/merge.c:209 builtin/pull.c:151
10890 msgid "add (at most <n>) entries from shortlog to merge commit message"
10891 msgstr ""
10892 "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
10893 "fusión"
10894
10866 -#: builtin/merge.c:211 builtin/pull.c:157
10895 +#: builtin/merge.c:212 builtin/pull.c:157
10896 msgid "create a single commit instead of doing a merge"
10897 msgstr "crear un commit único en lugar de hacer una fusión"
10898
10870 -#: builtin/merge.c:213 builtin/pull.c:160
10899 +#: builtin/merge.c:214 builtin/pull.c:160
10900 msgid "perform a commit if the merge succeeds (default)"
10901 msgstr "realizar un commit si la fusión es exitosa (default)"
10902
10874 -#: builtin/merge.c:215 builtin/pull.c:163
10903 +#: builtin/merge.c:216 builtin/pull.c:163
10904 msgid "edit message before committing"
10905 msgstr "editar mensaje antes de realizar commit"
10906
10878 -#: builtin/merge.c:216
10907 +#: builtin/merge.c:217
10908 msgid "allow fast-forward (default)"
10909 msgstr "permitir fast-forwars (default)"
10910
10882 -#: builtin/merge.c:218 builtin/pull.c:169
10911 +#: builtin/merge.c:219 builtin/pull.c:169
10912 msgid "abort if fast-forward is not possible"
10913 msgstr "abortar si fast-forward no es posible"
10914
10886 -#: builtin/merge.c:222 builtin/pull.c:172
10915 +#: builtin/merge.c:223 builtin/pull.c:172
10916 msgid "verify that the named commit has a valid GPG signature"
10917 msgstr "verificar que el commit nombrado tiene una firma GPG válida"
10918
10890 -#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176
10919 +#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
10920 #: builtin/revert.c:109
10921 msgid "strategy"
10922 msgstr "estrategia"
10923
10895 -#: builtin/merge.c:224 builtin/pull.c:177
10924 +#: builtin/merge.c:225 builtin/pull.c:177
10925 msgid "merge strategy to use"
10926 msgstr "estrategia de fusión para usar"
10927
10899 -#: builtin/merge.c:225 builtin/pull.c:180
10928 +#: builtin/merge.c:226 builtin/pull.c:180
10929 msgid "option=value"
10930 msgstr "opción=valor"
10931
10903 -#: builtin/merge.c:226 builtin/pull.c:181
10932 +#: builtin/merge.c:227 builtin/pull.c:181
10933 msgid "option for selected merge strategy"
10934 msgstr "opción para la estrategia de fusión seleccionada"
10935
10907 -#: builtin/merge.c:228
10936 +#: builtin/merge.c:229
10937 msgid "merge commit message (for a non-fast-forward merge)"
10938 msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
10939
10911 -#: builtin/merge.c:232
10940 +#: builtin/merge.c:233
10941 msgid "abort the current in-progress merge"
10942 msgstr "abortar la fusión en progreso actual"
10943
10915 -#: builtin/merge.c:234
10944 +#: builtin/merge.c:235
10945 msgid "continue the current in-progress merge"
10946 msgstr "continuar la fusión en progreso actual"
10947
10919 -#: builtin/merge.c:236 builtin/pull.c:188
10948 +#: builtin/merge.c:237 builtin/pull.c:188
10949 msgid "allow merging unrelated histories"
10950 msgstr "permitir fusionar historias no relacionadas"
10951
10923 -#: builtin/merge.c:242
10952 +#: builtin/merge.c:243
10953 msgid "verify commit-msg hook"
10954 msgstr "verificar el hook commit-msg"
10955
10927 -#: builtin/merge.c:267
10956 +#: builtin/merge.c:268
10957 msgid "could not run stash."
10958 msgstr "no se pudo ejecutar stash."
10959
10931 -#: builtin/merge.c:272
10960 +#: builtin/merge.c:273
10961 msgid "stash failed"
10962 msgstr "stash falló"
10963
10935 -#: builtin/merge.c:277
10964 +#: builtin/merge.c:278
10965 #, c-format
10966 msgid "not a valid object: %s"
10967 msgstr "no es un objeto válido: %s"
10968
10940 -#: builtin/merge.c:299 builtin/merge.c:316
10969 +#: builtin/merge.c:300 builtin/merge.c:317
10970 msgid "read-tree failed"
10971 msgstr "lectura de árbol falló"
10972
10944 -#: builtin/merge.c:346
10973 +#: builtin/merge.c:347
10974 msgid " (nothing to squash)"
10975 msgstr " (nada para hacer squash)"
10976
10948 -#: builtin/merge.c:357
10977 +#: builtin/merge.c:358
10978 #, c-format
10979 msgid "Squash commit -- not updating HEAD\n"
10980 msgstr "Commit de squash -- no actualizando HEAD\n"
10981
10953 -#: builtin/merge.c:407
10982 +#: builtin/merge.c:408
10983 #, c-format
10984 msgid "No merge message -- not updating HEAD\n"
10985 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
10986
10958 -#: builtin/merge.c:457
10987 +#: builtin/merge.c:458
10988 #, c-format
10989 msgid "'%s' does not point to a commit"
10990 msgstr "'%s' no apunta a ningún commit"
10991
10963 -#: builtin/merge.c:547
10992 +#: builtin/merge.c:548
10993 #, c-format
10994 msgid "Bad branch.%s.mergeoptions string: %s"
10995 msgstr "Mal string branch.%s.mergeoptions: %s"
10996
10968 -#: builtin/merge.c:668
10997 +#: builtin/merge.c:669
10998 msgid "Not handling anything other than two heads merge."
10999 msgstr "No manejando nada más que fusión de dos heads."
11000
10972 -#: builtin/merge.c:682
11001 +#: builtin/merge.c:683
11002 #, c-format
11003 msgid "Unknown option for merge-recursive: -X%s"
11004 msgstr "Opción desconocida para merge-recursive: -X%s"
11005
10977 -#: builtin/merge.c:697
11006 +#: builtin/merge.c:698
11007 #, c-format
11008 msgid "unable to write %s"
11009 msgstr "no es posible escribir %s"
11010
10982 -#: builtin/merge.c:748
11011 +#: builtin/merge.c:749
11012 #, c-format
11013 msgid "Could not read from '%s'"
11014 msgstr "No se puedo leer de '%s'"
11015
10987 -#: builtin/merge.c:757
11016 +#: builtin/merge.c:758
11017 #, c-format
11018 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
11019 msgstr ""
11020 "No se realiza commit de la fusión; use 'git commit' para completar la "
11021 "fusión.\n"
11022
10994 -#: builtin/merge.c:763
11023 +#: builtin/merge.c:764
11024 #, c-format
11025 msgid ""
11026 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -11008,70 +11037,70 @@ msgstr ""
11037 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
11038 "el commit.\n"
11039
11011 -#: builtin/merge.c:799
11040 +#: builtin/merge.c:800
11041 msgid "Empty commit message."
11042 msgstr "Mensaje de commit vacío."
11043
11015 -#: builtin/merge.c:818
11044 +#: builtin/merge.c:819
11045 #, c-format
11046 msgid "Wonderful.\n"
11047 msgstr "Maravilloso.\n"
11048
11020 -#: builtin/merge.c:871
11049 +#: builtin/merge.c:872
11050 #, c-format
11051 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
11052 msgstr ""
11053 "Fusión automática falló; arregle los conflictos y luego realice un commit "
11054 "con el resultado.\n"
11055
11027 -#: builtin/merge.c:910
11056 +#: builtin/merge.c:911
11057 msgid "No current branch."
11058 msgstr "No rama actual."
11059
11031 -#: builtin/merge.c:912
11060 +#: builtin/merge.c:913
11061 msgid "No remote for the current branch."
11062 msgstr "No hay remoto para la rama actual."
11063
11035 -#: builtin/merge.c:914
11064 +#: builtin/merge.c:915
11065 msgid "No default upstream defined for the current branch."
11066 msgstr "Por defecto, no hay un upstream definido para la rama actual."
11067
11039 -#: builtin/merge.c:919
11068 +#: builtin/merge.c:920
11069 #, c-format
11070 msgid "No remote-tracking branch for %s from %s"
11071 msgstr "No hay rama de rastreo remoto para %s de %s"
11072
11044 -#: builtin/merge.c:972
11073 +#: builtin/merge.c:973
11074 #, c-format
11075 msgid "Bad value '%s' in environment '%s'"
11076 msgstr "Mal valor '%s' en el entorno '%s'"
11077
11049 -#: builtin/merge.c:1074
11078 +#: builtin/merge.c:1075
11079 #, c-format
11080 msgid "not something we can merge in %s: %s"
11081 msgstr "nada que podamos fusionar en %s: %s"
11082
11054 -#: builtin/merge.c:1108
11083 +#: builtin/merge.c:1109
11084 msgid "not something we can merge"
11085 msgstr "nada que podamos fusionar"
11086
11058 -#: builtin/merge.c:1210
11087 +#: builtin/merge.c:1211
11088 msgid "--abort expects no arguments"
11089 msgstr "--abort no espera argumentos"
11090
11062 -#: builtin/merge.c:1214
11091 +#: builtin/merge.c:1215
11092 msgid "There is no merge to abort (MERGE_HEAD missing)."
11093 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
11094
11066 -#: builtin/merge.c:1226
11095 +#: builtin/merge.c:1227
11096 msgid "--continue expects no arguments"
11097 msgstr "--continue no espera argumentos"
11098
11070 -#: builtin/merge.c:1230
11099 +#: builtin/merge.c:1231
11100 msgid "There is no merge in progress (MERGE_HEAD missing)."
11101 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
11102
11074 -#: builtin/merge.c:1246
11103 +#: builtin/merge.c:1247
11104 msgid ""
11105 "You have not concluded your merge (MERGE_HEAD exists).\n"
11106 "Please, commit your changes before you merge."
@@ -11079,7 +11108,7 @@ msgstr ""
11108 "No ha concluido la fusión (existe MERGE_HEAD).\n"
11109 "Por favor, realice un commit con los cambios antes de fusionar."
11110
11082 -#: builtin/merge.c:1253
11111 +#: builtin/merge.c:1254
11112 msgid ""
11113 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
11114 "Please, commit your changes before you merge."
@@ -11087,113 +11116,113 @@ msgstr ""
11116 "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
11117 "Por favor, realice un commit con los cambios antes de fusionar."
11118
11090 -#: builtin/merge.c:1256
11119 +#: builtin/merge.c:1257
11120 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
11121 msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
11122
11094 -#: builtin/merge.c:1265
11123 +#: builtin/merge.c:1266
11124 msgid "You cannot combine --squash with --no-ff."
11125 msgstr "No se puede combinar --squash con --no-ff."
11126
11098 -#: builtin/merge.c:1273
11127 +#: builtin/merge.c:1274
11128 msgid "No commit specified and merge.defaultToUpstream not set."
11129 msgstr ""
11130 "No hay commit especificado y merge.defaultToUpstream no está configurado."
11131
11103 -#: builtin/merge.c:1290
11132 +#: builtin/merge.c:1291
11133 msgid "Squash commit into empty head not supported yet"
11134 msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
11135
11107 -#: builtin/merge.c:1292
11136 +#: builtin/merge.c:1293
11137 msgid "Non-fast-forward commit does not make sense into an empty head"
11138 msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
11139
11111 -#: builtin/merge.c:1297
11140 +#: builtin/merge.c:1298
11141 #, c-format
11142 msgid "%s - not something we can merge"
11143 msgstr "%s - nada que podamos fusionar"
11144
11116 -#: builtin/merge.c:1299
11145 +#: builtin/merge.c:1300
11146 msgid "Can merge only exactly one commit into empty head"
11147 msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
11148
11120 -#: builtin/merge.c:1333
11149 +#: builtin/merge.c:1334
11150 #, c-format
11151 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
11152 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
11153
11125 -#: builtin/merge.c:1336
11154 +#: builtin/merge.c:1337
11155 #, c-format
11156 msgid "Commit %s has a bad GPG signature allegedly by %s."
11157 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
11158
11130 -#: builtin/merge.c:1339
11159 +#: builtin/merge.c:1340
11160 #, c-format
11161 msgid "Commit %s does not have a GPG signature."
11162 msgstr "Commit %s no tiene una firma GPG."
11163
11135 -#: builtin/merge.c:1342
11164 +#: builtin/merge.c:1343
11165 #, c-format
11166 msgid "Commit %s has a good GPG signature by %s\n"
11167 msgstr "El Commit %s tiene una buena firma GPG por %s\n"
11168
11140 -#: builtin/merge.c:1401
11169 +#: builtin/merge.c:1402
11170 msgid "refusing to merge unrelated histories"
11171 msgstr "rehusando fusionar historias no relacionadas"
11172
11144 -#: builtin/merge.c:1410
11173 +#: builtin/merge.c:1411
11174 msgid "Already up to date."
11175 msgstr "Ya está actualizado."
11176
11148 -#: builtin/merge.c:1420
11177 +#: builtin/merge.c:1421
11178 #, c-format
11179 msgid "Updating %s..%s\n"
11180 msgstr "Actualizando %s..%s\n"
11181
11153 -#: builtin/merge.c:1461
11182 +#: builtin/merge.c:1462
11183 #, c-format
11184 msgid "Trying really trivial in-index merge...\n"
11185 msgstr "Intentando fusión en índice realmente trivial...\n"
11186
11158 -#: builtin/merge.c:1468
11187 +#: builtin/merge.c:1469
11188 #, c-format
11189 msgid "Nope.\n"
11190 msgstr "Nop.\n"
11191
11163 -#: builtin/merge.c:1493
11192 +#: builtin/merge.c:1494
11193 msgid "Already up to date. Yeeah!"
11194 msgstr "Ya está actualizado. ¡Oh, yeaahh!"
11195
11167 -#: builtin/merge.c:1499
11196 +#: builtin/merge.c:1500
11197 msgid "Not possible to fast-forward, aborting."
11198 msgstr "No es posible hacer fast-forward, abortando."
11199
11171 -#: builtin/merge.c:1522 builtin/merge.c:1601
11200 +#: builtin/merge.c:1523 builtin/merge.c:1602
11201 #, c-format
11202 msgid "Rewinding the tree to pristine...\n"
11203 msgstr "Rebobinando el árbol a original...\n"
11204
11176 -#: builtin/merge.c:1526
11205 +#: builtin/merge.c:1527
11206 #, c-format
11207 msgid "Trying merge strategy %s...\n"
11208 msgstr "Intentando estrategia de fusión %s...\n"
11209
11181 -#: builtin/merge.c:1592
11210 +#: builtin/merge.c:1593
11211 #, c-format
11212 msgid "No merge strategy handled the merge.\n"
11213 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
11214
11186 -#: builtin/merge.c:1594
11215 +#: builtin/merge.c:1595
11216 #, c-format
11217 msgid "Merge with strategy %s failed.\n"
11218 msgstr "Fusionar con estrategia %s falló.\n"
11219
11191 -#: builtin/merge.c:1603
11220 +#: builtin/merge.c:1604
11221 #, c-format
11222 msgid "Using the %s to prepare resolving by hand.\n"
11223 msgstr "Usando el %s para preparar resolución a mano.\n"
11224
11196 -#: builtin/merge.c:1615
11225 +#: builtin/merge.c:1616
11226 #, c-format
11227 msgid "Automatic merge went well; stopped before committing as requested\n"
11228 msgstr ""
@@ -13707,23 +13736,23 @@ msgstr "rev-list no soporta mostrar notas"
13736 msgid "cannot combine --use-bitmap-index with object filtering"
13737 msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
13738
13710 -#: builtin/rev-parse.c:402
13739 +#: builtin/rev-parse.c:406
13740 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
13741 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
13742
13714 -#: builtin/rev-parse.c:407
13743 +#: builtin/rev-parse.c:411
13744 msgid "keep the `--` passed as an arg"
13745 msgstr "mantener el `--` pasado como un arg"
13746
13718 -#: builtin/rev-parse.c:409
13747 +#: builtin/rev-parse.c:413
13748 msgid "stop parsing after the first non-option argument"
13749 msgstr "detener análisis tras el primer argumento que no es opción"
13750
13722 -#: builtin/rev-parse.c:412
13751 +#: builtin/rev-parse.c:416
13752 msgid "output in stuck long form"
13753 msgstr "salida en formulario largo de atasco"
13754
13726 -#: builtin/rev-parse.c:545
13755 +#: builtin/rev-parse.c:549
13756 msgid ""
13757 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
13758 " or: git rev-parse --sq-quote [<arg>...]\n"
@@ -15390,7 +15419,7 @@ msgstr ""
15419 msgid "print debugging messages to stderr"
15420 msgstr "mostrar mensajes de debug en stderr"
15421
15393 -#: git.c:26
15422 +#: git.c:27
15423 msgid ""
15424 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
15425 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -15406,7 +15435,7 @@ msgstr ""
15435 " [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
15436 " <comando> [<args>]"
15437
15409 -#: git.c:33
15438 +#: git.c:34
15439 msgid ""
15440 "'git help -a' and 'git help -g' list available subcommands and some\n"
15441 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -15416,47 +15445,47 @@ msgstr ""
15445 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
15446 "para leer sobre un subcomando o concepto específico."
15447
15419 -#: git.c:113
15448 +#: git.c:173
15449 #, c-format
15450 msgid "no directory given for --git-dir\n"
15451 msgstr "no se entregó directorio para --git-dir\n"
15452
15424 -#: git.c:127
15453 +#: git.c:187
15454 #, c-format
15455 msgid "no namespace given for --namespace\n"
15456 msgstr "no se entregó namespace para --namespace\n"
15457
15429 -#: git.c:141
15458 +#: git.c:201
15459 #, c-format
15460 msgid "no directory given for --work-tree\n"
15461 msgstr "no se entregó directorio para --work-tree\n"
15462
15434 -#: git.c:155
15463 +#: git.c:215
15464 #, c-format
15465 msgid "no prefix given for --super-prefix\n"
15466 msgstr "no se entregó prefijo para --super-prefix\n"
15467
15439 -#: git.c:177
15468 +#: git.c:237
15469 #, c-format
15470 msgid "-c expects a configuration string\n"
15471 msgstr "-c espera un string de configuración\n"
15472
15444 -#: git.c:215
15473 +#: git.c:275
15474 #, c-format
15475 msgid "no directory given for -C\n"
15476 msgstr "no se entregó directorio para -C\n"
15477
15449 -#: git.c:233
15478 +#: git.c:300
15479 #, c-format
15480 msgid "unknown option: %s\n"
15481 msgstr "opción %s desconocida\n"
15482
15454 -#: git.c:698
15483 +#: git.c:765
15484 #, c-format
15485 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
15486 msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
15487
15459 -#: git.c:710
15488 +#: git.c:777
15489 #, c-format
15490 msgid "failed to run command '%s': %s\n"
15491 msgstr "falló al ejecutar comando '%s': %s\n"
@@ -15498,129 +15527,669 @@ msgstr "args"
15527 msgid "object filtering"
15528 msgstr "filtrado de objeto"
15529
15501 -#: common-cmds.h:9
15502 -msgid "start a working area (see also: git help tutorial)"
15503 -msgstr "comienza un área de trabajo (ver también: git help tutorial)"
15530 +#: parse-options.h:157
15531 +msgid "expiry-date"
15532 +msgstr "fecha de expiración"
15533
15505 -#: common-cmds.h:10
15506 -msgid "work on the current change (see also: git help everyday)"
15507 -msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
15534 +#: parse-options.h:172
15535 +msgid "no-op (backward compatibility)"
15536 +msgstr "no-op (compatibilidad con versiones anteriores)"
15537
15509 -#: common-cmds.h:11
15510 -msgid "examine the history and state (see also: git help revisions)"
15511 -msgstr "examina el historial y el estado (ver también: git help revisions)"
15538 +#: parse-options.h:251
15539 +msgid "be more verbose"
15540 +msgstr "ser mas verboso"
15541
15513 -#: common-cmds.h:12
15514 -msgid "grow, mark and tweak your common history"
15515 -msgstr "crece, marca y ajusta tu historial común"
15542 +#: parse-options.h:253
15543 +msgid "be more quiet"
15544 +msgstr "ser mas discreto"
15545
15517 -#: common-cmds.h:13
15518 -msgid "collaborate (see also: git help workflows)"
15519 -msgstr "colabora (mira también: git help workflows)"
15546 +#: parse-options.h:259
15547 +msgid "use <n> digits to display SHA-1s"
15548 +msgstr "usa <n> dígitos para mostrar SHA-1s"
15549
15521 -#: common-cmds.h:17
15550 +#: command-list.h:50
15551 msgid "Add file contents to the index"
15552 msgstr "Agrega contenido de carpetas al índice"
15553
15525 -#: common-cmds.h:18
15554 +#: command-list.h:51
15555 +msgid "Apply a series of patches from a mailbox"
15556 +msgstr "Aplicar una serie de parches de un mailbox"
15557 +
15558 +#: command-list.h:52
15559 +msgid "Annotate file lines with commit information"
15560 +msgstr "Anotar líneas de archivo con información de commit"
15561 +
15562 +#: command-list.h:53
15563 +msgid "Apply a patch to files and/or to the index"
15564 +msgstr "Aplicar un parche a archivos y/o el índice"
15565 +
15566 +#: command-list.h:54
15567 +msgid "Import an Arch repository into Git"
15568 +msgstr "Importar un repositorio Arch en Git"
15569 +
15570 +#: command-list.h:55
15571 +msgid "Create an archive of files from a named tree"
15572 +msgstr "Crear un archivo o archivos de un árbol nombrado"
15573 +
15574 +#: command-list.h:56
15575 msgid "Use binary search to find the commit that introduced a bug"
15576 msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
15577
15529 -#: common-cmds.h:19
15578 +#: command-list.h:57
15579 +msgid "Show what revision and author last modified each line of a file"
15580 +msgstr ""
15581 +"Mostrar qué revisión y autor modificaron al último cada línea de un archivo"
15582 +
15583 +#: command-list.h:58
15584 msgid "List, create, or delete branches"
15585 msgstr "Lista, crea, o borra ramas"
15586
15533 -#: common-cmds.h:20
15587 +#: command-list.h:59
15588 +msgid "Move objects and refs by archive"
15589 +msgstr "Mover objetos y referencias por archivo"
15590 +
15591 +#: command-list.h:60
15592 +msgid "Provide content or type and size information for repository objects"
15593 +msgstr ""
15594 +"Proveer contenido o tipo y tamaño de información para objetos de repositorio"
15595 +
15596 +#: command-list.h:61
15597 +msgid "Display gitattributes information"
15598 +msgstr "Mostrar información de gitattributes"
15599 +
15600 +#: command-list.h:62
15601 +msgid "Debug gitignore / exclude files"
15602 +msgstr "Debug a gitignore / excluir archivos"
15603 +
15604 +#: command-list.h:63
15605 +msgid "Show canonical names and email addresses of contacts"
15606 +msgstr "Mostrar nombres canónicos y direcciones de correo de contactos"
15607 +
15608 +#: command-list.h:64
15609 msgid "Switch branches or restore working tree files"
15610 msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
15611
15537 -#: common-cmds.h:21
15612 +#: command-list.h:65
15613 +msgid "Copy files from the index to the working tree"
15614 +msgstr "Copiar archivos del índice al árbol de trabajo"
15615 +
15616 +#: command-list.h:66
15617 +msgid "Ensures that a reference name is well formed"
15618 +msgstr "Asegura que un nombre de referencia esté bien formado"
15619 +
15620 +#: command-list.h:67
15621 +msgid "Find commits yet to be applied to upstream"
15622 +msgstr "Encuentra commits que faltan aplicar en upstream"
15623 +
15624 +#: command-list.h:68
15625 +msgid "Apply the changes introduced by some existing commits"
15626 +msgstr "Aplica los cambios introducidos por algunos commits existentes"
15627 +
15628 +#: command-list.h:69
15629 +msgid "Graphical alternative to git-commit"
15630 +msgstr "Opción gráfica a git-commit"
15631 +
15632 +#: command-list.h:70
15633 +msgid "Remove untracked files from the working tree"
15634 +msgstr "Remueve archivos del árbol de trabajo no rastreados"
15635 +
15636 +#: command-list.h:71
15637 msgid "Clone a repository into a new directory"
15638 msgstr "Clona un repositorio dentro de un nuevo directorio"
15639
15541 -#: common-cmds.h:22
15640 +#: command-list.h:72
15641 +msgid "Display data in columns"
15642 +msgstr "Mostrar data en columnas"
15643 +
15644 +#: command-list.h:73
15645 msgid "Record changes to the repository"
15646 msgstr "Graba los cambios en tu repositorio"
15647
15545 -#: common-cmds.h:23
15648 +#: command-list.h:74
15649 +msgid "Write and verify Git commit graph files"
15650 +msgstr "Escribe y verifica los archivos de Git commit graph"
15651 +
15652 +#: command-list.h:75
15653 +msgid "Create a new commit object"
15654 +msgstr "Crea un nuevo objeto commit"
15655 +
15656 +#: command-list.h:76
15657 +msgid "Get and set repository or global options"
15658 +msgstr "Configurar repositorio u opciones globales"
15659 +
15660 +#: command-list.h:77
15661 +msgid "Count unpacked number of objects and their disk consumption"
15662 +msgstr "Contar número de objetos no empaquetados y su consumo en disco"
15663 +
15664 +#: command-list.h:78
15665 +msgid "Retrieve and store user credentials"
15666 +msgstr "Obtener y guardar credenciales de usuario"
15667 +
15668 +#: command-list.h:79
15669 +msgid "Helper to temporarily store passwords in memory"
15670 +msgstr "Auxiliar para almacenar temporalmente claves en memoria"
15671 +
15672 +#: command-list.h:80
15673 +msgid "Helper to store credentials on disk"
15674 +msgstr "Auxiliar para guardar credenciales en disco"
15675 +
15676 +#: command-list.h:81
15677 +msgid "Export a single commit to a CVS checkout"
15678 +msgstr "Exporta un commit único a CVS checkout"
15679 +
15680 +#: command-list.h:82
15681 +msgid "Salvage your data out of another SCM people love to hate"
15682 +msgstr "Salva tus datos de otro SCM que la gente adora odiar"
15683 +
15684 +#: command-list.h:83
15685 +msgid "A CVS server emulator for Git"
15686 +msgstr "Un servidor emulador de CVS para Git"
15687 +
15688 +#: command-list.h:84
15689 +msgid "A really simple server for Git repositories"
15690 +msgstr "Un servidor realmente simple para repositorios Git"
15691 +
15692 +#: command-list.h:85
15693 +msgid "Give an object a human readable name based on an available ref"
15694 +msgstr ""
15695 +"Dar a un objeto un nombre legible por humanos basado en una referencia "
15696 +"disponible"
15697 +
15698 +#: command-list.h:86
15699 msgid "Show changes between commits, commit and working tree, etc"
15700 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
15701
15549 -#: common-cmds.h:24
15702 +#: command-list.h:87
15703 +msgid "Compares files in the working tree and the index"
15704 +msgstr "Compara archivos del árbol de trabajo y del índice"
15705 +
15706 +#: command-list.h:88
15707 +msgid "Compare a tree to the working tree or index"
15708 +msgstr "Compara un árbol con el árbol de trabajo o índice"
15709 +
15710 +#: command-list.h:89
15711 +msgid "Compares the content and mode of blobs found via two tree objects"
15712 +msgstr ""
15713 +"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
15714 +"de árbol"
15715 +
15716 +#: command-list.h:90
15717 +msgid "Show changes using common diff tools"
15718 +msgstr "Mostrar cambios usando herramientas de diff comunes"
15719 +
15720 +#: command-list.h:91
15721 +msgid "Git data exporter"
15722 +msgstr "Exportador de data Git"
15723 +
15724 +#: command-list.h:92
15725 +msgid "Backend for fast Git data importers"
15726 +msgstr "Backend para importadores de data de Git rápidos"
15727 +
15728 +#: command-list.h:93
15729 msgid "Download objects and refs from another repository"
15730 msgstr "Descarga objetos y referencias de otro repositorio"
15731
15553 -#: common-cmds.h:25
15732 +#: command-list.h:94
15733 +msgid "Receive missing objects from another repository"
15734 +msgstr "Descarga objetos faltantes de otro repositorio"
15735 +
15736 +#: command-list.h:95
15737 +msgid "Rewrite branches"
15738 +msgstr "Reescribir ramas"
15739 +
15740 +#: command-list.h:96
15741 +msgid "Produce a merge commit message"
15742 +msgstr "Produce un mensaje de commit para fusión"
15743 +
15744 +#: command-list.h:97
15745 +msgid "Output information on each ref"
15746 +msgstr "Información de output en cada ref"
15747 +
15748 +#: command-list.h:98
15749 +msgid "Prepare patches for e-mail submission"
15750 +msgstr "Prepara parches para ser enviados por e-mail"
15751 +
15752 +#: command-list.h:99
15753 +msgid "Verifies the connectivity and validity of the objects in the database"
15754 +msgstr ""
15755 +"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
15756 +
15757 +#: command-list.h:100
15758 +msgid "Cleanup unnecessary files and optimize the local repository"
15759 +msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
15760 +
15761 +#: command-list.h:101
15762 +msgid "Extract commit ID from an archive created using git-archive"
15763 +msgstr "Extrae el ID de commit de un archivo creado usando git-archive"
15764 +
15765 +#: command-list.h:102
15766 msgid "Print lines matching a pattern"
15767 msgstr "Imprime las líneas que concuerdan con el patron"
15768
15557 -#: common-cmds.h:26
15769 +#: command-list.h:103
15770 +msgid "A portable graphical interface to Git"
15771 +msgstr "Una interfaz gráfica portátil para Git"
15772 +
15773 +#: command-list.h:104
15774 +msgid "Compute object ID and optionally creates a blob from a file"
15775 +msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
15776 +
15777 +#: command-list.h:105
15778 +msgid "Display help information about Git"
15779 +msgstr "Mostrar información sobre Git"
15780 +
15781 +#: command-list.h:106
15782 +msgid "Server side implementation of Git over HTTP"
15783 +msgstr "Implementación de lado de servidor de Git por HTTP"
15784 +
15785 +#: command-list.h:107
15786 +msgid "Download from a remote Git repository via HTTP"
15787 +msgstr "Descarga de un repositorio Git remoto vía HTTP"
15788 +
15789 +#: command-list.h:108
15790 +msgid "Push objects over HTTP/DAV to another repository"
15791 +msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
15792 +
15793 +#: command-list.h:109
15794 +msgid "Send a collection of patches from stdin to an IMAP folder"
15795 +msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
15796 +
15797 +#: command-list.h:110
15798 +msgid "Build pack index file for an existing packed archive"
15799 +msgstr "Constuye un archivo de índice para un archivo empaquetado existente"
15800 +
15801 +#: command-list.h:111
15802 msgid "Create an empty Git repository or reinitialize an existing one"
15803 msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
15804
15561 -#: common-cmds.h:27
15805 +#: command-list.h:112
15806 +msgid "Instantly browse your working repository in gitweb"
15807 +msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
15808 +
15809 +#: command-list.h:113
15810 +msgid "add or parse structured information in commit messages"
15811 +msgstr "agregar o analizar información estructurada en mensajes de commit"
15812 +
15813 +#: command-list.h:114
15814 +msgid "The Git repository browser"
15815 +msgstr "El navegador de repositorio Git"
15816 +
15817 +#: command-list.h:115
15818 msgid "Show commit logs"
15819 msgstr "Muestra los logs de los commits"
15820
15565 -#: common-cmds.h:28
15821 +#: command-list.h:116
15822 +msgid "Show information about files in the index and the working tree"
15823 +msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo"
15824 +
15825 +#: command-list.h:117
15826 +msgid "List references in a remote repository"
15827 +msgstr "Lista referencias en un repositorio remoto"
15828 +
15829 +#: command-list.h:118
15830 +msgid "List the contents of a tree object"
15831 +msgstr "Lista los contenidos de un objeto árbol"
15832 +
15833 +#: command-list.h:119
15834 +msgid "Extracts patch and authorship from a single e-mail message"
15835 +msgstr "Extraer parche y autoría de un único mensaje de e-mail"
15836 +
15837 +#: command-list.h:120
15838 +msgid "Simple UNIX mbox splitter program"
15839 +msgstr "Programa divisor de mbox simple de UNIX"
15840 +
15841 +#: command-list.h:121
15842 msgid "Join two or more development histories together"
15843 msgstr "Junta dos o mas historiales de desarrollo juntos"
15844
15569 -#: common-cmds.h:29
15845 +#: command-list.h:122
15846 +msgid "Find as good common ancestors as possible for a merge"
15847 +msgstr "Encuentra un ancestro común bueno para una posible fusión"
15848 +
15849 +#: command-list.h:123
15850 +msgid "Run a three-way file merge"
15851 +msgstr "Ejecuta una fusión de tres vías en un archivo"
15852 +
15853 +#: command-list.h:124
15854 +msgid "Run a merge for files needing merging"
15855 +msgstr "Ejecuta una fusión para archivos que la necesitan"
15856 +
15857 +#: command-list.h:125
15858 +msgid "The standard helper program to use with git-merge-index"
15859 +msgstr "El programa de ayuda estándar para usar con git-merge-index"
15860 +
15861 +#: command-list.h:126
15862 +msgid "Run merge conflict resolution tools to resolve merge conflicts"
15863 +msgstr ""
15864 +"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
15865 +"conflictos de fusión"
15866 +
15867 +#: command-list.h:127
15868 +msgid "Show three-way merge without touching index"
15869 +msgstr "Mostrar fusión de tres vías sin tocar el índice"
15870 +
15871 +#: command-list.h:128
15872 +msgid "Creates a tag object"
15873 +msgstr "Crea un objeto tag"
15874 +
15875 +#: command-list.h:129
15876 +msgid "Build a tree-object from ls-tree formatted text"
15877 +msgstr "Construir un objeto árbol de un texto en formato ls-tree"
15878 +
15879 +#: command-list.h:130
15880 msgid "Move or rename a file, a directory, or a symlink"
15881 msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
15882
15573 -#: common-cmds.h:30
15883 +#: command-list.h:131
15884 +msgid "Find symbolic names for given revs"
15885 +msgstr "Encontrar nombres simbólicos para revs dados"
15886 +
15887 +#: command-list.h:132
15888 +msgid "Add or inspect object notes"
15889 +msgstr "Agrega o inspecciona objetos nota"
15890 +
15891 +#: command-list.h:133
15892 +msgid "Import from and submit to Perforce repositories"
15893 +msgstr "Importar desde y enviar a repositorios Perforce"
15894 +
15895 +#: command-list.h:134
15896 +msgid "Create a packed archive of objects"
15897 +msgstr "Crea un archivo de objetos empaquetados"
15898 +
15899 +#: command-list.h:135
15900 +msgid "Find redundant pack files"
15901 +msgstr "Encuentra archivos empaquetados de manera redundante"
15902 +
15903 +#: command-list.h:136
15904 +msgid "Pack heads and tags for efficient repository access"
15905 +msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
15906 +
15907 +#: command-list.h:137
15908 +msgid "Routines to help parsing remote repository access parameters"
15909 +msgstr ""
15910 +"Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
15911 +"remoto"
15912 +
15913 +#: command-list.h:138
15914 +msgid "Compute unique ID for a patch"
15915 +msgstr "Calcular ID único para un parche"
15916 +
15917 +#: command-list.h:139
15918 +msgid "Prune all unreachable objects from the object database"
15919 +msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
15920 +
15921 +#: command-list.h:140
15922 +msgid "Remove extra objects that are already in pack files"
15923 +msgstr "Remover objetos extra que ya están en archivos empaquetados"
15924 +
15925 +#: command-list.h:141
15926 msgid "Fetch from and integrate with another repository or a local branch"
15927 msgstr "Realiza un fetch e integra con otro repositorio o rama local"
15928
15577 -#: common-cmds.h:31
15929 +#: command-list.h:142
15930 msgid "Update remote refs along with associated objects"
15931 msgstr "Actualiza referencias remotas junto con sus objetos asociados"
15932
15581 -#: common-cmds.h:32
15933 +#: command-list.h:143
15934 +msgid "Applies a quilt patchset onto the current branch"
15935 +msgstr "Aplica un parche quilt en la rama actual"
15936 +
15937 +#: command-list.h:144
15938 +msgid "Reads tree information into the index"
15939 +msgstr "Lee información del ábol en el índice"
15940 +
15941 +#: command-list.h:145
15942 msgid "Reapply commits on top of another base tip"
15943 msgstr "Vuelve a aplicar commits en la punta de otra rama"
15944
15585 -#: common-cmds.h:33
15945 +#: command-list.h:146
15946 +msgid "Receive what is pushed into the repository"
15947 +msgstr "Recibir lo que es empujado en el respositorio"
15948 +
15949 +#: command-list.h:147
15950 +msgid "Manage reflog information"
15951 +msgstr "Gestionar información de reflog"
15952 +
15953 +#: command-list.h:148
15954 +msgid "Manage set of tracked repositories"
15955 +msgstr "Gestiona un conjunto de repositorios rastreados"
15956 +
15957 +#: command-list.h:149
15958 +msgid "Pack unpacked objects in a repository"
15959 +msgstr "empaquetar objetos no empaquetados en un repositorio"
15960 +
15961 +#: command-list.h:150
15962 +msgid "Create, list, delete refs to replace objects"
15963 +msgstr "Crea, lista, borra referencias para reemplazar objetos"
15964 +
15965 +#: command-list.h:151
15966 +msgid "Generates a summary of pending changes"
15967 +msgstr "Genera un resumen de cambios pendientes"
15968 +
15969 +#: command-list.h:152
15970 +msgid "Reuse recorded resolution of conflicted merges"
15971 +msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
15972 +
15973 +#: command-list.h:153
15974 msgid "Reset current HEAD to the specified state"
15975 msgstr "Reinicia el HEAD actual a un estado especifico"
15976
15589 -#: common-cmds.h:34
15977 +#: command-list.h:154
15978 +msgid "Revert some existing commits"
15979 +msgstr "Revierte algunos commits existentes"
15980 +
15981 +#: command-list.h:155
15982 +msgid "Lists commit objects in reverse chronological order"
15983 +msgstr "Lista objetos commit en orden cronológico inverso"
15984 +
15985 +#: command-list.h:156
15986 +msgid "Pick out and massage parameters"
15987 +msgstr "Seleccionar y masajear los parámetros"
15988 +
15989 +#: command-list.h:157
15990 msgid "Remove files from the working tree and from the index"
15991 msgstr "Borra archivos del árbol de trabajo y del índice"
15992
15593 -#: common-cmds.h:35
15993 +#: command-list.h:158
15994 +msgid "Send a collection of patches as emails"
15995 +msgstr "Envía una colección de parches como e-mails"
15996 +
15997 +#: command-list.h:159
15998 +msgid "Push objects over Git protocol to another repository"
15999 +msgstr "Empujar objetos por protocolo Git a otro repositorio"
16000 +
16001 +#: command-list.h:160
16002 +msgid "Restricted login shell for Git-only SSH access"
16003 +msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
16004 +
16005 +#: command-list.h:161
16006 +msgid "Summarize 'git log' output"
16007 +msgstr "Resumir la salida 'git log'"
16008 +
16009 +#: command-list.h:162
16010 msgid "Show various types of objects"
16011 msgstr "Muestra varios tipos de objetos"
16012
15597 -#: common-cmds.h:36
16013 +#: command-list.h:163
16014 +msgid "Show branches and their commits"
16015 +msgstr "Mostrar ramas y sus commits"
16016 +
16017 +#: command-list.h:164
16018 +msgid "Show packed archive index"
16019 +msgstr "Mostrar el índice de archivo empaquetado"
16020 +
16021 +#: command-list.h:165
16022 +msgid "List references in a local repository"
16023 +msgstr "Listar referencias en el repositorio local"
16024 +
16025 +#: command-list.h:166
16026 +msgid "Git's i18n setup code for shell scripts"
16027 +msgstr "El código de configuración i18n de Git para scripts de shell"
16028 +
16029 +#: command-list.h:167
16030 +msgid "Common Git shell script setup code"
16031 +msgstr "Código de configuración de script de shell común de Git"
16032 +
16033 +#: command-list.h:168
16034 +msgid "Stash the changes in a dirty working directory away"
16035 +msgstr ""
16036 +"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
16037 +"maneras"
16038 +
16039 +#: command-list.h:169
16040 +msgid "Add file contents to the staging area"
16041 +msgstr "Agrega contenidos de un archivo al área de staging"
16042 +
16043 +#: command-list.h:170
16044 msgid "Show the working tree status"
16045 msgstr "Muestra el estado del árbol de trabajo"
16046
15601 -#: common-cmds.h:37
16047 +#: command-list.h:171
16048 +msgid "Remove unnecessary whitespace"
16049 +msgstr "Eliminar el espacio en blanco innecesario"
16050 +
16051 +#: command-list.h:172
16052 +msgid "Initialize, update or inspect submodules"
16053 +msgstr "Inicializa, actualiza o inspecciona submódulos"
16054 +
16055 +#: command-list.h:173
16056 +msgid "Bidirectional operation between a Subversion repository and Git"
16057 +msgstr "Operación bidireccional entre un repositorio Subversion y Git"
16058 +
16059 +#: command-list.h:174
16060 +msgid "Read, modify and delete symbolic refs"
16061 +msgstr "Lee, modifica y borra referencias simbólicas"
16062 +
16063 +#: command-list.h:175
16064 msgid "Create, list, delete or verify a tag object signed with GPG"
16065 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
16066
15605 -#: parse-options.h:157
15606 -msgid "expiry-date"
15607 -msgstr "fecha de expiración"
16067 +#: command-list.h:176
16068 +msgid "Creates a temporary file with a blob's contents"
16069 +msgstr "Crea un archivo temporal con contenidos de un blob"
16070
15609 -#: parse-options.h:172
15610 -msgid "no-op (backward compatibility)"
15611 -msgstr "no-op (compatibilidad con versiones anteriores)"
16071 +#: command-list.h:177
16072 +msgid "Unpack objects from a packed archive"
16073 +msgstr "Desempaqueta objetos de un archivo empaquetado"
16074
15613 -#: parse-options.h:251
15614 -msgid "be more verbose"
15615 -msgstr "ser mas verboso"
16075 +#: command-list.h:178
16076 +msgid "Register file contents in the working tree to the index"
16077 +msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
16078
15617 -#: parse-options.h:253
15618 -msgid "be more quiet"
15619 -msgstr "ser mas discreto"
16079 +#: command-list.h:179
16080 +msgid "Update the object name stored in a ref safely"
16081 +msgstr ""
16082 +"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
16083
15621 -#: parse-options.h:259
15622 -msgid "use <n> digits to display SHA-1s"
15623 -msgstr "usa <n> dígitos para mostrar SHA-1s"
16084 +#: command-list.h:180
16085 +msgid "Update auxiliary info file to help dumb servers"
16086 +msgstr ""
16087 +"Actualiza el archivo de información auxiliar para ayudar a los servidores "
16088 +"dumb"
16089 +
16090 +#: command-list.h:181
16091 +msgid "Send archive back to git-archive"
16092 +msgstr "Enviar archivo a git-archive"
16093 +
16094 +#: command-list.h:182
16095 +msgid "Send objects packed back to git-fetch-pack"
16096 +msgstr "Enviar objetos empaquetados a git-fetch-pack"
16097 +
16098 +#: command-list.h:183
16099 +msgid "Show a Git logical variable"
16100 +msgstr "Mostrar una variable lógica de Git"
16101 +
16102 +#: command-list.h:184
16103 +msgid "Check the GPG signature of commits"
16104 +msgstr "Verificar firma GPG de commits"
16105 +
16106 +#: command-list.h:185
16107 +msgid "Validate packed Git archive files"
16108 +msgstr "Valida archivos Git empaquetados"
16109 +
16110 +#: command-list.h:186
16111 +msgid "Check the GPG signature of tags"
16112 +msgstr "Verifica la firma GPG de etiquetas"
16113 +
16114 +#: command-list.h:187
16115 +msgid "Git web interface (web frontend to Git repositories)"
16116 +msgstr "Interfaz web Git (interfaz web para repositorios Git)"
16117 +
16118 +#: command-list.h:188
16119 +msgid "Show logs with difference each commit introduces"
16120 +msgstr "Muestra logs con las diferencias que cada commit introduce"
16121 +
16122 +#: command-list.h:189
16123 +msgid "Manage multiple working trees"
16124 +msgstr "Gestiona múltiples árboles de trabajo"
16125 +
16126 +#: command-list.h:190
16127 +msgid "Create a tree object from the current index"
16128 +msgstr "Crea un objeto árbol del índice actual"
16129 +
16130 +#: command-list.h:191
16131 +msgid "Defining attributes per path"
16132 +msgstr "Definiendo atributos por ruta"
16133 +
16134 +#: command-list.h:192
16135 +msgid "Git command-line interface and conventions"
16136 +msgstr "Interfaz y convenciones de línea de comandos de Git"
16137 +
16138 +#: command-list.h:193
16139 +msgid "A Git core tutorial for developers"
16140 +msgstr "Un tutorial básico de Git para desarrolladores"
16141 +
16142 +#: command-list.h:194
16143 +msgid "Git for CVS users"
16144 +msgstr "Git para usuarios CVS"
16145 +
16146 +#: command-list.h:195
16147 +msgid "Tweaking diff output"
16148 +msgstr "Afinar la salida de diff"
16149 +
16150 +#: command-list.h:196
16151 +msgid "A useful minimum set of commands for Everyday Git"
16152 +msgstr "Un conjunto mínimo útil de comandos diarios de Git"
16153 +
16154 +#: command-list.h:197
16155 +msgid "A Git Glossary"
16156 +msgstr "Un Glosario de Git"
16157 +
16158 +#: command-list.h:198
16159 +msgid "Hooks used by Git"
16160 +msgstr "Hooks utilizados por Git"
16161 +
16162 +#: command-list.h:199
16163 +msgid "Specifies intentionally untracked files to ignore"
16164 +msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
16165 +
16166 +#: command-list.h:200
16167 +msgid "Defining submodule properties"
16168 +msgstr "Definiendo las propiedades del submódulo"
16169 +
16170 +#: command-list.h:201
16171 +msgid "Git namespaces"
16172 +msgstr "namespaces de Git"
16173 +
16174 +#: command-list.h:202
16175 +msgid "Git Repository Layout"
16176 +msgstr "Disposición del repositorio Git"
16177 +
16178 +#: command-list.h:203
16179 +msgid "Specifying revisions and ranges for Git"
16180 +msgstr "Especificando revisiones y rangos para Git"
16181 +
16182 +#: command-list.h:204
16183 +msgid "A tutorial introduction to Git: part two"
16184 +msgstr "Un tutorial de introducción a Git: parte dos"
16185 +
16186 +#: command-list.h:205
16187 +msgid "A tutorial introduction to Git"
16188 +msgstr "Un tutorial de introducción para Git"
16189 +
16190 +#: command-list.h:206
16191 +msgid "An overview of recommended workflows with Git"
16192 +msgstr "Una visión general de flujos de trabajo recomendados con Git"
16193
16194 #: rerere.h:40
16195 msgid "update the index with reused conflict resolution if possible"
@@ -16379,7 +16948,7 @@ msgid ""
16948 "e, edit <commit> = use commit, but stop for amending\n"
16949 "s, squash <commit> = use commit, but meld into previous commit\n"
16950 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
16382 -"x, exec <commit> = run command (the rest of the line) using shell\n"
16951 +"x, exec <command> = run command (the rest of the line) using shell\n"
16952 "d, drop <commit> = remove commit\n"
16953 "l, label <label> = label current HEAD with a name\n"
16954 "t, reset <label> = reset HEAD to a label\n"
@@ -17689,6 +18258,9 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n"
18258 msgid "Do you really want to send %s? [y|N]: "
18259 msgstr "Realmente deseas mandar %s?[y|N]: "
18260
18261 +#~ msgid "Everyday Git With 20 Commands Or So"
18262 +#~ msgstr "Git diario con 20 comandos o algo así"
18263 +
18264 #~ msgid "Could not open '%s' for writing"
18265 #~ msgstr "No se pudo abrir '%s' para escritura"
18266