33ac3e8968 · matheusbsbs/matheus-bagliano

@@ -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-01-07 07:50+0800\n"

11 -"PO-Revision-Date: 2018-01-07 12:14-0500\n"

10 +"POT-Creation-Date: 2018-03-16 07:29+0800\n"

11 +"PO-Revision-Date: 2018-03-15 21:31-0500\n"

12 "Last-Translator: christopher.diaz.riv@gmail.com\n"

13 "Language-Team: CodeLabora <codelabora@gmail.com>\n"

14 "Language: es\n"

@@ -16,7 +16,7 @@ msgstr ""

16 "Content-Type: text/plain; charset=UTF-8\n"

17 "Content-Transfer-Encoding: 8bit\n"

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19 -"X-Generator: Poedit 1.8.7\n"

19 +"X-Generator: Poedit 2.0.6\n"

20

21 #: advice.c:62

22 #, c-format

@@ -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:121 builtin/merge.c:1213

64 +#: advice.c:121 builtin/merge.c:1251

65 msgid "You have not concluded your merge (MERGE_HEAD exists)."

66 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."

67

@@ -122,15 +122,15 @@ msgstr "--cached y --3way no se pueden utilizar juntas."

122

123 #: apply.c:127

124 msgid "--3way outside a repository"

125 -msgstr "--3way esta fuera de un repositorio"

125 +msgstr "--3way está fuera de un repositorio"

126

127 #: apply.c:138

128 msgid "--index outside a repository"

129 -msgstr "--index esta fuera de un repositorio"

129 +msgstr "--index está fuera de un repositorio"

130

131 #: apply.c:141

132 msgid "--cached outside a repository"

133 -msgstr "--cached esta fuera de un repositorio"

133 +msgstr "--cached está fuera de un repositorio"

134

135 #: apply.c:821

136 #, c-format

@@ -291,7 +291,7 @@ msgid ""

291 "while searching for:\n"

292 "%.*s"

293 msgstr ""

294 -"Mientras se busca:\n"

294 +"mientras se busca:\n"

295 "%.*s"

296

297 #: apply.c:3095

@@ -379,7 +379,7 @@ msgstr "%s: no concuerda con el índice"

379 msgid "repository lacks the necessary blob to fall back on 3-way merge."

380 msgstr ""

381 "el repositorio carece del blob necesario para regresar en un merge de tres-"

382 -"vías"

382 +"vías."

383

384 #: apply.c:3563

385 #, c-format

@@ -475,7 +475,7 @@ msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"

475 msgid "sha1 information is lacking or useless (%s)."

476 msgstr "falta información sha1 o es inútil (%s)."

477

478 -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

478 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

479 #, c-format

480 msgid "make_cache_entry failed for path '%s'"

481 msgstr "make_cache_entry fallo para la ruta '%s'"

@@ -534,11 +534,11 @@ msgstr "no es posible escribir el archivo '%s' modo %o"

534 #: apply.c:4515

535 #, c-format

536 msgid "Applied patch %s cleanly."

537 -msgstr "Parche %s aplicado limpiamente"

537 +msgstr "Parche %s aplicado limpiamente."

538

539 #: apply.c:4523

540 msgid "internal error"

541 -msgstr "Error interno"

541 +msgstr "error interno"

542

543 #: apply.c:4526

544 #, c-format

@@ -550,9 +550,9 @@ msgstr[1] "Aplicando parche %%s con %d rechazos..."

550 #: apply.c:4537

551 #, c-format

552 msgid "truncating .rej filename to %.*s.rej"

553 -msgstr "truncando el nombre de archivo .rej a %.*s.rej "

553 +msgstr "truncando el nombre de archivo .rej a %.*s.rej"

554

555 -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

555 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

556 #, c-format

557 msgid "cannot open %s"

558 msgstr "no se puede abrir %s"

@@ -560,12 +560,12 @@ msgstr "no se puede abrir %s"

560 #: apply.c:4559

561 #, c-format

562 msgid "Hunk #%d applied cleanly."

563 -msgstr "Hunk #%d aplicado limpiamente"

563 +msgstr "Hunk #%d aplicado limpiamente."

564

565 #: apply.c:4563

566 #, c-format

567 msgid "Rejected hunk #%d."

568 -msgstr "hunk #%d rechazado"

568 +msgstr "Hunk #%d rechazado."

569

570 #: apply.c:4673

571 #, c-format

@@ -612,11 +612,11 @@ msgstr[1] ""

612 msgid "Unable to write new index file"

613 msgstr "No es posible escribir el archivo índice"

614

615 -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

616 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

617 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

618 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

619 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

615 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

616 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

617 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

618 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

619 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

620 #: git-add--interactive.perl:197

621 msgid "path"

622 msgstr "ruta"

@@ -629,7 +629,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada"

629 msgid "apply changes matching the given path"

630 msgstr "aplicar cambios que concuerden con la ruta suministrada"

631

632 -#: apply.c:4927 builtin/am.c:2229

632 +#: apply.c:4927 builtin/am.c:2263

633 msgid "num"

634 msgstr "num"

635

@@ -669,81 +669,81 @@ msgstr "aplicar un parche sin tocar el árbol de trabajo"

669 msgid "accept a patch that touches outside the working area"

670 msgstr "aceptar un parche que toca fuera del área de trabajo"

671

672 -#: apply.c:4949

672 +#: apply.c:4950

673 msgid "also apply the patch (use with --stat/--summary/--check)"

674 msgstr "también aplicar el parche ( usar con --stat/--summary/--check"

675

676 -#: apply.c:4951

676 +#: apply.c:4952

677 msgid "attempt three-way merge if a patch does not apply"

678 msgstr "intentar merge de tres-vías si el parche no aplica"

679

680 -#: apply.c:4953

680 +#: apply.c:4954

681 msgid "build a temporary index based on embedded index information"

682 msgstr ""

683 "construir un índice temporal basado en la información del índice incrustado"

684

685 -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

685 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

686 msgid "paths are separated with NUL character"

687 -msgstr "rutas están separadas con un carácter NULL "

687 +msgstr "rutas están separadas con un carácter NULL"

688

689 -#: apply.c:4958

689 +#: apply.c:4959

690 msgid "ensure at least <n> lines of context match"

691 msgstr "asegure que por lo menos <n> líneas del contexto concuerden"

692

693 -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

693 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

694 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

695 -#: builtin/pack-objects.c:3009

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

696 msgid "action"

697 msgstr "acción"

698

699 -#: apply.c:4960

699 +#: apply.c:4961

700 msgid "detect new or modified lines that have whitespace errors"

701 msgstr ""

702 "detectar líneas nuevas o modificadas que contienen errores de espacios en "

703 "blanco"

704

705 -#: apply.c:4963 apply.c:4966

705 +#: apply.c:4964 apply.c:4967

706 msgid "ignore changes in whitespace when finding context"

707 msgstr ""

708 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"

709

710 -#: apply.c:4969

710 +#: apply.c:4970

711 msgid "apply the patch in reverse"

712 msgstr "aplicar el parche en reversa"

713

714 -#: apply.c:4971

714 +#: apply.c:4972

715 msgid "don't expect at least one line of context"

716 msgstr "no espera al menos una línea del contexto"

717

718 -#: apply.c:4973

718 +#: apply.c:4974

719 msgid "leave the rejected hunks in corresponding *.rej files"

720 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"

721

722 -#: apply.c:4975

722 +#: apply.c:4976

723 msgid "allow overlapping hunks"

724 msgstr "permitir solapamiento de hunks"

725

726 -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

727 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

728 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

726 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

727 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

728 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

729 msgid "be verbose"

730 msgstr "ser verboso"

731

732 -#: apply.c:4978

732 +#: apply.c:4979

733 msgid "tolerate incorrectly detected missing new-line at the end of file"

734 msgstr ""

735 "tolerar nuevas líneas faltantes detectadas incorrectamente al final del "

736 "archivo"

737

738 -#: apply.c:4981

738 +#: apply.c:4982

739 msgid "do not trust the line counts in the hunk headers"

740 msgstr "no confiar en el conteo de líneas en los headers del hunk"

741

742 -#: apply.c:4983 builtin/am.c:2217

742 +#: apply.c:4984 builtin/am.c:2251

743 msgid "root"

744 msgstr "raíz"

745

746 -#: apply.c:4984

746 +#: apply.c:4985

747 msgid "prepend <root> to all filenames"

748 msgstr "anteponer <root> a todos los nombres de archivos"

749

@@ -779,7 +779,7 @@ msgstr "fmt"

779 msgid "archive format"

780 msgstr "formato del archivo"

781

782 -#: archive.c:437 builtin/log.c:1459

782 +#: archive.c:437 builtin/log.c:1462

783 msgid "prefix"

784 msgstr "prefijo"

785

@@ -787,11 +787,11 @@ msgstr "prefijo"

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:693 builtin/blame.c:694 builtin/config.c:62

791 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

792 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

790 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

791 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 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:120

794 -#: parse-options.h:153

794 +#: parse-options.h:165

795 msgid "file"

796 msgstr "carpeta"

797

@@ -823,8 +823,8 @@ msgstr "comprimir mejor"

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:106 builtin/clone.c:109

827 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

826 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

827 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

828 msgid "repo"

829 msgstr "repo"

830

@@ -838,11 +838,11 @@ msgstr "comando"

838

839 #: archive.c:461 builtin/archive.c:93

840 msgid "path to the remote git-upload-archive command"

841 -msgstr "ruta para el comando git-upload-archivo remoto "

841 +msgstr "ruta para el comando git-upload-archivo remoto"

842

843 #: archive.c:468

844 msgid "Unexpected option --remote"

845 -msgstr "opción inesperada --remote"

845 +msgstr "Opción inesperada --remote"

846

847 #: archive.c:470

848 msgid "Option --exec can only be used together with --remote"

@@ -875,22 +875,22 @@ msgstr ""

875 "Los patrones negativos son ignorados en los atributos de git\n"

876 "Usa '\\!' para comenzar literalmente con exclamación."

877

878 -#: bisect.c:458

878 +#: bisect.c:460

879 #, c-format

880 msgid "Badly quoted content in file '%s': %s"

881 msgstr "Revisa las comillas en el archivo '%s': %s"

882

883 -#: bisect.c:666

883 +#: bisect.c:668

884 #, c-format

885 msgid "We cannot bisect more!\n"

886 msgstr "No podemos bisecar mas!\n"

887

888 -#: bisect.c:720

888 +#: bisect.c:722

889 #, c-format

890 msgid "Not a valid commit name %s"

891 msgstr "No es un nombre de commit valido %s"

892

893 -#: bisect.c:744

893 +#: bisect.c:746

894 #, c-format

895 msgid ""

896 "The merge base %s is bad.\n"

@@ -899,7 +899,7 @@ msgstr ""

899 "La base de fisión %s esta mal.\n"

900 "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"

901

902 -#: bisect.c:749

902 +#: bisect.c:751

903 #, c-format

904 msgid ""

905 "The merge base %s is new.\n"

@@ -908,7 +908,7 @@ msgstr ""

908 "La base de fisión %s es nueva.\n"

909 "Esta propiedad ha cambiado entre %s y [%s].\n"

910

911 -#: bisect.c:754

911 +#: bisect.c:756

912 #, c-format

913 msgid ""

914 "The merge base %s is %s.\n"

@@ -917,7 +917,7 @@ msgstr ""

917 "La base de fisión %s es %s.\n"

918 "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"

919

920 -#: bisect.c:762

920 +#: bisect.c:764

921 #, c-format

922 msgid ""

923 "Some %s revs are not ancestors of the %s rev.\n"

@@ -928,7 +928,7 @@ msgstr ""

928 "git bisect no puede trabajar bien en este caso.\n"

929 "Tal vez confundió la revisión %s y %s?\n"

930

931 -#: bisect.c:775

931 +#: bisect.c:777

932 #, c-format

933 msgid ""

934 "the merge base between %s and [%s] must be skipped.\n"

@@ -944,31 +944,31 @@ msgstr ""

944 msgid "Bisecting: a merge base must be tested\n"

945 msgstr "Bisectando: una base de fisión debe ser probada\n"

946

947 -#: bisect.c:862

947 +#: bisect.c:850

948 #, c-format

949 msgid "a %s revision is needed"

950 msgstr "una %s revisión es necesaria"

951

952 -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

952 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

953 #, c-format

954 msgid "could not create file '%s'"

955 msgstr "no se pudo crear el archivo '%s'"

956

957 -#: bisect.c:930

957 +#: bisect.c:920

958 #, c-format

959 msgid "could not read file '%s'"

960 msgstr "no se pudo leer el archivo '%s'"

961

962 -#: bisect.c:960

962 +#: bisect.c:950

963 msgid "reading bisect refs failed"

964 msgstr "fallo leer las refs de bisect"

965

966 -#: bisect.c:979

966 +#: bisect.c:969

967 #, c-format

968 msgid "%s was both %s and %s\n"

969 msgstr "%s fue tanto %s como %s\n"

970

971 -#: bisect.c:987

971 +#: bisect.c:977

972 #, c-format

973 msgid ""

974 "No testable commit found.\n"

@@ -977,7 +977,7 @@ msgstr ""

977 "No se encontró commit que se pueda probar.\n"

978 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"

979

980 -#: bisect.c:1006

980 +#: bisect.c:996

981 #, c-format

982 msgid "(roughly %d step)"

983 msgid_plural "(roughly %d steps)"

@@ -987,46 +987,46 @@ msgstr[1] "(aproximadamente %d pasos)"

987 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

988 #. steps)" translation.

989 #.

990 -#: bisect.c:1012

990 +#: bisect.c:1002

991 #, c-format

992 msgid "Bisecting: %d revision left to test after this %s\n"

993 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

994 msgstr[0] "Bisectando: falta %d revisión por probar después de esto %s\n"

995 msgstr[1] "Bisectando: faltan %d revisiones por probar después de esto %s\n"

996

997 -#: blame.c:1757

997 +#: blame.c:1758

998 msgid "--contents and --reverse do not blend well."

999 msgstr "--contents y --reverse no se mezclan bien."

1000

1001 -#: blame.c:1768

1001 +#: blame.c:1769

1002 msgid "cannot use --contents with final commit object name"

1003 msgstr "no se puede usar --contents con el nombre de objeto commit final"

1004

1005 -#: blame.c:1788

1005 +#: blame.c:1789

1006 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:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1011 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1012 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1010 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1011 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1012 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1013 #: builtin/shortlog.c:191

1014 msgid "revision walk setup failed"

1015 msgstr "fallo la configuración del camino de revisión"

1016

1017 -#: blame.c:1815

1017 +#: blame.c:1816

1018 msgid ""

1019 "--reverse --first-parent together require range along first-parent chain"

1020 msgstr ""

1021 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "

1022 "del primer padre"

1023

1024 -#: blame.c:1826

1024 +#: blame.c:1827

1025 #, c-format

1026 msgid "no such path %s in %s"

1027 msgstr "no hay una ruta %s en %s"

1028

1029 -#: blame.c:1837

1029 +#: blame.c:1838

1030 #, c-format

1031 msgid "cannot read blob %s for path %s"

1032 msgstr "no se puede leer el blob %s para la ruta %s"

@@ -1127,7 +1127,7 @@ msgstr "No se puede forzar la actualización de la rama actual."

1127 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1128 msgstr ""

1129 "No se puede configurar el rastreo de información; el punto de partida '%s' "

1130 -"no es una rama"

1130 +"no es una rama."

1131

1132 #: branch.c:235

1133 #, c-format

@@ -1178,7 +1178,7 @@ msgstr "'%s' ya ha sido marcado en '%s'"

1178 #: branch.c:382

1179 #, c-format

1180 msgid "HEAD of working tree %s is not updated"

1181 -msgstr "la HEAD del árbol de trabajo %s no esta actualizada"

1181 +msgstr "HEAD del árbol de trabajo %s no esta actualizada"

1182

1183 #: bundle.c:34

1184 #, c-format

@@ -1190,76 +1190,75 @@ 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:1360 sequencer.c:1807 sequencer.c:2637

1194 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1193 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1194 #, c-format

1195 msgid "could not open '%s'"

1196 msgstr "no se pudo abrir '%s'"

1197

1199 -#: bundle.c:140

1198 +#: bundle.c:139

1199 msgid "Repository lacks these prerequisite commits:"

1200 msgstr "Al repositorio le falta estos commits prerrequisito:"

1201

1203 -#: bundle.c:193

1202 +#: bundle.c:190

1203 #, c-format

1204 msgid "The bundle contains this ref:"

1205 msgid_plural "The bundle contains these %d refs:"

1206 msgstr[0] "El bundle contiene esta referencia:"

1207 msgstr[1] "El bundle contiene estas %d referencias:"

1208

1210 -#: bundle.c:200

1209 +#: bundle.c:197

1210 msgid "The bundle records a complete history."

1211 msgstr "El bundle registra una historia completa."

1212

1214 -#: bundle.c:202

1213 +#: bundle.c:199

1214 #, c-format

1215 msgid "The bundle requires this ref:"

1216 msgid_plural "The bundle requires these %d refs:"

1217 msgstr[0] "El bundle requiere esta referencia:"

1218 msgstr[1] "El bundle requiere estas %d referencias:"

1219

1221 -#: bundle.c:261

1220 +#: bundle.c:258

1221 msgid "Could not spawn pack-objects"

1223 -msgstr "no se pudo engendrar el pack-objetcts"

1222 +msgstr "No se pudo crear los pack-objetcts"

1223

1225 -#: bundle.c:272

1224 +#: bundle.c:269

1225 msgid "pack-objects died"

1226 msgstr "pack-objects murió"

1227

1229 -#: bundle.c:314

1228 +#: bundle.c:311

1229 msgid "rev-list died"

1230 msgstr "rev-list murió"

1231

1233 -#: bundle.c:363

1232 +#: bundle.c:360

1233 #, c-format

1234 msgid "ref '%s' is excluded by the rev-list options"

1235 msgstr "referencia '%s' es excluida por las opciones de rev-list"

1236

1238 -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1237 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1238 #, c-format

1239 msgid "unrecognized argument: %s"

1240 msgstr "argumento no reconocido: %s"

1241

1243 -#: bundle.c:461

1242 +#: bundle.c:458

1243 msgid "Refusing to create empty bundle."

1244 msgstr "Rechazando crear un bundle vacío."

1245

1247 -#: bundle.c:473

1246 +#: bundle.c:470

1247 #, c-format

1248 msgid "cannot create '%s'"

1249 msgstr "no se puede crear '%s'"

1250

1252 -#: bundle.c:501

1251 +#: bundle.c:498

1252 msgid "index-pack died"

1253 msgstr "index-pack murió"

1254

1256 -#: color.c:301

1255 +#: color.c:296

1256 #, c-format

1257 msgid "invalid color value: %.*s"

1258 msgstr "color inválido: %.*s"

1259

1261 -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1262 -#: builtin/am.c:1434 builtin/am.c:2069

1260 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1261 +#: builtin/am.c:1436 builtin/am.c:2072

1262 #, c-format

1263 msgid "could not parse %s"

1264 msgstr "no se puede analizar %s"

@@ -1269,7 +1268,7 @@ msgstr "no se puede analizar %s"

1268 msgid "%s %s is not a commit!"

1269 msgstr "%s %s no es un commit!"

1270

1272 -#: commit.c:1524

1271 +#: commit.c:1506

1272 msgid ""

1273 "Warning: commit message did not conform to UTF-8.\n"

1274 "You may want to amend it after fixing the message, or set the config\n"

@@ -1379,67 +1378,68 @@ msgstr "'%s' para '%s' no es una marca de tiempo válida"

1378 msgid "bad zlib compression level %d"

1379 msgstr "mala compresión zlib en nivel %d"

1380

1382 -#: config.c:1222

1381 +#: config.c:1225

1382 #, c-format

1383 msgid "invalid mode for object creation: %s"

1384 msgstr "modo invalido de creación de objetos: %s"

1385

1387 -#: config.c:1378

1386 +#: config.c:1386

1387 #, c-format

1388 msgid "bad pack compression level %d"

1389 msgstr "mala compresión pack en el nivel %d"

1390

1392 -#: config.c:1574

1391 +#: config.c:1582

1392 msgid "unable to parse command-line config"

1393 msgstr "no es posible analizar la configuración de la línea de comando"

1394

1396 -#: config.c:1906

1395 +#: config.c:1914

1396 msgid "unknown error occurred while reading the configuration files"

1397 msgstr ""

1398 "error desconocido ocurrió mientras se leían los archivos de configuración"

1399

1401 -#: config.c:2093

1400 +#: config.c:2101

1401 #, c-format

1402 msgid "Invalid %s: '%s'"

1403 msgstr "Invalido %s: '%s'"

1404

1406 -#: config.c:2136

1405 +#: config.c:2144

1406 #, c-format

1407 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1408 msgstr ""

1410 -"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"

1409 +"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "

1410 +"defecto"

1411

1412 -#: config.c:2162

1412 +#: config.c:2170

1413 #, c-format

1414 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1415 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"

1416

1417 -#: config.c:2187

1417 +#: config.c:2195

1418 #, c-format

1419 msgid "unable to parse '%s' from command-line config"

1420 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"

1421

1422 -#: config.c:2189

1422 +#: config.c:2197

1423 #, c-format

1424 msgid "bad config variable '%s' in file '%s' at line %d"

1425 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"

1426

1427 -#: config.c:2248

1427 +#: config.c:2256

1428 #, c-format

1429 msgid "%s has multiple values"

1430 msgstr "%s tiene múltiples valores"

1431

1432 -#: config.c:2591 config.c:2808

1432 +#: config.c:2599 config.c:2816

1433 #, c-format

1434 msgid "fstat on %s failed"

1435 msgstr "fstat en %s fallo"

1436

1437 -#: config.c:2698

1437 +#: config.c:2706

1438 #, c-format

1439 msgid "could not set '%s' to '%s'"

1440 msgstr "no se pudo configurar '%s' a '%s'"

1441

1442 -#: config.c:2700 builtin/remote.c:776

1442 +#: config.c:2708 builtin/remote.c:776

1443 #, c-format

1444 msgid "could not unset '%s'"

1445 msgstr "no se pudo desactivar '%s'"

@@ -1460,24 +1460,29 @@ msgstr ""

1460 "Por favor asegúrese que tiene los permisos de acceso correctos\n"

1461 "y que el repositorio existe."

1462

1463 -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1463 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1464 msgid "Checking connectivity"

1465 msgstr "Verificando conectividad"

1466

1467 -#: connected.c:76

1467 +#: connected.c:78

1468 msgid "Could not run 'git rev-list'"

1469 msgstr "No se pudo correr 'git rev-list'"

1470

1471 -#: connected.c:96

1471 +#: connected.c:98

1472 msgid "failed write to rev-list"

1473 msgstr "fallo escribir a rev-list"

1474

1475 -#: connected.c:103

1475 +#: connected.c:105

1476 msgid "failed to close rev-list's stdin"

1477 msgstr "fallo al cerrar la entrada standard de rev-list"

1478

1479 #: convert.c:205

1480 #, c-format

1481 +msgid "CRLF would be replaced by LF in %s."

1482 +msgstr "CRLF será reemplazado por LF en %s."

1483 +

1484 +#: convert.c:207

1485 +#, c-format

1486 msgid ""

1487 "CRLF will be replaced by LF in %s.\n"

1488 "The file will have its original line endings in your working directory."

@@ -1486,12 +1491,12 @@ msgstr ""

1491 "El archivo tendrá sus finales de línea originales en tu directorio de "

1492 "trabajo."

1493

1489 -#: convert.c:209

1494 +#: convert.c:215

1495 #, c-format

1491 -msgid "CRLF would be replaced by LF in %s."

1492 -msgstr "CRLF será remplazado por LF en %s."

1496 +msgid "LF would be replaced by CRLF in %s"

1497 +msgstr "LF será reemplazado por CRLF en %s"

1498

1494 -#: convert.c:215

1499 +#: convert.c:217

1500 #, c-format

1501 msgid ""

1502 "LF will be replaced by CRLF in %s.\n"

@@ -1501,11 +1506,6 @@ msgstr ""

1506 "El archivo tendrá sus finales de línea originales en tu directorio de "

1507 "trabajo."

1508

1504 -#: convert.c:219

1505 -#, c-format

1506 -msgid "LF would be replaced by CRLF in %s"

1507 -msgstr "LF será reemplazado por CRLF en %s"

1508 -

1509 #: date.c:116

1510 msgid "in the future"

1511 msgstr "en el futuro"

@@ -1609,7 +1609,8 @@ msgstr ""

1609 #: diff.c:341

1610 #, c-format

1611 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1612 -msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'"

1612 +msgstr ""

1613 +"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"

1614

1615 #: diff.c:401

1616 #, c-format

@@ -1620,20 +1621,24 @@ msgstr ""

1621 "Errores en la variable de config 'diff.dirstat' encontrados:\n"

1622 "%s"

1623

1623 -#: diff.c:3799

1624 +#: diff.c:3822

1625 #, c-format

1626 msgid "external diff died, stopping at %s"

1627 msgstr "diff externo murió, deteniendo en %s"

1628

1628 -#: diff.c:4127

1629 +#: diff.c:4146

1630 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1631 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"

1632

1632 -#: diff.c:4215

1633 +#: diff.c:4149

1634 +msgid "-G, -S and --find-object are mutually exclusive"

1635 +msgstr "-G, -S y --find-object son mutuamente exclusivas"

1636 +

1637 +#: diff.c:4237

1638 msgid "--follow requires exactly one pathspec"

1639 msgstr "--follow requiere exactamente un pathspec"

1640

1636 -#: diff.c:4381

1641 +#: diff.c:4403

1642 #, c-format

1643 msgid ""

1644 "Failed to parse --dirstat/-X option parameter:\n"

@@ -1642,22 +1647,22 @@ msgstr ""

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

1648 "%s"

1649

1645 -#: diff.c:4395

1650 +#: diff.c:4417

1651 #, c-format

1652 msgid "Failed to parse --submodule option parameter: '%s'"

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

1654

1650 -#: diff.c:5446

1655 +#: diff.c:5493

1656 msgid "inexact rename detection was skipped due to too many files."

1657 msgstr ""

1653 -"detección de cambio de nombre inexacta fue saltada por haber muchos archivos"

1658 +"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."

1659

1655 -#: diff.c:5449

1660 +#: diff.c:5496

1661 msgid "only found copies from modified paths due to too many files."

1662 msgstr ""

1658 -"solo se encontraron copias de rutas modificadas por haber muchos archivos"

1663 +"solo se encontraron copias de rutas modificadas por haber muchos archivos."

1664

1660 -#: diff.c:5452

1665 +#: diff.c:5499

1666 #, c-format

1667 msgid ""

1668 "you may want to set your %s variable to at least %d and retry the command."

@@ -1665,20 +1670,25 @@ msgstr ""

1670 "tal vez quiera configurar la variable %s para por lo menos %d y volver a "

1671 "intentar el comando."

1672

1668 -#: dir.c:2100

1673 +#: dir.c:1866

1674 +#, c-format

1675 +msgid "could not open directory '%s'"

1676 +msgstr "no se pudo abrir el directorio '%s'"

1677 +

1678 +#: dir.c:2108

1679 msgid "failed to get kernel name and information"

1680 msgstr "fallo al conseguir la información y nombre del kernel"

1681

1672 -#: dir.c:2219

1682 +#: dir.c:2232

1683 msgid "Untracked cache is disabled on this system or location."

1674 -msgstr "Untracked cache esta desactivado en este sistema o ubicación"

1684 +msgstr "Untracked cache esta desactivado en este sistema o ubicación."

1685

1676 -#: dir.c:3002 dir.c:3007

1686 +#: dir.c:3024 dir.c:3029

1687 #, c-format

1688 msgid "could not create directories for %s"

1689 msgstr "no se pudo crear directorios para %s"

1690

1681 -#: dir.c:3032

1691 +#: dir.c:3054

1692 #, c-format

1693 msgid "could not migrate git directory from '%s' to '%s'"

1694 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"

@@ -1697,184 +1707,192 @@ msgstr "Filtrando contenido"

1707 msgid "could not stat file '%s'"

1708 msgstr "no se pudo establecer el archivo '%s'"

1709

1700 -#: fetch-pack.c:252

1710 +#: fetch-object.c:17

1711 +msgid "Remote with no URL"

1712 +msgstr "Remoto sin URL"

1713 +

1714 +#: fetch-pack.c:253

1715 msgid "git fetch-pack: expected shallow list"

1716 msgstr "git fetch-pack: lista poco profunda esperada"

1717

1704 -#: fetch-pack.c:264

1705 -msgid "git fetch-pack: expected ACK/NAK, got EOF"

1706 -msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"

1718 +#: fetch-pack.c:265

1719 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1720 +msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"

1721

1708 -#: fetch-pack.c:283 builtin/archive.c:63

1722 +#: fetch-pack.c:284 builtin/archive.c:63

1723 #, c-format

1724 msgid "remote error: %s"

1725 msgstr "error remoto: %s"

1726

1713 -#: fetch-pack.c:284

1727 +#: fetch-pack.c:285

1728 #, c-format

1729 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1730 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"

1731

1718 -#: fetch-pack.c:336

1732 +#: fetch-pack.c:337

1733 msgid "--stateless-rpc requires multi_ack_detailed"

1734 msgstr "--stateless-rpc requiere multi_ack_detailed"

1735

1722 -#: fetch-pack.c:422

1736 +#: fetch-pack.c:428

1737 #, c-format

1738 msgid "invalid shallow line: %s"

1739 msgstr "línea poco profunda invalida: %s"

1740

1727 -#: fetch-pack.c:428

1741 +#: fetch-pack.c:434

1742 #, c-format

1743 msgid "invalid unshallow line: %s"

1744 msgstr "línea superficial inválida: %s"

1745

1732 -#: fetch-pack.c:430

1746 +#: fetch-pack.c:436

1747 #, c-format

1748 msgid "object not found: %s"

1749 msgstr "objeto no encontrado: %s"

1750

1737 -#: fetch-pack.c:433

1751 +#: fetch-pack.c:439

1752 #, c-format

1753 msgid "error in object: %s"

1754 msgstr "error en objeto: %s"

1755

1742 -#: fetch-pack.c:435

1756 +#: fetch-pack.c:441

1757 #, c-format

1758 msgid "no shallow found: %s"

1759 msgstr "superficie no encontrada: %s"

1760

1747 -#: fetch-pack.c:438

1761 +#: fetch-pack.c:444

1762 #, c-format

1763 msgid "expected shallow/unshallow, got %s"

1764 msgstr "se esperaba shallow/unshallow, se obtuvo %s"

1765

1752 -#: fetch-pack.c:477

1766 +#: fetch-pack.c:485

1767 #, c-format

1768 msgid "got %s %d %s"

1769 msgstr "se obtuvo %s %d %s"

1770

1757 -#: fetch-pack.c:491

1771 +#: fetch-pack.c:499

1772 #, c-format

1773 msgid "invalid commit %s"

1774 msgstr "commit inválido %s"

1775

1762 -#: fetch-pack.c:524

1776 +#: fetch-pack.c:532

1777 msgid "giving up"

1778 msgstr "rindiéndose"

1779

1766 -#: fetch-pack.c:534 progress.c:229

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

1781 msgid "done"

1782 msgstr "listo"

1783

1770 -#: fetch-pack.c:546

1784 +#: fetch-pack.c:554

1785 #, c-format

1786 msgid "got %s (%d) %s"

1787 msgstr "se obtuvo %s (%d) %s"

1788

1775 -#: fetch-pack.c:592

1789 +#: fetch-pack.c:600

1790 #, c-format

1791 msgid "Marking %s as complete"

1792 msgstr "Marcando %s como completa"

1793

1780 -#: fetch-pack.c:777

1794 +#: fetch-pack.c:788

1795 #, c-format

1796 msgid "already have %s (%s)"

1797 msgstr "ya se tiene %s (%s)"

1798

1785 -#: fetch-pack.c:815

1799 +#: fetch-pack.c:829

1800 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1801 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"

1802

1789 -#: fetch-pack.c:823

1803 +#: fetch-pack.c:837

1804 msgid "protocol error: bad pack header"

1805 msgstr "error de protocolo: mal paquete de header"

1806

1793 -#: fetch-pack.c:879

1807 +#: fetch-pack.c:895

1808 #, c-format

1809 msgid "fetch-pack: unable to fork off %s"

1810 msgstr "fetch-pack: no se puede quitar %s"

1811

1798 -#: fetch-pack.c:895

1812 +#: fetch-pack.c:911

1813 #, c-format

1814 msgid "%s failed"

1815 msgstr "%s fallo"

1816

1803 -#: fetch-pack.c:897

1817 +#: fetch-pack.c:913

1818 msgid "error in sideband demultiplexer"

1819 msgstr "error en demultiplexor de banda lateral"

1820

1807 -#: fetch-pack.c:924

1821 +#: fetch-pack.c:940

1822 msgid "Server does not support shallow clients"

1823 msgstr "Servidor no soporta clientes superficiales"

1824

1811 -#: fetch-pack.c:928

1825 +#: fetch-pack.c:944

1826 msgid "Server supports multi_ack_detailed"

1827 msgstr "Servidor soporta ulti_ack_detailed"

1828

1815 -#: fetch-pack.c:931

1829 +#: fetch-pack.c:947

1830 msgid "Server supports no-done"

1831 msgstr "Servidor soporta no-done"

1832

1819 -#: fetch-pack.c:937

1833 +#: fetch-pack.c:953

1834 msgid "Server supports multi_ack"

1835 msgstr "Servidor soporta multi_ack"

1836

1823 -#: fetch-pack.c:941

1837 +#: fetch-pack.c:957

1838 msgid "Server supports side-band-64k"

1839 msgstr "Servidor soporta side-band-64k"

1840

1827 -#: fetch-pack.c:945

1841 +#: fetch-pack.c:961

1842 msgid "Server supports side-band"

1843 msgstr "Servidor soporta side-band"

1844

1831 -#: fetch-pack.c:949

1845 +#: fetch-pack.c:965

1846 msgid "Server supports allow-tip-sha1-in-want"

1847 msgstr "Servidor soporta allow-tip-sha1-in-want"

1848

1835 -#: fetch-pack.c:953

1849 +#: fetch-pack.c:969

1850 msgid "Server supports allow-reachable-sha1-in-want"

1851 msgstr "Servidor soporta allow-reachable-sha1-in-want"

1852

1839 -#: fetch-pack.c:963

1853 +#: fetch-pack.c:979

1854 msgid "Server supports ofs-delta"

1855 msgstr "Servidor soporta ofs-delta"

1856

1843 -#: fetch-pack.c:970

1857 +#: fetch-pack.c:985

1858 +msgid "Server supports filter"

1859 +msgstr "Servidor soporta filtro"

1860 +

1861 +#: fetch-pack.c:993

1862 #, c-format

1863 msgid "Server version is %.*s"

1864 msgstr "Versión de servidor es %.*s"

1865

1848 -#: fetch-pack.c:976

1866 +#: fetch-pack.c:999

1867 msgid "Server does not support --shallow-since"

1868 msgstr "Servidor no soporta --shalow-since"

1869

1852 -#: fetch-pack.c:980

1870 +#: fetch-pack.c:1003

1871 msgid "Server does not support --shallow-exclude"

1872 msgstr "Servidor no soporta --shalow-exclude"

1873

1856 -#: fetch-pack.c:982

1874 +#: fetch-pack.c:1005

1875 msgid "Server does not support --deepen"

1876 msgstr "Servidor no soporta --deepen"

1877

1860 -#: fetch-pack.c:993

1878 +#: fetch-pack.c:1016

1879 msgid "no common commits"

1880 msgstr "no hay commits comunes"

1881

1864 -#: fetch-pack.c:1005

1882 +#: fetch-pack.c:1028

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

1866 -msgstr "git fetch-pack: fetch fallo"

1884 +msgstr "git fetch-pack: fetch fallo."

1885

1868 -#: fetch-pack.c:1167

1886 +#: fetch-pack.c:1190

1887 msgid "no matching remote head"

1888 msgstr "no concuerda el head remoto"

1889

1872 -#: fetch-pack.c:1189

1890 +#: fetch-pack.c:1212

1891 #, c-format

1892 msgid "no such remote ref %s"

1893 msgstr "no existe ref remota %s"

1894

1877 -#: fetch-pack.c:1192

1895 +#: fetch-pack.c:1215

1896 #, c-format

1897 msgid "Server does not allow request for unadvertised object %s"

1898 msgstr "Servidor no permite solicitudes de objetos inadvertidos %s"

@@ -1897,17 +1915,18 @@ msgstr "fallo al escribir la firma separada para '%s'"

1915 msgid "ignore invalid color '%.*s' in log.graphColors"

1916 msgstr "ignora color invalido '%.*s' en log.graphColors"

1917

1900 -#: grep.c:2017

1918 +#: grep.c:2022

1919 #, c-format

1920 msgid "'%s': unable to read %s"

1921 msgstr "'%s': no es posible leer %s"

1922

1905 -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1923 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

1924 +#: builtin/rm.c:134

1925 #, c-format

1926 msgid "failed to stat '%s'"

1927 msgstr "fallo al marcar '%s'"

1928

1910 -#: grep.c:2045

1929 +#: grep.c:2050

1930 #, c-format

1931 msgid "'%s': short read"

1932 msgstr "'%s': lectura corta"

@@ -1936,7 +1955,7 @@ msgstr ""

1955

1956 #: help.c:336

1957 msgid "Uh oh. Your system reports no Git commands at all."

1939 -msgstr "Oh oh. Tu sistema no reporta ningún comando de Git"

1958 +msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."

1959

1960 #: help.c:358

1961 #, c-format

@@ -2049,19 +2068,18 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

2068 msgid "name consists only of disallowed characters: %s"

2069 msgstr "el nombre consiste solo de caracteres no permitidos: %s"

2070

2052 -#: ident.c:416 builtin/commit.c:616

2071 +#: ident.c:416 builtin/commit.c:582

2072 #, c-format

2073 msgid "invalid date format: %s"

2074 msgstr "formato de fecha invalido: %s"

2075

2057 -#: list-objects-filter-options.c:30

2058 -msgid "multiple object filter types cannot be combined"

2059 -msgstr "no se pueden combinar múltiples tipos de objeto filtro"

2076 +#: list-objects-filter-options.c:36

2077 +msgid "multiple filter-specs cannot be combined"

2078 +msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"

2079

2061 -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2062 -#, c-format

2063 -msgid "invalid filter-spec expression '%s'"

2064 -msgstr "expresión filter-spec inválida '%s'"

2080 +#: list-objects-filter-options.c:126

2081 +msgid "cannot change partial clone promisor remote"

2082 +msgstr "no se puede cambiar un clon parcial remoto promisor"

2083

2084 #: lockfile.c:151

2085 #, c-format

@@ -2092,8 +2110,8 @@ msgstr "No se pudo crear '%s.lock': %s"

2110 msgid "failed to read the cache"

2111 msgstr "fallo al leer la cache"

2112

2095 -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2096 -#: builtin/checkout.c:600 builtin/clone.c:754

2113 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2114 +#: builtin/checkout.c:599 builtin/clone.c:759

2115 msgid "unable to write new index file"

2116 msgstr "no es posible escribir el archivo índice"

2117

@@ -2110,78 +2128,78 @@ msgstr "addinfo_cache fallo para la ruta '%s'"

2128 msgid "error building trees"

2129 msgstr "error construyendo árboles"

2130

2113 -#: merge-recursive.c:752

2131 +#: merge-recursive.c:771

2132 #, c-format

2133 msgid "failed to create path '%s'%s"

2134 msgstr "fallo al crear la ruta '%s'%s"

2135

2118 -#: merge-recursive.c:763

2136 +#: merge-recursive.c:782

2137 #, c-format

2138 msgid "Removing %s to make room for subdirectory\n"

2139 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"

2140

2123 -#: merge-recursive.c:777 merge-recursive.c:796

2141 +#: merge-recursive.c:796 merge-recursive.c:815

2142 msgid ": perhaps a D/F conflict?"

2143 msgstr ": tal vez un conflicto D/F?"

2144

2127 -#: merge-recursive.c:786

2145 +#: merge-recursive.c:805

2146 #, c-format

2147 msgid "refusing to lose untracked file at '%s'"

2148 msgstr "rehusando perder el archivo rastreado en '%s'"

2149

2132 -#: merge-recursive.c:828 builtin/cat-file.c:37

2150 +#: merge-recursive.c:847 builtin/cat-file.c:37

2151 #, c-format

2152 msgid "cannot read object %s '%s'"

2153 msgstr "no se puede leer el objeto %s '%s'"

2154

2137 -#: merge-recursive.c:830

2155 +#: merge-recursive.c:849

2156 #, c-format

2157 msgid "blob expected for %s '%s'"

2158 msgstr "se esperaba blob para %s '%s'"

2159

2142 -#: merge-recursive.c:854

2160 +#: merge-recursive.c:873

2161 #, c-format

2162 msgid "failed to open '%s': %s"

2163 msgstr "fallo al abrir '%s': %s"

2164

2147 -#: merge-recursive.c:865

2165 +#: merge-recursive.c:884

2166 #, c-format

2167 msgid "failed to symlink '%s': %s"

2168 msgstr "fallo al crear el enlace simbólico '%s': %s"

2169

2152 -#: merge-recursive.c:870

2170 +#: merge-recursive.c:889

2171 #, c-format

2172 msgid "do not know what to do with %06o %s '%s'"

2173 msgstr "no se que hacer con %06o %s '%s'"

2174

2157 -#: merge-recursive.c:1010

2175 +#: merge-recursive.c:1029

2176 msgid "Failed to execute internal merge"

2177 msgstr "Fallo al ejecutar la fusión interna"

2178

2161 -#: merge-recursive.c:1014

2179 +#: merge-recursive.c:1034

2180 #, c-format

2181 msgid "Unable to add %s to database"

2182 msgstr "No es posible agregar %s a la base de datos"

2183

2166 -#: merge-recursive.c:1117

2184 +#: merge-recursive.c:1146

2185 #, c-format

2186 msgid ""

2187 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2188 "in tree."

2189 msgstr ""

2190 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "

2173 -"en el árbol"

2191 +"en el árbol."

2192

2175 -#: merge-recursive.c:1122

2193 +#: merge-recursive.c:1151

2194 #, c-format

2195 msgid ""

2196 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2197 "left in tree."

2198 msgstr ""

2199 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

2182 -"permanece en el árbol"

2200 +"permanece en el árbol."

2201

2184 -#: merge-recursive.c:1129

2202 +#: merge-recursive.c:1158

2203 #, c-format

2204 msgid ""

2205 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2190,7 +2208,7 @@ msgstr ""

2208 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "

2209 "dejada en el árbol, en %s."

2210

2193 -#: merge-recursive.c:1134

2211 +#: merge-recursive.c:1163

2212 #, c-format

2213 msgid ""

2214 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2199,20 +2217,20 @@ msgstr ""

2217 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

2218 "permanece en el árbol en %s."

2219

2202 -#: merge-recursive.c:1168

2220 +#: merge-recursive.c:1197

2221 msgid "rename"

2222 msgstr "renombrar"

2223

2206 -#: merge-recursive.c:1168

2224 +#: merge-recursive.c:1197

2225 msgid "renamed"

2226 msgstr "renombrado"

2227

2210 -#: merge-recursive.c:1225

2228 +#: merge-recursive.c:1254

2229 #, c-format

2230 msgid "%s is a directory in %s adding as %s instead"

2231 msgstr "%s es un directorio en %s agregando como %s más bien"

2232

2215 -#: merge-recursive.c:1250

2233 +#: merge-recursive.c:1279

2234 #, c-format

2235 msgid ""

2236 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2221,143 +2239,143 @@ msgstr ""

2239 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "

2240 "renombrar \"%s\"->\"%s\" en \"%s\"%s"

2241

2224 -#: merge-recursive.c:1255

2242 +#: merge-recursive.c:1284

2243 msgid " (left unresolved)"

2244 msgstr " (dejado sin resolver)"

2245

2228 -#: merge-recursive.c:1317

2246 +#: merge-recursive.c:1346

2247 #, c-format

2248 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2249 msgstr ""

2250 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

2251 "%s"

2252

2235 -#: merge-recursive.c:1350

2253 +#: merge-recursive.c:1379

2254 #, c-format

2255 msgid "Renaming %s to %s and %s to %s instead"

2256 msgstr "Renombrando %s a %s y %s a %s más bien"

2257

2240 -#: merge-recursive.c:1553

2258 +#: merge-recursive.c:1582

2259 #, c-format

2260 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2261 msgstr ""

2262 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"

2263

2246 -#: merge-recursive.c:1568

2264 +#: merge-recursive.c:1597

2265 #, c-format

2266 msgid "Adding merged %s"

2267 msgstr "Agregar %s fusionado"

2268

2251 -#: merge-recursive.c:1575 merge-recursive.c:1805

2269 +#: merge-recursive.c:1604 merge-recursive.c:1834

2270 #, c-format

2271 msgid "Adding as %s instead"

2272 msgstr "Agregando más bien como %s"

2273

2256 -#: merge-recursive.c:1632

2274 +#: merge-recursive.c:1661

2275 #, c-format

2276 msgid "cannot read object %s"

2277 msgstr "no se pudo leer el objeto %s"

2278

2261 -#: merge-recursive.c:1635

2279 +#: merge-recursive.c:1664

2280 #, c-format

2281 msgid "object %s is not a blob"

2282 msgstr "objeto %s no es un blob"

2283

2266 -#: merge-recursive.c:1704

2284 +#: merge-recursive.c:1733

2285 msgid "modify"

2286 msgstr "modificar"

2287

2270 -#: merge-recursive.c:1704

2288 +#: merge-recursive.c:1733

2289 msgid "modified"

2290 msgstr "modificado"

2291

2274 -#: merge-recursive.c:1714

2292 +#: merge-recursive.c:1743

2293 msgid "content"

2294 msgstr "contenido"

2295

2278 -#: merge-recursive.c:1721

2296 +#: merge-recursive.c:1750

2297 msgid "add/add"

2298 msgstr "agregar/agregar"

2299

2282 -#: merge-recursive.c:1757

2300 +#: merge-recursive.c:1786

2301 #, c-format

2302 msgid "Skipped %s (merged same as existing)"

2303 msgstr "Saltado %s (fusionado como existente)"

2304

2287 -#: merge-recursive.c:1771

2305 +#: merge-recursive.c:1800

2306 #, c-format

2307 msgid "Auto-merging %s"

2308 msgstr "Auto-fusionando %s"

2309

2292 -#: merge-recursive.c:1775 git-submodule.sh:932

2310 +#: merge-recursive.c:1804 git-submodule.sh:879

2311 msgid "submodule"

2312 msgstr "submódulo"

2313

2296 -#: merge-recursive.c:1776

2314 +#: merge-recursive.c:1805

2315 #, c-format

2316 msgid "CONFLICT (%s): Merge conflict in %s"

2317 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

2318

2301 -#: merge-recursive.c:1870

2319 +#: merge-recursive.c:1899

2320 #, c-format

2321 msgid "Removing %s"

2322 msgstr "Eliminando %s"

2323

2306 -#: merge-recursive.c:1896

2324 +#: merge-recursive.c:1925

2325 msgid "file/directory"

2326 msgstr "archivo/directorio"

2327

2310 -#: merge-recursive.c:1902

2328 +#: merge-recursive.c:1931

2329 msgid "directory/file"

2330 msgstr "directorio/archivo"

2331

2314 -#: merge-recursive.c:1909

2332 +#: merge-recursive.c:1938

2333 #, c-format

2334 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2335 msgstr ""

2336 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "

2337 "%s"

2338

2321 -#: merge-recursive.c:1918

2339 +#: merge-recursive.c:1947

2340 #, c-format

2341 msgid "Adding %s"

2342 msgstr "Agregando %s"

2343

2326 -#: merge-recursive.c:1958

2344 +#: merge-recursive.c:1987

2345 #, c-format

2346 msgid "Dirty index: cannot merge (dirty: %s)"

2347 msgstr "Índice sucio: no se puede fusionar (sucio: %s)"

2348

2331 -#: merge-recursive.c:1962

2349 +#: merge-recursive.c:1991

2350 msgid "Already up to date!"

2351 msgstr "¡Ya está actualizado!"

2352

2335 -#: merge-recursive.c:1971

2353 +#: merge-recursive.c:2000

2354 #, c-format

2355 msgid "merging of trees %s and %s failed"

2356 msgstr "falló la fusión de los árboles %s y %s"

2357

2340 -#: merge-recursive.c:2068

2358 +#: merge-recursive.c:2097

2359 msgid "Merging:"

2360 msgstr "Fusionando:"

2361

2344 -#: merge-recursive.c:2081

2362 +#: merge-recursive.c:2110

2363 #, c-format

2364 msgid "found %u common ancestor:"

2365 msgid_plural "found %u common ancestors:"

2366 msgstr[0] "se encontró %u ancestro común:"

2367 msgstr[1] "se encontraron %u ancestros comunes:"

2368

2351 -#: merge-recursive.c:2120

2369 +#: merge-recursive.c:2149

2370 msgid "merge returned no commit"

2371 msgstr "la fusión no devolvió ningún commit"

2372

2355 -#: merge-recursive.c:2183

2373 +#: merge-recursive.c:2212

2374 #, c-format

2375 msgid "Could not parse object '%s'"

2376 msgstr "No se pudo analizar el objeto '%s'"

2377

2360 -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2378 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2379 msgid "Unable to write index."

2380 msgstr "Incapaz de escribir el índice."

2381

@@ -2378,18 +2396,18 @@ msgstr ""

2396 msgid "You have not concluded your notes merge (%s exists)."

2397 msgstr "No has terminado tus notas de fusión (%s existe)."

2398

2381 -#: notes-utils.c:42

2399 +#: notes-utils.c:43

2400 msgid "Cannot commit uninitialized/unreferenced notes tree"

2401 msgstr ""

2402 "No se puede realizar commit, notas del árbol no inicializadas o no "

2385 -"referenciadas."

2403 +"referenciadas"

2404

2387 -#: notes-utils.c:101

2405 +#: notes-utils.c:102

2406 #, c-format

2407 msgid "Bad notes.rewriteMode value: '%s'"

2408 msgstr "Mal valor para notes.rewriteMode: '%s'"

2409

2392 -#: notes-utils.c:111

2410 +#: notes-utils.c:112

2411 #, c-format

2412 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2413 msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

@@ -2398,7 +2416,7 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

2416 #. the environment variable, the second %s is

2417 #. its value.

2418 #.

2401 -#: notes-utils.c:141

2419 +#: notes-utils.c:142

2420 #, c-format

2421 msgid "Bad %s value: '%s'"

2422 msgstr "Mal valor para %s: '%s'"

@@ -2408,27 +2426,27 @@ msgstr "Mal valor para %s: '%s'"

2426 msgid "unable to parse object: %s"

2427 msgstr "incapaz de analizar objeto: %s"

2428

2411 -#: packfile.c:556

2429 +#: packfile.c:561

2430 msgid "offset before end of packfile (broken .idx?)"

2431 msgstr "offset antes del final del paquete (broken .idx?)"

2432

2415 -#: packfile.c:1683

2433 +#: packfile.c:1694

2434 #, c-format

2435 msgid "offset before start of pack index for %s (corrupt index?)"

2436 msgstr ""

2437 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"

2438

2421 -#: packfile.c:1687

2439 +#: packfile.c:1698

2440 #, c-format

2441 msgid "offset beyond end of pack index for %s (truncated index?)"

2442 msgstr ""

2443 "offset más allá del índice de fin de paquete para %s (índice truncado?)"

2444

2427 -#: parse-options.c:573

2445 +#: parse-options.c:619

2446 msgid "..."

2447 msgstr "..."

2448

2431 -#: parse-options.c:592

2449 +#: parse-options.c:638

2450 #, c-format

2451 msgid "usage: %s"

2452 msgstr "uso: %s"

@@ -2436,17 +2454,17 @@ msgstr "uso: %s"

2454 #. TRANSLATORS: the colon here should align with the

2455 #. one in "usage: %s" translation.

2456 #.

2439 -#: parse-options.c:598

2457 +#: parse-options.c:644

2458 #, c-format

2459 msgid " or: %s"

2460 msgstr " o: %s"

2461

2444 -#: parse-options.c:601

2462 +#: parse-options.c:647

2463 #, c-format

2464 msgid " %s"

2465 msgstr " %s"

2466

2449 -#: parse-options.c:640

2467 +#: parse-options.c:686

2468 msgid "-NUM"

2469 msgstr "-NUM"

2470

@@ -2481,7 +2499,7 @@ msgstr "nombre de atributo %s invalido"

2499 #: pathspec.c:258

2500 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2501 msgstr ""

2484 -"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles "

2502 +"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"

2503

2504 #: pathspec.c:265

2505 msgid ""

@@ -2498,7 +2516,7 @@ msgstr "parámetro no válido para el prefijo 'magic pathspec'"

2516 #: pathspec.c:326

2517 #, c-format

2518 msgid "Invalid pathspec magic '%.*s' in '%s'"

2501 -msgstr "magic pathspec invalido '%.*s' en '%s'"

2519 +msgstr "Magic pathspec inválido '%.*s' en '%s'"

2520

2521 #: pathspec.c:331

2522 #, c-format

@@ -2508,7 +2526,7 @@ msgstr "Falta ')' al final del magic pathspec en '%s'"

2526 #: pathspec.c:369

2527 #, c-format

2528 msgid "Unimplemented pathspec magic '%c' in '%s'"

2511 -msgstr "Magic pathspec '%c' en '%s' no implementado"

2529 +msgstr "Magic pathspec '%c' no implementado en '%s'"

2530

2531 #: pathspec.c:428

2532 #, c-format

@@ -2539,7 +2557,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

2557 msgid "unable to parse --pretty format"

2558 msgstr "incapaz de analizar el formato --pretty"

2559

2542 -#: read-cache.c:1472

2560 +#: read-cache.c:1473

2561 #, c-format

2562 msgid ""

2563 "index.version set, but the value is invalid.\n"

@@ -2548,7 +2566,7 @@ msgstr ""

2566 "index.version configurado, pero el valor no es válido.\n"

2567 "Usando versión %i"

2568

2551 -#: read-cache.c:1482

2569 +#: read-cache.c:1483

2570 #, c-format

2571 msgid ""

2572 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2557,22 +2575,22 @@ msgstr ""

2575 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"

2576 "Usando versión %i"

2577

2560 -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2578 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2579 #, c-format

2580 msgid "could not close '%s'"

2581 msgstr "no se pudo cerrar '%s'"

2582

2565 -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2583 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2584 #, c-format

2585 msgid "could not stat '%s'"

2586 msgstr "no se pudo definir '%s'"

2587

2570 -#: read-cache.c:2455

2588 +#: read-cache.c:2461

2589 #, c-format

2590 msgid "unable to open git dir: %s"

2591 msgstr "no es posible abrir el directorio de git: %s"

2592

2575 -#: read-cache.c:2467

2593 +#: read-cache.c:2473

2594 #, c-format

2595 msgid "unable to unlink: %s"

2596 msgstr "no es posible remover el vinculo: %s"

@@ -2591,18 +2609,18 @@ msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

2609 msgid "could not remove reference %s"

2610 msgstr "no se pudo remover la referencia %s"

2611

2594 -#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2595 -#: refs/packed-backend.c:1534

2612 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2613 +#: refs/packed-backend.c:1538

2614 #, c-format

2615 msgid "could not delete reference %s: %s"

2616 msgstr "no se pudo eliminar la referencia %s: %s"

2617

2600 -#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2618 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2619 #, c-format

2620 msgid "could not delete references: %s"

2621 msgstr "no se pudo eliminar la referencia: %s"

2622

2605 -#: ref-filter.c:35 wt-status.c:1816

2623 +#: ref-filter.c:35 wt-status.c:1842

2624 msgid "gone"

2625 msgstr "desaparecido"

2626

@@ -2634,12 +2652,12 @@ msgstr "color no reconocido: %%(color:%s)"

2652 #: ref-filter.c:129

2653 #, c-format

2654 msgid "Integer value expected refname:lstrip=%s"

2637 -msgstr "valor entero esperado refname:lstrip=%s"

2655 +msgstr "Valor entero esperado refname:lstrip=%s"

2656

2657 #: ref-filter.c:133

2658 #, c-format

2659 msgid "Integer value expected refname:rstrip=%s"

2642 -msgstr "valor entero esperado refname:rstrip=%s"

2660 +msgstr "Valor entero esperado refname:rstrip=%s"

2661

2662 #: ref-filter.c:135

2663 #, c-format

@@ -2749,7 +2767,7 @@ msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

2767 #: ref-filter.c:639

2768 #, c-format

2769 msgid "format: %%(else) atom used without a %%(then) atom"

2752 -msgstr "formato: átomo %%(else) usado sin un átomo %%(then) "

2770 +msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"

2771

2772 #: ref-filter.c:641

2773 #, c-format

@@ -2796,129 +2814,139 @@ msgstr "(HEAD desacoplado de %s)"

2814 msgid "(no branch)"

2815 msgstr "(sin rama)"

2816

2799 -#: ref-filter.c:1488 ref-filter.c:1519

2817 +#: ref-filter.c:1364

2818 #, c-format

2819 msgid "missing object %s for %s"

2820 msgstr "falta objeto %s para %s"

2821

2804 -#: ref-filter.c:1491 ref-filter.c:1522

2822 +#: ref-filter.c:1367

2823 #, c-format

2824 msgid "parse_object_buffer failed on %s for %s"

2825 msgstr "parse_object_buffer falló en %s para %s"

2826

2809 -#: ref-filter.c:1822

2827 +#: ref-filter.c:1819

2828 #, c-format

2829 msgid "malformed object at '%s'"

2830 msgstr "objeto mal formado en '%s'"

2831

2814 -#: ref-filter.c:1889

2832 +#: ref-filter.c:1886

2833 #, c-format

2834 msgid "ignoring ref with broken name %s"

2835 msgstr "ignorando referencia con nombre roto %s"

2836

2819 -#: ref-filter.c:1894

2837 +#: ref-filter.c:1891

2838 #, c-format

2839 msgid "ignoring broken ref %s"

2840 msgstr "ignorando referencia rota %s"

2841

2824 -#: ref-filter.c:2156

2842 +#: ref-filter.c:2152

2843 #, c-format

2844 msgid "format: %%(end) atom missing"

2845 msgstr "formato: falta átomo %%(end)"

2846

2829 -#: ref-filter.c:2250

2847 +#: ref-filter.c:2246

2848 #, c-format

2849 msgid "malformed object name %s"

2850 msgstr "nombre de objeto mal formado %s"

2851

2834 -#: remote.c:780

2852 +#: remote.c:795

2853 #, c-format

2854 msgid "Cannot fetch both %s and %s to %s"

2855 msgstr "No se pueden traer ambos %s y %s a %s"

2856

2839 -#: remote.c:784

2857 +#: remote.c:799

2858 #, c-format

2859 msgid "%s usually tracks %s, not %s"

2860 msgstr "%s por lo general hace seguimiento a %s, no a %s"

2861

2844 -#: remote.c:788

2862 +#: remote.c:803

2863 #, c-format

2864 msgid "%s tracks both %s and %s"

2865 msgstr "%s hace seguimiento tanto a %s como a %s"

2866

2849 -#: remote.c:796

2867 +#: remote.c:811

2868 msgid "Internal error"

2869 msgstr "Error interno"

2870

2853 -#: remote.c:1711 remote.c:1813

2871 +#: remote.c:1726 remote.c:1828

2872 msgid "HEAD does not point to a branch"

2873 msgstr "HEAD no apunta a ninguna rama"

2874

2857 -#: remote.c:1720

2875 +#: remote.c:1735

2876 #, c-format

2877 msgid "no such branch: '%s'"

2878 msgstr "no existe tal rama: '%s'"

2879

2862 -#: remote.c:1723

2880 +#: remote.c:1738

2881 #, c-format

2882 msgid "no upstream configured for branch '%s'"

2883 msgstr "no se ha configurado upstream para la rama '%s'"

2884

2867 -#: remote.c:1729

2885 +#: remote.c:1744

2886 #, c-format

2887 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2888 msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"

2889

2872 -#: remote.c:1744

2890 +#: remote.c:1759

2891 #, c-format

2892 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2893 msgstr ""

2894 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"

2895

2878 -#: remote.c:1756

2896 +#: remote.c:1771

2897 #, c-format

2898 msgid "branch '%s' has no remote for pushing"

2899 msgstr "la rama '%s' no tiene remoto para enviar"

2900

2883 -#: remote.c:1767

2901 +#: remote.c:1782

2902 #, c-format

2903 msgid "push refspecs for '%s' do not include '%s'"

2904 msgstr "refspecs del push para '%s' no incluyen '%s'"

2905

2888 -#: remote.c:1780

2906 +#: remote.c:1795

2907 msgid "push has no destination (push.default is 'nothing')"

2908 msgstr "push no tiene destino (push.default es 'nada')"

2909

2892 -#: remote.c:1802

2910 +#: remote.c:1817

2911 msgid "cannot resolve 'simple' push to a single destination"

2912 msgstr "no se puede resolver push 'simple' para un destino único"

2913

2896 -#: remote.c:2106

2914 +#: remote.c:2132

2915 #, c-format

2916 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2899 -msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n"

2917 +msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n"

2918

2901 -#: remote.c:2110

2919 +#: remote.c:2136

2920 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2921 msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"

2922

2905 -#: remote.c:2113

2923 +#: remote.c:2139

2924 #, c-format

2925 msgid "Your branch is up to date with '%s'.\n"

2926 msgstr "Tu rama está actualizada con '%s'.\n"

2927

2910 -#: remote.c:2117

2928 +#: remote.c:2143

2929 +#, c-format

2930 +msgid "Your branch and '%s' refer to different commits.\n"

2931 +msgstr "Tu rama y '%s' refieren a commits diferentes.\n"

2932 +

2933 +#: remote.c:2146

2934 +#, c-format

2935 +msgid " (use \"%s\" for details)\n"

2936 +msgstr " (usa \"%s\" para detalles)\n"

2937 +

2938 +#: remote.c:2150

2939 #, c-format

2940 msgid "Your branch is ahead of '%s' by %d commit.\n"

2941 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2942 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"

2943 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"

2944

2917 -#: remote.c:2123

2945 +#: remote.c:2156

2946 msgid " (use \"git push\" to publish your local commits)\n"

2947 msgstr " (usa \"git push\" para publicar tus commits locales)\n"

2948

2921 -#: remote.c:2126

2949 +#: remote.c:2159

2950 #, c-format

2951 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2952 msgid_plural ""

@@ -2928,11 +2956,11 @@ msgstr[0] ""

2956 msgstr[1] ""

2957 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"

2958

2931 -#: remote.c:2134

2959 +#: remote.c:2167

2960 msgid " (use \"git pull\" to update your local branch)\n"

2961 msgstr " (usa \"git pull\" para actualizar tu rama local)\n"

2962

2935 -#: remote.c:2137

2963 +#: remote.c:2170

2964 #, c-format

2965 msgid ""

2966 "Your branch and '%s' have diverged,\n"

@@ -2947,28 +2975,28 @@ msgstr[1] ""

2975 "Tu rama y '%s' han divergido,\n"

2976 "y tienen %d y %d commits diferentes cada una respectivamente.\n"

2977

2950 -#: remote.c:2147

2978 +#: remote.c:2180

2979 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2980 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

2981

2954 -#: revision.c:2268

2982 +#: revision.c:2277

2983 msgid "your current branch appears to be broken"

2984 msgstr "tu rama actual parece estar rota"

2985

2958 -#: revision.c:2271

2986 +#: revision.c:2280

2987 #, c-format

2988 msgid "your current branch '%s' does not have any commits yet"

2989 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

2990

2963 -#: revision.c:2465

2991 +#: revision.c:2477

2992 msgid "--first-parent is incompatible with --bisect"

2993 msgstr "--first-parent es incompatible con --bisect"

2994

2967 -#: run-command.c:645

2995 +#: run-command.c:731

2996 msgid "open /dev/null failed"

2997 msgstr "falló al abrir /dev/null"

2998

2971 -#: run-command.c:1188

2999 +#: run-command.c:1274

3000 #, c-format

3001 msgid ""

3002 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -2979,24 +3007,29 @@ msgstr ""

3007 "false`."

3008

3009 #: send-pack.c:141

3010 +msgid "unexpected flush packet while reading remote unpack status"

3011 +msgstr ""

3012 +"flush packet inesperado mientras se leía estatus de desempaquetado remoto"

3013 +

3014 +#: send-pack.c:143

3015 #, c-format

3016 msgid "unable to parse remote unpack status: %s"

3017 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"

3018

2986 -#: send-pack.c:143

3019 +#: send-pack.c:145

3020 #, c-format

3021 msgid "remote unpack failed: %s"

3022 msgstr "desempaquetado remoto falló: %s"

3023

2991 -#: send-pack.c:306

3024 +#: send-pack.c:308

3025 msgid "failed to sign the push certificate"

3026 msgstr "falló al firmar el certificado de push"

3027

2995 -#: send-pack.c:419

3028 +#: send-pack.c:421

3029 msgid "the receiving end does not support --signed push"

3030 msgstr "el final receptor no soporta --signed push"

3031

2999 -#: send-pack.c:421

3032 +#: send-pack.c:423

3033 msgid ""

3034 "not sending a push certificate since the receiving end does not support --"

3035 "signed push"

@@ -3004,32 +3037,37 @@ msgstr ""

3037 "no se manda un certificado de push ya que el destino no soporta push firmado "

3038 "(--signed )"

3039

3007 -#: send-pack.c:433

3040 +#: send-pack.c:435

3041 msgid "the receiving end does not support --atomic push"

3042 msgstr "el destino no soporta push atómicos (--atomic)"

3043

3011 -#: send-pack.c:438

3044 +#: send-pack.c:440

3045 msgid "the receiving end does not support push options"

3046 msgstr "el destino no soporta opciones de push"

3047

3015 -#: sequencer.c:218

3048 +#: sequencer.c:158

3049 +#, c-format

3050 +msgid "invalid commit message cleanup mode '%s'"

3051 +msgstr "mensaje de commit inválido, modo cleanup '%s'"

3052 +

3053 +#: sequencer.c:267

3054 msgid "revert"

3055 msgstr "revertir"

3056

3019 -#: sequencer.c:220

3057 +#: sequencer.c:269

3058 msgid "cherry-pick"

3059 msgstr "cherry-pick"

3060

3023 -#: sequencer.c:222

3061 +#: sequencer.c:271

3062 msgid "rebase -i"

3063 msgstr "rebase -i"

3064

3027 -#: sequencer.c:224

3065 +#: sequencer.c:273

3066 #, c-format

3067 msgid "Unknown action: %d"

3068 msgstr "Acción desconocida: %d"

3069

3032 -#: sequencer.c:281

3070 +#: sequencer.c:330

3071 msgid ""

3072 "after resolving the conflicts, mark the corrected paths\n"

3073 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3037,7 +3075,7 @@ msgstr ""

3075 "después de resolver los conflictos, marca las rutas corregidas\n"

3076 "con 'git add <rutas>' o 'git rm <rutas>'"

3077

3040 -#: sequencer.c:284

3078 +#: sequencer.c:333

3079 msgid ""

3080 "after resolving the conflicts, mark the corrected paths\n"

3081 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3047,43 +3085,43 @@ msgstr ""

3085 "con 'git add <rutas>' o 'git rm <rutas>'\n"

3086 "y haz un commit del resultado con 'git commit'"

3087

3050 -#: sequencer.c:297 sequencer.c:1718

3088 +#: sequencer.c:346 sequencer.c:2245

3089 #, c-format

3090 msgid "could not lock '%s'"

3053 -msgstr "No se pudo bloquear '%s'"

3091 +msgstr "no se pudo bloquear '%s'"

3092

3055 -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3056 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3093 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3094 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3095 #, c-format

3096 msgid "could not write to '%s'"

3059 -msgstr "No se pudo escribir en '%s'"

3097 +msgstr "no se pudo escribir en '%s'"

3098

3061 -#: sequencer.c:304

3099 +#: sequencer.c:353

3100 #, c-format

3101 msgid "could not write eol to '%s'"

3064 -msgstr "No se pudo escribir EOL en '%s'"

3102 +msgstr "no se pudo escribir EOL en '%s'"

3103

3066 -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3104 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3105 #, c-format

3068 -msgid "failed to finalize '%s'."

3069 -msgstr "Fallo al finalizar '%s'."

3106 +msgid "failed to finalize '%s'"

3107 +msgstr "falló al finalizar '%s'"

3108

3071 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

3072 -#: builtin/commit.c:754 builtin/merge.c:1046

3109 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3110 +#: builtin/commit.c:722 builtin/merge.c:1047

3111 #, c-format

3112 msgid "could not read '%s'"

3075 -msgstr "No se pudo leer '%s'"

3113 +msgstr "no se pudo leer '%s'"

3114

3077 -#: sequencer.c:358

3115 +#: sequencer.c:405

3116 #, c-format

3117 msgid "your local changes would be overwritten by %s."

3080 -msgstr "Tus cambios locales serán sobreescritos por %s."

3118 +msgstr "tus cambios locales serán sobreescritos por %s."

3119

3082 -#: sequencer.c:362

3120 +#: sequencer.c:409

3121 msgid "commit your changes or stash them to proceed."

3084 -msgstr "Realiza un commit con tus cambios o aplica un stash para proceder."

3122 +msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

3123

3086 -#: sequencer.c:391

3124 +#: sequencer.c:438

3125 #, c-format

3126 msgid "%s: fast-forward"

3127 msgstr "%s: avance rápido"

@@ -3091,20 +3129,20 @@ msgstr "%s: avance rápido"

3129 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3130 #. "rebase -i".

3131 #.

3094 -#: sequencer.c:477

3132 +#: sequencer.c:526

3133 #, c-format

3134 msgid "%s: Unable to write new index file"

3135 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

3136

3099 -#: sequencer.c:496

3137 +#: sequencer.c:542

3138 msgid "could not resolve HEAD commit"

3101 -msgstr "No se pudo resolver el commit de HEAD"

3139 +msgstr "no se pudo resolver el commit de HEAD"

3140

3103 -#: sequencer.c:516

3141 +#: sequencer.c:562

3142 msgid "unable to update cache tree"

3143 msgstr "no es posible actualizar el árbol de la caché"

3144

3107 -#: sequencer.c:600

3145 +#: sequencer.c:658

3146 #, c-format

3147 msgid ""

3148 "you have staged changes in your working tree\n"

@@ -3134,17 +3172,123 @@ msgstr ""

3172 "\n"

3173 " git rebase --continue\n"

3174

3137 -#: sequencer.c:702

3175 +#: sequencer.c:915

3176 +msgid "'prepare-commit-msg' hook failed"

3177 +msgstr "hook 'prepare-commit-msg' falló"

3178 +

3179 +#: sequencer.c:922

3180 +msgid ""

3181 +"Your name and email address were configured automatically based\n"

3182 +"on your username and hostname. Please check that they are accurate.\n"

3183 +"You can suppress this message by setting them explicitly. Run the\n"

3184 +"following command and follow the instructions in your editor to edit\n"

3185 +"your configuration file:\n"

3186 +"\n"

3187 +" git config --global --edit\n"

3188 +"\n"

3189 +"After doing this, you may fix the identity used for this commit with:\n"

3190 +"\n"

3191 +" git commit --amend --reset-author\n"

3192 +msgstr ""

3193 +"Tu nombre y correo fueron configurados automáticamente basados\n"

3194 +"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"

3195 +"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta "

3196 +"el \n"

3197 +"siguiente comando y sigue las instrucciones de tu editor\n"

3198 +" para modificar tu archivo de configuración:\n"

3199 +"\n"

3200 +" git config --global --edit\n"

3201 +"\n"

3202 +"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"

3203 +"\n"

3204 +" git commit --amend --reset-author\n"

3205 +

3206 +#: sequencer.c:935

3207 +msgid ""

3208 +"Your name and email address were configured automatically based\n"

3209 +"on your username and hostname. Please check that they are accurate.\n"

3210 +"You can suppress this message by setting them explicitly:\n"

3211 +"\n"

3212 +" git config --global user.name \"Your Name\"\n"

3213 +" git config --global user.email you@example.com\n"

3214 +"\n"

3215 +"After doing this, you may fix the identity used for this commit with:\n"

3216 +"\n"

3217 +" git commit --amend --reset-author\n"

3218 +msgstr ""

3219 +"Tu nombre y correo fueron configurados automáticamente basados\n"

3220 +"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"

3221 +"Tu puedes suprimir este mensaje configurándolos de forma explicita: \n"

3222 +"\n"

3223 +" git config --global user.name \"Tu nombre\"\n"

3224 +" git config --global user.email you@example.com\n"

3225 +"\n"

3226 +"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"

3227 +"\n"

3228 +" git commit --amend --reset-author\n"

3229 +

3230 +#: sequencer.c:975

3231 +msgid "couldn't look up newly created commit"

3232 +msgstr "no se pudo revisar el commit recién creado"

3233 +

3234 +#: sequencer.c:977

3235 +msgid "could not parse newly created commit"

3236 +msgstr "no se pudo analizar el commit recién creado"

3237 +

3238 +#: sequencer.c:1023

3239 +msgid "unable to resolve HEAD after creating commit"

3240 +msgstr "no se pudo resolver HEAD tras crear el commit"

3241 +

3242 +#: sequencer.c:1025

3243 +msgid "detached HEAD"

3244 +msgstr "HEAD desacoplado"

3245 +

3246 +#: sequencer.c:1029

3247 +msgid " (root-commit)"

3248 +msgstr " (commit-raíz)"

3249 +

3250 +#: sequencer.c:1050

3251 +msgid "could not parse HEAD"

3252 +msgstr "no se pudo analizar HEAD"

3253 +

3254 +#: sequencer.c:1052

3255 +#, c-format

3256 +msgid "HEAD %s is not a commit!"

3257 +msgstr "HEAD %s no es un commit!"

3258 +

3259 +#: sequencer.c:1056 builtin/commit.c:1491

3260 +msgid "could not parse HEAD commit"

3261 +msgstr "no se pudo analizar el commit de HEAD"

3262 +

3263 +#: sequencer.c:1107 sequencer.c:1673

3264 +msgid "unable to parse commit author"

3265 +msgstr "no es posible analizar el autor del commit"

3266 +

3267 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3268 +msgid "git write-tree failed to write a tree"

3269 +msgstr "git write-tree falló al escribir el árbol"

3270 +

3271 +#: sequencer.c:1134 sequencer.c:1186

3272 +#, c-format

3273 +msgid "unable to read commit message from '%s'"

3274 +msgstr "no se puede leer el mensaje del commit de '%s'"

3275 +

3276 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3277 +#: builtin/merge.c:851

3278 +msgid "failed to write commit object"

3279 +msgstr "fallo al escribir el objeto commit"

3280 +

3281 +#: sequencer.c:1213

3282 #, c-format

3283 msgid "could not parse commit %s"

3140 -msgstr "No se pudo analizar commit %s"

3284 +msgstr "no se pudo analizar commit %s"

3285

3142 -#: sequencer.c:707

3286 +#: sequencer.c:1218

3287 #, c-format

3288 msgid "could not parse parent commit %s"

3145 -msgstr "No se pudo analizar el commit padre %s"

3289 +msgstr "no se pudo analizar el commit padre %s"

3290

3147 -#: sequencer.c:836

3291 +#: sequencer.c:1347

3292 #, c-format

3293 msgid ""

3294 "unexpected 1st line of squash message:\n"

@@ -3155,7 +3299,7 @@ msgstr ""

3299 "\n"

3300 "\t%.*s"

3301

3158 -#: sequencer.c:842

3302 +#: sequencer.c:1353

3303 #, c-format

3304 msgid ""

3305 "invalid 1st line of squash message:\n"

@@ -3166,240 +3310,244 @@ msgstr ""

3310 "\n"

3311 "\t%.*s"

3312

3169 -#: sequencer.c:848 sequencer.c:873

3313 +#: sequencer.c:1359 sequencer.c:1384

3314 #, c-format

3315 msgid "This is a combination of %d commits."

3316 msgstr "Esta es una combinación de %d commits."

3317

3174 -#: sequencer.c:857 sequencer.c:2748

3318 +#: sequencer.c:1368 sequencer.c:3265

3319 msgid "need a HEAD to fixup"

3320 msgstr "se necesita un HEAD para arreglar"

3321

3178 -#: sequencer.c:859

3322 +#: sequencer.c:1370

3323 msgid "could not read HEAD"

3324 msgstr "no se pudo leer HEAD"

3325

3182 -#: sequencer.c:861

3326 +#: sequencer.c:1372

3327 msgid "could not read HEAD's commit message"

3328 msgstr "no se pudo leer el mensaje de commit de HEAD"

3329

3186 -#: sequencer.c:867

3330 +#: sequencer.c:1378

3331 #, c-format

3332 msgid "cannot write '%s'"

3333 msgstr "no se puede escribir '%s'"

3334

3191 -#: sequencer.c:876 git-rebase--interactive.sh:446

3335 +#: sequencer.c:1387 git-rebase--interactive.sh:452

3336 msgid "This is the 1st commit message:"

3337 msgstr "Este es el mensaje del 1er commit:"

3338

3195 -#: sequencer.c:884

3339 +#: sequencer.c:1395

3340 #, c-format

3341 msgid "could not read commit message of %s"

3342 msgstr "no se puede leer el mensaje del commit de %s"

3343

3200 -#: sequencer.c:891

3344 +#: sequencer.c:1402

3345 #, c-format

3346 msgid "This is the commit message #%d:"

3203 -msgstr "este es el mensaje del commit #%d:"

3347 +msgstr "Este es el mensaje del commit #%d:"

3348

3205 -#: sequencer.c:896

3349 +#: sequencer.c:1407

3350 #, c-format

3351 msgid "The commit message #%d will be skipped:"

3208 -msgstr "El mensaje del commit #%d será saltado: "

3352 +msgstr "El mensaje del commit #%d será saltado:"

3353

3210 -#: sequencer.c:901

3354 +#: sequencer.c:1412

3355 #, c-format

3356 msgid "unknown command: %d"

3357 msgstr "comando desconocido: %d"

3358

3215 -#: sequencer.c:967

3359 +#: sequencer.c:1479

3360 msgid "your index file is unmerged."

3361 msgstr "tu archivo índice no esta fusionado."

3362

3219 -#: sequencer.c:986

3363 +#: sequencer.c:1498

3364 #, c-format

3365 msgid "commit %s is a merge but no -m option was given."

3366 msgstr "el commit %s es una fusión pero no se entrego la opción -m."

3367

3224 -#: sequencer.c:994

3368 +#: sequencer.c:1506

3369 #, c-format

3370 msgid "commit %s does not have parent %d"

3371 msgstr "el commit %s no tiene un padre %d"

3372

3229 -#: sequencer.c:998

3373 +#: sequencer.c:1510

3374 #, c-format

3375 msgid "mainline was specified but commit %s is not a merge."

3376 msgstr "línea principal especificada pero el commit %s no es una fusión."

3377

3234 -#: sequencer.c:1004

3378 +#: sequencer.c:1516

3379 #, c-format

3380 msgid "cannot get commit message for %s"

3381 msgstr "no se puede obtener el mensaje de commit para %s"

3382

3383 #. TRANSLATORS: The first %s will be a "todo" command like

3384 #. "revert" or "pick", the second %s a SHA1.

3241 -#: sequencer.c:1023

3385 +#: sequencer.c:1535

3386 #, c-format

3387 msgid "%s: cannot parse parent commit %s"

3388 msgstr "%s: no se puede analizar el commit padre %s"

3389

3246 -#: sequencer.c:1086 sequencer.c:1867

3390 +#: sequencer.c:1600 sequencer.c:2397

3391 #, c-format

3392 msgid "could not rename '%s' to '%s'"

3249 -msgstr "No se puede renombrar '%s' a '%s'"

3393 +msgstr "no se puede renombrar '%s' a '%s'"

3394

3251 -#: sequencer.c:1137

3395 +#: sequencer.c:1654

3396 #, c-format

3397 msgid "could not revert %s... %s"

3398 msgstr "no se pudo revertir %s... %s"

3399

3256 -#: sequencer.c:1138

3400 +#: sequencer.c:1655

3401 #, c-format

3402 msgid "could not apply %s... %s"

3403 msgstr "no se pudo aplicar %s... %s"

3404

3261 -#: sequencer.c:1180

3405 +#: sequencer.c:1702

3406 msgid "empty commit set passed"

3407 msgstr "conjunto de commits vacío entregado"

3408

3265 -#: sequencer.c:1190

3409 +#: sequencer.c:1712

3410 #, c-format

3411 msgid "git %s: failed to read the index"

3412 msgstr "git %s: fallo al leer el índice"

3413

3270 -#: sequencer.c:1196

3414 +#: sequencer.c:1718

3415 #, c-format

3416 msgid "git %s: failed to refresh the index"

3417 msgstr "git %s: fallo al refrescar el índice"

3418

3275 -#: sequencer.c:1270

3419 +#: sequencer.c:1792

3420 #, c-format

3421 msgid "%s does not accept arguments: '%s'"

3422 msgstr "%s no acepta los argumentos: '%s'"

3423

3280 -#: sequencer.c:1279

3424 +#: sequencer.c:1801

3425 #, c-format

3426 msgid "missing arguments for %s"

3427 msgstr "faltan argumentos para para %s"

3428

3285 -#: sequencer.c:1322

3429 +#: sequencer.c:1844

3430 #, c-format

3431 msgid "invalid line %d: %.*s"

3432 msgstr "línea inválida %d: %.*s"

3433

3290 -#: sequencer.c:1330

3434 +#: sequencer.c:1852

3435 #, c-format

3436 msgid "cannot '%s' without a previous commit"

3437 msgstr "no se puede '%s' sin un commit previo"

3438

3295 -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3296 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3439 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3440 #, c-format

3441 msgid "could not read '%s'."

3442 msgstr "no se puede leer '%s'."

3443

3301 -#: sequencer.c:1375

3444 +#: sequencer.c:1906

3445 msgid "please fix this using 'git rebase --edit-todo'."

3446 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

3447

3305 -#: sequencer.c:1377

3448 +#: sequencer.c:1908

3449 #, c-format

3450 msgid "unusable instruction sheet: '%s'"

3451 msgstr "hoja de instrucciones inutilizable: '%s'"

3452

3310 -#: sequencer.c:1382

3453 +#: sequencer.c:1913

3454 msgid "no commits parsed."

3455 msgstr "ningún commit analizado."

3456

3314 -#: sequencer.c:1393

3457 +#: sequencer.c:1924

3458 msgid "cannot cherry-pick during a revert."

3459 msgstr "no se puede realizar cherry-pick durante un revert."

3460

3318 -#: sequencer.c:1395

3461 +#: sequencer.c:1926

3462 msgid "cannot revert during a cherry-pick."

3320 -msgstr "no se puede realizar un revert durante un cherry-pick"

3463 +msgstr "no se puede realizar un revert durante un cherry-pick."

3464

3322 -#: sequencer.c:1462

3465 +#: sequencer.c:1993

3466 #, c-format

3467 msgid "invalid key: %s"

3468 msgstr "llave invalida: %s"

3469

3327 -#: sequencer.c:1465

3470 +#: sequencer.c:1996

3471 #, c-format

3472 msgid "invalid value for %s: %s"

3473 msgstr "valor invalido para %s: %s"

3474

3332 -#: sequencer.c:1531

3475 +#: sequencer.c:2062

3476 #, c-format

3477 msgid "malformed options sheet: '%s'"

3478 msgstr "hoja de opciones mal formada: '%s'"

3479

3337 -#: sequencer.c:1569

3480 +#: sequencer.c:2100

3481 msgid "a cherry-pick or revert is already in progress"

3482 msgstr "un cherry-pick o revert ya esta en progreso"

3483

3341 -#: sequencer.c:1570

3484 +#: sequencer.c:2101

3485 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3486 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""

3487

3345 -#: sequencer.c:1573

3488 +#: sequencer.c:2104

3489 #, c-format

3490 msgid "could not create sequencer directory '%s'"

3348 -msgstr "no se pudo crear un directorio secuenciador '%s' "

3491 +msgstr "no se pudo crear un directorio secuenciador '%s'"

3492

3350 -#: sequencer.c:1588

3493 +#: sequencer.c:2118

3494 msgid "could not lock HEAD"

3495 msgstr "no se pudo bloquear HEAD"

3496

3354 -#: sequencer.c:1646 sequencer.c:2230

3497 +#: sequencer.c:2173 sequencer.c:2761

3498 msgid "no cherry-pick or revert in progress"

3499 msgstr "ningún cherry-pick o revert en progreso"

3500

3358 -#: sequencer.c:1648

3501 +#: sequencer.c:2175

3502 msgid "cannot resolve HEAD"

3503 msgstr "no se puede resolver HEAD"

3504

3362 -#: sequencer.c:1650 sequencer.c:1685

3505 +#: sequencer.c:2177 sequencer.c:2212

3506 msgid "cannot abort from a branch yet to be born"

3507 msgstr "no se puede abortar de una rama por nacer"

3508

3366 -#: sequencer.c:1671 builtin/grep.c:713

3509 +#: sequencer.c:2198 builtin/grep.c:720

3510 #, c-format

3511 msgid "cannot open '%s'"

3512 msgstr "no se puede abrir '%s'"

3513

3371 -#: sequencer.c:1673

3514 +#: sequencer.c:2200

3515 #, c-format

3516 msgid "cannot read '%s': %s"

3517 msgstr "no se puede leer '%s': %s"

3518

3376 -#: sequencer.c:1674

3519 +#: sequencer.c:2201

3520 msgid "unexpected end of file"

3521 msgstr "final de archivo inesperado"

3522

3380 -#: sequencer.c:1680

3523 +#: sequencer.c:2207

3524 #, c-format

3525 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3526 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"

3527

3385 -#: sequencer.c:1691

3528 +#: sequencer.c:2218

3529 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3530 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

3531

3389 -#: sequencer.c:1832 sequencer.c:2128

3532 +#: sequencer.c:2324 sequencer.c:2679

3533 +#, c-format

3534 +msgid "could not update %s"

3535 +msgstr "no se puede actualizar %s"

3536 +

3537 +#: sequencer.c:2362 sequencer.c:2659

3538 msgid "cannot read HEAD"

3539 msgstr "no se puede leer HEAD"

3540

3393 -#: sequencer.c:1872 builtin/difftool.c:639

3541 +#: sequencer.c:2402 builtin/difftool.c:639

3542 #, c-format

3543 msgid "could not copy '%s' to '%s'"

3544 msgstr "no se pudo copiar '%s' a '%s'"

3545

3398 -#: sequencer.c:1891

3546 +#: sequencer.c:2421

3547 msgid "could not read index"

3548 msgstr "no se pudo leer índice"

3549

3402 -#: sequencer.c:1896

3550 +#: sequencer.c:2426

3551 #, c-format

3552 msgid ""

3553 "execution failed: %s\n"

@@ -3414,11 +3562,11 @@ msgstr ""

3562 " git rebase --continue\n"

3563 "\n"

3564

3417 -#: sequencer.c:1902

3565 +#: sequencer.c:2432

3566 msgid "and made changes to the index and/or the working tree\n"

3567 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

3568

3421 -#: sequencer.c:1908

3569 +#: sequencer.c:2438

3570 #, c-format

3571 msgid ""

3572 "execution succeeded: %s\n"

@@ -3435,17 +3583,17 @@ msgstr ""

3583 " git rebase --continue\n"

3584 "\n"

3585

3438 -#: sequencer.c:1967

3586 +#: sequencer.c:2497

3587 #, c-format

3588 msgid "Applied autostash.\n"

3589 msgstr "Autostash aplicado.\n"

3590

3443 -#: sequencer.c:1979

3591 +#: sequencer.c:2509

3592 #, c-format

3593 msgid "cannot store %s"

3594 msgstr "no se puede guardar %s"

3595

3448 -#: sequencer.c:1982 git-rebase.sh:175

3596 +#: sequencer.c:2512 git-rebase.sh:178

3597 #, c-format

3598 msgid ""

3599 "Applying autostash resulted in conflicts.\n"

@@ -3457,57 +3605,52 @@ msgstr ""

3605 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

3606 "momento.\n"

3607

3460 -#: sequencer.c:2064

3608 +#: sequencer.c:2595

3609 #, c-format

3610 msgid "Stopped at %s... %.*s\n"

3611 msgstr "Detenido en %s... %.*s\n"

3612

3465 -#: sequencer.c:2106

3613 +#: sequencer.c:2637

3614 #, c-format

3615 msgid "unknown command %d"

3616 msgstr "comando desconocido %d"

3617

3470 -#: sequencer.c:2136

3618 +#: sequencer.c:2667

3619 msgid "could not read orig-head"

3620 msgstr "no se puede leer orig-head"

3621

3474 -#: sequencer.c:2141 sequencer.c:2745

3622 +#: sequencer.c:2672 sequencer.c:3262

3623 msgid "could not read 'onto'"

3624 msgstr "no se puede leer 'onto'"

3625

3478 -#: sequencer.c:2148

3479 -#, c-format

3480 -msgid "could not update %s"

3481 -msgstr "no se puede actualizar %s"

3482 -

3483 -#: sequencer.c:2155

3626 +#: sequencer.c:2686

3627 #, c-format

3628 msgid "could not update HEAD to %s"

3629 msgstr "no se puede actualizar HEAD a %s"

3630

3488 -#: sequencer.c:2239

3631 +#: sequencer.c:2770

3632 msgid "cannot rebase: You have unstaged changes."

3633 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

3634

3492 -#: sequencer.c:2244

3635 +#: sequencer.c:2775

3636 msgid "could not remove CHERRY_PICK_HEAD"

3637 msgstr "no se puede remover CHERRY_PICK_HEAD"

3638

3496 -#: sequencer.c:2253

3639 +#: sequencer.c:2784

3640 msgid "cannot amend non-existing commit"

3641 msgstr "no se puede arreglar un commit no existente"

3642

3500 -#: sequencer.c:2255

3643 +#: sequencer.c:2786

3644 #, c-format

3645 msgid "invalid file: '%s'"

3646 msgstr "archivo invalido: '%s'"

3647

3505 -#: sequencer.c:2257

3648 +#: sequencer.c:2788

3649 #, c-format

3650 msgid "invalid contents: '%s'"

3651 msgstr "contenido inválido: '%s'"

3652

3510 -#: sequencer.c:2260

3653 +#: sequencer.c:2791

3654 msgid ""

3655 "\n"

3656 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3518,45 +3661,45 @@ msgstr ""

3661 "un commit con estos\n"

3662 "primero y luego ejecuta 'git rebase --continue' de nuevo."

3663

3521 -#: sequencer.c:2270

3664 +#: sequencer.c:2801

3665 msgid "could not commit staged changes."

3666 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

3667

3525 -#: sequencer.c:2350

3668 +#: sequencer.c:2881

3669 #, c-format

3670 msgid "%s: can't cherry-pick a %s"

3671 msgstr "%s: no se puede aplicar cherry-pick a un %s"

3672

3530 -#: sequencer.c:2354

3673 +#: sequencer.c:2885

3674 #, c-format

3675 msgid "%s: bad revision"

3676 msgstr "%s: mala revision"

3677

3535 -#: sequencer.c:2387

3678 +#: sequencer.c:2918

3679 msgid "can't revert as initial commit"

3680 msgstr "no se puede revertir como commit inicial"

3681

3539 -#: sequencer.c:2492

3682 +#: sequencer.c:3023

3683 msgid "make_script: unhandled options"

3684 msgstr "make_script: opciones desconocidas"

3685

3543 -#: sequencer.c:2495

3686 +#: sequencer.c:3026

3687 msgid "make_script: error preparing revisions"

3688 msgstr "make_script: error preparando revisiones"

3689

3547 -#: sequencer.c:2529 sequencer.c:2564

3690 +#: sequencer.c:3060 sequencer.c:3095

3691 #, c-format

3692 msgid "unusable todo list: '%s'"

3693 msgstr "lista de pendientes inutilizable: '%s'"

3694

3552 -#: sequencer.c:2615

3695 +#: sequencer.c:3146

3696 #, c-format

3697 msgid ""

3698 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3699 msgstr ""

3557 -"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

3700 +"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

3701

3559 -#: sequencer.c:2695

3702 +#: sequencer.c:3212

3703 #, c-format

3704 msgid ""

3705 "Warning: some commits may have been dropped accidentally.\n"

@@ -3565,7 +3708,7 @@ msgstr ""

3708 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

3709 "Commits botados (empezando con el mas nuevo):\n"

3710

3568 -#: sequencer.c:2702

3711 +#: sequencer.c:3219

3712 #, c-format

3713 msgid ""

3714 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3583,7 +3726,7 @@ msgstr ""

3726 "Los posibles comportamientos son: ignore,warn,error.\n"

3727 "\n"

3728

3586 -#: sequencer.c:2714

3729 +#: sequencer.c:3231

3730 #, c-format

3731 msgid ""

3732 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3594,21 +3737,26 @@ msgstr ""

3737 "rebase --continue'.\n"

3738 "O se puede abortar el rebase con 'git rebase --abort'.\n"

3739

3597 -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3740 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3741 #: builtin/am.c:779

3742 #, c-format

3743 msgid "could not open '%s' for writing"

3744 msgstr "no se pudo abrir '%s' para escritura"

3745

3603 -#: sequencer.c:2775

3746 +#: sequencer.c:3285

3747 #, c-format

3748 msgid "could not parse commit '%s'"

3606 -msgstr "No se pudo analizar commit '%s'"

3749 +msgstr "no se pudo analizar commit '%s'"

3750

3608 -#: sequencer.c:2897

3751 +#: sequencer.c:3401

3752 msgid "the script was already rearranged."

3753 msgstr "este script ya fue reorganizado."

3754

3755 +#: setup.c:122

3756 +#, c-format

3757 +msgid "'%s' is outside repository"

3758 +msgstr "'%s' está fuera del repositorio"

3759 +

3760 #: setup.c:171

3761 #, c-format

3762 msgid ""

@@ -3631,6 +3779,11 @@ msgstr ""

3779 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"

3780 "'git <comando> [<revisión>...] -- [<archivo>...]'"

3781

3782 +#: setup.c:233

3783 +#, c-format

3784 +msgid "option '%s' must come before non-option arguments"

3785 +msgstr "opción '%s' debe venir antes de argumentos no opcionales"

3786 +

3787 #: setup.c:252

3788 #, c-format

3789 msgid ""

@@ -3642,76 +3795,148 @@ msgstr ""

3795 "Use '--' para separar rutas de revisiones, de esta manera:\n"

3796 "'git <comando> [<revisión>...] -- [<archivo>...]'"

3797

3645 -#: setup.c:501

3798 +#: setup.c:388

3799 +msgid "unable to set up work tree using invalid config"

3800 +msgstr ""

3801 +"no es posible configurar el directorio de trabajo usando una configuración "

3802 +"inválida"

3803 +

3804 +#: setup.c:395

3805 +msgid "this operation must be run in a work tree"

3806 +msgstr "esta operación debe ser realizada en un árbol de trabajo"

3807 +

3808 +#: setup.c:506

3809 #, c-format

3810 msgid "Expected git repo version <= %d, found %d"

3811 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

3812

3650 -#: setup.c:509

3813 +#: setup.c:514

3814 msgid "unknown repository extensions found:"

3815 msgstr "se encontró extensión de repositorio desconocida:"

3816

3654 -#: setup.c:811

3817 +#: setup.c:533

3818 +#, c-format

3819 +msgid "error opening '%s'"

3820 +msgstr "error abriendo '%s'"

3821 +

3822 +#: setup.c:535

3823 +#, c-format

3824 +msgid "too large to be a .git file: '%s'"

3825 +msgstr "muy grande para ser un archivo .git: '%s'"

3826 +

3827 +#: setup.c:537

3828 +#, c-format

3829 +msgid "error reading %s"

3830 +msgstr "error leyendo %s"

3831 +

3832 +#: setup.c:539

3833 +#, c-format

3834 +msgid "invalid gitfile format: %s"

3835 +msgstr "formato gitfile inválido: %s"

3836 +

3837 +#: setup.c:541

3838 +#, c-format

3839 +msgid "no path in gitfile: %s"

3840 +msgstr "no hay ruta en gitfile: %s"

3841 +

3842 +#: setup.c:543

3843 +#, c-format

3844 +msgid "not a git repository: %s"

3845 +msgstr "no es un repositorio git: %s"

3846 +

3847 +#: setup.c:642

3848 +#, c-format

3849 +msgid "'$%s' too big"

3850 +msgstr "'$%s' muy grande"

3851 +

3852 +#: setup.c:656

3853 +#, c-format

3854 +msgid "not a git repository: '%s'"

3855 +msgstr "no es un repositorio git: '%s'"

3856 +

3857 +#: setup.c:685 setup.c:687 setup.c:718

3858 +#, c-format

3859 +msgid "cannot chdir to '%s'"

3860 +msgstr "no se puede aplicar chdir a '%s'"

3861 +

3862 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3863 +msgid "cannot come back to cwd"

3864 +msgstr "no se puede volver a cwd"

3865 +

3866 +#: setup.c:816

3867 #, c-format

3656 -msgid "Not a git repository (or any of the parent directories): %s"

3868 +msgid "not a git repository (or any of the parent directories): %s"

3869 msgstr ""

3658 -"No es un repositorio git (ni ninguno de los directorios superiores): %s"

3870 +"no es un repositorio git (ni ninguno de los directorios superiores): %s"

3871

3660 -#: setup.c:813 builtin/index-pack.c:1653

3661 -msgid "Cannot come back to cwd"

3662 -msgstr "No se puede regresar a cwd"

3872 +#: setup.c:827

3873 +#, c-format

3874 +msgid "failed to stat '%*s%s%s'"

3875 +msgstr "fallo al determinar '%*s%s%s'"

3876

3664 -#: setup.c:1052

3877 +#: setup.c:1057

3878 msgid "Unable to read current working directory"

3879 msgstr "Incapaz de leer el directorio de trabajo actual"

3880

3668 -#: setup.c:1064 setup.c:1070

3881 +#: setup.c:1069 setup.c:1075

3882 #, c-format

3670 -msgid "Cannot change to '%s'"

3671 -msgstr "No se puede cambiar a '%s'"

3883 +msgid "cannot change to '%s'"

3884 +msgstr "no se puede cambiar a '%s'"

3885

3673 -#: setup.c:1083

3886 +#: setup.c:1088

3887 #, c-format

3888 msgid ""

3676 -"Not a git repository (or any parent up to mount point %s)\n"

3889 +"not a git repository (or any parent up to mount point %s)\n"

3890 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3891 msgstr ""

3679 -"No es un repositorio git ( o ningún padre en el punto de montado %s)\n"

3892 +"no es un repositorio git ( o ningún padre en el punto de montado %s)\n"

3893 "Parando en el límite del sistema de archivos "

3894 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

3895

3683 -#: setup.c:1167

3896 +#: setup.c:1172

3897 #, c-format

3898 msgid ""

3686 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

3899 +"problem with core.sharedRepository filemode value (0%.3o).\n"

3900 "The owner of files must always have read and write permissions."

3901 msgstr ""

3689 -"Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

3902 +"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

3903 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

3904

3692 -#: sha1_file.c:598

3905 +#: setup.c:1215

3906 +msgid "open /dev/null or dup failed"

3907 +msgstr "falló al abrir /dev/null o dup"

3908 +

3909 +#: setup.c:1230

3910 +msgid "fork failed"

3911 +msgstr "falló fork"

3912 +

3913 +#: setup.c:1235

3914 +msgid "setsid failed"

3915 +msgstr "falló setsid"

3916 +

3917 +#: sha1_file.c:592

3918 #, c-format

3919 msgid "path '%s' does not exist"

3920 msgstr "ruta '%s' no existe"

3921

3697 -#: sha1_file.c:624

3922 +#: sha1_file.c:618

3923 #, c-format

3924 msgid "reference repository '%s' as a linked checkout is not supported yet."

3925 msgstr ""

3926 "repositorio de referencia '%s' como un checkout vinculado no es soportado "

3927 "todavía."

3928

3704 -#: sha1_file.c:630

3929 +#: sha1_file.c:624

3930 #, c-format

3931 msgid "reference repository '%s' is not a local repository."

3932 msgstr "repositorio de referencia '%s' no es un repositorio local."

3933

3709 -#: sha1_file.c:636

3934 +#: sha1_file.c:630

3935 #, c-format

3936 msgid "reference repository '%s' is shallow"

3937 msgstr "repositorio de referencia '%s' es superficial (shallow)"

3938

3714 -#: sha1_file.c:644

3939 +#: sha1_file.c:638

3940 #, c-format

3941 msgid "reference repository '%s' is grafted"

3942 msgstr "repositorio de referencia '% s' está injertado"

@@ -3719,7 +3944,7 @@ msgstr "repositorio de referencia '% s' está injertado"

3944 #: sha1_name.c:422

3945 #, c-format

3946 msgid "short SHA1 %s is ambiguous"

3722 -msgstr "SHA1 %s corta es ambigua"

3947 +msgstr "SHA1 %s corto es ambiguao"

3948

3949 #: sha1_name.c:433

3950 msgid "The candidates are:"

@@ -3787,7 +4012,7 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"

4012 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4013 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"

4014

3790 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

4015 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

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

4017 msgstr "Fallo al resolver HEAD como un ref valido."

4018

@@ -3811,7 +4036,7 @@ msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"

4036 msgid "submodule '%s' has dirty index"

4037 msgstr "submódulo '%s' tiene un índice corrupto"

4038

3814 -#: submodule.c:1876

4039 +#: submodule.c:1878

4040 #, c-format

4041 msgid ""

4042 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3819,18 +4044,18 @@ msgstr ""

4044 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "

4045 "soportado"

4046

3822 -#: submodule.c:1888 submodule.c:1944

4047 +#: submodule.c:1890 submodule.c:1946

4048 #, c-format

4049 msgid "could not lookup name for submodule '%s'"

4050 msgstr "no se pudo resolver el nombre para el submódulo '%s'"

4051

3827 -#: submodule.c:1892 builtin/submodule--helper.c:909

3828 -#: builtin/submodule--helper.c:919

4052 +#: submodule.c:1894 builtin/submodule--helper.c:1246

4053 +#: builtin/submodule--helper.c:1256

4054 #, c-format

4055 msgid "could not create directory '%s'"

4056 msgstr "no se pudo crear el directorio '%s'"

4057

3833 -#: submodule.c:1895

4058 +#: submodule.c:1897

4059 #, c-format

4060 msgid ""

4061 "Migrating git directory of '%s%s' from\n"

@@ -3841,20 +4066,20 @@ msgstr ""

4066 "'%s' hacia\n"

4067 "'%s'\n"

4068

3844 -#: submodule.c:1979

4069 +#: submodule.c:1981

4070 #, c-format

4071 msgid "could not recurse into submodule '%s'"

3847 -msgstr "No pudo recursar en el submódulo '%s'"

4072 +msgstr "no pudo recursar en el submódulo '%s'"

4073

3849 -#: submodule.c:2023

4074 +#: submodule.c:2025

4075 msgid "could not start ls-files in .."

4076 msgstr "no se pudo comenzar ls-files en .."

4077

3853 -#: submodule.c:2043

4078 +#: submodule.c:2045

4079 msgid "BUG: returned path string doesn't match cwd?"

4080 msgstr "BUG: string de ruta recibido no concuerda con cwd?"

4081

3857 -#: submodule.c:2062

4082 +#: submodule.c:2064

4083 #, c-format

4084 msgid "ls-tree returned unexpected return code %d"

4085 msgstr "ls-tree retornó un código %d inesperado"

@@ -3871,7 +4096,7 @@ msgstr "valor inválido para %s"

4096 #: trailer.c:238

4097 #, c-format

4098 msgid "running trailer command '%s' failed"

3874 -msgstr "no se pudo ejecutar el comando de remolque '%s'"

4099 +msgstr "ejecución del comando de remolque '%s' falló"

4100

4101 #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553

4102 #: trailer.c:557

@@ -3911,7 +4136,7 @@ msgstr "el archivo %s no es un archivo regular"

4136 #: trailer.c:1012

4137 #, c-format

4138 msgid "file %s is not writable by user"

3914 -msgstr "el archivo %s no puede ser escrito por el usuario "

4139 +msgstr "el archivo %s no puede ser escrito por el usuario"

4140

4141 #: trailer.c:1024

4142 msgid "could not open temporary file"

@@ -3932,7 +4157,7 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"

4157 msgid "transport: invalid depth option '%s'"

4158 msgstr "transport: opción inválida '%s'"

4159

3935 -#: transport.c:904

4160 +#: transport.c:916

4161 #, c-format

4162 msgid ""

4163 "The following submodule paths contain changes that can\n"

@@ -3941,7 +4166,7 @@ msgstr ""

4166 "La siguiente ruta de submódulo contiene cambios que no\n"

4167 "pueden ser encontrados en ningún remoto:\n"

4168

3944 -#: transport.c:908

4169 +#: transport.c:920

4170 #, c-format

4171 msgid ""

4172 "\n"

@@ -3968,11 +4193,11 @@ msgstr ""

4193 "para hacer un push al remoto.\n"

4194 "\n"

4195

3971 -#: transport.c:916

4196 +#: transport.c:928

4197 msgid "Aborting."

4198 msgstr "Abortando."

4199

3975 -#: transport-helper.c:1074

4200 +#: transport-helper.c:1079

4201 #, c-format

4202 msgid "Could not read ref %s"

4203 msgstr "No se pudo leer la referencia %s"

@@ -3993,18 +4218,18 @@ msgstr "nombre de archivo vacío en la entrada de árbol"

4218 msgid "too-short tree file"

4219 msgstr "archivo de árbol muy corto"

4220

3996 -#: unpack-trees.c:107

4221 +#: unpack-trees.c:108

4222 #, c-format

4223 msgid ""

4224 "Your local changes to the following files would be overwritten by checkout:\n"

4225 "%%sPlease commit your changes or stash them before you switch branches."

4226 msgstr ""

4002 -"Los cambios locales de los siguientes archivos serán sobrescritos al "

4003 -"actualizar el árbol de trabajo:\n"

4004 -"%%sPor favor, confirma tus cambios o guárdalos antes de intercambiar "

4227 +"Los cambios locales de los siguientes archivos serán sobrescritos por "

4228 +"checkuot:\n"

4229 +"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "

4230 "ramas."

4231

4007 -#: unpack-trees.c:109

4232 +#: unpack-trees.c:110

4233 #, c-format

4234 msgid ""

4235 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4014,7 +4239,7 @@ msgstr ""

4239 "checkout:\n"

4240 "%%s"

4241

4017 -#: unpack-trees.c:112

4242 +#: unpack-trees.c:113

4243 #, c-format

4244 msgid ""

4245 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4024,7 +4249,7 @@ msgstr ""

4249 "fusionar:\n"

4250 "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."

4251

4027 -#: unpack-trees.c:114

4252 +#: unpack-trees.c:115

4253 #, c-format

4254 msgid ""

4255 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4034,7 +4259,7 @@ msgstr ""

4259 "merge:\n"

4260 "%%s"

4261

4037 -#: unpack-trees.c:117

4262 +#: unpack-trees.c:118

4263 #, c-format

4264 msgid ""

4265 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4043,7 +4268,7 @@ msgstr ""

4268 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"

4269 "%%sPor favor, confirma tus cambios o guárdalos antes de %s."

4270

4046 -#: unpack-trees.c:119

4271 +#: unpack-trees.c:120

4272 #, c-format

4273 msgid ""

4274 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4052,7 +4277,7 @@ msgstr ""

4277 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"

4278 "%%s"

4279

4055 -#: unpack-trees.c:124

4280 +#: unpack-trees.c:125

4281 #, c-format

4282 msgid ""

4283 "Updating the following directories would lose untracked files in them:\n"

@@ -4062,7 +4287,7 @@ msgstr ""

4287 "seguimiento en ellos:\n"

4288 "%s"

4289

4065 -#: unpack-trees.c:128

4290 +#: unpack-trees.c:129

4291 #, c-format

4292 msgid ""

4293 "The following untracked working tree files would be removed by checkout:\n"

@@ -4072,7 +4297,7 @@ msgstr ""

4297 "removidos al actualizar el árbol de trabajo:\n"

4298 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4299

4075 -#: unpack-trees.c:130

4300 +#: unpack-trees.c:131

4301 #, c-format

4302 msgid ""

4303 "The following untracked working tree files would be removed by checkout:\n"

@@ -4082,7 +4307,7 @@ msgstr ""

4307 "al actualizar el árbol de trabajo:\n"

4308 "%%s"

4309

4085 -#: unpack-trees.c:133

4310 +#: unpack-trees.c:134

4311 #, c-format

4312 msgid ""

4313 "The following untracked working tree files would be removed by merge:\n"

@@ -4092,7 +4317,7 @@ msgstr ""

4317 "removidos al fusionar:\n"

4318 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4319

4095 -#: unpack-trees.c:135

4320 +#: unpack-trees.c:136

4321 #, c-format

4322 msgid ""

4323 "The following untracked working tree files would be removed by merge:\n"

@@ -4102,7 +4327,7 @@ msgstr ""

4327 "al fusionar:\n"

4328 "%%s"

4329

4105 -#: unpack-trees.c:138

4330 +#: unpack-trees.c:139

4331 #, c-format

4332 msgid ""

4333 "The following untracked working tree files would be removed by %s:\n"

@@ -4112,7 +4337,7 @@ msgstr ""

4337 "removidos al %s:\n"

4338 "%%sPor favor, muévelos o elimínalos antes de %s."

4339

4115 -#: unpack-trees.c:140

4340 +#: unpack-trees.c:141

4341 #, c-format

4342 msgid ""

4343 "The following untracked working tree files would be removed by %s:\n"

@@ -4122,7 +4347,7 @@ msgstr ""

4347 "removidos al ejecutar %s:\n"

4348 "%%s"

4349

4125 -#: unpack-trees.c:145

4350 +#: unpack-trees.c:146

4351 #, c-format

4352 msgid ""

4353 "The following untracked working tree files would be overwritten by "

@@ -4133,7 +4358,7 @@ msgstr ""

4358 "sobrescritos al actualizar el árbol de trabajo:\n"

4359 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4360

4136 -#: unpack-trees.c:147

4361 +#: unpack-trees.c:148

4362 #, c-format

4363 msgid ""

4364 "The following untracked working tree files would be overwritten by "

@@ -4144,7 +4369,7 @@ msgstr ""

4369 "sobrescritos al actualizar el árbol de trabajo:\n"

4370 "%%s"

4371

4147 -#: unpack-trees.c:150

4372 +#: unpack-trees.c:151

4373 #, c-format

4374 msgid ""

4375 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4154,7 +4379,7 @@ msgstr ""

4379 "sobrescritos al fusionar:\n"

4380 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4381

4157 -#: unpack-trees.c:152

4382 +#: unpack-trees.c:153

4383 #, c-format

4384 msgid ""

4385 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4164,7 +4389,7 @@ msgstr ""

4389 "sobrescritos al fusionar:\n"

4390 "%%s"

4391

4167 -#: unpack-trees.c:155

4392 +#: unpack-trees.c:156

4393 #, c-format

4394 msgid ""

4395 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4174,7 +4399,7 @@ msgstr ""

4399 "sobrescritos al %s:\n"

4400 "%%sPor favor, muévelos o elimínalos antes de %s."

4401

4177 -#: unpack-trees.c:157

4402 +#: unpack-trees.c:158

4403 #, c-format

4404 msgid ""

4405 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4184,12 +4409,12 @@ msgstr ""

4409 "por %s:\n"

4410 "%%s"

4411

4187 -#: unpack-trees.c:164

4412 +#: unpack-trees.c:165

4413 #, c-format

4414 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4190 -msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir"

4415 +msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir."

4416

4192 -#: unpack-trees.c:167

4417 +#: unpack-trees.c:168

4418 #, c-format

4419 msgid ""

4420 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4199,7 +4424,7 @@ msgstr ""

4424 "actualizadas:\n"

4425 "%s"

4426

4202 -#: unpack-trees.c:169

4427 +#: unpack-trees.c:170

4428 #, c-format

4429 msgid ""

4430 "The following working tree files would be overwritten by sparse checkout "

@@ -4210,7 +4435,7 @@ msgstr ""

4435 "actualización sparse checkout:\n"

4436 "%s"

4437

4213 -#: unpack-trees.c:171

4438 +#: unpack-trees.c:172

4439 #, c-format

4440 msgid ""

4441 "The following working tree files would be removed by sparse checkout "

@@ -4221,7 +4446,7 @@ msgstr ""

4446 "actualización sparse checkout:\n"

4447 "%s"

4448

4224 -#: unpack-trees.c:173

4449 +#: unpack-trees.c:174

4450 #, c-format

4451 msgid ""

4452 "Cannot update submodule:\n"

@@ -4230,27 +4455,27 @@ msgstr ""

4455 "No se puede actualizar le submódulo:\n"

4456 "%s"

4457

4233 -#: unpack-trees.c:250

4458 +#: unpack-trees.c:251

4459 #, c-format

4460 msgid "Aborting\n"

4461 msgstr "Abortando\n"

4462

4238 -#: unpack-trees.c:332

4463 +#: unpack-trees.c:333

4464 msgid "Checking out files"

4465 msgstr "Revisando archivos"

4466

4467 #: urlmatch.c:163

4468 msgid "invalid URL scheme name or missing '://' suffix"

4244 -msgstr "nombre de URL invalido o falta sufijo '://'"

4469 +msgstr "nombre de URL invalido o sufijo '://' faltante"

4470

4471 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405

4472 #, c-format

4473 msgid "invalid %XX escape sequence"

4249 -msgstr "secuencia de escape %XX invalida "

4474 +msgstr "secuencia de escape %XX invalida"

4475

4476 #: urlmatch.c:215

4477 msgid "missing host and scheme is not 'file:'"

4253 -msgstr "falta host y el esquema no es 'archivo':"

4478 +msgstr "falta host y el esquema no es 'file:'"

4479

4480 #: urlmatch.c:232

4481 msgid "a 'file:' URL may not have a port number"

@@ -4268,18 +4493,46 @@ msgstr "numero de puerto invalido"

4493 msgid "invalid '..' path segment"

4494 msgstr "segmento de ruta '..' invalido"

4495

4271 -#: worktree.c:245

4496 +#: worktree.c:245 builtin/am.c:2147

4497 #, c-format

4498 msgid "failed to read '%s'"

4499 msgstr "fallo al leer '%s'"

4500

4501 +#: worktree.c:291

4502 +#, c-format

4503 +msgid "'%s' at main working tree is not the repository directory"

4504 +msgstr ""

4505 +"'%s' en el árbol de trabajo principal no es el directorio del repositorio"

4506 +

4507 +#: worktree.c:302

4508 +#, c-format

4509 +msgid "'%s' file does not contain absolute path to the working tree location"

4510 +msgstr ""

4511 +"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "

4512 +"trabajo"

4513 +

4514 +#: worktree.c:314

4515 +#, c-format

4516 +msgid "'%s' does not exist"

4517 +msgstr "'%s' no existe"

4518 +

4519 +#: worktree.c:320

4520 +#, c-format

4521 +msgid "'%s' is not a .git file, error code %d"

4522 +msgstr "'%s' no es un archivo .git, código de error %d"

4523 +

4524 +#: worktree.c:328

4525 +#, c-format

4526 +msgid "'%s' does not point back to '%s'"

4527 +msgstr "'%s' no apunta de vuelta a '%s'"

4528 +

4529 #: wrapper.c:223 wrapper.c:393

4530 #, c-format

4531 msgid "could not open '%s' for reading and writing"

4532 msgstr "no se pudo abrir '%s' para lectura y escritura"

4533

4534 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4282 -#: builtin/am.c:862 builtin/merge.c:1043

4535 +#: builtin/am.c:862 builtin/merge.c:1044

4536 #, c-format

4537 msgid "could not open '%s' for reading"

4538 msgstr "no se pudo abrir '%s' para lectura"

@@ -4293,159 +4546,159 @@ msgstr "no es posible acceder '%s'"

4546 msgid "unable to get current working directory"

4547 msgstr "no es posible obtener el directorio de trabajo actual"

4548

4296 -#: wt-status.c:150

4549 +#: wt-status.c:151

4550 msgid "Unmerged paths:"

4298 -msgstr "rutas no fusionadas:"

4551 +msgstr "Rutas no fusionadas:"

4552

4300 -#: wt-status.c:177 wt-status.c:204

4553 +#: wt-status.c:178 wt-status.c:205

4554 #, c-format

4555 msgid " (use \"git reset %s <file>...\" to unstage)"

4556 msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)"

4557

4305 -#: wt-status.c:179 wt-status.c:206

4558 +#: wt-status.c:180 wt-status.c:207

4559 msgid " (use \"git rm --cached <file>...\" to unstage)"

4560 msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"

4561

4309 -#: wt-status.c:183

4562 +#: wt-status.c:184

4563 msgid " (use \"git add <file>...\" to mark resolution)"

4564 msgstr " (usa \"git add <archivo>...\" para marcar una resolución)"

4565

4313 -#: wt-status.c:185 wt-status.c:189

4566 +#: wt-status.c:186 wt-status.c:190

4567 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4568 msgstr ""

4569 " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "

4570 "resolución)"

4571

4319 -#: wt-status.c:187

4572 +#: wt-status.c:188

4573 msgid " (use \"git rm <file>...\" to mark resolution)"

4574 msgstr " (usa \"git rm <file>...\" para marcar la resolución)"

4575

4323 -#: wt-status.c:198 wt-status.c:984

4576 +#: wt-status.c:199 wt-status.c:1007

4577 msgid "Changes to be committed:"

4578 msgstr "Cambios a ser confirmados:"

4579

4327 -#: wt-status.c:216 wt-status.c:993

4580 +#: wt-status.c:217 wt-status.c:1016

4581 msgid "Changes not staged for commit:"

4582 msgstr "Cambios no rastreados para el commit:"

4583

4331 -#: wt-status.c:220

4584 +#: wt-status.c:221

4585 msgid " (use \"git add <file>...\" to update what will be committed)"

4586 msgstr ""

4587 " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"

4588

4336 -#: wt-status.c:222

4589 +#: wt-status.c:223

4590 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4591 msgstr ""

4592 " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "

4593 "commit)"

4594

4342 -#: wt-status.c:223

4595 +#: wt-status.c:224

4596 msgid ""

4597 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4598 msgstr ""

4599 " (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "

4600 "directorio de trabajo)"

4601

4349 -#: wt-status.c:225

4602 +#: wt-status.c:226

4603 msgid " (commit or discard the untracked or modified content in submodules)"

4604 msgstr ""

4605 " (confirmar o descartar el contenido sin seguimiento o modificado en los "

4606 "sub-módulos)"

4607

4355 -#: wt-status.c:237

4608 +#: wt-status.c:238

4609 #, c-format

4610 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4611 msgstr ""

4612 " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"

4613

4361 -#: wt-status.c:252

4614 +#: wt-status.c:253

4615 msgid "both deleted:"

4616 msgstr "ambos borrados:"

4617

4365 -#: wt-status.c:254

4618 +#: wt-status.c:255

4619 msgid "added by us:"

4620 msgstr "agregado por nosotros:"

4621

4369 -#: wt-status.c:256

4622 +#: wt-status.c:257

4623 msgid "deleted by them:"

4624 msgstr "borrados por ellos:"

4625

4373 -#: wt-status.c:258

4626 +#: wt-status.c:259

4627 msgid "added by them:"

4628 msgstr "agregado por ellos:"

4629

4377 -#: wt-status.c:260

4630 +#: wt-status.c:261

4631 msgid "deleted by us:"

4632 msgstr "borrado por nosotros:"

4633

4381 -#: wt-status.c:262

4634 +#: wt-status.c:263

4635 msgid "both added:"

4636 msgstr "ambos agregados:"

4637

4385 -#: wt-status.c:264

4638 +#: wt-status.c:265

4639 msgid "both modified:"

4640 msgstr "ambos modificados:"

4641

4389 -#: wt-status.c:274

4642 +#: wt-status.c:275

4643 msgid "new file:"

4644 msgstr "nuevo archivo:"

4645

4393 -#: wt-status.c:276

4646 +#: wt-status.c:277

4647 msgid "copied:"

4648 msgstr "copiado:"

4649

4397 -#: wt-status.c:278

4650 +#: wt-status.c:279

4651 msgid "deleted:"

4652 msgstr "borrado:"

4653

4401 -#: wt-status.c:280

4654 +#: wt-status.c:281

4655 msgid "modified:"

4656 msgstr "modificado:"

4657

4405 -#: wt-status.c:282

4658 +#: wt-status.c:283

4659 msgid "renamed:"

4660 msgstr "renombrado:"

4661

4409 -#: wt-status.c:284

4662 +#: wt-status.c:285

4663 msgid "typechange:"

4664 msgstr "cambio de tipo:"

4665

4413 -#: wt-status.c:286

4666 +#: wt-status.c:287

4667 msgid "unknown:"

4668 msgstr "desconocido:"

4669

4417 -#: wt-status.c:288

4670 +#: wt-status.c:289

4671 msgid "unmerged:"

4672 msgstr "des-fusionado:"

4673

4421 -#: wt-status.c:370

4674 +#: wt-status.c:369

4675 msgid "new commits, "

4676 msgstr "nuevos commits, "

4677

4425 -#: wt-status.c:372

4678 +#: wt-status.c:371

4679 msgid "modified content, "

4680 msgstr "contenido modificado, "

4681

4429 -#: wt-status.c:374

4682 +#: wt-status.c:373

4683 msgid "untracked content, "

4684 msgstr "contenido no rastreado, "

4685

4433 -#: wt-status.c:824

4686 +#: wt-status.c:847

4687 #, c-format

4688 msgid "Your stash currently has %d entry"

4689 msgid_plural "Your stash currently has %d entries"

4690 msgstr[0] "Tu stash actualmente tiene %d entrada"

4691 msgstr[1] "Tu stash actualmente tiene %d entradas"

4692

4440 -#: wt-status.c:856

4693 +#: wt-status.c:879

4694 msgid "Submodules changed but not updated:"

4695 msgstr "Submodulos cambiados pero no actualizados:"

4696

4444 -#: wt-status.c:858

4697 +#: wt-status.c:881

4698 msgid "Submodule changes to be committed:"

4699 msgstr "Submodulos cambiados listos para realizar commit:"

4700

4448 -#: wt-status.c:940

4701 +#: wt-status.c:963

4702 msgid ""

4703 "Do not modify or remove the line above.\n"

4704 "Everything below it will be ignored."

@@ -4453,107 +4706,107 @@ msgstr ""

4706 "No modifique o borre la línea de encima.\n"

4707 "Todo lo que este por abajo será removido."

4708

4456 -#: wt-status.c:1053

4709 +#: wt-status.c:1076

4710 msgid "You have unmerged paths."

4458 -msgstr "tienes rutas no fusionadas"

4711 +msgstr "Tienes rutas no fusionadas."

4712

4460 -#: wt-status.c:1056

4713 +#: wt-status.c:1079

4714 msgid " (fix conflicts and run \"git commit\")"

4715 msgstr " (arregla los conflictos y corre \"git commit\""

4716

4464 -#: wt-status.c:1058

4717 +#: wt-status.c:1081

4718 msgid " (use \"git merge --abort\" to abort the merge)"

4719 msgstr " (usa \"git merge --abort\" para abortar la fusion)"

4720

4468 -#: wt-status.c:1063

4721 +#: wt-status.c:1086

4722 msgid "All conflicts fixed but you are still merging."

4723 msgstr "Todos los conflictos resueltos pero sigues fusionando."

4724

4472 -#: wt-status.c:1066

4725 +#: wt-status.c:1089

4726 msgid " (use \"git commit\" to conclude merge)"

4727 msgstr " (usa \"git commit\" para concluir la fusión)"

4728

4476 -#: wt-status.c:1076

4729 +#: wt-status.c:1099

4730 msgid "You are in the middle of an am session."

4731 msgstr "Estás en medio de una sesión am."

4732

4480 -#: wt-status.c:1079

4733 +#: wt-status.c:1102

4734 msgid "The current patch is empty."

4735 msgstr "El parche actual esta vacío."

4736

4484 -#: wt-status.c:1083

4737 +#: wt-status.c:1106

4738 msgid " (fix conflicts and then run \"git am --continue\")"

4739 msgstr " (arregla los conflictos y luego corre \"git am --continue\""

4740

4488 -#: wt-status.c:1085

4741 +#: wt-status.c:1108

4742 msgid " (use \"git am --skip\" to skip this patch)"

4743 msgstr " (usa \"git am --skip\" para saltar este parche)"

4744

4492 -#: wt-status.c:1087

4745 +#: wt-status.c:1110

4746 msgid " (use \"git am --abort\" to restore the original branch)"

4747 msgstr " (usa \"git am --abort\" para restaurar la rama original)"

4748

4496 -#: wt-status.c:1219

4749 +#: wt-status.c:1242

4750 msgid "git-rebase-todo is missing."

4751 msgstr "git-rebase-todo no esta presente."

4752

4500 -#: wt-status.c:1221

4753 +#: wt-status.c:1244

4754 msgid "No commands done."

4755 msgstr "No se realizaron los comandos."

4756

4504 -#: wt-status.c:1224

4757 +#: wt-status.c:1247

4758 #, c-format

4759 msgid "Last command done (%d command done):"

4760 msgid_plural "Last commands done (%d commands done):"

4761 msgstr[0] "El último comando realizado (%d comando realizado):"

4762 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"

4763

4511 -#: wt-status.c:1235

4764 +#: wt-status.c:1258

4765 #, c-format

4766 msgid " (see more in file %s)"

4767 msgstr " (ver mas en el archivo %s)"

4768

4516 -#: wt-status.c:1240

4769 +#: wt-status.c:1263

4770 msgid "No commands remaining."

4771 msgstr "No quedan mas comandos."

4772

4520 -#: wt-status.c:1243

4773 +#: wt-status.c:1266

4774 #, c-format

4775 msgid "Next command to do (%d remaining command):"

4776 msgid_plural "Next commands to do (%d remaining commands):"

4524 -msgstr[0] "Siguiente comando a realizar (%d comando restante)"

4525 -msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes="

4777 +msgstr[0] "Siguiente comando a realizar (%d comando restante):"

4778 +msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"

4779

4527 -#: wt-status.c:1251

4780 +#: wt-status.c:1274

4781 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4782 msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"

4783

4531 -#: wt-status.c:1264

4784 +#: wt-status.c:1287

4785 #, c-format

4786 msgid "You are currently rebasing branch '%s' on '%s'."

4787 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."

4788

4536 -#: wt-status.c:1269

4789 +#: wt-status.c:1292

4790 msgid "You are currently rebasing."

4791 msgstr "Estás aplicando un rebase."

4792

4540 -#: wt-status.c:1283

4793 +#: wt-status.c:1306

4794 msgid " (fix conflicts and then run \"git rebase --continue\")"

4795 msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"

4796

4544 -#: wt-status.c:1285

4797 +#: wt-status.c:1308

4798 msgid " (use \"git rebase --skip\" to skip this patch)"

4799 msgstr " (usa \"git rebase --skip\" para omitir este parche)"

4800

4548 -#: wt-status.c:1287

4801 +#: wt-status.c:1310

4802 msgid " (use \"git rebase --abort\" to check out the original branch)"

4803 msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"

4804

4552 -#: wt-status.c:1293

4805 +#: wt-status.c:1316

4806 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4807 msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"

4808

4556 -#: wt-status.c:1297

4809 +#: wt-status.c:1320

4810 #, c-format

4811 msgid ""

4812 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4561,128 +4814,128 @@ msgstr ""

4814 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "

4815 "'%s'."

4816

4564 -#: wt-status.c:1302

4817 +#: wt-status.c:1325

4818 msgid "You are currently splitting a commit during a rebase."

4819 msgstr "Estás dividiendo un commit durante un rebase."

4820

4568 -#: wt-status.c:1305

4821 +#: wt-status.c:1328

4822 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4823 msgstr ""

4824 " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"

4825 "continue\")"

4826

4574 -#: wt-status.c:1309

4827 +#: wt-status.c:1332

4828 #, c-format

4829 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4830 msgstr ""

4831 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "

4832 "'%s'."

4833

4581 -#: wt-status.c:1314

4834 +#: wt-status.c:1337

4835 msgid "You are currently editing a commit during a rebase."

4836 msgstr "Estás editando un commit durante un rebase."

4837

4585 -#: wt-status.c:1317

4838 +#: wt-status.c:1340

4839 msgid " (use \"git commit --amend\" to amend the current commit)"

4840 msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"

4841

4589 -#: wt-status.c:1319

4842 +#: wt-status.c:1342

4843 msgid ""

4844 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4845 msgstr ""

4846 " (usa \"git rebase --continue\" una vez que estés satisfecho con tus "

4847 "cambios)"

4848

4596 -#: wt-status.c:1329

4849 +#: wt-status.c:1352

4850 #, c-format

4851 msgid "You are currently cherry-picking commit %s."

4852 msgstr "Estás realizando un cherry-picking en el commit %s."

4853

4601 -#: wt-status.c:1334

4854 +#: wt-status.c:1357

4855 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4856 msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"

4857

4605 -#: wt-status.c:1337

4858 +#: wt-status.c:1360

4859 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4860 msgstr ""

4861 " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"

4862

4610 -#: wt-status.c:1339

4863 +#: wt-status.c:1362

4864 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4865 msgstr ""

4866 " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"

4867

4615 -#: wt-status.c:1348

4868 +#: wt-status.c:1371

4869 #, c-format

4870 msgid "You are currently reverting commit %s."

4871 msgstr "Estás revirtiendo el commit %s."

4872

4620 -#: wt-status.c:1353

4873 +#: wt-status.c:1376

4874 msgid " (fix conflicts and run \"git revert --continue\")"

4875 msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"

4876

4624 -#: wt-status.c:1356

4877 +#: wt-status.c:1379

4878 msgid " (all conflicts fixed: run \"git revert --continue\")"

4879 msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"

4880

4628 -#: wt-status.c:1358

4881 +#: wt-status.c:1381

4882 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4883 msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"

4884

4632 -#: wt-status.c:1369

4885 +#: wt-status.c:1392

4886 #, c-format

4887 msgid "You are currently bisecting, started from branch '%s'."

4888 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."

4889

4637 -#: wt-status.c:1373

4890 +#: wt-status.c:1396

4891 msgid "You are currently bisecting."

4892 msgstr "Estás aplicando un bisect."

4893

4641 -#: wt-status.c:1376

4894 +#: wt-status.c:1399

4895 msgid " (use \"git bisect reset\" to get back to the original branch)"

4896 msgstr " (usa \"git bisect reset\" para volver a la rama original)"

4897

4645 -#: wt-status.c:1573

4898 +#: wt-status.c:1596

4899 msgid "On branch "

4900 msgstr "En la rama "

4901

4649 -#: wt-status.c:1579

4902 +#: wt-status.c:1602

4903 msgid "interactive rebase in progress; onto "

4651 -msgstr "rebase interactivo en progreso; en"

4904 +msgstr "rebase interactivo en progreso; en "

4905

4653 -#: wt-status.c:1581

4906 +#: wt-status.c:1604

4907 msgid "rebase in progress; onto "

4655 -msgstr "rebase en progreso; en"

4908 +msgstr "rebase en progreso; en "

4909

4657 -#: wt-status.c:1586

4910 +#: wt-status.c:1609

4911 msgid "HEAD detached at "

4659 -msgstr "HEAD desacoplada en"

4912 +msgstr "HEAD desacoplada en "

4913

4661 -#: wt-status.c:1588

4914 +#: wt-status.c:1611

4915 msgid "HEAD detached from "

4663 -msgstr "HEAD desacoplada de"

4916 +msgstr "HEAD desacoplada de "

4917

4665 -#: wt-status.c:1591

4918 +#: wt-status.c:1614

4919 msgid "Not currently on any branch."

4920 msgstr "Actualmente no estás en ninguna rama."

4921

4669 -#: wt-status.c:1611

4922 +#: wt-status.c:1634

4923 msgid "Initial commit"

4924 msgstr "Confirmación inicial"

4925

4673 -#: wt-status.c:1612

4926 +#: wt-status.c:1635

4927 msgid "No commits yet"

4928 msgstr "No hay commits todavía"

4929

4677 -#: wt-status.c:1626

4930 +#: wt-status.c:1649

4931 msgid "Untracked files"

4932 msgstr "Archivos sin seguimiento"

4933

4681 -#: wt-status.c:1628

4934 +#: wt-status.c:1651

4935 msgid "Ignored files"

4936 msgstr "Archivos ignorados"

4937

4685 -#: wt-status.c:1632

4938 +#: wt-status.c:1655

4939 #, c-format

4940 msgid ""

4941 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4693,31 +4946,31 @@ msgstr ""

4946 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"

4947 "nuevos archivos usted mismo (vea 'git help status')."

4948

4696 -#: wt-status.c:1638

4949 +#: wt-status.c:1661

4950 #, c-format

4951 msgid "Untracked files not listed%s"

4952 msgstr "Archivos no rastreados no son mostrados %s"

4953

4701 -#: wt-status.c:1640

4954 +#: wt-status.c:1663

4955 msgid " (use -u option to show untracked files)"

4956 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"

4957

4705 -#: wt-status.c:1646

4958 +#: wt-status.c:1669

4959 msgid "No changes"

4960 msgstr "Sin cambios"

4961

4709 -#: wt-status.c:1651

4962 +#: wt-status.c:1674

4963 #, c-format

4964 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4965 msgstr ""

4966 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"

4967

4715 -#: wt-status.c:1654

4968 +#: wt-status.c:1677

4969 #, c-format

4970 msgid "no changes added to commit\n"

4971 msgstr "no se agregaron cambios al commit\n"

4972

4720 -#: wt-status.c:1657

4973 +#: wt-status.c:1680

4974 #, c-format

4975 msgid ""

4976 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -4726,68 +4979,72 @@ msgstr ""

4979 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "

4980 "(usa \"git add\" para hacerles seguimiento)\n"

4981

4729 -#: wt-status.c:1660

4982 +#: wt-status.c:1683

4983 #, c-format

4984 msgid "nothing added to commit but untracked files present\n"

4985 msgstr ""

4986 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "

4987 "presentes\n"

4988

4736 -#: wt-status.c:1663

4989 +#: wt-status.c:1686

4990 #, c-format

4991 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4992 msgstr ""

4993 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "

4994 "hacerles seguimiento)\n"

4995

4743 -#: wt-status.c:1666 wt-status.c:1671

4996 +#: wt-status.c:1689 wt-status.c:1694

4997 #, c-format

4998 msgid "nothing to commit\n"

4999 msgstr "nada para hacer commit\n"

5000

4748 -#: wt-status.c:1669

5001 +#: wt-status.c:1692

5002 #, c-format

5003 msgid "nothing to commit (use -u to show untracked files)\n"

5004 msgstr ""

5005 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"

5006

4754 -#: wt-status.c:1673

5007 +#: wt-status.c:1696

5008 #, c-format

5009 msgid "nothing to commit, working tree clean\n"

5010 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"

5011

4759 -#: wt-status.c:1785

5012 +#: wt-status.c:1809

5013 msgid "No commits yet on "

5014 msgstr "No hay commits todavía en "

5015

4763 -#: wt-status.c:1789

5016 +#: wt-status.c:1813

5017 msgid "HEAD (no branch)"

5018 msgstr "HEAD (sin rama)"

5019

4767 -#: wt-status.c:1818 wt-status.c:1826

5020 +#: wt-status.c:1844

5021 +msgid "different"

5022 +msgstr "diferente"

5023 +

5024 +#: wt-status.c:1846 wt-status.c:1854

5025 msgid "behind "

4769 -msgstr "detrás"

5026 +msgstr "detrás "

5027

4771 -#: wt-status.c:1821 wt-status.c:1824

5028 +#: wt-status.c:1849 wt-status.c:1852

5029 msgid "ahead "

4773 -msgstr "adelante"

5030 +msgstr "adelante "

5031

5032 #. TRANSLATORS: the action is e.g. "pull with rebase"

4776 -#: wt-status.c:2318

5033 +#: wt-status.c:2358

5034 #, c-format

5035 msgid "cannot %s: You have unstaged changes."

5036 msgstr "no se puede %s: Tienes cambios sin marcar."

5037

4781 -#: wt-status.c:2324

5038 +#: wt-status.c:2364

5039 msgid "additionally, your index contains uncommitted changes."

5040 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

5041

4785 -#: wt-status.c:2326

5042 +#: wt-status.c:2366

5043 #, c-format

5044 msgid "cannot %s: Your index contains uncommitted changes."

5045 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

5046

4790 -#: compat/precompose_utf8.c:58 builtin/clone.c:437

5047 +#: compat/precompose_utf8.c:58 builtin/clone.c:440

5048 #, c-format

5049 msgid "failed to unlink '%s'"

5050 msgstr "fallo al desvincular '%s'"

@@ -4801,7 +5058,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..."

5058 msgid "unexpected diff status %c"

5059 msgstr "diff status inesperado %c"

5060

4804 -#: builtin/add.c:88 builtin/commit.c:291

5061 +#: builtin/add.c:88 builtin/commit.c:257

5062 msgid "updating files failed"

5063 msgstr "fallo la actualización de carpetas"

5064

@@ -4850,7 +5107,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

5107 msgstr ""

5108 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"

5109

4853 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

5110 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5111 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5112 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5113 msgid "dry run"

@@ -4860,7 +5117,7 @@ msgstr "dry run ( ejecución en seco)"

5117 msgid "interactive picking"

5118 msgstr "selección interactiva"

5119

4863 -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

5120 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5121 msgid "select hunks interactively"

5122 msgstr "elegir hunks de forma interactiva"

5123

@@ -4984,10 +5241,10 @@ msgstr "Nada especificado, nada agregado.\n"

5241 msgid "Maybe you wanted to say 'git add .'?\n"

5242 msgstr "Tal vez quiso decir 'git add .'?\n"

5243

4987 -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4988 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4989 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4990 -#: builtin/rm.c:271 builtin/submodule--helper.c:311

5244 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5245 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5246 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5247 +#: builtin/rm.c:271 builtin/submodule--helper.c:326

5248 msgid "index file corrupt"

5249 msgstr "archivo índice corrompido"

5250

@@ -5003,7 +5260,7 @@ msgstr "'%s' fue borrado por el hook de applypatch-msg"

5260 #: builtin/am.c:539

5261 #, c-format

5262 msgid "Malformed input line: '%s'."

5006 -msgstr "línea mal formada: '%s'."

5263 +msgstr "Línea mal formada: '%s'."

5264

5265 #: builtin/am.c:576

5266 #, c-format

@@ -5021,7 +5278,7 @@ msgstr "no se pudo analizar el parche '%s'"

5278

5279 #: builtin/am.c:855

5280 msgid "Only one StGIT patch series can be applied at once"

5024 -msgstr "Solo un parche StGIT puede ser aplicado de una vez "

5281 +msgstr "Solo un parche StGIT puede ser aplicado de una vez"

5282

5283 #: builtin/am.c:903

5284 msgid "invalid timestamp"

@@ -5039,61 +5296,61 @@ msgstr "offset de zona horaria inválido"

5296 msgid "Patch format detection failed."

5297 msgstr "Falló al detectar el formato del parche."

5298

5042 -#: builtin/am.c:1013 builtin/clone.c:402

5299 +#: builtin/am.c:1013 builtin/clone.c:405

5300 #, c-format

5301 msgid "failed to create directory '%s'"

5302 msgstr "fallo al crear el directorio '%s'"

5303

5047 -#: builtin/am.c:1017

5304 +#: builtin/am.c:1018

5305 msgid "Failed to split patches."

5049 -msgstr "Fallo al dividir parches"

5306 +msgstr "Fallo al dividir parches."

5307

5051 -#: builtin/am.c:1146 builtin/commit.c:376

5308 +#: builtin/am.c:1148 builtin/commit.c:342

5309 msgid "unable to write index file"

5310 msgstr "no es posible escribir en el archivo índice"

5311

5055 -#: builtin/am.c:1160

5312 +#: builtin/am.c:1162

5313 #, c-format

5314 msgid "When you have resolved this problem, run \"%s --continue\"."

5315 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."

5316

5060 -#: builtin/am.c:1161

5317 +#: builtin/am.c:1163

5318 #, c-format

5319 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5320 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."

5321

5065 -#: builtin/am.c:1162

5322 +#: builtin/am.c:1164

5323 #, c-format

5324 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5325 msgstr ""

5326 "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"

5327 "\"."

5328

5072 -#: builtin/am.c:1269

5329 +#: builtin/am.c:1271

5330 msgid "Patch is empty."

5331 msgstr "El parche esta vacío."

5332

5076 -#: builtin/am.c:1335

5333 +#: builtin/am.c:1337

5334 #, c-format

5335 msgid "invalid ident line: %.*s"

5336 msgstr "sangría no válida: %.*s"

5337

5081 -#: builtin/am.c:1357

5338 +#: builtin/am.c:1359

5339 #, c-format

5340 msgid "unable to parse commit %s"

5341 msgstr "no es posible analizar el commit %s"

5342

5086 -#: builtin/am.c:1550

5343 +#: builtin/am.c:1554

5344 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5345 msgstr ""

5346 "Repositorio carece de los blobs necesarios para retroceder en una fusión de "

5090 -"3-vías"

5347 +"3-vías."

5348

5092 -#: builtin/am.c:1552

5349 +#: builtin/am.c:1556

5350 msgid "Using index info to reconstruct a base tree..."

5351 msgstr "Usando la información del índice para reconstruir un árbol base..."

5352

5096 -#: builtin/am.c:1571

5353 +#: builtin/am.c:1575

5354 msgid ""

5355 "Did you hand edit your patch?\n"

5356 "It does not apply to blobs recorded in its index."

@@ -5101,37 +5358,28 @@ msgstr ""

5358 "Editaste el parche a mano?\n"

5359 "No aplica a blobs guardados en su índice."

5360

5104 -#: builtin/am.c:1577

5361 +#: builtin/am.c:1581

5362 msgid "Falling back to patching base and 3-way merge..."

5363 msgstr "Retrocediendo para parchar base y fusión de 3-vías..."

5364

5108 -#: builtin/am.c:1602

5365 +#: builtin/am.c:1606

5366 msgid "Failed to merge in the changes."

5367 msgstr "Falló al fusionar en los cambios."

5368

5112 -#: builtin/am.c:1626 builtin/merge.c:642

5113 -msgid "git write-tree failed to write a tree"

5114 -msgstr "git write-tree falló al escribir el árbol"

5115 -

5116 -#: builtin/am.c:1633

5369 +#: builtin/am.c:1637

5370 msgid "applying to an empty history"

5371 msgstr "aplicando a un historial vacío"

5372

5120 -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

5121 -#: builtin/merge.c:850

5122 -msgid "failed to write commit object"

5123 -msgstr "fallo al escribir el objeto commit"

5124 -

5125 -#: builtin/am.c:1679 builtin/am.c:1683

5373 +#: builtin/am.c:1683 builtin/am.c:1687

5374 #, c-format

5375 msgid "cannot resume: %s does not exist."

5128 -msgstr "no se puede continuar: %s no existe"

5376 +msgstr "no se puede continuar: %s no existe."

5377

5130 -#: builtin/am.c:1699

5378 +#: builtin/am.c:1703

5379 msgid "cannot be interactive without stdin connected to a terminal."

5132 -msgstr "no se puede ser interactivo sin stdin conectado a un terminal"

5380 +msgstr "no se puede ser interactivo sin stdin conectado a un terminal."

5381

5134 -#: builtin/am.c:1704

5382 +#: builtin/am.c:1708

5383 msgid "Commit Body is:"

5384 msgstr "Cuerpo de commit es:"

5385

@@ -5139,35 +5387,34 @@ msgstr "Cuerpo de commit es:"

5387 #. in your translation. The program will only accept English

5388 #. input at this point.

5389 #.

5142 -#: builtin/am.c:1714

5390 +#: builtin/am.c:1718

5391 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5392 msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5393

5146 -#: builtin/am.c:1764

5394 +#: builtin/am.c:1768

5395 #, c-format

5396 msgid "Dirty index: cannot apply patches (dirty: %s)"

5397 msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"

5398

5151 -#: builtin/am.c:1804 builtin/am.c:1876

5399 +#: builtin/am.c:1808 builtin/am.c:1879

5400 #, c-format

5401 msgid "Applying: %.*s"

5402 msgstr "Aplicando: %.*s"

5403

5156 -#: builtin/am.c:1820

5404 +#: builtin/am.c:1824

5405 msgid "No changes -- Patch already applied."

5406 msgstr "Sin cambios -- parche ya aplicado."

5407

5160 -#: builtin/am.c:1828

5408 +#: builtin/am.c:1832

5409 #, c-format

5410 msgid "Patch failed at %s %.*s"

5411 msgstr "El parche fallo en %s %.*s"

5412

5165 -#: builtin/am.c:1834

5166 -#, c-format

5167 -msgid "The copy of the patch that failed is found in: %s"

5168 -msgstr "La copia del parche que fallido se encuentra en: %s"

5413 +#: builtin/am.c:1838

5414 +msgid "Use 'git am --show-current-patch' to see the failed patch"

5415 +msgstr "Use 'git am --show-current-patch' para ver el parche fallido"

5416

5170 -#: builtin/am.c:1879

5417 +#: builtin/am.c:1882

5418 msgid ""

5419 "No changes - did you forget to use 'git add'?\n"

5420 "If there is nothing left to stage, chances are that something else\n"

@@ -5177,7 +5424,7 @@ msgstr ""

5424 "Si no hay nada en el área de stage, las posibilidad es que algo mas\n"

5425 "ya haya introducido el mismo cambio; tal vez quieras omitir este parche."

5426

5180 -#: builtin/am.c:1886

5427 +#: builtin/am.c:1889

5428 msgid ""

5429 "You still have unmerged paths in your index.\n"

5430 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5190,152 +5437,160 @@ msgstr ""

5437 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "

5438 "él."

5439

5193 -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5194 -#: builtin/reset.c:340

5440 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324

5441 +#: builtin/reset.c:332

5442 #, c-format

5443 msgid "Could not parse object '%s'."

5444 msgstr "No se pudo analizar el objeto '%s'."

5445

5199 -#: builtin/am.c:2045

5446 +#: builtin/am.c:2048

5447 msgid "failed to clean index"

5448 msgstr "fallo al limpiar el índice"

5449

5203 -#: builtin/am.c:2080

5450 +#: builtin/am.c:2083

5451 msgid ""

5452 "You seem to have moved HEAD since the last 'am' failure.\n"

5453 "Not rewinding to ORIG_HEAD"

5454 msgstr ""

5455 "Parece haber movido HEAD desde el último fallo 'am'.\n"

5209 -"No rebobinando a ORIG_HEAD "

5456 +"No rebobinando a ORIG_HEAD"

5457

5211 -#: builtin/am.c:2143

5458 +#: builtin/am.c:2174

5459 #, c-format

5460 msgid "Invalid value for --patch-format: %s"

5214 -msgstr "valor invalido para --patch-format: %s"

5461 +msgstr "Valor invalido para --patch-format: %s"

5462

5216 -#: builtin/am.c:2176

5463 +#: builtin/am.c:2210

5464 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5465 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"

5466

5220 -#: builtin/am.c:2177

5467 +#: builtin/am.c:2211

5468 msgid "git am [<options>] (--continue | --skip | --abort)"

5469 msgstr "git am [<opciones>] (--continue | --skip | --abort)"

5470

5224 -#: builtin/am.c:2183

5471 +#: builtin/am.c:2217

5472 msgid "run interactively"

5473 msgstr "ejecutar de manera interactiva"

5474

5228 -#: builtin/am.c:2185

5475 +#: builtin/am.c:2219

5476 msgid "historical option -- no-op"

5477 msgstr "opción histórica -- no-op"

5478

5232 -#: builtin/am.c:2187

5479 +#: builtin/am.c:2221

5480 msgid "allow fall back on 3way merging if needed"

5481 msgstr "permitir retroceso en fusión de 3-vías si es necesario"

5482

5236 -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

5237 -#: builtin/repack.c:180

5483 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5484 +#: builtin/repack.c:182

5485 msgid "be quiet"

5486 msgstr "ser silencioso"

5487

5241 -#: builtin/am.c:2190

5488 +#: builtin/am.c:2224

5489 msgid "add a Signed-off-by line to the commit message"

5490 msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"

5491

5245 -#: builtin/am.c:2193

5492 +#: builtin/am.c:2227

5493 msgid "recode into utf8 (default)"

5494 msgstr "recodificar en utf8 (default)"

5495

5249 -#: builtin/am.c:2195

5496 +#: builtin/am.c:2229

5497 msgid "pass -k flag to git-mailinfo"

5498 msgstr "pasar flag -k a git-mailinfo"

5499

5253 -#: builtin/am.c:2197

5500 +#: builtin/am.c:2231

5501 msgid "pass -b flag to git-mailinfo"

5502 msgstr "pasar flag -b a git-mailinfo"

5503

5257 -#: builtin/am.c:2199

5504 +#: builtin/am.c:2233

5505 msgid "pass -m flag to git-mailinfo"

5506 msgstr "pasar flag -m a git-mailinfo"

5507

5261 -#: builtin/am.c:2201

5508 +#: builtin/am.c:2235

5509 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5510 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"

5511

5265 -#: builtin/am.c:2204

5512 +#: builtin/am.c:2238

5513 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5514 msgstr ""

5515 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"

5516

5270 -#: builtin/am.c:2207

5517 +#: builtin/am.c:2241

5518 msgid "strip everything before a scissors line"

5519 msgstr "descubrir todo antes de una línea de tijeras"

5520

5274 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5275 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5276 -#: builtin/am.c:2236

5521 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252

5522 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264

5523 +#: builtin/am.c:2270

5524 msgid "pass it through git-apply"

5525 msgstr "pasarlo a través de git-apply"

5526

5280 -#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5281 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5282 -#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5283 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5284 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5527 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5528 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5529 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5530 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5531 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5532 msgid "n"

5533 msgstr "n"

5534

5288 -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

5289 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5535 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5536 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5537 msgid "format"

5538 msgstr "formato"

5539

5293 -#: builtin/am.c:2233

5540 +#: builtin/am.c:2267

5541 msgid "format the patch(es) are in"

5542 msgstr "formatear el parche(s)"

5543

5297 -#: builtin/am.c:2239

5544 +#: builtin/am.c:2273

5545 msgid "override error message when patch failure occurs"

5546 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"

5547

5301 -#: builtin/am.c:2241

5548 +#: builtin/am.c:2275

5549 msgid "continue applying patches after resolving a conflict"

5550 msgstr "continuar aplicando los parches tras resolver conflictos"

5551

5305 -#: builtin/am.c:2244

5552 +#: builtin/am.c:2278

5553 msgid "synonyms for --continue"

5554 msgstr "sinónimos para --continue"

5555

5309 -#: builtin/am.c:2247

5556 +#: builtin/am.c:2281

5557 msgid "skip the current patch"

5558 msgstr "saltar el parche actual"

5559

5313 -#: builtin/am.c:2250

5560 +#: builtin/am.c:2284

5561 msgid "restore the original branch and abort the patching operation."

5562 msgstr "restaurar la rama original y abortar la operación de parchado."

5563

5317 -#: builtin/am.c:2254

5564 +#: builtin/am.c:2287

5565 +msgid "abort the patching operation but keep HEAD where it is."

5566 +msgstr "abortar la operación de parchado pero mantener HEAD donde está."

5567 +

5568 +#: builtin/am.c:2290

5569 +msgid "show the patch being applied."

5570 +msgstr "muestra el parche siendo aplicado."

5571 +

5572 +#: builtin/am.c:2294

5573 msgid "lie about committer date"

5574 msgstr "mentir sobre la fecha del committer"

5575

5321 -#: builtin/am.c:2256

5576 +#: builtin/am.c:2296

5577 msgid "use current timestamp for author date"

5578 msgstr "usar el timestamp actual para la fecha del autor"

5579

5325 -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

5326 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5580 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5581 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5582 msgid "key-id"

5583 msgstr "key-id"

5584

5330 -#: builtin/am.c:2259

5585 +#: builtin/am.c:2299

5586 msgid "GPG-sign commits"

5332 -msgstr "commits con firma GPG"

5587 +msgstr "Commits con firma GPG"

5588

5334 -#: builtin/am.c:2262

5589 +#: builtin/am.c:2302

5590 msgid "(internal use for git-rebase)"

5591 msgstr "(uso interno para git-rebase)"

5592

5338 -#: builtin/am.c:2280

5593 +#: builtin/am.c:2320

5594 msgid ""

5595 "The -b/--binary option has been a no-op for long time, and\n"

5596 "it will be removed. Please do not use it anymore."

@@ -5343,16 +5598,16 @@ msgstr ""

5598 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"

5599 "será removida. Por favor no la use más."

5600

5346 -#: builtin/am.c:2287

5601 +#: builtin/am.c:2327

5602 msgid "failed to read the index"

5603 msgstr "fallo al leer el índice"

5604

5350 -#: builtin/am.c:2302

5605 +#: builtin/am.c:2342

5606 #, c-format

5607 msgid "previous rebase directory %s still exists but mbox given."

5608 msgstr "directorio de rebase previo %s todavía existe en el mbox dado."

5609

5355 -#: builtin/am.c:2326

5610 +#: builtin/am.c:2366

5611 #, c-format

5612 msgid ""

5613 "Stray %s directory found.\n"

@@ -5361,7 +5616,7 @@ msgstr ""

5616 "Directorio extraviado %s encontrado.\n"

5617 "Use \"git am --abort\" para borrarlo."

5618

5364 -#: builtin/am.c:2332

5619 +#: builtin/am.c:2372

5620 msgid "Resolve operation not in progress, we are not resuming."

5621 msgstr "Operación de resolución no está en progreso, no vamos a continuar."

5622

@@ -5383,8 +5638,8 @@ msgid "git archive: Remote with no URL"

5638 msgstr "git archive: Remote sin URL"

5639

5640 #: builtin/archive.c:58

5386 -msgid "git archive: expected ACK/NAK, got EOF"

5387 -msgstr "git archive: se esperaba ACK/NAK, se obtuvo EOF"

5641 +msgid "git archive: expected ACK/NAK, got a flush packet"

5642 +msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"

5643

5644 #: builtin/archive.c:61

5645 #, c-format

@@ -5414,7 +5669,7 @@ msgstr "git bisect--helper --bisect-clean-state"

5669 #: builtin/bisect--helper.c:46

5670 #, c-format

5671 msgid "'%s' is not a valid term"

5417 -msgstr "'%s' no es un término válido."

5672 +msgstr "'%s' no es un término válido"

5673

5674 #: builtin/bisect--helper.c:50

5675 #, c-format

@@ -5470,107 +5725,107 @@ msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"

5725 msgid "<rev-opts> are documented in git-rev-list(1)"

5726 msgstr "<rev-opts> están documentadas en git-rev-list(1)"

5727

5473 -#: builtin/blame.c:668

5728 +#: builtin/blame.c:677

5729 msgid "Show blame entries as we find them, incrementally"

5730 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"

5731

5477 -#: builtin/blame.c:669

5732 +#: builtin/blame.c:678

5733 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5734 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"

5735

5481 -#: builtin/blame.c:670

5736 +#: builtin/blame.c:679

5737 msgid "Do not treat root commits as boundaries (Default: off)"

5738 msgstr "No tratar commits raíces como extremos (Default: off)"

5739

5485 -#: builtin/blame.c:671

5740 +#: builtin/blame.c:680

5741 msgid "Show work cost statistics"

5742 msgstr "Mostrar estadísticas de costo de trabajo"

5743

5489 -#: builtin/blame.c:672

5744 +#: builtin/blame.c:681

5745 msgid "Force progress reporting"

5746 msgstr "Forzar el reporte de progreso"

5747

5493 -#: builtin/blame.c:673

5748 +#: builtin/blame.c:682

5749 msgid "Show output score for blame entries"

5750 msgstr "Mostrar la puntuación de salida de las entradas de blame"

5751

5497 -#: builtin/blame.c:674

5752 +#: builtin/blame.c:683

5753 msgid "Show original filename (Default: auto)"

5754 msgstr "Mostrar nombre original del archivo (Default: auto)"

5755

5501 -#: builtin/blame.c:675

5756 +#: builtin/blame.c:684

5757 msgid "Show original linenumber (Default: off)"

5758 msgstr "Mostrar número de línea original (Default: off)"

5759

5505 -#: builtin/blame.c:676

5760 +#: builtin/blame.c:685

5761 msgid "Show in a format designed for machine consumption"

5762 msgstr "Mostrar en un formato diseñado para consumo de máquina"

5763

5509 -#: builtin/blame.c:677

5764 +#: builtin/blame.c:686

5765 msgid "Show porcelain format with per-line commit information"

5766 msgstr "Mostrar en formato porcelana con información de commit por línea"

5767

5513 -#: builtin/blame.c:678

5768 +#: builtin/blame.c:687

5769 msgid "Use the same output mode as git-annotate (Default: off)"

5770 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"

5771

5517 -#: builtin/blame.c:679

5772 +#: builtin/blame.c:688

5773 msgid "Show raw timestamp (Default: off)"

5774 msgstr "Mostrar timestamp en formato raw (Default: off)"

5775

5521 -#: builtin/blame.c:680

5776 +#: builtin/blame.c:689

5777 msgid "Show long commit SHA1 (Default: off)"

5778 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"

5779

5525 -#: builtin/blame.c:681

5780 +#: builtin/blame.c:690

5781 msgid "Suppress author name and timestamp (Default: off)"

5782 msgstr "Suprimir nombre del autor y timestamp (Default: off)"

5783

5529 -#: builtin/blame.c:682

5784 +#: builtin/blame.c:691

5785 msgid "Show author email instead of name (Default: off)"

5786 msgstr "Mostrar en cambio el email del autor (Default: off)"

5787

5533 -#: builtin/blame.c:683

5788 +#: builtin/blame.c:692

5789 msgid "Ignore whitespace differences"

5790 msgstr "Ignorar diferencias de espacios en blanco"

5791

5537 -#: builtin/blame.c:690

5792 +#: builtin/blame.c:699

5793 msgid "Use an experimental heuristic to improve diffs"

5794 msgstr "Usar un heurístico experimental para mejorar los diffs"

5795

5541 -#: builtin/blame.c:692

5796 +#: builtin/blame.c:701

5797 msgid "Spend extra cycles to find better match"

5798 msgstr "Ocupo más ciclos para encontrar mejoras resultados"

5799

5545 -#: builtin/blame.c:693

5800 +#: builtin/blame.c:702

5801 msgid "Use revisions from <file> instead of calling git-rev-list"

5802 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"

5803

5549 -#: builtin/blame.c:694

5804 +#: builtin/blame.c:703

5805 msgid "Use <file>'s contents as the final image"

5806 msgstr "Usar contenido de <archivo> como imagen final"

5807

5553 -#: builtin/blame.c:695 builtin/blame.c:696

5808 +#: builtin/blame.c:704 builtin/blame.c:705

5809 msgid "score"

5810 msgstr "puntaje"

5811

5557 -#: builtin/blame.c:695

5812 +#: builtin/blame.c:704

5813 msgid "Find line copies within and across files"

5814 msgstr "Encontrar copias de líneas entre y a través de archivos"

5815

5561 -#: builtin/blame.c:696

5816 +#: builtin/blame.c:705

5817 msgid "Find line movements within and across files"

5818 msgstr "Encontrar movimientos de líneas entre y a través de archivos"

5819

5565 -#: builtin/blame.c:697

5820 +#: builtin/blame.c:706

5821 msgid "n,m"

5822 msgstr "n,m"

5823

5569 -#: builtin/blame.c:697

5824 +#: builtin/blame.c:706

5825 msgid "Process only line range n,m, counting from 1"

5826 msgstr "Procesar solo el rango de líneas n,m, contando desde 1"

5827

5573 -#: builtin/blame.c:744

5828 +#: builtin/blame.c:753

5829 msgid "--progress can't be used with --incremental or porcelain formats"

5830 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"

5831

@@ -5582,18 +5837,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"

5837 #. your language may need more or fewer display

5838 #. columns.

5839 #.

5585 -#: builtin/blame.c:795

5840 +#: builtin/blame.c:804

5841 msgid "4 years, 11 months ago"

5842 msgstr "hace 4 años, 11 meses"

5843

5589 -#: builtin/blame.c:882

5844 +#: builtin/blame.c:890

5845 #, c-format

5846 msgid "file %s has only %lu line"

5847 msgid_plural "file %s has only %lu lines"

5848 msgstr[0] "archivo %s tiene solo %lu línea"

5849 msgstr[1] "archivo %s tiene solo %lu líneas"

5850

5596 -#: builtin/blame.c:928

5851 +#: builtin/blame.c:936

5852 msgid "Blaming lines"

5853 msgstr "Blaming a líneas"

5854

@@ -5742,7 +5997,7 @@ msgstr "Copiado de rama fallido"

5997 #: builtin/branch.c:517

5998 #, c-format

5999 msgid "Created a copy of a misnamed branch '%s'"

5745 -msgstr "Copia creada de la rama malnombrada '%s' "

6000 +msgstr "Copia creada de la rama malnombrada '%s'"

6001

6002 #: builtin/branch.c:520

6003 #, c-format

@@ -5787,7 +6042,7 @@ msgstr "mostrar hash y tema, dar dos veces para rama upstream"

6042

6043 #: builtin/branch.c:589

6044 msgid "suppress informational messages"

5790 -msgstr "Suprimir mensajes informativos"

6045 +msgstr "suprimir mensajes informativos"

6046

6047 #: builtin/branch.c:590

6048 msgid "set up tracking mode (see git-pull(1))"

@@ -5885,17 +6140,17 @@ msgstr "muestra solo ramas que no han sido fusionadas"

6140 msgid "list branches in columns"

6141 msgstr "muestra las ramas en columnas"

6142

5888 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

6143 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

6144 msgid "key"

6145 msgstr "clave"

6146

5892 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

6147 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

6148 msgid "field name to sort on"

6149 msgstr "nombre del campo por el cuál ordenar"

6150

6151 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

6152 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5898 -#: builtin/tag.c:408

6153 +#: builtin/tag.c:414

6154 msgid "object"

6155 msgstr "objeto"

6156

@@ -5903,16 +6158,16 @@ msgstr "objeto"

6158 msgid "print only branches of the object"

6159 msgstr "imprimir sólo las ramas del objeto"

6160

5906 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

6161 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

6162 msgid "sorting and filtering are case insensitive"

6163 msgstr "ordenamiento y filtrado son case-insensitive"

6164

5910 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

6165 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

6166 #: builtin/verify-tag.c:39

6167 msgid "format to use for the output"

6168 msgstr "formato para usar para el output"

6169

5915 -#: builtin/branch.c:652 builtin/clone.c:730

6170 +#: builtin/branch.c:652 builtin/clone.c:735

6171 msgid "HEAD not found below refs/heads!"

6172 msgstr "HEAD no encontrado abajo de refs/heads!"

6173

@@ -5997,7 +6252,7 @@ msgid ""

6252 "the '--set-upstream' option is no longer supported. Please use '--track' or "

6253 "'--set-upstream-to' instead."

6254 msgstr ""

6000 -"La opción --set-upstream ya no es soportada. Considere usar '--track' o '--"

6255 +"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"

6256 "set-upstream-to' en cambio."

6257

6258 #: builtin/bundle.c:45

@@ -6013,7 +6268,7 @@ msgstr "Se necesita un repositorio para agrupar."

6268 msgid "Need a repository to unbundle."

6269 msgstr "Se necesita un repositorio para desagrupar."

6270

6016 -#: builtin/cat-file.c:521

6271 +#: builtin/cat-file.c:523

6272 msgid ""

6273 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6274 "p | <type> | --textconv | --filters) [--path=<path>] <object>"

@@ -6021,7 +6276,7 @@ msgstr ""

6276 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6277 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"

6278

6024 -#: builtin/cat-file.c:522

6279 +#: builtin/cat-file.c:524

6280 msgid ""

6281 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6282 "filters]"

@@ -6029,64 +6284,64 @@ msgstr ""

6284 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6285 "filters]"

6286

6032 -#: builtin/cat-file.c:559

6287 +#: builtin/cat-file.c:561

6288 msgid "<type> can be one of: blob, tree, commit, tag"

6289 msgstr "<tipo> puede ser: blob, tree, commit, tag"

6290

6036 -#: builtin/cat-file.c:560

6291 +#: builtin/cat-file.c:562

6292 msgid "show object type"

6293 msgstr "mostrar el tipo del objeto"

6294

6040 -#: builtin/cat-file.c:561

6295 +#: builtin/cat-file.c:563

6296 msgid "show object size"

6297 msgstr "mostrar el tamaño del objeto"

6298

6044 -#: builtin/cat-file.c:563

6299 +#: builtin/cat-file.c:565

6300 msgid "exit with zero when there's no error"

6301 msgstr "salir con cero cuando no haya error"

6302

6048 -#: builtin/cat-file.c:564

6303 +#: builtin/cat-file.c:566

6304 msgid "pretty-print object's content"

6305 msgstr "realizar pretty-print del contenido del objeto"

6306

6052 -#: builtin/cat-file.c:566

6307 +#: builtin/cat-file.c:568

6308 msgid "for blob objects, run textconv on object's content"

6309 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"

6310

6056 -#: builtin/cat-file.c:568

6311 +#: builtin/cat-file.c:570

6312 msgid "for blob objects, run filters on object's content"

6313 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"

6314

6060 -#: builtin/cat-file.c:569 git-submodule.sh:931

6315 +#: builtin/cat-file.c:571 git-submodule.sh:878

6316 msgid "blob"

6317 msgstr "blob"

6318

6064 -#: builtin/cat-file.c:570

6319 +#: builtin/cat-file.c:572

6320 msgid "use a specific path for --textconv/--filters"

6321 msgstr "use una ruta específica para --textconv/--filters"

6322

6068 -#: builtin/cat-file.c:572

6323 +#: builtin/cat-file.c:574

6324 msgid "allow -s and -t to work with broken/corrupt objects"

6325 msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"

6326

6072 -#: builtin/cat-file.c:573

6327 +#: builtin/cat-file.c:575

6328 msgid "buffer --batch output"

6074 -msgstr "salida buffer --batch "

6329 +msgstr "salida buffer --batch"

6330

6076 -#: builtin/cat-file.c:575

6331 +#: builtin/cat-file.c:577

6332 msgid "show info and content of objects fed from the standard input"

6333 msgstr "mostrar info y content de los objetos alimentados por standard input"

6334

6080 -#: builtin/cat-file.c:578

6335 +#: builtin/cat-file.c:580

6336 msgid "show info about objects fed from the standard input"

6337 msgstr "mostrar info de los objetos alimentados por standard input"

6338

6084 -#: builtin/cat-file.c:581

6339 +#: builtin/cat-file.c:583

6340 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

6341 msgstr ""

6342 "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"

6343

6089 -#: builtin/cat-file.c:583

6344 +#: builtin/cat-file.c:585

6345 msgid "show all objects with --batch or --batch-check"

6346 msgstr "mostrar todos los objetos con --batch o --batch-check"

6347

@@ -6106,7 +6361,7 @@ msgstr "reportar todos los atributos configurados en el archivo"

6361 msgid "use .gitattributes only from the index"

6362 msgstr "use .gitattributes solo desde el índice"

6363

6109 -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99

6364 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

6365 msgid "read file names from stdin"

6366 msgstr "leer nombres de archivos de stdin"

6367

@@ -6114,7 +6369,7 @@ msgstr "leer nombres de archivos de stdin"

6369 msgid "terminate input and output records by a NUL character"

6370 msgstr "terminar registros de entrada y salida con un carácter NUL"

6371

6117 -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6372 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

6373 msgid "suppress progress reporting"

6374 msgstr "suprimir el reporte de progreso"

6375

@@ -6126,27 +6381,27 @@ msgstr "mostrar rutas de entrada que no concuerdan"

6381 msgid "ignore index when checking"

6382 msgstr "ignorar el índice cuando se revise"

6383

6129 -#: builtin/check-ignore.c:158

6384 +#: builtin/check-ignore.c:159

6385 msgid "cannot specify pathnames with --stdin"

6386 msgstr "no se puede especificar los nombres de rutas con --stdin"

6387

6133 -#: builtin/check-ignore.c:161

6388 +#: builtin/check-ignore.c:162

6389 msgid "-z only makes sense with --stdin"

6390 msgstr "-z sólo tiene sentido con --stdin"

6391

6137 -#: builtin/check-ignore.c:163

6392 +#: builtin/check-ignore.c:164

6393 msgid "no path specified"

6394 msgstr "ruta no especificada"

6395

6141 -#: builtin/check-ignore.c:167

6396 +#: builtin/check-ignore.c:168

6397 msgid "--quiet is only valid with a single pathname"

6398 msgstr "--quiet solo es válido con un nombre de ruta único"

6399

6145 -#: builtin/check-ignore.c:169

6400 +#: builtin/check-ignore.c:170

6401 msgid "cannot have both --quiet and --verbose"

6402 msgstr "no se puede tener ambos --quiet y --verbose"

6403

6149 -#: builtin/check-ignore.c:172

6404 +#: builtin/check-ignore.c:173

6405 msgid "--non-matching is only valid with --verbose"

6406 msgstr "--non-matching sólo es válida con --verbose"

6407

@@ -6206,9 +6461,9 @@ msgid "write the content to temporary files"

6461 msgstr "escribir el contenido en un archivo temporal"

6462

6463 #: builtin/checkout-index.c:173 builtin/column.c:31

6209 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6210 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6211 -#: builtin/worktree.c:552

6464 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206

6465 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574

6466 +#: builtin/worktree.c:570

6467 msgid "string"

6468 msgstr "string"

6469

@@ -6253,80 +6508,80 @@ msgstr "ruta '%s' no tiene versiones necesarias"

6508 msgid "path '%s': cannot merge"

6509 msgstr "ruta '%s': no se puede fusionar"

6510

6256 -#: builtin/checkout.c:232

6511 +#: builtin/checkout.c:231

6512 #, c-format

6513 msgid "Unable to add merge result for '%s'"

6514 msgstr "Incapaz de agregar resultados de fusión a '%s'"

6515

6261 -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

6262 -#: builtin/checkout.c:263

6516 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

6517 +#: builtin/checkout.c:262

6518 #, c-format

6519 msgid "'%s' cannot be used with updating paths"

6520 msgstr "'%s' no puede ser usada con rutas actualizadas"

6521

6267 -#: builtin/checkout.c:266 builtin/checkout.c:269

6522 +#: builtin/checkout.c:265 builtin/checkout.c:268

6523 #, c-format

6524 msgid "'%s' cannot be used with %s"

6525 msgstr "'%s' no puede ser usado con %s"

6526

6272 -#: builtin/checkout.c:272

6527 +#: builtin/checkout.c:271

6528 #, c-format

6529 msgid "Cannot update paths and switch to branch '%s' at the same time."

6275 -msgstr "no se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."

6530 +msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."

6531

6277 -#: builtin/checkout.c:341 builtin/checkout.c:348

6532 +#: builtin/checkout.c:340 builtin/checkout.c:347

6533 #, c-format

6534 msgid "path '%s' is unmerged"

6535 msgstr "ruta '%s' no esta fusionada"

6536

6282 -#: builtin/checkout.c:506

6537 +#: builtin/checkout.c:505

6538 msgid "you need to resolve your current index first"

6539 msgstr "necesita resolver su índice actual primero"

6540

6286 -#: builtin/checkout.c:637

6541 +#: builtin/checkout.c:636

6542 #, c-format

6543 msgid "Can not do reflog for '%s': %s\n"

6544 msgstr "No se puede hacer reflog para '%s': %s\n"

6545

6291 -#: builtin/checkout.c:678

6546 +#: builtin/checkout.c:677

6547 msgid "HEAD is now at"

6548 msgstr "HEAD está ahora en"

6549

6295 -#: builtin/checkout.c:682 builtin/clone.c:684

6550 +#: builtin/checkout.c:681 builtin/clone.c:689

6551 msgid "unable to update HEAD"

6552 msgstr "no es posible actualizar HEAD"

6553

6299 -#: builtin/checkout.c:686

6554 +#: builtin/checkout.c:685

6555 #, c-format

6556 msgid "Reset branch '%s'\n"

6557 msgstr "Reiniciar rama '%s'\n"

6558

6304 -#: builtin/checkout.c:689

6559 +#: builtin/checkout.c:688

6560 #, c-format

6561 msgid "Already on '%s'\n"

6562 msgstr "Ya en '%s'\n"

6563

6309 -#: builtin/checkout.c:693

6564 +#: builtin/checkout.c:692

6565 #, c-format

6566 msgid "Switched to and reset branch '%s'\n"

6567 msgstr "Rama reiniciada y cambiada a '%s'\n"

6568

6314 -#: builtin/checkout.c:695 builtin/checkout.c:1051

6569 +#: builtin/checkout.c:694 builtin/checkout.c:1039

6570 #, c-format

6571 msgid "Switched to a new branch '%s'\n"

6572 msgstr "Cambiado a nueva rama '%s'\n"

6573

6319 -#: builtin/checkout.c:697

6574 +#: builtin/checkout.c:696

6575 #, c-format

6576 msgid "Switched to branch '%s'\n"

6577 msgstr "Cambiado a rama '%s'\n"

6578

6324 -#: builtin/checkout.c:748

6579 +#: builtin/checkout.c:747

6580 #, c-format

6581 msgid " ... and %d more.\n"

6582 msgstr " ... y %d más.\n"

6583

6329 -#: builtin/checkout.c:754

6584 +#: builtin/checkout.c:753

6585 #, c-format

6586 msgid ""

6587 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -6349,7 +6604,7 @@ msgstr[1] ""

6604 "\n"

6605 "%s\n"

6606

6352 -#: builtin/checkout.c:773

6607 +#: builtin/checkout.c:772

6608 #, c-format

6609 msgid ""

6610 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -6376,160 +6631,160 @@ msgstr[1] ""

6631 " git branch <nombre-de-rama> %s\n"

6632 "\n"

6633

6379 -#: builtin/checkout.c:814

6634 +#: builtin/checkout.c:804

6635 msgid "internal error in revision walk"

6636 msgstr "error interno en camino de revisión"

6637

6383 -#: builtin/checkout.c:818

6638 +#: builtin/checkout.c:808

6639 msgid "Previous HEAD position was"

6640 msgstr "La posición previa de HEAD era"

6641

6387 -#: builtin/checkout.c:848 builtin/checkout.c:1046

6642 +#: builtin/checkout.c:836 builtin/checkout.c:1034

6643 msgid "You are on a branch yet to be born"

6644 msgstr "Estás en una rama por nacer"

6645

6391 -#: builtin/checkout.c:952

6646 +#: builtin/checkout.c:940

6647 #, c-format

6648 msgid "only one reference expected, %d given."

6649 msgstr "solo una referencia esperada, %d entregadas."

6650

6396 -#: builtin/checkout.c:992 builtin/worktree.c:247

6651 +#: builtin/checkout.c:980 builtin/worktree.c:249

6652 #, c-format

6653 msgid "invalid reference: %s"

6654 msgstr "referencia invalida: %s"

6655

6401 -#: builtin/checkout.c:1021

6656 +#: builtin/checkout.c:1009

6657 #, c-format

6658 msgid "reference is not a tree: %s"

6659 msgstr "la referencia no es n árbol: %s"

6660

6406 -#: builtin/checkout.c:1060

6661 +#: builtin/checkout.c:1048

6662 msgid "paths cannot be used with switching branches"

6663 msgstr "rutas no pueden ser usadas con cambios de rama"

6664

6410 -#: builtin/checkout.c:1063 builtin/checkout.c:1067

6665 +#: builtin/checkout.c:1051 builtin/checkout.c:1055

6666 #, c-format

6667 msgid "'%s' cannot be used with switching branches"

6668 msgstr "'%s' no puede ser usado con cambios de ramas"

6669

6415 -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079

6416 -#: builtin/checkout.c:1082

6670 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067

6671 +#: builtin/checkout.c:1070

6672 #, c-format

6673 msgid "'%s' cannot be used with '%s'"

6674 msgstr "'%s' no puede ser usado con '%s'"

6675

6421 -#: builtin/checkout.c:1087

6676 +#: builtin/checkout.c:1075

6677 #, c-format

6678 msgid "Cannot switch branch to a non-commit '%s'"

6679 msgstr "No se puede cambiar rama a un '%s' sin commits"

6680

6426 -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114

6427 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369

6428 -#: builtin/worktree.c:371

6681 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116

6682 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387

6683 +#: builtin/worktree.c:389

6684 msgid "branch"

6685 msgstr "rama"

6686

6432 -#: builtin/checkout.c:1120

6687 +#: builtin/checkout.c:1108

6688 msgid "create and checkout a new branch"

6689 msgstr "crear y hacer checkout a una nueva rama"

6690

6436 -#: builtin/checkout.c:1122

6691 +#: builtin/checkout.c:1110

6692 msgid "create/reset and checkout a branch"

6693 msgstr "crear/reiniciar y hacer checkout a una rama"

6694

6440 -#: builtin/checkout.c:1123

6695 +#: builtin/checkout.c:1111

6696 msgid "create reflog for new branch"

6697 msgstr "crear un reflog para una nueva rama"

6698

6444 -#: builtin/checkout.c:1124 builtin/worktree.c:373

6699 +#: builtin/checkout.c:1112 builtin/worktree.c:391

6700 msgid "detach HEAD at named commit"

6701 msgstr "desacoplar HEAD en el commit nombrado"

6702

6448 -#: builtin/checkout.c:1125

6703 +#: builtin/checkout.c:1113

6704 msgid "set upstream info for new branch"

6705 msgstr "configurar info de upstream para una rama nueva"

6706

6452 -#: builtin/checkout.c:1127

6707 +#: builtin/checkout.c:1115

6708 msgid "new-branch"

6709 msgstr "nueva-rama"

l10n: es.po: Update Spanish translation 2.17.0