296415c039 · 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-03-16 07:29+0800\n"

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

10 +"POT-Creation-Date: 2018-05-31 23:32+0800\n"

11 +"PO-Revision-Date: 2018-05-31 23:07-0500\n"

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

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

14 "Language: es\n"

@@ -18,38 +18,38 @@ msgstr ""

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

19 "X-Generator: Poedit 2.0.6\n"

20

21 -#: advice.c:62

21 +#: advice.c:92

22 #, c-format

23 -msgid "hint: %.*s\n"

24 -msgstr "ayuda: %.*s\n"

23 +msgid "%shint: %.*s%s\n"

24 +msgstr "%sayuda: %.*s%s\n"

25

26 -#: advice.c:90

26 +#: advice.c:137

27 msgid "Cherry-picking is not possible because you have unmerged files."

28 msgstr ""

29 "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."

30

31 -#: advice.c:92

31 +#: advice.c:139

32 msgid "Committing is not possible because you have unmerged files."

33 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."

34

35 -#: advice.c:94

35 +#: advice.c:141

36 msgid "Merging is not possible because you have unmerged files."

37 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."

38

39 -#: advice.c:96

39 +#: advice.c:143

40 msgid "Pulling is not possible because you have unmerged files."

41 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."

42

43 -#: advice.c:98

43 +#: advice.c:145

44 msgid "Reverting is not possible because you have unmerged files."

45 msgstr "No es posible revertir porque tienes archivos sin fusionar."

46

47 -#: advice.c:100

47 +#: advice.c:147

48 #, c-format

49 msgid "It is not possible to %s because you have unmerged files."

50 msgstr "No es posible %s porque tienes archivos sin fusionar."

51

52 -#: advice.c:108

52 +#: advice.c:155

53 msgid ""

54 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

55 "as appropriate to mark resolution and make a commit."

@@ -57,23 +57,23 @@ msgstr ""

57 "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"

58 "como sea apropiado, para marcar la resolución y realizar un commit."

59

60 -#: advice.c:116

60 +#: advice.c:163

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:1251

64 +#: advice.c:168 builtin/merge.c:1249

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

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

67

68 -#: advice.c:123

68 +#: advice.c:170

69 msgid "Please, commit your changes before merging."

70 msgstr "Por favor, realiza un commit antes de fusionar."

71

72 -#: advice.c:124

72 +#: advice.c:171

73 msgid "Exiting because of unfinished merge."

74 msgstr "Saliendo por una fusión inconclusa."

75

76 -#: advice.c:130

76 +#: advice.c:177

77 #, c-format

78 msgid ""

79 "Note: checking out '%s'.\n"

@@ -343,14 +343,14 @@ msgstr ""

343 #: apply.c:3225

344 #, c-format

345 msgid "patch failed: %s:%ld"

346 -msgstr "el parche fallo: %s:%ld"

346 +msgstr "el parche falló: %s:%ld"

347

348 #: apply.c:3347

349 #, c-format

350 msgid "cannot checkout %s"

351 msgstr "no se puede hacer checkout a %s"

352

353 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

353 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

354 #, c-format

355 msgid "failed to read %s"

356 msgstr "no se pudo leer %s"

@@ -394,7 +394,7 @@ msgstr "no se pueden leer los contenidos actuales de '%s'"

394 #: apply.c:3595

395 #, c-format

396 msgid "Failed to fall back on three-way merge...\n"

397 -msgstr "Fallo el merge en retroceso de tres-vías...\n"

397 +msgstr "Falló el merge en retroceso de tres-vías...\n"

398

399 #: apply.c:3609

400 #, c-format

@@ -478,7 +478,7 @@ msgstr "falta información sha1 o es inútil (%s)."

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

481 +msgstr "make_cache_entry falló para la ruta '%s'"

482

483 #: apply.c:4099

484 #, c-format

@@ -519,7 +519,7 @@ msgstr "no es posible agregar una entrada en el cache para %s"

519 #: apply.c:4343

520 #, c-format

521 msgid "failed to write to '%s'"

522 -msgstr "fallo escribir para '%s'"

522 +msgstr "falló escribir para '%s'"

523

524 #: apply.c:4347

525 #, c-format

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

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

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

554

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

555 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

556 #, c-format

557 msgid "cannot open %s"

558 msgstr "no se puede abrir %s"

@@ -608,15 +608,15 @@ msgstr[0] ""

608 msgstr[1] ""

609 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."

610

611 -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

611 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

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

616 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

617 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

618 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

619 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

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

621 msgid "path"

622 msgstr "ruta"

@@ -692,7 +692,7 @@ msgstr "asegure que por lo menos <n> líneas del contexto concuerden"

692

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:3035

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

696 msgid "action"

697 msgstr "acción"

698

@@ -723,9 +723,9 @@ msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"

723 msgid "allow overlapping hunks"

724 msgstr "permitir solapamiento de hunks"

725

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

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

727 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

728 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

729 msgid "be verbose"

730 msgstr "ser verboso"

731

@@ -766,7 +766,7 @@ msgstr ""

766 msgid "git archive --remote <repo> [--exec <cmd>] --list"

767 msgstr "git archive --remote <repo> [--exec <comando>] --list"

768

769 -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

769 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

770 #, c-format

771 msgid "pathspec '%s' did not match any files"

772 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"

@@ -787,10 +787,10 @@ 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:702 builtin/blame.c:703 builtin/config.c:62

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

790 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

791 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

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

793 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

793 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

794 #: parse-options.h:165

795 msgid "file"

796 msgstr "carpeta"

@@ -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:108 builtin/clone.c:111

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

826 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

827 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

828 msgid "repo"

829 msgstr "repo"

830

@@ -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:460

878 +#: bisect.c:461

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:668

883 +#: bisect.c:669

884 #, c-format

885 msgid "We cannot bisect more!\n"

886 msgstr "No podemos bisecar mas!\n"

887

888 -#: bisect.c:722

888 +#: bisect.c:723

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:746

893 +#: bisect.c:747

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:751

902 +#: bisect.c:752

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:756

911 +#: bisect.c:757

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:764

920 +#: bisect.c:765

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:777

931 +#: bisect.c:778

932 #, c-format

933 msgid ""

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

@@ -939,36 +939,36 @@ msgstr ""

939 "Así que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n"

940 "Vamos a continuar de todas maneras."

941

942 -#: bisect.c:810

942 +#: bisect.c:811

943 #, c-format

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:850

947 +#: bisect.c:851

948 #, c-format

949 msgid "a %s revision is needed"

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

951

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

952 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

953 #, c-format

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

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

956

957 -#: bisect.c:920

957 +#: bisect.c:921

958 #, c-format

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

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

961

962 -#: bisect.c:950

962 +#: bisect.c:951

963 msgid "reading bisect refs failed"

964 -msgstr "fallo leer las refs de bisect"

964 +msgstr "falló leer las refs de bisect"

965

966 -#: bisect.c:969

966 +#: bisect.c:970

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:977

971 +#: bisect.c:978

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:996

980 +#: bisect.c:997

981 #, c-format

982 msgid "(roughly %d step)"

983 msgid_plural "(roughly %d steps)"

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

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

988 #. steps)" translation.

989 #.

990 -#: bisect.c:1002

990 +#: bisect.c:1003

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:1758

997 +#: blame.c:1756

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

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

1000

1001 -#: blame.c:1769

1001 +#: blame.c:1767

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:1789

1005 +#: blame.c:1787

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

1010 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

1011 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

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

1013 +#: builtin/shortlog.c:192

1014 msgid "revision walk setup failed"

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

1015 +msgstr "falló la configuración del camino de revisión"

1016

1017 -#: blame.c:1816

1017 +#: blame.c:1814

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:1827

1024 +#: blame.c:1825

1025 #, c-format

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

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

1028

1029 -#: blame.c:1838

1029 +#: blame.c:1836

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"

1033

1034 -#: branch.c:53

1034 +#: branch.c:54

1035 #, c-format

1036 msgid ""

1037 "\n"

@@ -1044,97 +1044,97 @@ msgstr ""

1044 "la infamación del rastreo remoto invocando\n"

1045 "\"git branch --set-upstream-to=%s%s%s\"."

1046

1047 -#: branch.c:67

1047 +#: branch.c:68

1048 #, c-format

1049 msgid "Not setting branch %s as its own upstream."

1050 msgstr "La rama %s no se configura como su propio upstream."

1051

1052 -#: branch.c:93

1052 +#: branch.c:94

1053 #, c-format

1054 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1055 msgstr ""

1056 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "

1057 "por rebase."

1058

1059 -#: branch.c:94

1059 +#: branch.c:95

1060 #, c-format

1061 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1062 msgstr ""

1063 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."

1064

1065 -#: branch.c:98

1065 +#: branch.c:99

1066 #, c-format

1067 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1068 msgstr ""

1069 "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."

1070

1071 -#: branch.c:99

1071 +#: branch.c:100

1072 #, c-format

1073 msgid "Branch '%s' set up to track local branch '%s'."

1074 msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."

1075

1076 -#: branch.c:104

1076 +#: branch.c:105

1077 #, c-format

1078 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1079 msgstr ""

1080 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "

1081 "rebase."

1082

1083 -#: branch.c:105

1083 +#: branch.c:106

1084 #, c-format

1085 msgid "Branch '%s' set up to track remote ref '%s'."

1086 msgstr ""

1087 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."

1088

1089 -#: branch.c:109

1089 +#: branch.c:110

1090 #, c-format

1091 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1092 msgstr ""

1093 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "

1094 "rebase."

1095

1096 -#: branch.c:110

1096 +#: branch.c:111

1097 #, c-format

1098 msgid "Branch '%s' set up to track local ref '%s'."

1099 msgstr ""

1100 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."

1101

1102 -#: branch.c:119

1102 +#: branch.c:120

1103 msgid "Unable to write upstream branch configuration"

1104 msgstr "No es posible escribir la configuración de la rama upstream"

1105

1106 -#: branch.c:156

1106 +#: branch.c:157

1107 #, c-format

1108 msgid "Not tracking: ambiguous information for ref %s"

1109 msgstr "No rastreando: información ambigua para la referencia %s"

1110

1111 -#: branch.c:189

1111 +#: branch.c:190

1112 #, c-format

1113 msgid "'%s' is not a valid branch name."

1114 msgstr "'%s' no es un nombre valido de rama."

1115

1116 -#: branch.c:208

1116 +#: branch.c:209

1117 #, c-format

1118 msgid "A branch named '%s' already exists."

1119 msgstr "Una rama llamada '%s' ya existe."

1120

1121 -#: branch.c:213

1121 +#: branch.c:214

1122 msgid "Cannot force update the current branch."

1123 msgstr "No se puede forzar la actualización de la rama actual."

1124

1125 -#: branch.c:233

1125 +#: branch.c:234

1126 #, c-format

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

1131

1132 -#: branch.c:235

1132 +#: branch.c:236

1133 #, c-format

1134 msgid "the requested upstream branch '%s' does not exist"

1135 msgstr "la rama de upstream solicitada '%s' no existe"

1136

1137 -#: branch.c:237

1137 +#: branch.c:238

1138 msgid ""

1139 "\n"

1140 "If you are planning on basing your work on an upstream\n"

@@ -1155,27 +1155,27 @@ msgstr ""

1155 "\"git push -u\" para configurar tu upstream predeterminado cuando realizas "

1156 "el push."

1157

1158 -#: branch.c:280

1158 +#: branch.c:281

1159 #, c-format

1160 msgid "Not a valid object name: '%s'."

1161 msgstr "Nombre de objeto no valido: '%s'."

1162

1163 -#: branch.c:300

1163 +#: branch.c:301

1164 #, c-format

1165 msgid "Ambiguous object name: '%s'."

1166 msgstr "Nombre de objeto ambiguo: '%s'."

1167

1168 -#: branch.c:305

1168 +#: branch.c:306

1169 #, c-format

1170 msgid "Not a valid branch point: '%s'."

1171 msgstr "Punto de rama no valido: '%s'."

1172

1173 -#: branch.c:359

1173 +#: branch.c:360

1174 #, c-format

1175 msgid "'%s' is already checked out at '%s'"

1176 msgstr "'%s' ya ha sido marcado en '%s'"

1177

1178 -#: branch.c:382

1178 +#: branch.c:383

1179 #, c-format

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

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

@@ -1190,7 +1190,7 @@ msgstr "'%s' no se ve como un archivo bundle v2"

1190 msgid "unrecognized header: %s%s (%d)"

1191 msgstr "header no reconocido %s%s (%d)"

1192

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

1193 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1194 #, c-format

1195 msgid "could not open '%s'"

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

@@ -1234,7 +1234,7 @@ msgstr "rev-list murió"

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

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

1236

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

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

1238 #, c-format

1239 msgid "unrecognized argument: %s"

1240 msgstr "argumento no reconocido: %s"

@@ -1257,18 +1257,39 @@ msgstr "index-pack murió"

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

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

1259

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

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

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

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

1262 +#: builtin/replace.c:448

1263 #, c-format

1264 msgid "could not parse %s"

1265 msgstr "no se puede analizar %s"

1266

1266 -#: commit.c:43

1267 +#: commit.c:45

1268 #, c-format

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

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

1271

1271 -#: commit.c:1506

1272 +#: commit.c:182

1273 +msgid ""

1274 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

1275 +"and will be removed in a future Git version.\n"

1276 +"\n"

1277 +"Please use \"git replace --convert-graft-file\"\n"

1278 +"to convert the grafts into replace refs.\n"

1279 +"\n"

1280 +"Turn this message off by running\n"

1281 +"\"git config advice.graftFileDeprecated false\""

1282 +msgstr ""

1283 +"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"

1284 +"y será removido en una versión futura de Git.\n"

1285 +"\n"

1286 +"Por favor use \"git replace --convert-graft-file\"\n"

1287 +"para convertir los grafts en refs.\n"

1288 +"\n"

1289 +"Apapa este mensaje ejecutando\n"

1290 +"\"git config advice.graftFileDeprecated false\""

1291 +

1292 +#: commit.c:1537

1293 msgid ""

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

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

@@ -1279,176 +1300,190 @@ msgstr ""

1300 "variable de configuración i18n.commitencoding para la codificación que usa "

1301 "su proyecto.\n"

1302

1303 +#: commit-graph.c:669

1304 +#, c-format

1305 +msgid "the commit graph format cannot write %d commits"

1306 +msgstr "el formato de gráficos de commit no pudede escribir %d commits"

1307 +

1308 +#: commit-graph.c:696

1309 +msgid "too many commits to write graph"

1310 +msgstr "demasiados commits para escribir el gráfico"

1311 +

1312 +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1313 +#, c-format

1314 +msgid "cannot mkdir %s"

1315 +msgstr "no se pude crear directorio %s"

1316 +

1317 #: compat/obstack.c:405 compat/obstack.c:407

1318 msgid "memory exhausted"

1319 msgstr "memoria agotada"

1320

1286 -#: config.c:186

1321 +#: config.c:187

1322 msgid "relative config include conditionals must come from files"

1323 msgstr ""

1324 "la configuración relativa incluye condicionales que deben venir de archivos"

1325

1291 -#: config.c:720

1326 +#: config.c:788

1327 #, c-format

1328 msgid "bad config line %d in blob %s"

1329 msgstr "mala línea de config %d en el blob %s"

1330

1296 -#: config.c:724

1331 +#: config.c:792

1332 #, c-format

1333 msgid "bad config line %d in file %s"

1334 msgstr "mala línea de config %d en el archivo %s"

1335

1301 -#: config.c:728

1336 +#: config.c:796

1337 #, c-format

1338 msgid "bad config line %d in standard input"

1339 msgstr "mala línea de config %d en la entrada standard"

1340

1306 -#: config.c:732

1341 +#: config.c:800

1342 #, c-format

1343 msgid "bad config line %d in submodule-blob %s"

1344 msgstr "mala línea de config %d en el submódulo-blob %s"

1345

1311 -#: config.c:736

1346 +#: config.c:804

1347 #, c-format

1348 msgid "bad config line %d in command line %s"

1349 msgstr "mala línea de config %d en la línea de comando %s"

1350

1316 -#: config.c:740

1351 +#: config.c:808

1352 #, c-format

1353 msgid "bad config line %d in %s"

1354 msgstr "mala línea de config %d en %s"

1355

1321 -#: config.c:868

1356 +#: config.c:936

1357 msgid "out of range"

1358 msgstr "fuera de rango"

1359

1325 -#: config.c:868

1360 +#: config.c:936

1361 msgid "invalid unit"

1362 msgstr "unidad invalida"

1363

1329 -#: config.c:874

1364 +#: config.c:942

1365 #, c-format

1366 msgid "bad numeric config value '%s' for '%s': %s"

1367 msgstr "mal valor de config numérica '%s' para '%s': %s"

1368

1334 -#: config.c:879

1369 +#: config.c:947

1370 #, c-format

1371 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1372 msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"

1373

1339 -#: config.c:882

1374 +#: config.c:950

1375 #, c-format

1376 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1377 msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"

1378

1344 -#: config.c:885

1379 +#: config.c:953

1380 #, c-format

1381 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1382 msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"

1383

1349 -#: config.c:888

1384 +#: config.c:956

1385 #, c-format

1386 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1387 msgstr ""

1388 "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"

1389

1355 -#: config.c:891

1390 +#: config.c:959

1391 #, c-format

1392 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1393 msgstr ""

1394 "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"

1395

1361 -#: config.c:894

1396 +#: config.c:962

1397 #, c-format

1398 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1399 msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"

1400

1366 -#: config.c:989

1401 +#: config.c:1057

1402 #, c-format

1403 msgid "failed to expand user dir in: '%s'"

1369 -msgstr "fallo al expandir el directorio de usuario en: '%s'"

1404 +msgstr "falló al expandir el directorio de usuario en: '%s'"

1405

1371 -#: config.c:998

1406 +#: config.c:1066

1407 #, c-format

1408 msgid "'%s' for '%s' is not a valid timestamp"

1409 msgstr "'%s' para '%s' no es una marca de tiempo válida"

1410

1376 -#: config.c:1094 config.c:1105

1411 +#: config.c:1171 config.c:1182

1412 #, c-format

1413 msgid "bad zlib compression level %d"

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

1415

1381 -#: config.c:1225

1416 +#: config.c:1307

1417 #, c-format

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

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

1420

1386 -#: config.c:1386

1421 +#: config.c:1473

1422 #, c-format

1423 msgid "bad pack compression level %d"

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

1425

1391 -#: config.c:1582

1426 +#: config.c:1681

1427 msgid "unable to parse command-line config"

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

1429

1395 -#: config.c:1914

1430 +#: config.c:2013

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

1432 msgstr ""

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

1434

1400 -#: config.c:2101

1435 +#: config.c:2200

1436 #, c-format

1437 msgid "Invalid %s: '%s'"

1438 msgstr "Invalido %s: '%s'"

1439

1405 -#: config.c:2144

1440 +#: config.c:2243

1441 #, c-format

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

1443 msgstr ""

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

1445 "defecto"

1446

1412 -#: config.c:2170

1447 +#: config.c:2269

1448 #, c-format

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

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

1451

1417 -#: config.c:2195

1452 +#: config.c:2294

1453 #, c-format

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

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

1456

1422 -#: config.c:2197

1457 +#: config.c:2296

1458 #, c-format

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

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

1461

1427 -#: config.c:2256

1462 +#: config.c:2402

1463 #, c-format

1464 msgid "%s has multiple values"

1465 msgstr "%s tiene múltiples valores"

1466

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

1467 +#: config.c:2766 config.c:3019

1468 #, c-format

1469 msgid "fstat on %s failed"

1435 -msgstr "fstat en %s fallo"

1470 +msgstr "fstat en %s falló"

1471

1437 -#: config.c:2706

1472 +#: config.c:2905

1473 #, c-format

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

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

1476

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

1477 +#: config.c:2907 builtin/remote.c:779

1478 #, c-format

1479 msgid "could not unset '%s'"

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

1481

1447 -#: connect.c:52

1482 +#: connect.c:60

1483 msgid "The remote end hung up upon initial contact"

1484 msgstr "El remoto se colgó en el contacto inicial"

1485

1451 -#: connect.c:54

1486 +#: connect.c:62

1487 msgid ""

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

1489 "\n"

@@ -1460,7 +1495,7 @@ msgstr ""

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

1496 "y que el repositorio existe."

1497

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

1498 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1499 msgid "Checking connectivity"

1500 msgstr "Verificando conectividad"

1501

@@ -1470,18 +1505,18 @@ msgstr "No se pudo correr 'git rev-list'"

1505

1506 #: connected.c:98

1507 msgid "failed write to rev-list"

1473 -msgstr "fallo escribir a rev-list"

1508 +msgstr "falló escribir a rev-list"

1509

1510 #: connected.c:105

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

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

1512 +msgstr "falló al cerrar la entrada standard de rev-list"

1513

1479 -#: convert.c:205

1514 +#: convert.c:206

1515 #, c-format

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

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

1518

1484 -#: convert.c:207

1519 +#: convert.c:208

1520 #, c-format

1521 msgid ""

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

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

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

1527 "trabajo."

1528

1494 -#: convert.c:215

1529 +#: convert.c:216

1530 #, c-format

1531 msgid "LF would be replaced by CRLF in %s"

1532 msgstr "LF será reemplazado por CRLF en %s"

1533

1499 -#: convert.c:217

1534 +#: convert.c:218

1535 #, c-format

1536 msgid ""

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

@@ -1506,6 +1541,48 @@ msgstr ""

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

1542 "trabajo."

1543

1544 +#: convert.c:279

1545 +#, c-format

1546 +msgid "BOM is prohibited in '%s' if encoded as %s"

1547 +msgstr "BOM está prohibido en '%s' si es codificado como %s"

1548 +

1549 +#: convert.c:286

1550 +#, c-format

1551 +msgid ""

1552 +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1553 +"tree-encoding."

1554 +msgstr ""

1555 +"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "

1556 +"working-tree-encoding."

1557 +

1558 +#: convert.c:304

1559 +#, c-format

1560 +msgid "BOM is required in '%s' if encoded as %s"

1561 +msgstr "BOM es requerido en '%s' si es codificado como %s"

1562 +

1563 +#: convert.c:306

1564 +#, c-format

1565 +msgid ""

1566 +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1567 +"%sLE (depending on the byte order) as working-tree-encoding."

1568 +msgstr ""

1569 +"Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "

1570 +"UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."

1571 +

1572 +#: convert.c:424

1573 +#, c-format

1574 +msgid "failed to encode '%s' from %s to %s"

1575 +msgstr "falló al codificar '%s' de %s a %s"

1576 +

1577 +#: convert.c:467

1578 +#, c-format

1579 +msgid "encoding '%s' from %s to %s and back is not the same"

1580 +msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"

1581 +

1582 +#: convert.c:1225

1583 +msgid "true/false are no valid working-tree-encodings"

1584 +msgstr "true/false no son working-tree-encodings válidos"

1585 +

1586 #: date.c:116

1587 msgid "in the future"

1588 msgstr "en el futuro"

@@ -1577,7 +1654,7 @@ msgstr[1] "hace %<PRIuMAX> años"

1654 #: diffcore-order.c:24

1655 #, c-format

1656 msgid "failed to read orderfile '%s'"

1580 -msgstr "fallo al leer orden de archivos '%s'"

1657 +msgstr "falló al leer orden de archivos '%s'"

1658

1659 #: diffcore-rename.c:535

1660 msgid "Performing inexact rename detection"

@@ -1591,7 +1668,7 @@ msgstr "opción '%s' requiere un valor"

1668 #: diff.c:152

1669 #, c-format

1670 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

1594 -msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n"

1671 +msgstr " Falló al analizar dirstat porcentaje de corte '%s'\n"

1672

1673 #: diff.c:157

1674 #, c-format

@@ -1621,48 +1698,48 @@ msgstr ""

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

1699 "%s"

1700

1624 -#: diff.c:3822

1701 +#: diff.c:3823

1702 #, c-format

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

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

1705

1629 -#: diff.c:4146

1706 +#: diff.c:4153

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

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

1709

1633 -#: diff.c:4149

1710 +#: diff.c:4156

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

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

1713

1637 -#: diff.c:4237

1714 +#: diff.c:4244

1715 msgid "--follow requires exactly one pathspec"

1716 msgstr "--follow requiere exactamente un pathspec"

1717

1641 -#: diff.c:4403

1718 +#: diff.c:4410

1719 #, c-format

1720 msgid ""

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

1722 "%s"

1723 msgstr ""

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

1724 +"Falló al analizar parámetro de opción --dirstat/-X:\n"

1725 "%s"

1726

1650 -#: diff.c:4417

1727 +#: diff.c:4424

1728 #, c-format

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

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

1730 +msgstr "Falló al analizar parámetro de opción --submodule: '%s'"

1731

1655 -#: diff.c:5493

1732 +#: diff.c:5500

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

1734 msgstr ""

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

1736

1660 -#: diff.c:5496

1737 +#: diff.c:5503

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

1739 msgstr ""

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

1741

1665 -#: diff.c:5499

1742 +#: diff.c:5506

1743 #, c-format

1744 msgid ""

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

@@ -1670,25 +1747,25 @@ msgstr ""

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

1748 "intentar el comando."

1749

1673 -#: dir.c:1866

1750 +#: dir.c:1867

1751 #, c-format

1752 msgid "could not open directory '%s'"

1753 msgstr "no se pudo abrir el directorio '%s'"

1754

1678 -#: dir.c:2108

1755 +#: dir.c:2109

1756 msgid "failed to get kernel name and information"

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

1757 +msgstr "falló al conseguir la información y nombre del kernel"

1758

1682 -#: dir.c:2232

1759 +#: dir.c:2233

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

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

1762

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

1763 +#: dir.c:3075 dir.c:3080

1764 #, c-format

1765 msgid "could not create directories for %s"

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

1767

1691 -#: dir.c:3054

1768 +#: dir.c:3109

1769 #, c-format

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

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

@@ -1711,222 +1788,226 @@ msgstr "no se pudo establecer el archivo '%s'"

1788 msgid "Remote with no URL"

1789 msgstr "Remoto sin URL"

1790

1714 -#: fetch-pack.c:253

1791 +#: fetch-pack.c:254

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

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

1794

1718 -#: fetch-pack.c:265

1795 +#: fetch-pack.c:266

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

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

1798

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

1799 +#: fetch-pack.c:285 builtin/archive.c:63

1800 #, c-format

1801 msgid "remote error: %s"

1802 msgstr "error remoto: %s"

1803

1727 -#: fetch-pack.c:285

1804 +#: fetch-pack.c:286

1805 #, c-format

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

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

1808

1732 -#: fetch-pack.c:337

1809 +#: fetch-pack.c:338

1810 msgid "--stateless-rpc requires multi_ack_detailed"

1811 msgstr "--stateless-rpc requiere multi_ack_detailed"

1812

1736 -#: fetch-pack.c:428

1813 +#: fetch-pack.c:429 fetch-pack.c:1310

1814 #, c-format

1815 msgid "invalid shallow line: %s"

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

1817

1741 -#: fetch-pack.c:434

1818 +#: fetch-pack.c:435 fetch-pack.c:1316

1819 #, c-format

1820 msgid "invalid unshallow line: %s"

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

1822

1746 -#: fetch-pack.c:436

1823 +#: fetch-pack.c:437 fetch-pack.c:1318

1824 #, c-format

1825 msgid "object not found: %s"

1826 msgstr "objeto no encontrado: %s"

1827

1751 -#: fetch-pack.c:439

1828 +#: fetch-pack.c:440 fetch-pack.c:1321

1829 #, c-format

1830 msgid "error in object: %s"

1831 msgstr "error en objeto: %s"

1832

1756 -#: fetch-pack.c:441

1833 +#: fetch-pack.c:442 fetch-pack.c:1323

1834 #, c-format

1835 msgid "no shallow found: %s"

1836 msgstr "superficie no encontrada: %s"

1837

1761 -#: fetch-pack.c:444

1838 +#: fetch-pack.c:445 fetch-pack.c:1326

1839 #, c-format

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

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

1842

1766 -#: fetch-pack.c:485

1843 +#: fetch-pack.c:486

1844 #, c-format

1845 msgid "got %s %d %s"

1846 msgstr "se obtuvo %s %d %s"

1847

1771 -#: fetch-pack.c:499

1848 +#: fetch-pack.c:500

1849 #, c-format

1850 msgid "invalid commit %s"

1851 msgstr "commit inválido %s"

1852

1776 -#: fetch-pack.c:532

1853 +#: fetch-pack.c:533

1854 msgid "giving up"

1855 msgstr "rindiéndose"

1856

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

1857 +#: fetch-pack.c:543 progress.c:229

1858 msgid "done"

1859 msgstr "listo"

1860

1784 -#: fetch-pack.c:554

1861 +#: fetch-pack.c:555

1862 #, c-format

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

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

1865

1789 -#: fetch-pack.c:600

1866 +#: fetch-pack.c:601

1867 #, c-format

1868 msgid "Marking %s as complete"

1869 msgstr "Marcando %s como completa"

1870

1794 -#: fetch-pack.c:788

1871 +#: fetch-pack.c:828

1872 #, c-format

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

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

1875

1799 -#: fetch-pack.c:829

1876 +#: fetch-pack.c:869

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

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

1879

1803 -#: fetch-pack.c:837

1880 +#: fetch-pack.c:877

1881 msgid "protocol error: bad pack header"

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

1883

1807 -#: fetch-pack.c:895

1884 +#: fetch-pack.c:944

1885 #, c-format

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

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

1888

1812 -#: fetch-pack.c:911

1889 +#: fetch-pack.c:960

1890 #, c-format

1891 msgid "%s failed"

1815 -msgstr "%s fallo"

1892 +msgstr "%s falló"

1893

1817 -#: fetch-pack.c:913

1894 +#: fetch-pack.c:962

1895 msgid "error in sideband demultiplexer"

1896 msgstr "error en demultiplexor de banda lateral"

1897

1821 -#: fetch-pack.c:940

1898 +#: fetch-pack.c:989

1899 msgid "Server does not support shallow clients"

1900 msgstr "Servidor no soporta clientes superficiales"

1901

1825 -#: fetch-pack.c:944

1902 +#: fetch-pack.c:993

1903 msgid "Server supports multi_ack_detailed"

1904 msgstr "Servidor soporta ulti_ack_detailed"

1905

1829 -#: fetch-pack.c:947

1906 +#: fetch-pack.c:996

1907 msgid "Server supports no-done"

1908 msgstr "Servidor soporta no-done"

1909

1833 -#: fetch-pack.c:953

1910 +#: fetch-pack.c:1002

1911 msgid "Server supports multi_ack"

1912 msgstr "Servidor soporta multi_ack"

1913

1837 -#: fetch-pack.c:957

1914 +#: fetch-pack.c:1006

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

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

1917

1841 -#: fetch-pack.c:961

1918 +#: fetch-pack.c:1010

1919 msgid "Server supports side-band"

1920 msgstr "Servidor soporta side-band"

1921

1845 -#: fetch-pack.c:965

1922 +#: fetch-pack.c:1014

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

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

1925

1849 -#: fetch-pack.c:969

1926 +#: fetch-pack.c:1018

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

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

1929

1853 -#: fetch-pack.c:979

1930 +#: fetch-pack.c:1028

1931 msgid "Server supports ofs-delta"

1932 msgstr "Servidor soporta ofs-delta"

1933

1857 -#: fetch-pack.c:985

1934 +#: fetch-pack.c:1034 fetch-pack.c:1204

1935 msgid "Server supports filter"

1936 msgstr "Servidor soporta filtro"

1937

1861 -#: fetch-pack.c:993

1938 +#: fetch-pack.c:1042

1939 #, c-format

1940 msgid "Server version is %.*s"

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

1942

1866 -#: fetch-pack.c:999

1943 +#: fetch-pack.c:1048

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

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

1946

1870 -#: fetch-pack.c:1003

1947 +#: fetch-pack.c:1052

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

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

1950

1874 -#: fetch-pack.c:1005

1951 +#: fetch-pack.c:1054

1952 msgid "Server does not support --deepen"

1953 msgstr "Servidor no soporta --deepen"

1954

1878 -#: fetch-pack.c:1016

1955 +#: fetch-pack.c:1065

1956 msgid "no common commits"

1957 msgstr "no hay commits comunes"

1958

1882 -#: fetch-pack.c:1028

1959 +#: fetch-pack.c:1077 fetch-pack.c:1414

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

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

1961 +msgstr "git fetch-pack: fetch falló."

1962 +

1963 +#: fetch-pack.c:1199

1964 +msgid "Server does not support shallow requests"

1965 +msgstr "Servidor no soporta peticiones superficiales"

1966

1886 -#: fetch-pack.c:1190

1967 +#: fetch-pack.c:1584

1968 msgid "no matching remote head"

1969 msgstr "no concuerda el head remoto"

1970

1890 -#: fetch-pack.c:1212

1971 +#: fetch-pack.c:1610

1972 #, c-format

1973 msgid "no such remote ref %s"

1974 msgstr "no existe ref remota %s"

1975

1895 -#: fetch-pack.c:1215

1976 +#: fetch-pack.c:1613

1977 #, c-format

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

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

1980

1900 -#: gpg-interface.c:181

1981 +#: gpg-interface.c:185

1982 msgid "gpg failed to sign the data"

1902 -msgstr "gpg fallo al firmar la data"

1983 +msgstr "gpg falló al firmar la data"

1984

1904 -#: gpg-interface.c:211

1985 +#: gpg-interface.c:210

1986 msgid "could not create temporary file"

1987 msgstr "no se pudo crear archivo temporal"

1988

1908 -#: gpg-interface.c:214

1989 +#: gpg-interface.c:213

1990 #, c-format

1991 msgid "failed writing detached signature to '%s'"

1911 -msgstr "fallo al escribir la firma separada para '%s'"

1992 +msgstr "falló al escribir la firma separada para '%s'"

1993

1994 #: graph.c:97

1995 #, c-format

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

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

1998

1918 -#: grep.c:2022

1999 +#: grep.c:2020

2000 #, c-format

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

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

2003

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

2004 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2005 #: builtin/rm.c:134

2006 #, c-format

2007 msgid "failed to stat '%s'"

1927 -msgstr "fallo al marcar '%s'"

2008 +msgstr "falló al marcar '%s'"

2009

1929 -#: grep.c:2050

2010 +#: grep.c:2048

2011 #, c-format

2012 msgid "'%s': short read"

2013 msgstr "'%s': lectura corta"

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

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

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

2151

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

2152 +#: ident.c:416 builtin/commit.c:587

2153 #, c-format

2154 msgid "invalid date format: %s"

2155 msgstr "formato de fecha invalido: %s"

@@ -2106,82 +2187,161 @@ msgstr ""

2187 msgid "Unable to create '%s.lock': %s"

2188 msgstr "No se pudo crear '%s.lock': %s"

2189

2109 -#: merge.c:74

2190 +#: merge.c:71

2191 msgid "failed to read the cache"

2111 -msgstr "fallo al leer la cache"

2192 +msgstr "falló al leer la cache"

2193

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

2194 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2195 +#: builtin/checkout.c:606 builtin/clone.c:761

2196 msgid "unable to write new index file"

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

2198

2118 -#: merge-recursive.c:235

2199 +#: merge-recursive.c:298

2200 msgid "(bad commit)\n"

2201 msgstr "(mal commit)\n"

2202

2122 -#: merge-recursive.c:257 merge-recursive.c:265

2203 +#: merge-recursive.c:320

2204 #, c-format

2124 -msgid "addinfo_cache failed for path '%s'"

2125 -msgstr "addinfo_cache fallo para la ruta '%s'"

2205 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

2206 +msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."

2207

2127 -#: merge-recursive.c:329

2208 +#: merge-recursive.c:328

2209 +#, c-format

2210 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2211 +msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."

2212 +

2213 +#: merge-recursive.c:410

2214 msgid "error building trees"

2215 msgstr "error construyendo árboles"

2216

2131 -#: merge-recursive.c:771

2217 +#: merge-recursive.c:881

2218 #, c-format

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

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

2220 +msgstr "falló al crear la ruta '%s'%s"

2221

2136 -#: merge-recursive.c:782

2222 +#: merge-recursive.c:892

2223 #, c-format

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

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

2226

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

2227 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

2230

2145 -#: merge-recursive.c:805

2231 +#: merge-recursive.c:915

2232 #, c-format

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

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

2235

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

2236 +#: merge-recursive.c:957 builtin/cat-file.c:37

2237 #, c-format

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

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

2240

2155 -#: merge-recursive.c:849

2241 +#: merge-recursive.c:959

2242 #, c-format

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

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

2245

2160 -#: merge-recursive.c:873

2246 +#: merge-recursive.c:983

2247 #, c-format

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

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

2249 +msgstr "falló al abrir '%s': %s"

2250

2165 -#: merge-recursive.c:884

2251 +#: merge-recursive.c:994

2252 #, c-format

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

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

2254 +msgstr "falló al crear el enlace simbólico '%s': %s"

2255

2170 -#: merge-recursive.c:889

2256 +#: merge-recursive.c:999

2257 #, c-format

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

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

2260

2175 -#: merge-recursive.c:1029

2261 +#: merge-recursive.c:1186

2262 +#, c-format

2263 +msgid "Failed to merge submodule %s (not checked out)"

2264 +msgstr "Falló al fusionar el submódulo %s (no revisado)"

2265 +

2266 +#: merge-recursive.c:1193

2267 +#, c-format

2268 +msgid "Failed to merge submodule %s (commits not present)"

2269 +msgstr "Falló al fusionar el submódulo %s (commits no presentes)"

2270 +

2271 +#: merge-recursive.c:1200

2272 +#, c-format

2273 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2274 +msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"

2275 +

2276 +#: merge-recursive.c:1208 merge-recursive.c:1220

2277 +#, c-format

2278 +msgid "Fast-forwarding submodule %s to the following commit:"

2279 +msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"

2280 +

2281 +#: merge-recursive.c:1211 merge-recursive.c:1223

2282 +#, c-format

2283 +msgid "Fast-forwarding submodule %s to %s"

2284 +msgstr "Avance rápido del submódulo %s a %s"

2285 +

2286 +#: merge-recursive.c:1245

2287 +#, c-format

2288 +msgid "Failed to merge submodule %s (merge following commits not found)"

2289 +msgstr ""

2290 +"Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"

2291 +

2292 +#: merge-recursive.c:1249

2293 +#, c-format

2294 +msgid "Failed to merge submodule %s (not fast-forward)"

2295 +msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"

2296 +

2297 +#: merge-recursive.c:1250

2298 +msgid "Found a possible merge resolution for the submodule:\n"

2299 +msgstr "Se encontró una posible solución de fusión para el submódulo:\n"

2300 +

2301 +#: merge-recursive.c:1253

2302 +#, c-format

2303 +msgid ""

2304 +"If this is correct simply add it to the index for example\n"

2305 +"by using:\n"

2306 +"\n"

2307 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2308 +"\n"

2309 +"which will accept this suggestion.\n"

2310 +msgstr ""

2311 +"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"

2312 +"usando:\n"

2313 +"\n"

2314 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2315 +"\n"

2316 +"el cual aceptará esta sugerencia.\n"

2317 +

2318 +#: merge-recursive.c:1262

2319 +#, c-format

2320 +msgid "Failed to merge submodule %s (multiple merges found)"

2321 +msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"

2322 +

2323 +#: merge-recursive.c:1321

2324 msgid "Failed to execute internal merge"

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

2325 +msgstr "Falló al ejecutar la fusión interna"

2326

2179 -#: merge-recursive.c:1034

2327 +#: merge-recursive.c:1326

2328 #, c-format

2329 msgid "Unable to add %s to database"

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

2331

2184 -#: merge-recursive.c:1146

2332 +#: merge-recursive.c:1358

2333 +#, c-format

2334 +msgid "Auto-merging %s"

2335 +msgstr "Auto-fusionando %s"

2336 +

2337 +#: merge-recursive.c:1423

2338 +#, c-format

2339 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2340 +msgstr ""

2341 +"Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "

2342 +"cambio."

2343 +

2344 +#: merge-recursive.c:1475

2345 #, c-format

2346 msgid ""

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

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

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

2351 "en el árbol."

2352

2193 -#: merge-recursive.c:1151

2353 +#: merge-recursive.c:1480

2354 #, c-format

2355 msgid ""

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

@@ -2199,7 +2359,7 @@ msgstr ""

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

2360 "permanece en el árbol."

2361

2202 -#: merge-recursive.c:1158

2362 +#: merge-recursive.c:1487

2363 #, c-format

2364 msgid ""

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

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

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

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

2370

2211 -#: merge-recursive.c:1163

2371 +#: merge-recursive.c:1492

2372 #, c-format

2373 msgid ""

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

@@ -2217,20 +2377,32 @@ msgstr ""

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

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

2379

2220 -#: merge-recursive.c:1197

2380 +#: merge-recursive.c:1526

2381 msgid "rename"

2382 msgstr "renombrar"

2383

2224 -#: merge-recursive.c:1197

2384 +#: merge-recursive.c:1526

2385 msgid "renamed"

2386 msgstr "renombrado"

2387

2228 -#: merge-recursive.c:1254

2388 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2389 +#: merge-recursive.c:3086

2390 +#, c-format

2391 +msgid "Refusing to lose dirty file at %s"

2392 +msgstr "Rehusando perder el archivo sucio en %s"

2393 +

2394 +#: merge-recursive.c:1594

2395 #, c-format

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

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

2398

2233 -#: merge-recursive.c:1279

2399 +#: merge-recursive.c:1599

2400 +#, c-format

2401 +msgid "Refusing to lose untracked file at %s; adding as %s instead"

2402 +msgstr ""

2403 +"Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"

2404 +

2405 +#: merge-recursive.c:1625

2406 #, c-format

2407 msgid ""

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

@@ -2239,143 +2411,193 @@ msgstr ""

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

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

2413

2242 -#: merge-recursive.c:1284

2414 +#: merge-recursive.c:1630

2415 msgid " (left unresolved)"

2416 msgstr " (dejado sin resolver)"

2417

2246 -#: merge-recursive.c:1346

2418 +#: merge-recursive.c:1694

2419 #, c-format

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

2421 msgstr ""

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

2423 "%s"

2424

2253 -#: merge-recursive.c:1379

2425 +#: merge-recursive.c:1733

2426 #, c-format

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

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

2429

2258 -#: merge-recursive.c:1582

2430 +#: merge-recursive.c:1745

2431 +#, c-format

2432 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2433 +msgstr ""

2434 +"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "

2435 +"interponiendo."

2436 +

2437 +#: merge-recursive.c:1951

2438 +#, c-format

2439 +msgid ""

2440 +"CONFLICT (directory rename split): Unclear where to place %s because "

2441 +"directory %s was renamed to multiple other directories, with no destination "

2442 +"getting a majority of the files."

2443 +msgstr ""

2444 +"CONFLICTO (división de cambio de nombre de directorio): No es claro dónde "

2445 +"colocar %s porque el directorio %s fue renombrado a otros múltiples "

2446 +"directorios, sin ningún que contenga la mayoría de archivos."

2447 +

2448 +#: merge-recursive.c:1983

2449 +#, c-format

2450 +msgid ""

2451 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2452 +"implicit directory rename(s) putting the following path(s) there: %s."

2453 +msgstr ""

2454 +"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "

2455 +"existente en %s se interpone con el cambio de nombres implícito, poniendo "

2456 +"la(s) siguiente(s) ruta(s) aquí: %s."

2457 +

2458 +#: merge-recursive.c:1993

2459 +#, c-format

2460 +msgid ""

2461 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2462 +"implicit directory renames tried to put these paths there: %s"

2463 +msgstr ""

2464 +"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

2465 +"para %s; cambio de nombre implícito intentó poner estas rutas: %s"

2466 +

2467 +#: merge-recursive.c:2085

2468 +#, c-format

2469 +msgid ""

2470 +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2471 +">%s in %s"

2472 +msgstr ""

2473 +"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

2474 +"Renombrar directorio %s->%s en %s"

2475 +

2476 +#: merge-recursive.c:2330

2477 +#, c-format

2478 +msgid ""

2479 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2480 +"renamed."

2481 +msgstr ""

2482 +"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

2483 +"renombrado."

2484 +

2485 +#: merge-recursive.c:2736

2486 #, c-format

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

2488 msgstr ""

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

2490

2264 -#: merge-recursive.c:1597

2491 +#: merge-recursive.c:2751

2492 #, c-format

2493 msgid "Adding merged %s"

2494 msgstr "Agregar %s fusionado"

2495

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

2496 +#: merge-recursive.c:2758 merge-recursive.c:3089

2497 #, c-format

2498 msgid "Adding as %s instead"

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

2500

2274 -#: merge-recursive.c:1661

2501 +#: merge-recursive.c:2914

2502 #, c-format

2503 msgid "cannot read object %s"

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

2505

2279 -#: merge-recursive.c:1664

2506 +#: merge-recursive.c:2917

2507 #, c-format

2508 msgid "object %s is not a blob"

2509 msgstr "objeto %s no es un blob"

2510

2284 -#: merge-recursive.c:1733

2511 +#: merge-recursive.c:2986

2512 msgid "modify"

2513 msgstr "modificar"

2514

2288 -#: merge-recursive.c:1733

2515 +#: merge-recursive.c:2986

2516 msgid "modified"

2517 msgstr "modificado"

2518

2292 -#: merge-recursive.c:1743

2519 +#: merge-recursive.c:2997

2520 msgid "content"

2521 msgstr "contenido"

2522

2296 -#: merge-recursive.c:1750

2523 +#: merge-recursive.c:3004

2524 msgid "add/add"

2525 msgstr "agregar/agregar"

2526

2300 -#: merge-recursive.c:1786

2527 +#: merge-recursive.c:3046

2528 #, c-format

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

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

2531

2305 -#: merge-recursive.c:1800

2306 -#, c-format

2307 -msgid "Auto-merging %s"

2308 -msgstr "Auto-fusionando %s"

2309 -

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

2532 +#: merge-recursive.c:3055 git-submodule.sh:895

2533 msgid "submodule"

2534 msgstr "submódulo"

2535

2314 -#: merge-recursive.c:1805

2536 +#: merge-recursive.c:3056

2537 #, c-format

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

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

2540

2319 -#: merge-recursive.c:1899

2541 +#: merge-recursive.c:3178

2542 #, c-format

2543 msgid "Removing %s"

2544 msgstr "Eliminando %s"

2545

2324 -#: merge-recursive.c:1925

2546 +#: merge-recursive.c:3204

2547 msgid "file/directory"

2548 msgstr "archivo/directorio"

2549

2328 -#: merge-recursive.c:1931

2550 +#: merge-recursive.c:3210

2551 msgid "directory/file"

2552 msgstr "directorio/archivo"

2553

2332 -#: merge-recursive.c:1938

2554 +#: merge-recursive.c:3217

2555 #, c-format

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

2557 msgstr ""

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

2559 "%s"

2560

2339 -#: merge-recursive.c:1947

2561 +#: merge-recursive.c:3226

2562 #, c-format

2563 msgid "Adding %s"

2564 msgstr "Agregando %s"

2565

2344 -#: merge-recursive.c:1987

2566 +#: merge-recursive.c:3267

2567 #, c-format

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

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

2570

2349 -#: merge-recursive.c:1991

2571 +#: merge-recursive.c:3271

2572 msgid "Already up to date!"

2573 msgstr "¡Ya está actualizado!"

2574

2353 -#: merge-recursive.c:2000

2575 +#: merge-recursive.c:3280

2576 #, c-format

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

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

2579

2358 -#: merge-recursive.c:2097

2580 +#: merge-recursive.c:3379

2581 msgid "Merging:"

2582 msgstr "Fusionando:"

2583

2362 -#: merge-recursive.c:2110

2584 +#: merge-recursive.c:3392

2585 #, c-format

2586 msgid "found %u common ancestor:"

2587 msgid_plural "found %u common ancestors:"

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

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

2590

2369 -#: merge-recursive.c:2149

2591 +#: merge-recursive.c:3431

2592 msgid "merge returned no commit"

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

2594

2373 -#: merge-recursive.c:2212

2595 +#: merge-recursive.c:3495

2596 #, c-format

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

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

2599

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

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

2601 msgid "Unable to write index."

2602 msgstr "Incapaz de escribir el índice."

2603

@@ -2421,32 +2643,32 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

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

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

2645

2424 -#: object.c:239

2646 +#: object.c:242

2647 #, c-format

2648 msgid "unable to parse object: %s"

2649 msgstr "incapaz de analizar objeto: %s"

2650

2429 -#: packfile.c:561

2651 +#: packfile.c:563

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

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

2654

2433 -#: packfile.c:1694

2655 +#: packfile.c:1742

2656 #, c-format

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

2658 msgstr ""

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

2660

2439 -#: packfile.c:1698

2661 +#: packfile.c:1746

2662 #, c-format

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

2664 msgstr ""

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

2666

2445 -#: parse-options.c:619

2667 +#: parse-options.c:621

2668 msgid "..."

2669 msgstr "..."

2670

2449 -#: parse-options.c:638

2671 +#: parse-options.c:640

2672 #, c-format

2673 msgid "usage: %s"

2674 msgstr "uso: %s"

@@ -2454,26 +2676,31 @@ msgstr "uso: %s"

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

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

2678 #.

2457 -#: parse-options.c:644

2679 +#: parse-options.c:646

2680 #, c-format

2681 msgid " or: %s"

2682 msgstr " o: %s"

2683

2462 -#: parse-options.c:647

2684 +#: parse-options.c:649

2685 #, c-format

2686 msgid " %s"

2687 msgstr " %s"

2688

2467 -#: parse-options.c:686

2689 +#: parse-options.c:688

2690 msgid "-NUM"

2691 msgstr "-NUM"

2692

2471 -#: parse-options-cb.c:108

2693 +#: parse-options-cb.c:44

2694 +#, c-format

2695 +msgid "malformed expiration date '%s'"

2696 +msgstr "fecha de expiración mal formada: '%s'"

2697 +

2698 +#: parse-options-cb.c:112

2699 #, c-format

2700 msgid "malformed object name '%s'"

2701 msgstr "nombre de objeto mal formado '%s'"

2702

2476 -#: path.c:891

2703 +#: path.c:892

2704 #, c-format

2705 msgid "Could not make %s writable by group"

2706 msgstr "No se pudo hacer que %s fuera escribible por el grupo"

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

2784 msgid "unable to parse --pretty format"

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

2786

2560 -#: read-cache.c:1473

2787 +#: read-cache.c:1500

2788 #, c-format

2789 msgid ""

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

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

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

2794 "Usando versión %i"

2795

2569 -#: read-cache.c:1483

2796 +#: read-cache.c:1510

2797 #, c-format

2798 msgid ""

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

@@ -2575,52 +2802,53 @@ msgstr ""

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

2803 "Usando versión %i"

2804

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

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

2806 #, c-format

2807 msgid "could not close '%s'"

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

2809

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

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

2811 #, c-format

2812 msgid "could not stat '%s'"

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

2814

2588 -#: read-cache.c:2461

2815 +#: read-cache.c:2490

2816 #, c-format

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

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

2819

2593 -#: read-cache.c:2473

2820 +#: read-cache.c:2502

2821 #, c-format

2822 msgid "unable to unlink: %s"

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

2824

2598 -#: refs.c:706

2825 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2826 +#: builtin/am.c:779

2827 #, c-format

2600 -msgid "Could not open '%s' for writing"

2601 -msgstr "No se pudo abrir '%s' para escritura"

2828 +msgid "could not open '%s' for writing"

2829 +msgstr "no se pudo abrir '%s' para escritura"

2830

2603 -#: refs.c:1850

2831 +#: refs.c:1880

2832 msgid "ref updates forbidden inside quarantine environment"

2833 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

2834

2607 -#: refs/files-backend.c:1189

2835 +#: refs/files-backend.c:1191

2836 #, c-format

2837 msgid "could not remove reference %s"

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

2839

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

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

2840 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2841 +#: refs/packed-backend.c:1541

2842 #, c-format

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

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

2845

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

2846 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544

2847 #, c-format

2848 msgid "could not delete references: %s"

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

2850

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

2851 +#: ref-filter.c:35 wt-status.c:1850

2852 msgid "gone"

2853 msgstr "desaparecido"

2854

@@ -2639,157 +2867,162 @@ msgstr "detrás %d"

2867 msgid "ahead %d, behind %d"

2868 msgstr "delante %d, detrás %d"

2869

2642 -#: ref-filter.c:107

2870 +#: ref-filter.c:121

2871 #, c-format

2872 msgid "expected format: %%(color:<color>)"

2873 msgstr "formato esperado: %%(color:<color>)"

2874

2647 -#: ref-filter.c:109

2875 +#: ref-filter.c:123

2876 #, c-format

2877 msgid "unrecognized color: %%(color:%s)"

2878 msgstr "color no reconocido: %%(color:%s)"

2879

2652 -#: ref-filter.c:129

2880 +#: ref-filter.c:145

2881 #, c-format

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

2883 msgstr "Valor entero esperado refname:lstrip=%s"

2884

2657 -#: ref-filter.c:133

2885 +#: ref-filter.c:149

2886 #, c-format

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

2888 msgstr "Valor entero esperado refname:rstrip=%s"

2889

2662 -#: ref-filter.c:135

2890 +#: ref-filter.c:151

2891 #, c-format

2892 msgid "unrecognized %%(%s) argument: %s"

2893 msgstr "argumento: %s no reconocido %%(%s)"

2894

2667 -#: ref-filter.c:184

2895 +#: ref-filter.c:206

2896 #, c-format

2897 msgid "%%(body) does not take arguments"

2898 msgstr "%%(body) no toma ningún argumento"

2899

2672 -#: ref-filter.c:191

2900 +#: ref-filter.c:215

2901 #, c-format

2902 msgid "%%(subject) does not take arguments"

2903 msgstr "%%(subject) no toma ningún argumento"

2904

2677 -#: ref-filter.c:209

2905 +#: ref-filter.c:235

2906 #, c-format

2907 msgid "unknown %%(trailers) argument: %s"

2908 msgstr "%%(trailers) desconocidos, argumento: %s"

2909

2682 -#: ref-filter.c:232

2910 +#: ref-filter.c:264

2911 #, c-format

2912 msgid "positive value expected contents:lines=%s"

2913 msgstr "valor positivo esperado contents:lines=%s"

2914

2687 -#: ref-filter.c:234

2915 +#: ref-filter.c:266

2916 #, c-format

2917 msgid "unrecognized %%(contents) argument: %s"

2918 msgstr "argumento %s no reconocido %%(contents)"

2919

2692 -#: ref-filter.c:247

2920 +#: ref-filter.c:281

2921 #, c-format

2922 msgid "positive value expected objectname:short=%s"

2923 msgstr "valor positivo esperado objectname:short=%s"

2924

2697 -#: ref-filter.c:251

2925 +#: ref-filter.c:285

2926 #, c-format

2927 msgid "unrecognized %%(objectname) argument: %s"

2928 msgstr "argumento: %s no reconocido %%(objectname)"

2929

2702 -#: ref-filter.c:278

2930 +#: ref-filter.c:315

2931 #, c-format

2932 msgid "expected format: %%(align:<width>,<position>)"

2933 msgstr "formato esperado: %%(align:<ancho>,<posición>)"

2934

2707 -#: ref-filter.c:290

2935 +#: ref-filter.c:327

2936 #, c-format

2937 msgid "unrecognized position:%s"

2938 msgstr "posición desconocida: %s"

2939

2712 -#: ref-filter.c:294

2940 +#: ref-filter.c:334

2941 #, c-format

2942 msgid "unrecognized width:%s"

2943 msgstr "ancho desconocido: %s"

2944

2717 -#: ref-filter.c:300

2945 +#: ref-filter.c:343

2946 #, c-format

2947 msgid "unrecognized %%(align) argument: %s"

2948 msgstr "argumento no reconocido para %%(align): %s"

2949

2722 -#: ref-filter.c:304

2950 +#: ref-filter.c:351

2951 #, c-format

2952 msgid "positive width expected with the %%(align) atom"

2953 msgstr "se esperaba un ancho positivo con el átomo %%(align)"

2954

2727 -#: ref-filter.c:319

2955 +#: ref-filter.c:369

2956 #, c-format

2957 msgid "unrecognized %%(if) argument: %s"

2958 msgstr "argumento: %s no reconocido %%(if)"

2959

2732 -#: ref-filter.c:409

2960 +#: ref-filter.c:464

2961 #, c-format

2962 msgid "malformed field name: %.*s"

2963 msgstr "nombre mal formado de campo: %.*s"

2964

2737 -#: ref-filter.c:435

2965 +#: ref-filter.c:491

2966 #, c-format

2967 msgid "unknown field name: %.*s"

2968 msgstr "nombre de campo desconocido: %.*s"

2969

2742 -#: ref-filter.c:547

2970 +#: ref-filter.c:608

2971 #, c-format

2972 msgid "format: %%(if) atom used without a %%(then) atom"

2973 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"

2974

2747 -#: ref-filter.c:607

2975 +#: ref-filter.c:671

2976 #, c-format

2977 msgid "format: %%(then) atom used without an %%(if) atom"

2978 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"

2979

2752 -#: ref-filter.c:609

2980 +#: ref-filter.c:673

2981 #, c-format

2982 msgid "format: %%(then) atom used more than once"

2983 msgstr "formato: átomo %%(then) usado mas de una vez"

2984

2757 -#: ref-filter.c:611

2985 +#: ref-filter.c:675

2986 #, c-format

2987 msgid "format: %%(then) atom used after %%(else)"

2988 msgstr "formato: átomo %%(then) usado después de %%(else)"

2989

2762 -#: ref-filter.c:637

2990 +#: ref-filter.c:703

2991 #, c-format

2992 msgid "format: %%(else) atom used without an %%(if) atom"

2993 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

2994

2767 -#: ref-filter.c:639

2995 +#: ref-filter.c:705

2996 #, c-format

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

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

2999

2772 -#: ref-filter.c:641

3000 +#: ref-filter.c:707

3001 #, c-format

3002 msgid "format: %%(else) atom used more than once"

3003 msgstr "formato: átomo %%(else) usado mas de una vez"

3004

2777 -#: ref-filter.c:654

3005 +#: ref-filter.c:722

3006 #, c-format

3007 msgid "format: %%(end) atom used without corresponding atom"

3008 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

3009

2782 -#: ref-filter.c:709

3010 +#: ref-filter.c:779

3011 #, c-format

3012 msgid "malformed format string %s"

3013 msgstr "formato de cadena mal formado %s"

3014

2787 -#: ref-filter.c:1313

3015 +#: ref-filter.c:1387

3016 #, c-format

3017 msgid "(no branch, rebasing %s)"

3018 msgstr "(no hay rama, rebasando %s)"

3019

2792 -#: ref-filter.c:1316

3020 +#: ref-filter.c:1390

3021 +#, c-format

3022 +msgid "(no branch, rebasing detached HEAD %s)"

3023 +msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"

3024 +

3025 +#: ref-filter.c:1393

3026 #, c-format

3027 msgid "(no branch, bisect started on %s)"

3028 msgstr "(no hay rama, comenzando bisecado en %s)"

@@ -2797,7 +3030,7 @@ msgstr "(no hay rama, comenzando bisecado en %s)"

3030 #. TRANSLATORS: make sure this matches "HEAD

3031 #. detached at " in wt-status.c

3032 #.

2800 -#: ref-filter.c:1324

3033 +#: ref-filter.c:1401

3034 #, c-format

3035 msgid "(HEAD detached at %s)"

3036 msgstr "(HEAD desacoplado en %s)"

@@ -2805,148 +3038,148 @@ msgstr "(HEAD desacoplado en %s)"

3038 #. TRANSLATORS: make sure this matches "HEAD

3039 #. detached from " in wt-status.c

3040 #.

2808 -#: ref-filter.c:1331

3041 +#: ref-filter.c:1408

3042 #, c-format

3043 msgid "(HEAD detached from %s)"

3044 msgstr "(HEAD desacoplado de %s)"

3045

2813 -#: ref-filter.c:1335

3046 +#: ref-filter.c:1412

3047 msgid "(no branch)"

3048 msgstr "(sin rama)"

3049

2817 -#: ref-filter.c:1364

3050 +#: ref-filter.c:1442

3051 #, c-format

3052 msgid "missing object %s for %s"

3053 msgstr "falta objeto %s para %s"

3054

2822 -#: ref-filter.c:1367

3055 +#: ref-filter.c:1445

3056 #, c-format

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

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

3059

2827 -#: ref-filter.c:1819

3060 +#: ref-filter.c:1902

3061 #, c-format

3062 msgid "malformed object at '%s'"

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

3064

2832 -#: ref-filter.c:1886

3065 +#: ref-filter.c:1984

3066 #, c-format

3067 msgid "ignoring ref with broken name %s"

3068 msgstr "ignorando referencia con nombre roto %s"

3069

2837 -#: ref-filter.c:1891

3070 +#: ref-filter.c:1989

3071 #, c-format

3072 msgid "ignoring broken ref %s"

3073 msgstr "ignorando referencia rota %s"

3074

2842 -#: ref-filter.c:2152

3075 +#: ref-filter.c:2261

3076 #, c-format

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

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

3079

2847 -#: ref-filter.c:2246

3080 +#: ref-filter.c:2365

3081 #, c-format

3082 msgid "malformed object name %s"

3083 msgstr "nombre de objeto mal formado %s"

3084

2852 -#: remote.c:795

3085 +#: remote.c:605

3086 #, c-format

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

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

3089

2857 -#: remote.c:799

3090 +#: remote.c:609

3091 #, c-format

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

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

3094

2862 -#: remote.c:803

3095 +#: remote.c:613

3096 #, c-format

3097 msgid "%s tracks both %s and %s"

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

3099

2867 -#: remote.c:811

3100 +#: remote.c:621

3101 msgid "Internal error"

3102 msgstr "Error interno"

3103

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

3104 +#: remote.c:1534 remote.c:1635

3105 msgid "HEAD does not point to a branch"

3106 msgstr "HEAD no apunta a ninguna rama"

3107

2875 -#: remote.c:1735

3108 +#: remote.c:1543

3109 #, c-format

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

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

3112

2880 -#: remote.c:1738

3113 +#: remote.c:1546

3114 #, c-format

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

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

3117

2885 -#: remote.c:1744

3118 +#: remote.c:1552

3119 #, c-format

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

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

3122

2890 -#: remote.c:1759

3123 +#: remote.c:1567

3124 #, c-format

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

3126 msgstr ""

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

3128

2896 -#: remote.c:1771

3129 +#: remote.c:1579

3130 #, c-format

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

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

3133

2901 -#: remote.c:1782

3134 +#: remote.c:1589

3135 #, c-format

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

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

3138

2906 -#: remote.c:1795

3139 +#: remote.c:1602

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

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

3142

2910 -#: remote.c:1817

3143 +#: remote.c:1624

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

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

3146

2914 -#: remote.c:2132

3147 +#: remote.c:1939

3148 #, c-format

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

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

3151

2919 -#: remote.c:2136

3152 +#: remote.c:1943

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

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

3155

2923 -#: remote.c:2139

3156 +#: remote.c:1946

3157 #, c-format

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

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

3160

2928 -#: remote.c:2143

3161 +#: remote.c:1950

3162 #, c-format

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

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

3165

2933 -#: remote.c:2146

3166 +#: remote.c:1953

3167 #, c-format

3168 msgid " (use \"%s\" for details)\n"

3169 msgstr " (usa \"%s\" para detalles)\n"

3170

2938 -#: remote.c:2150

3171 +#: remote.c:1957

3172 #, c-format

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

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

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

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

3177

2945 -#: remote.c:2156

3178 +#: remote.c:1963

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

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

3181

2949 -#: remote.c:2159

3182 +#: remote.c:1966

3183 #, c-format

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

3185 msgid_plural ""

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

3189 msgstr[1] ""

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

3191

2959 -#: remote.c:2167

3192 +#: remote.c:1974

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

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

3195

2963 -#: remote.c:2170

3196 +#: remote.c:1977

3197 #, c-format

3198 msgid ""

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

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

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

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

3210

2978 -#: remote.c:2180

3211 +#: remote.c:1987

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

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

3214

2982 -#: revision.c:2277

3215 +#: revision.c:2289

3216 msgid "your current branch appears to be broken"

3217 msgstr "tu rama actual parece estar rota"

3218

2986 -#: revision.c:2280

3219 +#: revision.c:2292

3220 #, c-format

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

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

3223

2991 -#: revision.c:2477

3224 +#: revision.c:2489

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

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

3227

2995 -#: run-command.c:731

3228 +#: run-command.c:728

3229 msgid "open /dev/null failed"

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

3231

2999 -#: run-command.c:1274

3232 +#: run-command.c:1271

3233 #, c-format

3234 msgid ""

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

@@ -3045,29 +3278,34 @@ msgstr "el destino no soporta push atómicos (--atomic)"

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

3279 msgstr "el destino no soporta opciones de push"

3280

3048 -#: sequencer.c:158

3281 +#: sequencer.c:174

3282 #, c-format

3283 msgid "invalid commit message cleanup mode '%s'"

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

3285

3053 -#: sequencer.c:267

3286 +#: sequencer.c:274

3287 +#, c-format

3288 +msgid "could not delete '%s'"

3289 +msgstr "No se pudo borrar '%s'"

3290 +

3291 +#: sequencer.c:300

3292 msgid "revert"

3293 msgstr "revertir"

3294

3057 -#: sequencer.c:269

3295 +#: sequencer.c:302

3296 msgid "cherry-pick"

3297 msgstr "cherry-pick"

3298

3061 -#: sequencer.c:271

3299 +#: sequencer.c:304

3300 msgid "rebase -i"

3301 msgstr "rebase -i"

3302

3065 -#: sequencer.c:273

3303 +#: sequencer.c:306

3304 #, c-format

3305 msgid "Unknown action: %d"

3306 msgstr "Acción desconocida: %d"

3307

3070 -#: sequencer.c:330

3308 +#: sequencer.c:363

3309 msgid ""

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

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

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

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

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

3315

3078 -#: sequencer.c:333

3316 +#: sequencer.c:366

3317 msgid ""

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

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

@@ -3085,43 +3323,45 @@ msgstr ""

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

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

3325

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

3326 +#: sequencer.c:379 sequencer.c:2467

3327 #, c-format

3328 msgid "could not lock '%s'"

3329 msgstr "no se pudo bloquear '%s'"

3330

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

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

3331 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3332 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3333 #, c-format

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

3335 msgstr "no se pudo escribir en '%s'"

3336

3099 -#: sequencer.c:353

3337 +#: sequencer.c:386

3338 #, c-format

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

3340 msgstr "no se pudo escribir EOL en '%s'"

3341

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

3342 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3343 +#: sequencer.c:2701

3344 #, c-format

3345 msgid "failed to finalize '%s'"

3346 msgstr "falló al finalizar '%s'"

3347

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

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

3348 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3349 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3350 +#: builtin/merge.c:1045

3351 #, c-format

3352 msgid "could not read '%s'"

3353 msgstr "no se pudo leer '%s'"

3354

3115 -#: sequencer.c:405

3355 +#: sequencer.c:440

3356 #, c-format

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

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

3359

3120 -#: sequencer.c:409

3360 +#: sequencer.c:444

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

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

3363

3124 -#: sequencer.c:438

3364 +#: sequencer.c:473

3365 #, c-format

3366 msgid "%s: fast-forward"

3367 msgstr "%s: avance rápido"

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

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

3370 #. "rebase -i".

3371 #.

3132 -#: sequencer.c:526

3372 +#: sequencer.c:562

3373 #, c-format

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

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

3376

3137 -#: sequencer.c:542

3138 -msgid "could not resolve HEAD commit"

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

3140 -

3141 -#: sequencer.c:562

3377 +#: sequencer.c:578

3378 msgid "unable to update cache tree"

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

3380

3145 -#: sequencer.c:658

3381 +#: sequencer.c:591

3382 +msgid "could not resolve HEAD commit"

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

3384 +

3385 +#: sequencer.c:748

3386 #, c-format

3387 msgid ""

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

@@ -3172,11 +3412,15 @@ msgstr ""

3412 "\n"

3413 " git rebase --continue\n"

3414

3175 -#: sequencer.c:915

3415 +#: sequencer.c:817

3416 +msgid "writing root commit"

3417 +msgstr "escribiendo commit raíz"

3418 +

3419 +#: sequencer.c:1042

3420 msgid "'prepare-commit-msg' hook failed"

3421 msgstr "hook 'prepare-commit-msg' falló"

3422

3179 -#: sequencer.c:922

3423 +#: sequencer.c:1049

3424 msgid ""

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

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

@@ -3203,7 +3447,7 @@ msgstr ""

3447 "\n"

3448 " git commit --amend --reset-author\n"

3449

3206 -#: sequencer.c:935

3450 +#: sequencer.c:1062

3451 msgid ""

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

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

@@ -3227,327 +3471,313 @@ msgstr ""

3471 "\n"

3472 " git commit --amend --reset-author\n"

3473

3230 -#: sequencer.c:975

3474 +#: sequencer.c:1102

3475 msgid "couldn't look up newly created commit"

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

3477

3234 -#: sequencer.c:977

3478 +#: sequencer.c:1104

3479 msgid "could not parse newly created commit"

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

3481

3238 -#: sequencer.c:1023

3482 +#: sequencer.c:1150

3483 msgid "unable to resolve HEAD after creating commit"

3484 msgstr "no se pudo resolver HEAD tras crear el commit"

3485

3242 -#: sequencer.c:1025

3486 +#: sequencer.c:1152

3487 msgid "detached HEAD"

3488 msgstr "HEAD desacoplado"

3489

3246 -#: sequencer.c:1029

3490 +#: sequencer.c:1156

3491 msgid " (root-commit)"

3492 msgstr " (commit-raíz)"

3493

3250 -#: sequencer.c:1050

3494 +#: sequencer.c:1177

3495 msgid "could not parse HEAD"

3496 msgstr "no se pudo analizar HEAD"

3497

3254 -#: sequencer.c:1052

3498 +#: sequencer.c:1179

3499 #, c-format

3500 msgid "HEAD %s is not a commit!"

3501 msgstr "HEAD %s no es un commit!"

3502

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

3503 +#: sequencer.c:1183 builtin/commit.c:1528

3504 msgid "could not parse HEAD commit"

3505 msgstr "no se pudo analizar el commit de HEAD"

3506

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

3507 +#: sequencer.c:1234 sequencer.c:1831

3508 msgid "unable to parse commit author"

3509 msgstr "no es posible analizar el autor del commit"

3510

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

3511 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

3512 msgid "git write-tree failed to write a tree"

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

3514

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

3515 +#: sequencer.c:1261 sequencer.c:1316

3516 #, c-format

3517 msgid "unable to read commit message from '%s'"

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

3519

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

3277 -#: builtin/merge.c:851

3520 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3521 +#: builtin/merge.c:849

3522 msgid "failed to write commit object"

3279 -msgstr "fallo al escribir el objeto commit"

3523 +msgstr "falló al escribir el objeto commit"

3524

3281 -#: sequencer.c:1213

3525 +#: sequencer.c:1343

3526 #, c-format

3527 msgid "could not parse commit %s"

3528 msgstr "no se pudo analizar commit %s"

3529

3286 -#: sequencer.c:1218

3530 +#: sequencer.c:1348

3531 #, c-format

3532 msgid "could not parse parent commit %s"

3533 msgstr "no se pudo analizar el commit padre %s"

3534

3291 -#: sequencer.c:1347

3292 -#, c-format

3293 -msgid ""

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

3295 -"\n"

3296 -"\t%.*s"

3297 -msgstr ""

3298 -"1ra línea del mensaje squash no esperada:\n"

3299 -"\n"

3300 -"\t%.*s"

3301 -

3302 -#: sequencer.c:1353

3303 -#, c-format

3304 -msgid ""

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

3306 -"\n"

3307 -"\t%.*s"

3308 -msgstr ""

3309 -"1ra línea del mensaje squash inválida:\n"

3310 -"\n"

3311 -"\t%.*s"

3312 -

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

3535 +#: sequencer.c:1499 sequencer.c:1524

3536 #, c-format

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

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

3539

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

3540 +#: sequencer.c:1509 sequencer.c:4354

3541 msgid "need a HEAD to fixup"

3542 msgstr "se necesita un HEAD para arreglar"

3543

3322 -#: sequencer.c:1370

3544 +#: sequencer.c:1511 sequencer.c:2728

3545 msgid "could not read HEAD"

3546 msgstr "no se pudo leer HEAD"

3547

3326 -#: sequencer.c:1372

3548 +#: sequencer.c:1513

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

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

3551

3330 -#: sequencer.c:1378

3552 +#: sequencer.c:1519

3553 #, c-format

3554 msgid "cannot write '%s'"

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

3556

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

3557 +#: sequencer.c:1526 git-rebase--interactive.sh:457

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

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

3560

3339 -#: sequencer.c:1395

3561 +#: sequencer.c:1534

3562 #, c-format

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

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

3565

3344 -#: sequencer.c:1402

3566 +#: sequencer.c:1541

3567 #, c-format

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

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

3570

3349 -#: sequencer.c:1407

3571 +#: sequencer.c:1547

3572 #, c-format

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

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

3575

3354 -#: sequencer.c:1412

3576 +#: sequencer.c:1552

3577 #, c-format

3578 msgid "unknown command: %d"

3579 msgstr "comando desconocido: %d"

3580

3359 -#: sequencer.c:1479

3581 +#: sequencer.c:1630

3582 msgid "your index file is unmerged."

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

3584

3363 -#: sequencer.c:1498

3585 +#: sequencer.c:1637

3586 +msgid "cannot fixup root commit"

3587 +msgstr "no se puede arreglar el commit raíz"

3588 +

3589 +#: sequencer.c:1656

3590 #, c-format

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

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

3593

3368 -#: sequencer.c:1506

3594 +#: sequencer.c:1664

3595 #, c-format

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

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

3598

3373 -#: sequencer.c:1510

3599 +#: sequencer.c:1668

3600 #, c-format

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

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

3603

3378 -#: sequencer.c:1516

3604 +#: sequencer.c:1674

3605 #, c-format

3606 msgid "cannot get commit message for %s"

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

3608

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

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

3385 -#: sequencer.c:1535

3611 +#: sequencer.c:1693

3612 #, c-format

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

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

3615

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

3616 +#: sequencer.c:1758

3617 #, c-format

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

3619 msgstr "no se puede renombrar '%s' a '%s'"

3620

3395 -#: sequencer.c:1654

3621 +#: sequencer.c:1812

3622 #, c-format

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

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

3625

3400 -#: sequencer.c:1655

3626 +#: sequencer.c:1813

3627 #, c-format

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

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

3630

3405 -#: sequencer.c:1702

3631 +#: sequencer.c:1863

3632 msgid "empty commit set passed"

3633 msgstr "conjunto de commits vacío entregado"

3634

3409 -#: sequencer.c:1712

3635 +#: sequencer.c:1873

3636 #, c-format

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

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

3638 +msgstr "git %s: falló al leer el índice"

3639

3414 -#: sequencer.c:1718

3640 +#: sequencer.c:1880

3641 #, c-format

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

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

3643 +msgstr "git %s: falló al refrescar el índice"

3644

3419 -#: sequencer.c:1792

3645 +#: sequencer.c:1960

3646 #, c-format

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

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

3649

3424 -#: sequencer.c:1801

3650 +#: sequencer.c:1969

3651 #, c-format

3652 msgid "missing arguments for %s"

3653 msgstr "faltan argumentos para para %s"

3654

3429 -#: sequencer.c:1844

3655 +#: sequencer.c:2028

3656 #, c-format

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

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

3659

3434 -#: sequencer.c:1852

3660 +#: sequencer.c:2036

3661 #, c-format

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

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

3664

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

3665 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3666 #, c-format

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

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

3669

3444 -#: sequencer.c:1906

3670 +#: sequencer.c:2107

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

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

3673

3448 -#: sequencer.c:1908

3674 +#: sequencer.c:2109

3675 #, c-format

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

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

3678

3453 -#: sequencer.c:1913

3679 +#: sequencer.c:2114

3680 msgid "no commits parsed."

3681 msgstr "ningún commit analizado."

3682

3457 -#: sequencer.c:1924

3683 +#: sequencer.c:2125

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

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

3686

3461 -#: sequencer.c:1926

3687 +#: sequencer.c:2127

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

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

3690

3465 -#: sequencer.c:1993

3691 +#: sequencer.c:2194

3692 #, c-format

3693 msgid "invalid key: %s"

3694 msgstr "llave invalida: %s"

3695

3470 -#: sequencer.c:1996

3696 +#: sequencer.c:2197

3697 #, c-format

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

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

3700

3475 -#: sequencer.c:2062

3701 +#: sequencer.c:2268

3702 +msgid "unusable squash-onto"

3703 +msgstr "squash-onto inservible"

3704 +

3705 +#: sequencer.c:2284

3706 #, c-format

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

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

3709

3480 -#: sequencer.c:2100

3710 +#: sequencer.c:2322

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

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

3713

3484 -#: sequencer.c:2101

3714 +#: sequencer.c:2323

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

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

3717

3488 -#: sequencer.c:2104

3718 +#: sequencer.c:2326

3719 #, c-format

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

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

3722

3493 -#: sequencer.c:2118

3723 +#: sequencer.c:2340

3724 msgid "could not lock HEAD"

3725 msgstr "no se pudo bloquear HEAD"

3726

3497 -#: sequencer.c:2173 sequencer.c:2761

3727 +#: sequencer.c:2395 sequencer.c:3402

3728 msgid "no cherry-pick or revert in progress"

3729 msgstr "ningún cherry-pick o revert en progreso"

3730

3501 -#: sequencer.c:2175

3731 +#: sequencer.c:2397

3732 msgid "cannot resolve HEAD"

3733 msgstr "no se puede resolver HEAD"

3734

3505 -#: sequencer.c:2177 sequencer.c:2212

3735 +#: sequencer.c:2399 sequencer.c:2434

3736 msgid "cannot abort from a branch yet to be born"

3737 msgstr "no se puede abortar de una rama por nacer"

3738

3509 -#: sequencer.c:2198 builtin/grep.c:720

3739 +#: sequencer.c:2420 builtin/grep.c:720

3740 #, c-format

3741 msgid "cannot open '%s'"

3742 msgstr "no se puede abrir '%s'"

3743

3514 -#: sequencer.c:2200

3744 +#: sequencer.c:2422

3745 #, c-format

3746 msgid "cannot read '%s': %s"

3747 msgstr "no se puede leer '%s': %s"

3748

3519 -#: sequencer.c:2201

3749 +#: sequencer.c:2423

3750 msgid "unexpected end of file"

3751 msgstr "final de archivo inesperado"

3752

3523 -#: sequencer.c:2207

3753 +#: sequencer.c:2429

3754 #, c-format

3755 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3756 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"

3757

3528 -#: sequencer.c:2218

3758 +#: sequencer.c:2440

3759 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3760 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

3761

3532 -#: sequencer.c:2324 sequencer.c:2679

3762 +#: sequencer.c:2544 sequencer.c:3320

3763 #, c-format

3764 msgid "could not update %s"

3765 msgstr "no se puede actualizar %s"

3766

3537 -#: sequencer.c:2362 sequencer.c:2659

3767 +#: sequencer.c:2582 sequencer.c:3300

3768 msgid "cannot read HEAD"

3769 msgstr "no se puede leer HEAD"

3770

3541 -#: sequencer.c:2402 builtin/difftool.c:639

3771 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3772 #, c-format

3773 msgid "could not copy '%s' to '%s'"

3774 msgstr "no se pudo copiar '%s' a '%s'"

3775

3546 -#: sequencer.c:2421

3776 +#: sequencer.c:2640

3777 msgid "could not read index"

3778 msgstr "no se pudo leer índice"

3779

3550 -#: sequencer.c:2426

3780 +#: sequencer.c:2645

3781 #, c-format

3782 msgid ""

3783 "execution failed: %s\n"

@@ -3562,11 +3792,11 @@ msgstr ""

3792 " git rebase --continue\n"

3793 "\n"

3794

3565 -#: sequencer.c:2432

3795 +#: sequencer.c:2651

3796 msgid "and made changes to the index and/or the working tree\n"

3797 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

3798

3569 -#: sequencer.c:2438

3799 +#: sequencer.c:2657

3800 #, c-format

3801 msgid ""

3802 "execution succeeded: %s\n"

@@ -3583,17 +3813,62 @@ msgstr ""

3813 " git rebase --continue\n"

3814 "\n"

3815

3586 -#: sequencer.c:2497

3816 +#: sequencer.c:2770

3817 +msgid "writing fake root commit"

3818 +msgstr "escribiendo commit raíz falso"

3819 +

3820 +#: sequencer.c:2775

3821 +msgid "writing squash-onto"

3822 +msgstr "escribiendo squash-onto"

3823 +

3824 +#: sequencer.c:2810

3825 +#, c-format

3826 +msgid "failed to find tree of %s"

3827 +msgstr "falló al encontrar árbol de %s"

3828 +

3829 +#: sequencer.c:2828

3830 +msgid "could not write index"

3831 +msgstr "no se pudo escribir índice"

3832 +

3833 +#: sequencer.c:2860

3834 +msgid "cannot merge without a current revision"

3835 +msgstr "no se puede fusionar sin una versión actual"

3836 +

3837 +#: sequencer.c:2883

3838 +#, c-format

3839 +msgid "could not resolve '%s'"

3840 +msgstr "no se pudo resolver '%s'"

3841 +

3842 +#: sequencer.c:2905

3843 +#, c-format

3844 +msgid "could not get commit message of '%s'"

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

3846 +

3847 +#: sequencer.c:2915 sequencer.c:2940

3848 +#, c-format

3849 +msgid "could not write '%s'"

3850 +msgstr "no se pudo escribir '%s'"

3851 +

3852 +#: sequencer.c:3004

3853 +#, c-format

3854 +msgid "could not even attempt to merge '%.*s'"

3855 +msgstr "no se pudo intentar fusionar '%.*s'"

3856 +

3857 +#: sequencer.c:3020

3858 +msgid "merge: Unable to write new index file"

3859 +msgstr "fusión: No se puede escribir el nuevo archivo índice"

3860 +

3861 +#: sequencer.c:3087

3862 #, c-format

3863 msgid "Applied autostash.\n"

3864 msgstr "Autostash aplicado.\n"

3865

3591 -#: sequencer.c:2509

3866 +#: sequencer.c:3099

3867 #, c-format

3868 msgid "cannot store %s"

3869 msgstr "no se puede guardar %s"

3870

3596 -#: sequencer.c:2512 git-rebase.sh:178

3871 +#: sequencer.c:3102 git-rebase.sh:188

3872 #, c-format

3873 msgid ""

3874 "Applying autostash resulted in conflicts.\n"

@@ -3605,52 +3880,69 @@ msgstr ""

3880 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

3881 "momento.\n"

3882

3608 -#: sequencer.c:2595

3883 +#: sequencer.c:3133

3884 +#, c-format

3885 +msgid ""

3886 +"Could not execute the todo command\n"

3887 +"\n"

3888 +" %.*s\n"

3889 +"It has been rescheduled; To edit the command before continuing, please\n"

3890 +"edit the todo list first:\n"

3891 +"\n"

3892 +" git rebase --edit-todo\n"

3893 +" git rebase --continue\n"

3894 +msgstr ""

3895 +"No se pudo ejecutar el comando \"todo\"\n"

3896 +"\n"

3897 +" %.*s\n"

3898 +"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"

3899 +"edite la lista de \"todo\" primero:\n"

3900 +"\n"

3901 +" git rebase --edit-todo\n"

3902 +" git rebase --continue\n"

3903 +

3904 +#: sequencer.c:3201

3905 #, c-format

3906 msgid "Stopped at %s... %.*s\n"

3907 msgstr "Detenido en %s... %.*s\n"

3908

3613 -#: sequencer.c:2637

3909 +#: sequencer.c:3263

3910 #, c-format

3911 msgid "unknown command %d"

3912 msgstr "comando desconocido %d"

3913

3618 -#: sequencer.c:2667

3914 +#: sequencer.c:3308

3915 msgid "could not read orig-head"

3916 msgstr "no se puede leer orig-head"

3917

3622 -#: sequencer.c:2672 sequencer.c:3262

3918 +#: sequencer.c:3313 sequencer.c:4351

3919 msgid "could not read 'onto'"

3920 msgstr "no se puede leer 'onto'"

3921

3626 -#: sequencer.c:2686

3922 +#: sequencer.c:3327

3923 #, c-format

3924 msgid "could not update HEAD to %s"

3925 msgstr "no se puede actualizar HEAD a %s"

3926

3631 -#: sequencer.c:2770

3927 +#: sequencer.c:3413

3928 msgid "cannot rebase: You have unstaged changes."

3929 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

3930

3635 -#: sequencer.c:2775

3636 -msgid "could not remove CHERRY_PICK_HEAD"

3637 -msgstr "no se puede remover CHERRY_PICK_HEAD"

3638 -

3639 -#: sequencer.c:2784

3931 +#: sequencer.c:3422

3932 msgid "cannot amend non-existing commit"

3933 msgstr "no se puede arreglar un commit no existente"

3934

3643 -#: sequencer.c:2786

3935 +#: sequencer.c:3424

3936 #, c-format

3937 msgid "invalid file: '%s'"

3938 msgstr "archivo invalido: '%s'"

3939

3648 -#: sequencer.c:2788

3940 +#: sequencer.c:3426

3941 #, c-format

3942 msgid "invalid contents: '%s'"

3943 msgstr "contenido inválido: '%s'"

3944

3653 -#: sequencer.c:2791

3945 +#: sequencer.c:3429

3946 msgid ""

3947 "\n"

3948 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3661,45 +3953,54 @@ msgstr ""

3953 "un commit con estos\n"

3954 "primero y luego ejecuta 'git rebase --continue' de nuevo."

3955

3664 -#: sequencer.c:2801

3956 +#: sequencer.c:3454 sequencer.c:3492

3957 +#, c-format

3958 +msgid "could not write file: '%s'"

3959 +msgstr "no se pudo escribir el archivo: '%s'"

3960 +

3961 +#: sequencer.c:3507

3962 +msgid "could not remove CHERRY_PICK_HEAD"

3963 +msgstr "no se puede remover CHERRY_PICK_HEAD"

3964 +

3965 +#: sequencer.c:3514

3966 msgid "could not commit staged changes."

3967 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

3968

3668 -#: sequencer.c:2881

3969 +#: sequencer.c:3611

3970 #, c-format

3971 msgid "%s: can't cherry-pick a %s"

3972 msgstr "%s: no se puede aplicar cherry-pick a un %s"

3973

3673 -#: sequencer.c:2885

3974 +#: sequencer.c:3615

3975 #, c-format

3976 msgid "%s: bad revision"

3977 msgstr "%s: mala revision"

3978

3678 -#: sequencer.c:2918

3979 +#: sequencer.c:3648

3980 msgid "can't revert as initial commit"

3981 msgstr "no se puede revertir como commit inicial"

3982

3682 -#: sequencer.c:3023

3983 +#: sequencer.c:4097

3984 msgid "make_script: unhandled options"

3985 msgstr "make_script: opciones desconocidas"

3986

3686 -#: sequencer.c:3026

3987 +#: sequencer.c:4100

3988 msgid "make_script: error preparing revisions"

3989 msgstr "make_script: error preparando revisiones"

3990

3690 -#: sequencer.c:3060 sequencer.c:3095

3991 +#: sequencer.c:4141 sequencer.c:4176

3992 #, c-format

3993 msgid "unusable todo list: '%s'"

3994 msgstr "lista de pendientes inutilizable: '%s'"

3995

3695 -#: sequencer.c:3146

3996 +#: sequencer.c:4235

3997 #, c-format

3998 msgid ""

3999 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4000 msgstr ""

4001 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

4002

3702 -#: sequencer.c:3212

4003 +#: sequencer.c:4301

4004 #, c-format

4005 msgid ""

4006 "Warning: some commits may have been dropped accidentally.\n"

@@ -3708,7 +4009,7 @@ msgstr ""

4009 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

4010 "Commits botados (empezando con el mas nuevo):\n"

4011

3711 -#: sequencer.c:3219

4012 +#: sequencer.c:4308

4013 #, c-format

4014 msgid ""

4015 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3726,7 +4027,7 @@ msgstr ""

4027 "Los posibles comportamientos son: ignore,warn,error.\n"

4028 "\n"

4029

3729 -#: sequencer.c:3231

4030 +#: sequencer.c:4320

4031 #, c-format

4032 msgid ""

4033 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3737,27 +4038,21 @@ msgstr ""

4038 "rebase --continue'.\n"

4039 "O se puede abortar el rebase con 'git rebase --abort'.\n"

4040

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 -

3746 -#: sequencer.c:3285

4041 +#: sequencer.c:4374

4042 #, c-format

4043 msgid "could not parse commit '%s'"

4044 msgstr "no se pudo analizar commit '%s'"

4045

3751 -#: sequencer.c:3401

4046 +#: sequencer.c:4489

4047 msgid "the script was already rearranged."

4048 msgstr "este script ya fue reorganizado."

4049

3755 -#: setup.c:122

4050 +#: setup.c:123

4051 #, c-format

4052 msgid "'%s' is outside repository"

4053 msgstr "'%s' está fuera del repositorio"

4054

3760 -#: setup.c:171

4055 +#: setup.c:172

4056 #, c-format

4057 msgid ""

4058 "%s: no such path in the working tree.\n"

@@ -3767,7 +4062,7 @@ msgstr ""

4062 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "

4063 "localmente."

4064

3770 -#: setup.c:184

4065 +#: setup.c:185

4066 #, c-format

4067 msgid ""

4068 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3779,12 +4074,12 @@ msgstr ""

4074 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"

4075 "'git <comando> [<revisión>...] -- [<archivo>...]'"

4076

3782 -#: setup.c:233

4077 +#: setup.c:234

4078 #, c-format

4079 msgid "option '%s' must come before non-option arguments"

4080 msgstr "opción '%s' debe venir antes de argumentos no opcionales"

4081

3787 -#: setup.c:252

4082 +#: setup.c:253

4083 #, c-format

4084 msgid ""

4085 "ambiguous argument '%s': both revision and filename\n"

@@ -3795,95 +4090,95 @@ msgstr ""

4090 "Use '--' para separar rutas de revisiones, de esta manera:\n"

4091 "'git <comando> [<revisión>...] -- [<archivo>...]'"

4092

3798 -#: setup.c:388

4093 +#: setup.c:389

4094 msgid "unable to set up work tree using invalid config"

4095 msgstr ""

4096 "no es posible configurar el directorio de trabajo usando una configuración "

4097 "inválida"

4098

3804 -#: setup.c:395

4099 +#: setup.c:393

4100 msgid "this operation must be run in a work tree"

4101 msgstr "esta operación debe ser realizada en un árbol de trabajo"

4102

3808 -#: setup.c:506

4103 +#: setup.c:503

4104 #, c-format

4105 msgid "Expected git repo version <= %d, found %d"

4106 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

4107

3813 -#: setup.c:514

4108 +#: setup.c:511

4109 msgid "unknown repository extensions found:"

4110 msgstr "se encontró extensión de repositorio desconocida:"

4111

3817 -#: setup.c:533

4112 +#: setup.c:530

4113 #, c-format

4114 msgid "error opening '%s'"

4115 msgstr "error abriendo '%s'"

4116

3822 -#: setup.c:535

4117 +#: setup.c:532

4118 #, c-format

4119 msgid "too large to be a .git file: '%s'"

4120 msgstr "muy grande para ser un archivo .git: '%s'"

4121

3827 -#: setup.c:537

4122 +#: setup.c:534

4123 #, c-format

4124 msgid "error reading %s"

4125 msgstr "error leyendo %s"

4126

3832 -#: setup.c:539

4127 +#: setup.c:536

4128 #, c-format

4129 msgid "invalid gitfile format: %s"

4130 msgstr "formato gitfile inválido: %s"

4131

3837 -#: setup.c:541

4132 +#: setup.c:538

4133 #, c-format

4134 msgid "no path in gitfile: %s"

4135 msgstr "no hay ruta en gitfile: %s"

4136

3842 -#: setup.c:543

4137 +#: setup.c:540

4138 #, c-format

4139 msgid "not a git repository: %s"

4140 msgstr "no es un repositorio git: %s"

4141

3847 -#: setup.c:642

4142 +#: setup.c:639

4143 #, c-format

4144 msgid "'$%s' too big"

4145 msgstr "'$%s' muy grande"

4146

3852 -#: setup.c:656

4147 +#: setup.c:653

4148 #, c-format

4149 msgid "not a git repository: '%s'"

4150 msgstr "no es un repositorio git: '%s'"

4151

3857 -#: setup.c:685 setup.c:687 setup.c:718

4152 +#: setup.c:682 setup.c:684 setup.c:715

4153 #, c-format

4154 msgid "cannot chdir to '%s'"

4155 msgstr "no se puede aplicar chdir a '%s'"

4156

3862 -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

4157 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

4158 msgid "cannot come back to cwd"

4159 msgstr "no se puede volver a cwd"

4160

3866 -#: setup.c:816

4161 +#: setup.c:813

4162 #, c-format

4163 msgid "not a git repository (or any of the parent directories): %s"

4164 msgstr ""

4165 "no es un repositorio git (ni ninguno de los directorios superiores): %s"

4166

3872 -#: setup.c:827

4167 +#: setup.c:824

4168 #, c-format

4169 msgid "failed to stat '%*s%s%s'"

3875 -msgstr "fallo al determinar '%*s%s%s'"

4170 +msgstr "falló al determinar '%*s%s%s'"

4171

3877 -#: setup.c:1057

4172 +#: setup.c:1054

4173 msgid "Unable to read current working directory"

4174 msgstr "Incapaz de leer el directorio de trabajo actual"

4175

3881 -#: setup.c:1069 setup.c:1075

4176 +#: setup.c:1066 setup.c:1072

4177 #, c-format

4178 msgid "cannot change to '%s'"

4179 msgstr "no se puede cambiar a '%s'"

4180

3886 -#: setup.c:1088

4181 +#: setup.c:1085

4182 #, c-format

4183 msgid ""

4184 "not a git repository (or any parent up to mount point %s)\n"

@@ -3893,7 +4188,7 @@ msgstr ""

4188 "Parando en el límite del sistema de archivos "

4189 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

4190

3896 -#: setup.c:1172

4191 +#: setup.c:1168

4192 #, c-format

4193 msgid ""

4194 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3902,55 +4197,55 @@ msgstr ""

4197 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

4198 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

4199

3905 -#: setup.c:1215

4200 +#: setup.c:1211

4201 msgid "open /dev/null or dup failed"

4202 msgstr "falló al abrir /dev/null o dup"

4203

3909 -#: setup.c:1230

4204 +#: setup.c:1226

4205 msgid "fork failed"

4206 msgstr "falló fork"

4207

3913 -#: setup.c:1235

4208 +#: setup.c:1231

4209 msgid "setsid failed"

4210 msgstr "falló setsid"

4211

3917 -#: sha1_file.c:592

4212 +#: sha1-file.c:625

4213 #, c-format

4214 msgid "path '%s' does not exist"

4215 msgstr "ruta '%s' no existe"

4216

3922 -#: sha1_file.c:618

4217 +#: sha1-file.c:651

4218 #, c-format

4219 msgid "reference repository '%s' as a linked checkout is not supported yet."

4220 msgstr ""

4221 "repositorio de referencia '%s' como un checkout vinculado no es soportado "

4222 "todavía."

4223

3929 -#: sha1_file.c:624

4224 +#: sha1-file.c:657

4225 #, c-format

4226 msgid "reference repository '%s' is not a local repository."

4227 msgstr "repositorio de referencia '%s' no es un repositorio local."

4228

3934 -#: sha1_file.c:630

4229 +#: sha1-file.c:663

4230 #, c-format

4231 msgid "reference repository '%s' is shallow"

4232 msgstr "repositorio de referencia '%s' es superficial (shallow)"

4233

3939 -#: sha1_file.c:638

4234 +#: sha1-file.c:671

4235 #, c-format

4236 msgid "reference repository '%s' is grafted"

4237 msgstr "repositorio de referencia '% s' está injertado"

4238

3944 -#: sha1_name.c:422

4239 +#: sha1-name.c:442

4240 #, c-format

4241 msgid "short SHA1 %s is ambiguous"

4242 msgstr "SHA1 %s corto es ambiguao"

4243

3949 -#: sha1_name.c:433

4244 +#: sha1-name.c:453

4245 msgid "The candidates are:"

4246 msgstr "Los candidatos son:"

4247

3953 -#: sha1_name.c:693

4248 +#: sha1-name.c:695

4249 msgid ""

4250 "Git normally never creates a ref that ends with 40 hex characters\n"

4251 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3973,70 +4268,70 @@ msgstr ""

4268 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"

4269 "ejecutando \"git config advice.objectNameWarning false\""

4270

3976 -#: submodule.c:96 submodule.c:130

4271 +#: submodule.c:97 submodule.c:131

4272 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

4273 msgstr ""

4274 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"

4275

3981 -#: submodule.c:100 submodule.c:134

4276 +#: submodule.c:101 submodule.c:135

4277 #, c-format

4278 msgid "Could not find section in .gitmodules where path=%s"

4279 msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"

4280

3986 -#: submodule.c:108

4281 +#: submodule.c:109

4282 #, c-format

4283 msgid "Could not update .gitmodules entry %s"

4284 msgstr "No se pudo actualizar la entrada %s de .gitmodules"

4285

3991 -#: submodule.c:141

4286 +#: submodule.c:142

4287 #, c-format

4288 msgid "Could not remove .gitmodules entry for %s"

4289 msgstr "No se pudo remover la entrada %s de .gitmodules"

4290

3996 -#: submodule.c:152

4291 +#: submodule.c:153

4292 msgid "staging updated .gitmodules failed"

4293 msgstr "falló realizar stage a los .gitmodules actualizados"

4294

4000 -#: submodule.c:312

4295 +#: submodule.c:315

4296 #, c-format

4297 msgid "in unpopulated submodule '%s'"

4298 msgstr "en el submódulo no poblado '%s'"

4299

4005 -#: submodule.c:343

4300 +#: submodule.c:346

4301 #, c-format

4302 msgid "Pathspec '%s' is in submodule '%.*s'"

4303 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"

4304

4010 -#: submodule.c:833

4305 +#: submodule.c:837

4306 #, c-format

4307 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4308 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"

4309

4015 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

4310 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

4311 msgid "Failed to resolve HEAD as a valid ref."

4017 -msgstr "Fallo al resolver HEAD como un ref valido."

4312 +msgstr "Falló al resolver HEAD como un ref valido."

4313

4019 -#: submodule.c:1370

4314 +#: submodule.c:1373

4315 #, c-format

4316 msgid "'%s' not recognized as a git repository"

4317 msgstr "'%s' no reconocido como un repositorio git"

4318

4024 -#: submodule.c:1508

4319 +#: submodule.c:1511

4320 #, c-format

4321 msgid "could not start 'git status' in submodule '%s'"

4322 msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"

4323

4029 -#: submodule.c:1521

4324 +#: submodule.c:1524

4325 #, c-format

4326 msgid "could not run 'git status' in submodule '%s'"

4327 msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"

4328

4034 -#: submodule.c:1614

4329 +#: submodule.c:1617

4330 #, c-format

4331 msgid "submodule '%s' has dirty index"

4332 msgstr "submódulo '%s' tiene un índice corrupto"

4333

4039 -#: submodule.c:1878

4334 +#: submodule.c:1716

4335 #, c-format

4336 msgid ""

4337 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -4044,18 +4339,18 @@ msgstr ""

4339 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "

4340 "soportado"

4341

4047 -#: submodule.c:1890 submodule.c:1946

4342 +#: submodule.c:1728 submodule.c:1784

4343 #, c-format

4344 msgid "could not lookup name for submodule '%s'"

4345 msgstr "no se pudo resolver el nombre para el submódulo '%s'"

4346

4052 -#: submodule.c:1894 builtin/submodule--helper.c:1246

4053 -#: builtin/submodule--helper.c:1256

4347 +#: submodule.c:1732 builtin/submodule--helper.c:1261

4348 +#: builtin/submodule--helper.c:1271

4349 #, c-format

4350 msgid "could not create directory '%s'"

4351 msgstr "no se pudo crear el directorio '%s'"

4352

4058 -#: submodule.c:1897

4353 +#: submodule.c:1735

4354 #, c-format

4355 msgid ""

4356 "Migrating git directory of '%s%s' from\n"

@@ -4066,29 +4361,30 @@ msgstr ""

4361 "'%s' hacia\n"

4362 "'%s'\n"

4363

4069 -#: submodule.c:1981

4364 +#: submodule.c:1819

4365 #, c-format

4366 msgid "could not recurse into submodule '%s'"

4367 msgstr "no pudo recursar en el submódulo '%s'"

4368

4074 -#: submodule.c:2025

4369 +#: submodule.c:1863

4370 msgid "could not start ls-files in .."

4371 msgstr "no se pudo comenzar ls-files en .."

4372

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 -

4082 -#: submodule.c:2064

4373 +#: submodule.c:1902

4374 #, c-format

4375 msgid "ls-tree returned unexpected return code %d"

4376 msgstr "ls-tree retornó un código %d inesperado"

4377

4087 -#: submodule-config.c:263

4378 +#: submodule-config.c:230

4379 +#, c-format

4380 +msgid "ignoring suspicious submodule name: %s"

4381 +msgstr "ignorando submódulo sospechoso: %s"

4382 +

4383 +#: submodule-config.c:294

4384 msgid "negative values not allowed for submodule.fetchjobs"

4385 msgstr "no se permiten valores negativos para submodule.fetchjobs"

4386

4091 -#: submodule-config.c:436

4387 +#: submodule-config.c:467

4388 #, c-format

4389 msgid "invalid value for %s"

4390 msgstr "valor inválido para %s"

@@ -4104,7 +4400,7 @@ msgstr "ejecución del comando de remolque '%s' falló"

4400 msgid "unknown value '%s' for key '%s'"

4401 msgstr "valor '%s' desconocido para la clave '%s'"

4402

4107 -#: trailer.c:539 trailer.c:544 builtin/remote.c:290

4403 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293

4404 #, c-format

4405 msgid "more than one %s"

4406 msgstr "más de un %s"

@@ -4147,17 +4443,21 @@ msgstr "no se pudo abrir el archivo temporal"

4443 msgid "could not rename temporary file to %s"

4444 msgstr "no se pudo renombrar el archivo temporal a %s"

4445

4150 -#: transport.c:63

4446 +#: transport.c:116

4447 #, c-format

4448 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4449 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"

4450

4155 -#: transport.c:152

4451 +#: transport.c:208

4452 #, c-format

4453 msgid "transport: invalid depth option '%s'"

4454 msgstr "transport: opción inválida '%s'"

4455

4160 -#: transport.c:916

4456 +#: transport.c:584

4457 +msgid "could not parse transport.color.* config"

4458 +msgstr "no se pudo analizar valor de configuración transport.color.*"

4459 +

4460 +#: transport.c:996

4461 #, c-format

4462 msgid ""

4463 "The following submodule paths contain changes that can\n"

@@ -4166,7 +4466,7 @@ msgstr ""

4466 "La siguiente ruta de submódulo contiene cambios que no\n"

4467 "pueden ser encontrados en ningún remoto:\n"

4468

4169 -#: transport.c:920

4469 +#: transport.c:1000

4470 #, c-format

4471 msgid ""

4472 "\n"

@@ -4193,11 +4493,11 @@ msgstr ""

4493 "para hacer un push al remoto.\n"

4494 "\n"

4495

4196 -#: transport.c:928

4496 +#: transport.c:1008

4497 msgid "Aborting."

4498 msgstr "Abortando."

4499

4200 -#: transport-helper.c:1079

4500 +#: transport-helper.c:1087

4501 #, c-format

4502 msgid "Could not read ref %s"

4503 msgstr "No se pudo leer la referencia %s"

@@ -4214,22 +4514,22 @@ msgstr "modo mal formado en la entrada de árbol"

4514 msgid "empty filename in tree entry"

4515 msgstr "nombre de archivo vacío en la entrada de árbol"

4516

4217 -#: tree-walk.c:114

4517 +#: tree-walk.c:113

4518 msgid "too-short tree file"

4519 msgstr "archivo de árbol muy corto"

4520

4221 -#: unpack-trees.c:108

4521 +#: unpack-trees.c:111

4522 #, c-format

4523 msgid ""

4524 "Your local changes to the following files would be overwritten by checkout:\n"

4525 "%%sPlease commit your changes or stash them before you switch branches."

4526 msgstr ""

4527 "Los cambios locales de los siguientes archivos serán sobrescritos por "

4228 -"checkuot:\n"

4528 +"checkout:\n"

4529 "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "

4530 "ramas."

4531

4232 -#: unpack-trees.c:110

4532 +#: unpack-trees.c:113

4533 #, c-format

4534 msgid ""

4535 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4239,7 +4539,7 @@ msgstr ""

4539 "checkout:\n"

4540 "%%s"

4541

4242 -#: unpack-trees.c:113

4542 +#: unpack-trees.c:116

4543 #, c-format

4544 msgid ""

4545 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4249,7 +4549,7 @@ msgstr ""

4549 "fusionar:\n"

4550 "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."

4551

4252 -#: unpack-trees.c:115

4552 +#: unpack-trees.c:118

4553 #, c-format

4554 msgid ""

4555 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4259,7 +4559,7 @@ msgstr ""

4559 "merge:\n"

4560 "%%s"

4561

4262 -#: unpack-trees.c:118

4562 +#: unpack-trees.c:121

4563 #, c-format

4564 msgid ""

4565 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4268,7 +4568,7 @@ msgstr ""

4568 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"

4569 "%%sPor favor, confirma tus cambios o guárdalos antes de %s."

4570

4271 -#: unpack-trees.c:120

4571 +#: unpack-trees.c:123

4572 #, c-format

4573 msgid ""

4574 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4277,7 +4577,7 @@ msgstr ""

4577 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"

4578 "%%s"

4579

4280 -#: unpack-trees.c:125

4580 +#: unpack-trees.c:128

4581 #, c-format

4582 msgid ""

4583 "Updating the following directories would lose untracked files in them:\n"

@@ -4287,7 +4587,7 @@ msgstr ""

4587 "seguimiento en ellos:\n"

4588 "%s"

4589

4290 -#: unpack-trees.c:129

4590 +#: unpack-trees.c:132

4591 #, c-format

4592 msgid ""

4593 "The following untracked working tree files would be removed by checkout:\n"

@@ -4297,7 +4597,7 @@ msgstr ""

4597 "removidos al actualizar el árbol de trabajo:\n"

4598 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4599

4300 -#: unpack-trees.c:131

4600 +#: unpack-trees.c:134

4601 #, c-format

4602 msgid ""

4603 "The following untracked working tree files would be removed by checkout:\n"

@@ -4307,7 +4607,7 @@ msgstr ""

4607 "al actualizar el árbol de trabajo:\n"

4608 "%%s"

4609

4310 -#: unpack-trees.c:134

4610 +#: unpack-trees.c:137

4611 #, c-format

4612 msgid ""

4613 "The following untracked working tree files would be removed by merge:\n"

@@ -4317,7 +4617,7 @@ msgstr ""

4617 "removidos al fusionar:\n"

4618 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4619

4320 -#: unpack-trees.c:136

4620 +#: unpack-trees.c:139

4621 #, c-format

4622 msgid ""

4623 "The following untracked working tree files would be removed by merge:\n"

@@ -4327,7 +4627,7 @@ msgstr ""

4627 "al fusionar:\n"

4628 "%%s"

4629

4330 -#: unpack-trees.c:139

4630 +#: unpack-trees.c:142

4631 #, c-format

4632 msgid ""

4633 "The following untracked working tree files would be removed by %s:\n"

@@ -4337,7 +4637,7 @@ msgstr ""

4637 "removidos al %s:\n"

4638 "%%sPor favor, muévelos o elimínalos antes de %s."

4639

4340 -#: unpack-trees.c:141

4640 +#: unpack-trees.c:144

4641 #, c-format

4642 msgid ""

4643 "The following untracked working tree files would be removed by %s:\n"

@@ -4347,7 +4647,7 @@ msgstr ""

4647 "removidos al ejecutar %s:\n"

4648 "%%s"

4649

4350 -#: unpack-trees.c:146

4650 +#: unpack-trees.c:150

4651 #, c-format

4652 msgid ""

4653 "The following untracked working tree files would be overwritten by "

@@ -4358,7 +4658,7 @@ msgstr ""

4658 "sobrescritos al actualizar el árbol de trabajo:\n"

4659 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4660

4361 -#: unpack-trees.c:148

4661 +#: unpack-trees.c:152

4662 #, c-format

4663 msgid ""

4664 "The following untracked working tree files would be overwritten by "

@@ -4369,7 +4669,7 @@ msgstr ""

4669 "sobrescritos al actualizar el árbol de trabajo:\n"

4670 "%%s"

4671

4372 -#: unpack-trees.c:151

4672 +#: unpack-trees.c:155

4673 #, c-format

4674 msgid ""

4675 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4379,7 +4679,7 @@ msgstr ""

4679 "sobrescritos al fusionar:\n"

4680 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4681

4382 -#: unpack-trees.c:153

4682 +#: unpack-trees.c:157

4683 #, c-format

4684 msgid ""

4685 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4389,7 +4689,7 @@ msgstr ""

4689 "sobrescritos al fusionar:\n"

4690 "%%s"

4691

4392 -#: unpack-trees.c:156

4692 +#: unpack-trees.c:160

4693 #, c-format

4694 msgid ""

4695 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4399,7 +4699,7 @@ msgstr ""

4699 "sobrescritos al %s:\n"

4700 "%%sPor favor, muévelos o elimínalos antes de %s."

4701

4402 -#: unpack-trees.c:158

4702 +#: unpack-trees.c:162

4703 #, c-format

4704 msgid ""

4705 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4409,12 +4709,12 @@ msgstr ""

4709 "por %s:\n"

4710 "%%s"

4711

4412 -#: unpack-trees.c:165

4712 +#: unpack-trees.c:170

4713 #, c-format

4714 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4715 msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir."

4716

4417 -#: unpack-trees.c:168

4717 +#: unpack-trees.c:173

4718 #, c-format

4719 msgid ""

4720 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4424,7 +4724,7 @@ msgstr ""

4724 "actualizadas:\n"

4725 "%s"

4726

4427 -#: unpack-trees.c:170

4727 +#: unpack-trees.c:175

4728 #, c-format

4729 msgid ""

4730 "The following working tree files would be overwritten by sparse checkout "

@@ -4435,7 +4735,7 @@ msgstr ""

4735 "actualización sparse checkout:\n"

4736 "%s"

4737

4438 -#: unpack-trees.c:172

4738 +#: unpack-trees.c:177

4739 #, c-format

4740 msgid ""

4741 "The following working tree files would be removed by sparse checkout "

@@ -4446,7 +4746,7 @@ msgstr ""

4746 "actualización sparse checkout:\n"

4747 "%s"

4748

4449 -#: unpack-trees.c:174

4749 +#: unpack-trees.c:179

4750 #, c-format

4751 msgid ""

4752 "Cannot update submodule:\n"

@@ -4455,12 +4755,12 @@ msgstr ""

4755 "No se puede actualizar le submódulo:\n"

4756 "%s"

4757

4458 -#: unpack-trees.c:251

4758 +#: unpack-trees.c:262

4759 #, c-format

4760 msgid "Aborting\n"

4761 msgstr "Abortando\n"

4762

4463 -#: unpack-trees.c:333

4763 +#: unpack-trees.c:344

4764 msgid "Checking out files"

4765 msgstr "Revisando archivos"

4766

@@ -4496,7 +4796,7 @@ msgstr "segmento de ruta '..' invalido"

4796 #: worktree.c:245 builtin/am.c:2147

4797 #, c-format

4798 msgid "failed to read '%s'"

4499 -msgstr "fallo al leer '%s'"

4799 +msgstr "falló al leer '%s'"

4800

4801 #: worktree.c:291

4802 #, c-format

@@ -4532,7 +4832,7 @@ msgid "could not open '%s' for reading and writing"

4832 msgstr "no se pudo abrir '%s' para lectura y escritura"

4833

4834 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4535 -#: builtin/am.c:862 builtin/merge.c:1044

4835 +#: builtin/am.c:862 builtin/merge.c:1042

4836 #, c-format

4837 msgid "could not open '%s' for reading"

4838 msgstr "no se pudo abrir '%s' para lectura"

@@ -4546,159 +4846,159 @@ msgstr "no es posible acceder '%s'"

4846 msgid "unable to get current working directory"

4847 msgstr "no es posible obtener el directorio de trabajo actual"

4848

4549 -#: wt-status.c:151

4849 +#: wt-status.c:154

4850 msgid "Unmerged paths:"

4851 msgstr "Rutas no fusionadas:"

4852

4553 -#: wt-status.c:178 wt-status.c:205

4853 +#: wt-status.c:181 wt-status.c:208

4854 #, c-format

4855 msgid " (use \"git reset %s <file>...\" to unstage)"

4856 msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)"

4857

4558 -#: wt-status.c:180 wt-status.c:207

4858 +#: wt-status.c:183 wt-status.c:210

4859 msgid " (use \"git rm --cached <file>...\" to unstage)"

4860 msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"

4861

4562 -#: wt-status.c:184

4862 +#: wt-status.c:187

4863 msgid " (use \"git add <file>...\" to mark resolution)"

4864 msgstr " (usa \"git add <archivo>...\" para marcar una resolución)"

4865

4566 -#: wt-status.c:186 wt-status.c:190

4866 +#: wt-status.c:189 wt-status.c:193

4867 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4868 msgstr ""

4869 " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "

4870 "resolución)"

4871

4572 -#: wt-status.c:188

4872 +#: wt-status.c:191

4873 msgid " (use \"git rm <file>...\" to mark resolution)"

4874 msgstr " (usa \"git rm <file>...\" para marcar la resolución)"

4875

4576 -#: wt-status.c:199 wt-status.c:1007

4876 +#: wt-status.c:202 wt-status.c:1015

4877 msgid "Changes to be committed:"

4878 msgstr "Cambios a ser confirmados:"

4879

4580 -#: wt-status.c:217 wt-status.c:1016

4880 +#: wt-status.c:220 wt-status.c:1024

4881 msgid "Changes not staged for commit:"

4882 msgstr "Cambios no rastreados para el commit:"

4883

4584 -#: wt-status.c:221

4884 +#: wt-status.c:224

4885 msgid " (use \"git add <file>...\" to update what will be committed)"

4886 msgstr ""

4887 " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"

4888

4589 -#: wt-status.c:223

4889 +#: wt-status.c:226

4890 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4891 msgstr ""

4892 " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "

4893 "commit)"

4894

4595 -#: wt-status.c:224

4895 +#: wt-status.c:227

4896 msgid ""

4897 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4898 msgstr ""

4899 " (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "

4900 "directorio de trabajo)"

4901

4602 -#: wt-status.c:226

4902 +#: wt-status.c:229

4903 msgid " (commit or discard the untracked or modified content in submodules)"

4904 msgstr ""

4905 " (confirmar o descartar el contenido sin seguimiento o modificado en los "

4906 "sub-módulos)"

4907

4608 -#: wt-status.c:238

4908 +#: wt-status.c:241

4909 #, c-format

4910 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4911 msgstr ""

4912 " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"

4913

4614 -#: wt-status.c:253

4914 +#: wt-status.c:256

4915 msgid "both deleted:"

4916 msgstr "ambos borrados:"

4917

4618 -#: wt-status.c:255

4918 +#: wt-status.c:258

4919 msgid "added by us:"

4920 msgstr "agregado por nosotros:"

4921

4622 -#: wt-status.c:257

4922 +#: wt-status.c:260

4923 msgid "deleted by them:"

4924 msgstr "borrados por ellos:"

4925

4626 -#: wt-status.c:259

4926 +#: wt-status.c:262

4927 msgid "added by them:"

4928 msgstr "agregado por ellos:"

4929

4630 -#: wt-status.c:261

4930 +#: wt-status.c:264

4931 msgid "deleted by us:"

4932 msgstr "borrado por nosotros:"

4933

4634 -#: wt-status.c:263

4934 +#: wt-status.c:266

4935 msgid "both added:"

4936 msgstr "ambos agregados:"

4937

4638 -#: wt-status.c:265

4938 +#: wt-status.c:268

4939 msgid "both modified:"

4940 msgstr "ambos modificados:"

4941

4642 -#: wt-status.c:275

4942 +#: wt-status.c:278

4943 msgid "new file:"

4944 msgstr "nuevo archivo:"

4945

4646 -#: wt-status.c:277

4946 +#: wt-status.c:280

4947 msgid "copied:"

4948 msgstr "copiado:"

4949

4650 -#: wt-status.c:279

4950 +#: wt-status.c:282

4951 msgid "deleted:"

4952 msgstr "borrado:"

4953

4654 -#: wt-status.c:281

4954 +#: wt-status.c:284

4955 msgid "modified:"

4956 msgstr "modificado:"

4957

4658 -#: wt-status.c:283

4958 +#: wt-status.c:286

4959 msgid "renamed:"

4960 msgstr "renombrado:"

4961

4662 -#: wt-status.c:285

4962 +#: wt-status.c:288

4963 msgid "typechange:"

4964 msgstr "cambio de tipo:"

4965

4666 -#: wt-status.c:287

4966 +#: wt-status.c:290

4967 msgid "unknown:"

4968 msgstr "desconocido:"

4969

4670 -#: wt-status.c:289

4970 +#: wt-status.c:292

4971 msgid "unmerged:"

4972 msgstr "des-fusionado:"

4973

4674 -#: wt-status.c:369

4974 +#: wt-status.c:372

4975 msgid "new commits, "

4976 msgstr "nuevos commits, "

4977

4678 -#: wt-status.c:371

4978 +#: wt-status.c:374

4979 msgid "modified content, "

4980 msgstr "contenido modificado, "

4981

4682 -#: wt-status.c:373

4982 +#: wt-status.c:376

4983 msgid "untracked content, "

4984 msgstr "contenido no rastreado, "

4985

4686 -#: wt-status.c:847

4986 +#: wt-status.c:853

4987 #, c-format

4988 msgid "Your stash currently has %d entry"

4989 msgid_plural "Your stash currently has %d entries"

4990 msgstr[0] "Tu stash actualmente tiene %d entrada"

4991 msgstr[1] "Tu stash actualmente tiene %d entradas"

4992

4693 -#: wt-status.c:879

4993 +#: wt-status.c:885

4994 msgid "Submodules changed but not updated:"

4995 msgstr "Submodulos cambiados pero no actualizados:"

4996

4697 -#: wt-status.c:881

4997 +#: wt-status.c:887

4998 msgid "Submodule changes to be committed:"

4999 msgstr "Submodulos cambiados listos para realizar commit:"

5000

4701 -#: wt-status.c:963

5001 +#: wt-status.c:969

5002 msgid ""

5003 "Do not modify or remove the line above.\n"

5004 "Everything below it will be ignored."

@@ -4706,107 +5006,107 @@ msgstr ""

5006 "No modifique o borre la línea de encima.\n"

5007 "Todo lo que este por abajo será removido."

5008

4709 -#: wt-status.c:1076

5009 +#: wt-status.c:1084

5010 msgid "You have unmerged paths."

5011 msgstr "Tienes rutas no fusionadas."

5012

4713 -#: wt-status.c:1079

5013 +#: wt-status.c:1087

5014 msgid " (fix conflicts and run \"git commit\")"

5015 msgstr " (arregla los conflictos y corre \"git commit\""

5016

4717 -#: wt-status.c:1081

5017 +#: wt-status.c:1089

5018 msgid " (use \"git merge --abort\" to abort the merge)"

5019 msgstr " (usa \"git merge --abort\" para abortar la fusion)"

5020

4721 -#: wt-status.c:1086

5021 +#: wt-status.c:1094

5022 msgid "All conflicts fixed but you are still merging."

5023 msgstr "Todos los conflictos resueltos pero sigues fusionando."

5024

4725 -#: wt-status.c:1089

5025 +#: wt-status.c:1097

5026 msgid " (use \"git commit\" to conclude merge)"

5027 msgstr " (usa \"git commit\" para concluir la fusión)"

5028

4729 -#: wt-status.c:1099

5029 +#: wt-status.c:1107

5030 msgid "You are in the middle of an am session."

5031 msgstr "Estás en medio de una sesión am."

5032

4733 -#: wt-status.c:1102

5033 +#: wt-status.c:1110

5034 msgid "The current patch is empty."

5035 msgstr "El parche actual esta vacío."

5036

4737 -#: wt-status.c:1106

5037 +#: wt-status.c:1114

5038 msgid " (fix conflicts and then run \"git am --continue\")"

5039 msgstr " (arregla los conflictos y luego corre \"git am --continue\""

5040

4741 -#: wt-status.c:1108

5041 +#: wt-status.c:1116

5042 msgid " (use \"git am --skip\" to skip this patch)"

5043 msgstr " (usa \"git am --skip\" para saltar este parche)"

5044

4745 -#: wt-status.c:1110

5045 +#: wt-status.c:1118

5046 msgid " (use \"git am --abort\" to restore the original branch)"

5047 msgstr " (usa \"git am --abort\" para restaurar la rama original)"

5048

4749 -#: wt-status.c:1242

5049 +#: wt-status.c:1250

5050 msgid "git-rebase-todo is missing."

5051 msgstr "git-rebase-todo no esta presente."

5052

4753 -#: wt-status.c:1244

5053 +#: wt-status.c:1252

5054 msgid "No commands done."

5055 msgstr "No se realizaron los comandos."

5056

4757 -#: wt-status.c:1247

5057 +#: wt-status.c:1255

5058 #, c-format

5059 msgid "Last command done (%d command done):"

5060 msgid_plural "Last commands done (%d commands done):"

5061 msgstr[0] "El último comando realizado (%d comando realizado):"

5062 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"

5063

4764 -#: wt-status.c:1258

5064 +#: wt-status.c:1266

5065 #, c-format

5066 msgid " (see more in file %s)"

5067 msgstr " (ver mas en el archivo %s)"

5068

4769 -#: wt-status.c:1263

5069 +#: wt-status.c:1271

5070 msgid "No commands remaining."

5071 msgstr "No quedan mas comandos."

5072

4773 -#: wt-status.c:1266

5073 +#: wt-status.c:1274

5074 #, c-format

5075 msgid "Next command to do (%d remaining command):"

5076 msgid_plural "Next commands to do (%d remaining commands):"

5077 msgstr[0] "Siguiente comando a realizar (%d comando restante):"

5078 msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"

5079

4780 -#: wt-status.c:1274

5080 +#: wt-status.c:1282

5081 msgid " (use \"git rebase --edit-todo\" to view and edit)"

5082 msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"

5083

4784 -#: wt-status.c:1287

5084 +#: wt-status.c:1295

5085 #, c-format

5086 msgid "You are currently rebasing branch '%s' on '%s'."

5087 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."

5088

4789 -#: wt-status.c:1292

5089 +#: wt-status.c:1300

5090 msgid "You are currently rebasing."

5091 msgstr "Estás aplicando un rebase."

5092

4793 -#: wt-status.c:1306

5093 +#: wt-status.c:1314

5094 msgid " (fix conflicts and then run \"git rebase --continue\")"

5095 msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"

5096

4797 -#: wt-status.c:1308

5097 +#: wt-status.c:1316

5098 msgid " (use \"git rebase --skip\" to skip this patch)"

5099 msgstr " (usa \"git rebase --skip\" para omitir este parche)"

5100

4801 -#: wt-status.c:1310

5101 +#: wt-status.c:1318

5102 msgid " (use \"git rebase --abort\" to check out the original branch)"

5103 msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"

5104

4805 -#: wt-status.c:1316

5105 +#: wt-status.c:1324

5106 msgid " (all conflicts fixed: run \"git rebase --continue\")"

5107 msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"

5108

4809 -#: wt-status.c:1320

5109 +#: wt-status.c:1328

5110 #, c-format

5111 msgid ""

5112 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4814,128 +5114,128 @@ msgstr ""

5114 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "

5115 "'%s'."

5116

4817 -#: wt-status.c:1325

5117 +#: wt-status.c:1333

5118 msgid "You are currently splitting a commit during a rebase."

5119 msgstr "Estás dividiendo un commit durante un rebase."

5120

4821 -#: wt-status.c:1328

5121 +#: wt-status.c:1336

5122 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

5123 msgstr ""

5124 " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"

5125 "continue\")"

5126

4827 -#: wt-status.c:1332

5127 +#: wt-status.c:1340

5128 #, c-format

5129 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

5130 msgstr ""

5131 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "

5132 "'%s'."

5133

4834 -#: wt-status.c:1337

5134 +#: wt-status.c:1345

5135 msgid "You are currently editing a commit during a rebase."

5136 msgstr "Estás editando un commit durante un rebase."

5137

4838 -#: wt-status.c:1340

5138 +#: wt-status.c:1348

5139 msgid " (use \"git commit --amend\" to amend the current commit)"

5140 msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"

5141

4842 -#: wt-status.c:1342

5142 +#: wt-status.c:1350

5143 msgid ""

5144 " (use \"git rebase --continue\" once you are satisfied with your changes)"

5145 msgstr ""

5146 " (usa \"git rebase --continue\" una vez que estés satisfecho con tus "

5147 "cambios)"

5148

4849 -#: wt-status.c:1352

5149 +#: wt-status.c:1360

5150 #, c-format

5151 msgid "You are currently cherry-picking commit %s."

5152 msgstr "Estás realizando un cherry-picking en el commit %s."

5153

4854 -#: wt-status.c:1357

5154 +#: wt-status.c:1365

5155 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

5156 msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"

5157

4858 -#: wt-status.c:1360

5158 +#: wt-status.c:1368

5159 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

5160 msgstr ""

5161 " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"

5162

4863 -#: wt-status.c:1362

5163 +#: wt-status.c:1370

5164 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

5165 msgstr ""

5166 " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"

5167

4868 -#: wt-status.c:1371

5168 +#: wt-status.c:1379

5169 #, c-format

5170 msgid "You are currently reverting commit %s."

5171 msgstr "Estás revirtiendo el commit %s."

5172

4873 -#: wt-status.c:1376

5173 +#: wt-status.c:1384

5174 msgid " (fix conflicts and run \"git revert --continue\")"

5175 msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"

5176

4877 -#: wt-status.c:1379

5177 +#: wt-status.c:1387

5178 msgid " (all conflicts fixed: run \"git revert --continue\")"

5179 msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"

5180

4881 -#: wt-status.c:1381

5181 +#: wt-status.c:1389

5182 msgid " (use \"git revert --abort\" to cancel the revert operation)"

5183 msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"

5184

4885 -#: wt-status.c:1392

5185 +#: wt-status.c:1400

5186 #, c-format

5187 msgid "You are currently bisecting, started from branch '%s'."

5188 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."

5189

4890 -#: wt-status.c:1396

5190 +#: wt-status.c:1404

5191 msgid "You are currently bisecting."

5192 msgstr "Estás aplicando un bisect."

5193

4894 -#: wt-status.c:1399

5194 +#: wt-status.c:1407

5195 msgid " (use \"git bisect reset\" to get back to the original branch)"

5196 msgstr " (usa \"git bisect reset\" para volver a la rama original)"

5197

4898 -#: wt-status.c:1596

5198 +#: wt-status.c:1604

5199 msgid "On branch "

5200 msgstr "En la rama "

5201

4902 -#: wt-status.c:1602

5202 +#: wt-status.c:1610

5203 msgid "interactive rebase in progress; onto "

5204 msgstr "rebase interactivo en progreso; en "

5205

4906 -#: wt-status.c:1604

5206 +#: wt-status.c:1612

5207 msgid "rebase in progress; onto "

5208 msgstr "rebase en progreso; en "

5209

4910 -#: wt-status.c:1609

5210 +#: wt-status.c:1617

5211 msgid "HEAD detached at "

5212 msgstr "HEAD desacoplada en "

5213

4914 -#: wt-status.c:1611

5214 +#: wt-status.c:1619

5215 msgid "HEAD detached from "

5216 msgstr "HEAD desacoplada de "

5217

4918 -#: wt-status.c:1614

5218 +#: wt-status.c:1622

5219 msgid "Not currently on any branch."

5220 msgstr "Actualmente no estás en ninguna rama."

5221

4922 -#: wt-status.c:1634

5222 +#: wt-status.c:1642

5223 msgid "Initial commit"

5224 msgstr "Confirmación inicial"

5225

4926 -#: wt-status.c:1635

5226 +#: wt-status.c:1643

5227 msgid "No commits yet"

5228 msgstr "No hay commits todavía"

5229

4930 -#: wt-status.c:1649

5230 +#: wt-status.c:1657

5231 msgid "Untracked files"

5232 msgstr "Archivos sin seguimiento"

5233

4934 -#: wt-status.c:1651

5234 +#: wt-status.c:1659

5235 msgid "Ignored files"

5236 msgstr "Archivos ignorados"

5237

4938 -#: wt-status.c:1655

5238 +#: wt-status.c:1663

5239 #, c-format

5240 msgid ""

5241 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4946,31 +5246,31 @@ msgstr ""

5246 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"

5247 "nuevos archivos usted mismo (vea 'git help status')."

5248

4949 -#: wt-status.c:1661

5249 +#: wt-status.c:1669

5250 #, c-format

5251 msgid "Untracked files not listed%s"

5252 msgstr "Archivos no rastreados no son mostrados %s"

5253

4954 -#: wt-status.c:1663

5254 +#: wt-status.c:1671

5255 msgid " (use -u option to show untracked files)"

5256 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"

5257

4958 -#: wt-status.c:1669

5258 +#: wt-status.c:1677

5259 msgid "No changes"

5260 msgstr "Sin cambios"

5261

4962 -#: wt-status.c:1674

5262 +#: wt-status.c:1682

5263 #, c-format

5264 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

5265 msgstr ""

5266 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"

5267

4968 -#: wt-status.c:1677

5268 +#: wt-status.c:1685

5269 #, c-format

5270 msgid "no changes added to commit\n"

5271 msgstr "no se agregaron cambios al commit\n"

5272

4973 -#: wt-status.c:1680

5273 +#: wt-status.c:1688

5274 #, c-format

5275 msgid ""

5276 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -4979,75 +5279,75 @@ msgstr ""

5279 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "

5280 "(usa \"git add\" para hacerles seguimiento)\n"

5281

4982 -#: wt-status.c:1683

5282 +#: wt-status.c:1691

5283 #, c-format

5284 msgid "nothing added to commit but untracked files present\n"

5285 msgstr ""

5286 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "

5287 "presentes\n"

5288

4989 -#: wt-status.c:1686

5289 +#: wt-status.c:1694

5290 #, c-format

5291 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

5292 msgstr ""

5293 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "

5294 "hacerles seguimiento)\n"

5295

4996 -#: wt-status.c:1689 wt-status.c:1694

5296 +#: wt-status.c:1697 wt-status.c:1702

5297 #, c-format

5298 msgid "nothing to commit\n"

5299 msgstr "nada para hacer commit\n"

5300

5001 -#: wt-status.c:1692

5301 +#: wt-status.c:1700

5302 #, c-format

5303 msgid "nothing to commit (use -u to show untracked files)\n"

5304 msgstr ""

5305 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"

5306

5007 -#: wt-status.c:1696

5307 +#: wt-status.c:1704

5308 #, c-format

5309 msgid "nothing to commit, working tree clean\n"

5310 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"

5311

5012 -#: wt-status.c:1809

5312 +#: wt-status.c:1817

5313 msgid "No commits yet on "

5314 msgstr "No hay commits todavía en "

5315

5016 -#: wt-status.c:1813

5316 +#: wt-status.c:1821

5317 msgid "HEAD (no branch)"

5318 msgstr "HEAD (sin rama)"

5319

5020 -#: wt-status.c:1844

5320 +#: wt-status.c:1852

5321 msgid "different"

5322 msgstr "diferente"

5323

5024 -#: wt-status.c:1846 wt-status.c:1854

5324 +#: wt-status.c:1854 wt-status.c:1862

5325 msgid "behind "

5326 msgstr "detrás "

5327

5028 -#: wt-status.c:1849 wt-status.c:1852

5328 +#: wt-status.c:1857 wt-status.c:1860

5329 msgid "ahead "

5330 msgstr "adelante "

5331

5332 #. TRANSLATORS: the action is e.g. "pull with rebase"

5033 -#: wt-status.c:2358

5333 +#: wt-status.c:2366

5334 #, c-format

5335 msgid "cannot %s: You have unstaged changes."

5336 msgstr "no se puede %s: Tienes cambios sin marcar."

5337

5038 -#: wt-status.c:2364

5338 +#: wt-status.c:2372

5339 msgid "additionally, your index contains uncommitted changes."

5340 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

5341

5042 -#: wt-status.c:2366

5342 +#: wt-status.c:2374

5343 #, c-format

5344 msgid "cannot %s: Your index contains uncommitted changes."

5345 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

5346

5047 -#: compat/precompose_utf8.c:58 builtin/clone.c:440

5347 +#: compat/precompose_utf8.c:58 builtin/clone.c:442

5348 #, c-format

5349 msgid "failed to unlink '%s'"

5050 -msgstr "fallo al desvincular '%s'"

5350 +msgstr "falló al desvincular '%s'"

5351

5352 #: builtin/add.c:24

5353 msgid "git add [<options>] [--] <pathspec>..."

@@ -5058,9 +5358,9 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..."

5358 msgid "unexpected diff status %c"

5359 msgstr "diff status inesperado %c"

5360

5061 -#: builtin/add.c:88 builtin/commit.c:257

5361 +#: builtin/add.c:88 builtin/commit.c:266

5362 msgid "updating files failed"

5063 -msgstr "fallo la actualización de carpetas"

5363 +msgstr "falló la actualización de carpetas"

5364

5365 #: builtin/add.c:98

5366 #, c-format

@@ -5086,7 +5386,7 @@ msgstr "No se puede escribir el parche"

5386

5387 #: builtin/add.c:251

5388 msgid "editing patch failed"

5089 -msgstr "fallo la edición del parche"

5389 +msgstr "falló la edición del parche"

5390

5391 #: builtin/add.c:254

5392 #, c-format

@@ -5102,78 +5402,78 @@ msgstr "Parche vacío. Abortado."

5402 msgid "Could not apply '%s'"

5403 msgstr "No se pudo aplicar '%s'"

5404

5105 -#: builtin/add.c:271

5405 +#: builtin/add.c:269

5406 msgid "The following paths are ignored by one of your .gitignore files:\n"

5407 msgstr ""

5408 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"

5409

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

5410 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123

5411 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557

5412 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

5413 msgid "dry run"

5414 msgstr "dry run ( ejecución en seco)"

5415

5116 -#: builtin/add.c:294

5416 +#: builtin/add.c:292

5417 msgid "interactive picking"

5418 msgstr "selección interactiva"

5419

5120 -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5420 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

5421 msgid "select hunks interactively"

5422 msgstr "elegir hunks de forma interactiva"

5423

5124 -#: builtin/add.c:296

5424 +#: builtin/add.c:294

5425 msgid "edit current diff and apply"

5426 msgstr "editar diff actual y aplicar"

5427

5128 -#: builtin/add.c:297

5428 +#: builtin/add.c:295

5429 msgid "allow adding otherwise ignored files"

5430 msgstr "permitir agregar caso contrario ignorar archivos"

5431

5132 -#: builtin/add.c:298

5432 +#: builtin/add.c:296

5433 msgid "update tracked files"

5434 msgstr "actualizado las carpetas rastreadas"

5435

5136 -#: builtin/add.c:299

5436 +#: builtin/add.c:297

5437 msgid "renormalize EOL of tracked files (implies -u)"

5438 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"

5439

5140 -#: builtin/add.c:300

5440 +#: builtin/add.c:298

5441 msgid "record only the fact that the path will be added later"

5442 msgstr "grabar solo el hecho de que la ruta será agregada después"

5443

5144 -#: builtin/add.c:301

5444 +#: builtin/add.c:299

5445 msgid "add changes from all tracked and untracked files"

5446 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"

5447

5148 -#: builtin/add.c:304

5448 +#: builtin/add.c:302

5449 msgid "ignore paths removed in the working tree (same as --no-all)"

5450 msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"

5451

5152 -#: builtin/add.c:306

5452 +#: builtin/add.c:304

5453 msgid "don't add, only refresh the index"

5454 msgstr "no agregar, solo actualizar el índice"

5455

5156 -#: builtin/add.c:307

5456 +#: builtin/add.c:305

5457 msgid "just skip files which cannot be added because of errors"

5458 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"

5459

5160 -#: builtin/add.c:308

5460 +#: builtin/add.c:306

5461 msgid "check if - even missing - files are ignored in dry run"

5462 msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"

5463

5164 -#: builtin/add.c:309 builtin/update-index.c:964

5464 +#: builtin/add.c:307 builtin/update-index.c:974

5465 msgid "(+/-)x"

5466 msgstr "(+/-)x"

5467

5168 -#: builtin/add.c:309 builtin/update-index.c:965

5468 +#: builtin/add.c:307 builtin/update-index.c:975

5469 msgid "override the executable bit of the listed files"

5470 msgstr "sobrescribir el bit ejecutable de los archivos listados"

5471

5172 -#: builtin/add.c:311

5472 +#: builtin/add.c:309

5473 msgid "warn when adding an embedded repository"

5474 msgstr "avisar cuando se agrega un repositorio incrustado"

5475

5176 -#: builtin/add.c:326

5476 +#: builtin/add.c:324

5477 #, c-format

5478 msgid ""

5479 "You've added another git repository inside your current repository.\n"

@@ -5204,47 +5504,47 @@ msgstr ""

5504 "\n"

5505 "Vea \"git help submodule\" para mas información."

5506

5207 -#: builtin/add.c:354

5507 +#: builtin/add.c:352

5508 #, c-format

5509 msgid "adding embedded git repository: %s"

5510 msgstr "agregando repositorio embebido: %s"

5511

5212 -#: builtin/add.c:372

5512 +#: builtin/add.c:370

5513 #, c-format

5514 msgid "Use -f if you really want to add them.\n"

5515 msgstr "Use -f si realmente quiere agregarlos.\n"

5516

5217 -#: builtin/add.c:380

5517 +#: builtin/add.c:378

5518 msgid "adding files failed"

5219 -msgstr "fallo al agregar archivos"

5519 +msgstr "falló al agregar archivos"

5520

5221 -#: builtin/add.c:417

5521 +#: builtin/add.c:416

5522 msgid "-A and -u are mutually incompatible"

5523 msgstr "-A y -u son mutuamente incompatibles"

5524

5225 -#: builtin/add.c:424

5525 +#: builtin/add.c:423

5526 msgid "Option --ignore-missing can only be used together with --dry-run"

5527 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"

5528

5229 -#: builtin/add.c:428

5529 +#: builtin/add.c:427

5530 #, c-format

5531 msgid "--chmod param '%s' must be either -x or +x"

5532 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"

5533

5234 -#: builtin/add.c:443

5534 +#: builtin/add.c:442

5535 #, c-format

5536 msgid "Nothing specified, nothing added.\n"

5537 msgstr "Nada especificado, nada agregado.\n"

5538

5239 -#: builtin/add.c:444

5539 +#: builtin/add.c:443

5540 #, c-format

5541 msgid "Maybe you wanted to say 'git add .'?\n"

5542 msgstr "Tal vez quiso decir 'git add .'?\n"

5543

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

5544 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280

5545 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

5546 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5247 -#: builtin/rm.c:271 builtin/submodule--helper.c:326

5547 +#: builtin/rm.c:270 builtin/submodule--helper.c:328

5548 msgid "index file corrupt"

5549 msgstr "archivo índice corrompido"

5550

@@ -5265,7 +5565,7 @@ msgstr "Línea mal formada: '%s'."

5565 #: builtin/am.c:576

5566 #, c-format

5567 msgid "Failed to copy notes from '%s' to '%s'"

5268 -msgstr "Fallo al copiar notas de '%s' a '%s'"

5568 +msgstr "Falló al copiar notas de '%s' a '%s'"

5569

5570 #: builtin/am.c:602

5571 msgid "fseek failed"

@@ -5296,16 +5596,16 @@ msgstr "offset de zona horaria inválido"

5596 msgid "Patch format detection failed."

5597 msgstr "Falló al detectar el formato del parche."

5598

5299 -#: builtin/am.c:1013 builtin/clone.c:405

5599 +#: builtin/am.c:1013 builtin/clone.c:407

5600 #, c-format

5601 msgid "failed to create directory '%s'"

5302 -msgstr "fallo al crear el directorio '%s'"

5602 +msgstr "falló al crear el directorio '%s'"

5603

5604 #: builtin/am.c:1018

5605 msgid "Failed to split patches."

5306 -msgstr "Fallo al dividir parches."

5606 +msgstr "Falló al dividir parches."

5607

5308 -#: builtin/am.c:1148 builtin/commit.c:342

5608 +#: builtin/am.c:1148 builtin/commit.c:351

5609 msgid "unable to write index file"

5610 msgstr "no es posible escribir en el archivo índice"

5611

@@ -5408,7 +5708,7 @@ msgstr "Sin cambios -- parche ya aplicado."

5708 #: builtin/am.c:1832

5709 #, c-format

5710 msgid "Patch failed at %s %.*s"

5411 -msgstr "El parche fallo en %s %.*s"

5711 +msgstr "El parche falló en %s %.*s"

5712

5713 #: builtin/am.c:1838

5714 msgid "Use 'git am --show-current-patch' to see the failed patch"

@@ -5445,14 +5745,14 @@ msgstr "No se pudo analizar el objeto '%s'."

5745

5746 #: builtin/am.c:2048

5747 msgid "failed to clean index"

5448 -msgstr "fallo al limpiar el índice"

5748 +msgstr "falló al limpiar el índice"

5749

5750 #: builtin/am.c:2083

5751 msgid ""

5752 "You seem to have moved HEAD since the last 'am' failure.\n"

5753 "Not rewinding to ORIG_HEAD"

5754 msgstr ""

5455 -"Parece haber movido HEAD desde el último fallo 'am'.\n"

5755 +"Parece haber movido HEAD desde el último falló 'am'.\n"

5756 "No rebobinando a ORIG_HEAD"

5757

5758 #: builtin/am.c:2174

@@ -5481,7 +5781,7 @@ msgid "allow fall back on 3way merging if needed"

5781 msgstr "permitir retroceso en fusión de 3-vías si es necesario"

5782

5783 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5484 -#: builtin/repack.c:182

5784 +#: builtin/repack.c:192

5785 msgid "be quiet"

5786 msgstr "ser silencioso"

5787

@@ -5524,16 +5824,17 @@ msgstr "descubrir todo antes de una línea de tijeras"

5824 msgid "pass it through git-apply"

5825 msgstr "pasarlo a través de git-apply"

5826

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

5827 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

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

5829 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5830 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5831 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

5832 +#: parse-options.h:146 parse-options.h:258

5833 msgid "n"

5834 msgstr "n"

5835

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

5836 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38

5837 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

5838 msgid "format"

5839 msgstr "formato"

5840

@@ -5577,8 +5878,8 @@ msgstr "mentir sobre la fecha del committer"

5878 msgid "use current timestamp for author date"

5879 msgstr "usar el timestamp actual para la fecha del autor"

5880

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

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

5882 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5883 msgid "key-id"

5884 msgstr "key-id"

5885

@@ -5600,7 +5901,7 @@ msgstr ""

5901

5902 #: builtin/am.c:2327

5903 msgid "failed to read the index"

5603 -msgstr "fallo al leer el índice"

5904 +msgstr "falló al leer el índice"

5905

5906 #: builtin/am.c:2342

5907 #, c-format

@@ -5717,115 +6018,141 @@ msgstr "--write-terms requiere dos argumentos"

6018 msgid "--bisect-clean-state requires no arguments"

6019 msgstr "--bisect-clean-state no requiere argumentos"

6020

5720 -#: builtin/blame.c:27

6021 +#: builtin/blame.c:29

6022 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

6023 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"

6024

5724 -#: builtin/blame.c:32

6025 +#: builtin/blame.c:34

6026 msgid "<rev-opts> are documented in git-rev-list(1)"

6027 msgstr "<rev-opts> están documentadas en git-rev-list(1)"

6028

5728 -#: builtin/blame.c:677

6029 +#: builtin/blame.c:404

6030 +#, c-format

6031 +msgid "expecting a color: %s"

6032 +msgstr "esperando un color: %s"

6033 +

6034 +#: builtin/blame.c:411

6035 +msgid "must end with a color"

6036 +msgstr "tiene que terminar con un color"

6037 +

6038 +#: builtin/blame.c:697

6039 +#, c-format

6040 +msgid "invalid color '%s' in color.blame.repeatedLines"

6041 +msgstr "color invalido '%s' en color.blame.repeatedLines"

6042 +

6043 +#: builtin/blame.c:715

6044 +msgid "invalid value for blame.coloring"

6045 +msgstr "valor inválido para blame.coloring"

6046 +

6047 +#: builtin/blame.c:786

6048 msgid "Show blame entries as we find them, incrementally"

6049 msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"

6050

5732 -#: builtin/blame.c:678

6051 +#: builtin/blame.c:787

6052 msgid "Show blank SHA-1 for boundary commits (Default: off)"

6053 msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"

6054

5736 -#: builtin/blame.c:679

6055 +#: builtin/blame.c:788

6056 msgid "Do not treat root commits as boundaries (Default: off)"

6057 msgstr "No tratar commits raíces como extremos (Default: off)"

6058

5740 -#: builtin/blame.c:680

6059 +#: builtin/blame.c:789

6060 msgid "Show work cost statistics"

6061 msgstr "Mostrar estadísticas de costo de trabajo"

6062

5744 -#: builtin/blame.c:681

6063 +#: builtin/blame.c:790

6064 msgid "Force progress reporting"

6065 msgstr "Forzar el reporte de progreso"

6066

5748 -#: builtin/blame.c:682

6067 +#: builtin/blame.c:791

6068 msgid "Show output score for blame entries"

6069 msgstr "Mostrar la puntuación de salida de las entradas de blame"

6070

5752 -#: builtin/blame.c:683

6071 +#: builtin/blame.c:792

6072 msgid "Show original filename (Default: auto)"

6073 msgstr "Mostrar nombre original del archivo (Default: auto)"

6074

5756 -#: builtin/blame.c:684

6075 +#: builtin/blame.c:793

6076 msgid "Show original linenumber (Default: off)"

6077 msgstr "Mostrar número de línea original (Default: off)"

6078

5760 -#: builtin/blame.c:685

6079 +#: builtin/blame.c:794

6080 msgid "Show in a format designed for machine consumption"

6081 msgstr "Mostrar en un formato diseñado para consumo de máquina"

6082

5764 -#: builtin/blame.c:686

6083 +#: builtin/blame.c:795

6084 msgid "Show porcelain format with per-line commit information"

6085 msgstr "Mostrar en formato porcelana con información de commit por línea"

6086

5768 -#: builtin/blame.c:687

6087 +#: builtin/blame.c:796

6088 msgid "Use the same output mode as git-annotate (Default: off)"

6089 msgstr "Usar el mismo modo salida como git-annotate (Default: off)"

6090

5772 -#: builtin/blame.c:688

6091 +#: builtin/blame.c:797

6092 msgid "Show raw timestamp (Default: off)"

6093 msgstr "Mostrar timestamp en formato raw (Default: off)"

6094

5776 -#: builtin/blame.c:689

6095 +#: builtin/blame.c:798

6096 msgid "Show long commit SHA1 (Default: off)"

6097 msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"

6098

5780 -#: builtin/blame.c:690

6099 +#: builtin/blame.c:799

6100 msgid "Suppress author name and timestamp (Default: off)"

6101 msgstr "Suprimir nombre del autor y timestamp (Default: off)"

6102

5784 -#: builtin/blame.c:691

6103 +#: builtin/blame.c:800

6104 msgid "Show author email instead of name (Default: off)"

6105 msgstr "Mostrar en cambio el email del autor (Default: off)"

6106

5788 -#: builtin/blame.c:692

6107 +#: builtin/blame.c:801

6108 msgid "Ignore whitespace differences"

6109 msgstr "Ignorar diferencias de espacios en blanco"

6110

5792 -#: builtin/blame.c:699

6111 +#: builtin/blame.c:802

6112 +msgid "color redundant metadata from previous line differently"

6113 +msgstr "colorear metadata redundante de lineas previas de manera diferente"

6114 +

6115 +#: builtin/blame.c:803

6116 +msgid "color lines by age"

6117 +msgstr "colorear lineas por edad"

6118 +

6119 +#: builtin/blame.c:810

6120 msgid "Use an experimental heuristic to improve diffs"

6121 msgstr "Usar un heurístico experimental para mejorar los diffs"

6122

5796 -#: builtin/blame.c:701

6123 +#: builtin/blame.c:812

6124 msgid "Spend extra cycles to find better match"

6125 msgstr "Ocupo más ciclos para encontrar mejoras resultados"

6126

5800 -#: builtin/blame.c:702

6127 +#: builtin/blame.c:813

6128 msgid "Use revisions from <file> instead of calling git-rev-list"

6129 msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"

6130

5804 -#: builtin/blame.c:703

6131 +#: builtin/blame.c:814

6132 msgid "Use <file>'s contents as the final image"

6133 msgstr "Usar contenido de <archivo> como imagen final"

6134

5808 -#: builtin/blame.c:704 builtin/blame.c:705

6135 +#: builtin/blame.c:815 builtin/blame.c:816

6136 msgid "score"

6137 msgstr "puntaje"

6138

5812 -#: builtin/blame.c:704

6139 +#: builtin/blame.c:815

6140 msgid "Find line copies within and across files"

6141 msgstr "Encontrar copias de líneas entre y a través de archivos"

6142

5816 -#: builtin/blame.c:705

6143 +#: builtin/blame.c:816

6144 msgid "Find line movements within and across files"

6145 msgstr "Encontrar movimientos de líneas entre y a través de archivos"

6146

5820 -#: builtin/blame.c:706

6147 +#: builtin/blame.c:817

6148 msgid "n,m"

6149 msgstr "n,m"

6150

5824 -#: builtin/blame.c:706

6151 +#: builtin/blame.c:817

6152 msgid "Process only line range n,m, counting from 1"

6153 msgstr "Procesar solo el rango de líneas n,m, contando desde 1"

6154

5828 -#: builtin/blame.c:753

6155 +#: builtin/blame.c:866

6156 msgid "--progress can't be used with --incremental or porcelain formats"

6157 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"

6158

@@ -5837,18 +6164,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"

6164 #. your language may need more or fewer display

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