cf69bcadee · 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-12-02 10:55+0800\n"

11 -"PO-Revision-Date: 2018-12-01 23:16-0500\n"

10 +"POT-Creation-Date: 2019-02-15 10:09+0800\n"

11 +"PO-Revision-Date: 2019-02-16 15:19-0500\n"

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

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

14 "Language: es\n"

@@ -16,40 +16,40 @@ msgstr ""

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

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

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

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

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

20

21 -#: advice.c:99

21 +#: advice.c:101

22 #, c-format

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

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

25

26 -#: advice.c:152

26 +#: advice.c:154

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

31 +#: advice.c:156

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

35 +#: advice.c:158

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

39 +#: advice.c:160

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

43 +#: advice.c:162

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

47 +#: advice.c:164

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

52 +#: advice.c:172

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

60 +#: advice.c:180

61 msgid "Exiting because of an unresolved conflict."

62 msgstr "Saliendo porque existe un conflicto sin resolver."

63

64 -#: advice.c:183 builtin/merge.c:1289

64 +#: advice.c:185 builtin/merge.c:1290

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

68 +#: advice.c:187

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

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

71

72 -#: advice.c:186

72 +#: advice.c:188

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:192

76 +#: advice.c:194

77 #, c-format

78 msgid ""

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

@@ -102,6 +102,14 @@ msgstr ""

102 " git checkout -b <nombre-de-nueva-rama>\n"

103 "\n"

104

105 +#: alias.c:50

106 +msgid "cmdline ends with \\"

107 +msgstr "cmdline termina en \\"

108 +

109 +#: alias.c:51

110 +msgid "unclosed quote"

111 +msgstr "comillas incompletas"

112 +

113 #: apply.c:59

114 #, c-format

115 msgid "unrecognized whitespace option '%s'"

@@ -132,69 +140,69 @@ msgstr "--index está fuera de un repositorio"

140 msgid "--cached outside a repository"

141 msgstr "--cached está fuera de un repositorio"

142

135 -#: apply.c:826

143 +#: apply.c:825

144 #, c-format

145 msgid "Cannot prepare timestamp regexp %s"

146 msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"

147

140 -#: apply.c:835

148 +#: apply.c:834

149 #, c-format

150 msgid "regexec returned %d for input: %s"

151 msgstr "regexec devolvió %d para la entrada: %s"

152

145 -#: apply.c:909

153 +#: apply.c:908

154 #, c-format

155 msgid "unable to find filename in patch at line %d"

156 msgstr ""

157 "no se puede encontrar el nombre del archivo en el parche en la línea %d"

158

151 -#: apply.c:947

159 +#: apply.c:946

160 #, c-format

161 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

162 msgstr ""

163 "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en "

164 "lalínea %d"

165

158 -#: apply.c:953

166 +#: apply.c:952

167 #, c-format

168 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

169 msgstr ""

170 "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en "

171 "lalínea %d"

172

165 -#: apply.c:954

173 +#: apply.c:953

174 #, c-format

175 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

176 msgstr ""

177 "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en "

178 "lalínea %d"

179

172 -#: apply.c:959

180 +#: apply.c:958

181 #, c-format

182 msgid "git apply: bad git-diff - expected /dev/null on line %d"

183 msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"

184

177 -#: apply.c:988

185 +#: apply.c:987

186 #, c-format

187 msgid "invalid mode on line %d: %s"

188 msgstr "modo inválido en la línea %d: %s"

189

182 -#: apply.c:1307

190 +#: apply.c:1306

191 #, c-format

192 msgid "inconsistent header lines %d and %d"

193 msgstr "header inconsistente en las líneas %d y %d"

194

187 -#: apply.c:1479

195 +#: apply.c:1478

196 #, c-format

197 msgid "recount: unexpected line: %.*s"

198 msgstr "recount: línea inesperada: %.*s"

199

192 -#: apply.c:1548

200 +#: apply.c:1547

201 #, c-format

202 msgid "patch fragment without header at line %d: %.*s"

203 msgstr "fragmento de parche sin header en la línea %d: %.*s"

204

197 -#: apply.c:1568

205 +#: apply.c:1567

206 #, c-format

207 msgid ""

208 "git diff header lacks filename information when removing %d leading pathname "

@@ -209,83 +217,83 @@ msgstr[1] ""

217 "los headers de git diff carecen de información de los nombres de los "

218 "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)"

219

212 -#: apply.c:1581

220 +#: apply.c:1580

221 #, c-format

222 msgid "git diff header lacks filename information (line %d)"

223 msgstr ""

224 "el header de git diff carece de información del nombre del archivo (línea %d)"

225

218 -#: apply.c:1769

226 +#: apply.c:1768

227 msgid "new file depends on old contents"

228 msgstr "el nuevo archivo depende de contenidos viejos"

229

222 -#: apply.c:1771

230 +#: apply.c:1770

231 msgid "deleted file still has contents"

232 msgstr "el archivo eliminado todavía tiene contenido"

233

226 -#: apply.c:1805

234 +#: apply.c:1804

235 #, c-format

236 msgid "corrupt patch at line %d"

237 msgstr "parche corrupto en la línea %d"

238

231 -#: apply.c:1842

239 +#: apply.c:1841

240 #, c-format

241 msgid "new file %s depends on old contents"

242 msgstr "nuevo archivo %s depende en contenidos viejos"

243

236 -#: apply.c:1844

244 +#: apply.c:1843

245 #, c-format

246 msgid "deleted file %s still has contents"

247 msgstr "el archivo borrado %s todavía tiene contenido"

248

241 -#: apply.c:1847

249 +#: apply.c:1846

250 #, c-format

251 msgid "** warning: file %s becomes empty but is not deleted"

252 msgstr "** peligro: el archivo %s está vacío pero no es borrado"

253

246 -#: apply.c:1994

254 +#: apply.c:1993

255 #, c-format

256 msgid "corrupt binary patch at line %d: %.*s"

257 msgstr "parche binario corrupto en la línea %d: %.*s"

258

251 -#: apply.c:2031

259 +#: apply.c:2030

260 #, c-format

261 msgid "unrecognized binary patch at line %d"

262 msgstr "parche binario no reconocido en la línea %d"

263

256 -#: apply.c:2193

264 +#: apply.c:2192

265 #, c-format

266 msgid "patch with only garbage at line %d"

267 msgstr "parche que solo contiene basura en la línea %d"

268

261 -#: apply.c:2279

269 +#: apply.c:2278

270 #, c-format

271 msgid "unable to read symlink %s"

272 msgstr "no es posible leer el enlace simbólico %s"

273

266 -#: apply.c:2283

274 +#: apply.c:2282

275 #, c-format

276 msgid "unable to open or read %s"

277 msgstr "no es posible abrir o leer %s"

278

271 -#: apply.c:2942

279 +#: apply.c:2941

280 #, c-format

281 msgid "invalid start of line: '%c'"

282 msgstr "comienzo inválido de línea: '%c'"

283

276 -#: apply.c:3063

284 +#: apply.c:3062

285 #, c-format

286 msgid "Hunk #%d succeeded at %d (offset %d line)."

287 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

288 msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."

289 msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."

290

283 -#: apply.c:3075

291 +#: apply.c:3074

292 #, c-format

293 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

294 msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"

295

288 -#: apply.c:3081

296 +#: apply.c:3080

297 #, c-format

298 msgid ""

299 "while searching for:\n"

@@ -294,23 +302,23 @@ msgstr ""

302 "mientras se busca:\n"

303 "%.*s"

304

297 -#: apply.c:3103

305 +#: apply.c:3102

306 #, c-format

307 msgid "missing binary patch data for '%s'"

308 msgstr "data perdida en parche binario para '%s'"

309

302 -#: apply.c:3111

310 +#: apply.c:3110

311 #, c-format

312 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

313 msgstr ""

314 "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"

315

308 -#: apply.c:3158

316 +#: apply.c:3157

317 #, c-format

318 msgid "cannot apply binary patch to '%s' without full index line"

319 msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"

320

313 -#: apply.c:3168

321 +#: apply.c:3167

322 #, c-format

323 msgid ""

324 "the patch applies to '%s' (%s), which does not match the current contents."

@@ -318,29 +326,29 @@ msgstr ""

326 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "

327 "actuales."

328

321 -#: apply.c:3176

329 +#: apply.c:3175

330 #, c-format

331 msgid "the patch applies to an empty '%s' but it is not empty"

332 msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"

333

326 -#: apply.c:3194

334 +#: apply.c:3193

335 #, c-format

336 msgid "the necessary postimage %s for '%s' cannot be read"

337 msgstr "la postimagen necesaria %s para '%s' no se puede leer"

338

331 -#: apply.c:3207

339 +#: apply.c:3206

340 #, c-format

341 msgid "binary patch does not apply to '%s'"

342 msgstr "el parche binario no aplica para '%s'"

343

336 -#: apply.c:3213

344 +#: apply.c:3212

345 #, c-format

346 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

347 msgstr ""

348 "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "

349 "obtuvo %s)"

350

343 -#: apply.c:3234

351 +#: apply.c:3233

352 #, c-format

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

354 msgstr "el parche falló: %s:%ld"

@@ -420,7 +428,8 @@ msgstr "%s: tipo incorrecto"

428 msgid "%s has type %o, expected %o"

429 msgstr "%s tiene tipo %o, se esperaba %o"

430

423 -#: apply.c:3881 apply.c:3883

431 +#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

432 +#: read-cache.c:1299

433 #, c-format

434 msgid "invalid path '%s'"

435 msgstr "ruta inválida '%s'"

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

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

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

486

478 -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

487 +#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

488 #, c-format

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

490 msgstr "make_cache_entry falló para la ruta '%s'"

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

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

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

563

555 -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

564 +#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

565 #, c-format

566 msgid "cannot open %s"

567 msgstr "no se puede abrir %s"

@@ -576,30 +585,30 @@ msgstr "Parche '%s' saltado."

585 msgid "unrecognized input"

586 msgstr "input no reconocido"

587

579 -#: apply.c:4719

588 +#: apply.c:4720

589 msgid "unable to read index file"

590 msgstr "no es posible leer el archivo índice"

591

583 -#: apply.c:4874

592 +#: apply.c:4875

593 #, c-format

594 msgid "can't open patch '%s': %s"

595 msgstr "no se puede abrir el parche '%s': %s"

596

588 -#: apply.c:4901

597 +#: apply.c:4902

598 #, c-format

599 msgid "squelched %d whitespace error"

600 msgid_plural "squelched %d whitespace errors"

601 msgstr[0] "%d error de espacios en blanco aplastado"

602 msgstr[1] "%d errores de espacios en blanco aplastados"

603

595 -#: apply.c:4907 apply.c:4922

604 +#: apply.c:4908 apply.c:4923

605 #, c-format

606 msgid "%d line adds whitespace errors."

607 msgid_plural "%d lines add whitespace errors."

608 msgstr[0] "%d línea agrega errores de espacios en blanco."

609 msgstr[1] "%d líneas agregan errores de espacios en blanco."

610

602 -#: apply.c:4915

611 +#: apply.c:4916

612 #, c-format

613 msgid "%d line applied after fixing whitespace errors."

614 msgid_plural "%d lines applied after fixing whitespace errors."

@@ -608,147 +617,147 @@ msgstr[0] ""

617 msgstr[1] ""

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

619

611 -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

620 +#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

621 msgid "Unable to write new index file"

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

623

615 -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

616 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

617 -#: builtin/pull.c:199 builtin/submodule--helper.c:406

618 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

619 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

620 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

624 +#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

625 +#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

626 +#: builtin/pull.c:200 builtin/submodule--helper.c:407

627 +#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

628 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

629 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

630 msgid "path"

631 msgstr "ruta"

632

624 -#: apply.c:4959

633 +#: apply.c:4960

634 msgid "don't apply changes matching the given path"

635 msgstr "no aplicar cambios que concuerden con la ruta suministrada"

636

628 -#: apply.c:4962

637 +#: apply.c:4963

638 msgid "apply changes matching the given path"

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

640

632 -#: apply.c:4964 builtin/am.c:2218

641 +#: apply.c:4965 builtin/am.c:2212

642 msgid "num"

643 msgstr "num"

644

636 -#: apply.c:4965

645 +#: apply.c:4966

646 msgid "remove <num> leading slashes from traditional diff paths"

647 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"

648

640 -#: apply.c:4968

649 +#: apply.c:4969

650 msgid "ignore additions made by the patch"

651 msgstr "ignorar adiciones hechas por el parche"

652

644 -#: apply.c:4970

653 +#: apply.c:4971

654 msgid "instead of applying the patch, output diffstat for the input"

655 msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"

656

648 -#: apply.c:4974

657 +#: apply.c:4975

658 msgid "show number of added and deleted lines in decimal notation"

659 msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"

660

652 -#: apply.c:4976

661 +#: apply.c:4977

662 msgid "instead of applying the patch, output a summary for the input"

663 msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"

664

656 -#: apply.c:4978

665 +#: apply.c:4979

666 msgid "instead of applying the patch, see if the patch is applicable"

667 msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"

668

660 -#: apply.c:4980

669 +#: apply.c:4981

670 msgid "make sure the patch is applicable to the current index"

671 msgstr "asegurar que el parche es aplicable al índice actual"

672

664 -#: apply.c:4982

673 +#: apply.c:4983

674 msgid "mark new files with `git add --intent-to-add`"

675 msgstr "marca los nuevos archivos con `git add --intent-to-add`"

676

668 -#: apply.c:4984

677 +#: apply.c:4985

678 msgid "apply a patch without touching the working tree"

679 msgstr "aplicar un parche sin tocar el árbol de trabajo"

680

672 -#: apply.c:4986

681 +#: apply.c:4987

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

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

684

676 -#: apply.c:4989

685 +#: apply.c:4990

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

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

688

680 -#: apply.c:4991

689 +#: apply.c:4992

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

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

692

684 -#: apply.c:4993

693 +#: apply.c:4994

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

695 msgstr ""

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

697

689 -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

698 +#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

699 msgid "paths are separated with NUL character"

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

701

693 -#: apply.c:4998

702 +#: apply.c:4999

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

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

705

697 -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

706 +#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

707 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

699 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857

708 +#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

709 msgid "action"

710 msgstr "acción"

711

703 -#: apply.c:5000

712 +#: apply.c:5001

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

714 msgstr ""

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

716 "blanco"

717

709 -#: apply.c:5003 apply.c:5006

718 +#: apply.c:5004 apply.c:5007

719 msgid "ignore changes in whitespace when finding context"

720 msgstr ""

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

722

714 -#: apply.c:5009

723 +#: apply.c:5010

724 msgid "apply the patch in reverse"

725 msgstr "aplicar el parche en reversa"

726

718 -#: apply.c:5011

727 +#: apply.c:5012

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

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

730

722 -#: apply.c:5013

731 +#: apply.c:5014

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

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

734

726 -#: apply.c:5015

735 +#: apply.c:5016

736 msgid "allow overlapping hunks"

737 msgstr "permitir solapamiento de hunks"

738

730 -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

731 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

732 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

733 -#: builtin/rebase--interactive.c:157

739 +#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22

740 +#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

741 +#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128

742 +#: builtin/rebase--interactive.c:159

743 msgid "be verbose"

744 msgstr "ser verboso"

745

737 -#: apply.c:5018

746 +#: apply.c:5019

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

748 msgstr ""

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

750 "archivo"

751

743 -#: apply.c:5021

752 +#: apply.c:5022

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

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

755

747 -#: apply.c:5023 builtin/am.c:2206

756 +#: apply.c:5024 builtin/am.c:2200

757 msgid "root"

758 msgstr "raíz"

759

751 -#: apply.c:5024

760 +#: apply.c:5025

761 msgid "prepend <root> to all filenames"

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

763

@@ -771,99 +780,118 @@ msgstr ""

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

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

782

774 -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

783 +#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

784 #, c-format

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

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

787

779 -#: archive.c:453

788 +#: archive.c:396

789 +#, c-format

790 +msgid "no such ref: %.*s"

791 +msgstr "no existe el ref: %.*s"

792 +

793 +#: archive.c:401

794 +#, c-format

795 +msgid "not a valid object name: %s"

796 +msgstr "nombre de objeto no válido: %s"

797 +

798 +#: archive.c:414

799 +#, c-format

800 +msgid "not a tree object: %s"

801 +msgstr "no es un objeto tree: %s"

802 +

803 +#: archive.c:424

804 +msgid "current working directory is untracked"

805 +msgstr "directorio de trabajo actual no rastreado"

806 +

807 +#: archive.c:455

808 msgid "fmt"

809 msgstr "fmt"

810

783 -#: archive.c:453

811 +#: archive.c:455

812 msgid "archive format"

813 msgstr "formato del archivo"

814

787 -#: archive.c:454 builtin/log.c:1536

815 +#: archive.c:456 builtin/log.c:1549

816 msgid "prefix"

817 msgstr "prefijo"

818

791 -#: archive.c:455

819 +#: archive.c:457

820 msgid "prepend prefix to each pathname in the archive"

821 msgstr "anteponer prefijo a cada ruta en el archivo"

822

795 -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

796 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

797 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

798 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

823 +#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

824 +#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

825 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

826 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

827 #: parse-options.h:162

828 msgid "file"

829 msgstr "carpeta"

830

803 -#: archive.c:457 builtin/archive.c:89

831 +#: archive.c:459 builtin/archive.c:90

832 msgid "write the archive to this file"

833 msgstr "escribe el archivo en esta carpeta"

834

807 -#: archive.c:459

835 +#: archive.c:461

836 msgid "read .gitattributes in working directory"

837 msgstr "leer .gitattributes en el directorio de trabajo"

838

811 -#: archive.c:460

839 +#: archive.c:462

840 msgid "report archived files on stderr"

841 msgstr "reportar archivos archivados por stderr"

842

815 -#: archive.c:461

843 +#: archive.c:463

844 msgid "store only"

845 msgstr "solo guardar"

846

819 -#: archive.c:462

847 +#: archive.c:464

848 msgid "compress faster"

849 msgstr "comprimir mas rápido"

850

823 -#: archive.c:470

851 +#: archive.c:472

852 msgid "compress better"

853 msgstr "comprimir mejor"

854

827 -#: archive.c:473

855 +#: archive.c:475

856 msgid "list supported archive formats"

857 msgstr "listar los formatos de carpeta soportados"

858

831 -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

832 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

859 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

860 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

861 msgid "repo"

862 msgstr "repo"

863

836 -#: archive.c:476 builtin/archive.c:91

864 +#: archive.c:478 builtin/archive.c:92

865 msgid "retrieve the archive from remote repository <repo>"

866 msgstr "obtener la carpeta del repositorio remoto <repo>"

867

840 -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

841 -#: builtin/notes.c:496

868 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

869 +#: builtin/notes.c:498

870 msgid "command"

871 msgstr "comando"

872

845 -#: archive.c:478 builtin/archive.c:93

873 +#: archive.c:480 builtin/archive.c:94

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

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

876

849 -#: archive.c:485

877 +#: archive.c:487

878 msgid "Unexpected option --remote"

879 msgstr "Opción inesperada --remote"

880

853 -#: archive.c:487

881 +#: archive.c:489

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

883 msgstr "Opción --exec solo puede ser utilizada con --remote"

884

857 -#: archive.c:489

885 +#: archive.c:491

886 msgid "Unexpected option --output"

887 msgstr "Opción inesperada --output"

888

861 -#: archive.c:511

889 +#: archive.c:513

890 #, c-format

891 msgid "Unknown archive format '%s'"

892 msgstr "Formato de carpeta desconocido '%s'"

893

866 -#: archive.c:518

894 +#: archive.c:520

895 #, c-format

896 msgid "Argument not supported for format '%s': -%d"

897 msgstr "Argumento no soportado para formato '%s': -%d"

@@ -907,7 +935,7 @@ msgstr "ruta no válida UTF-8: %s"

935 msgid "path too long (%d chars, SHA1: %s): %s"

936 msgstr "ruta muy larga (%d chars, SHA1: %s): %s"

937

910 -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

938 +#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

939 #, c-format

940 msgid "deflate error (%d)"

941 msgstr "error al desinflar (%d)"

@@ -917,12 +945,17 @@ msgstr "error al desinflar (%d)"

945 msgid "timestamp too large for this system: %<PRIuMAX>"

946 msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"

947

920 -#: attr.c:212

948 +#: attr.c:211

949 #, c-format

950 msgid "%.*s is not a valid attribute name"

951 msgstr "%.*s no es un nombre de atributo valido"

952

925 -#: attr.c:409

953 +#: attr.c:368

954 +#, c-format

955 +msgid "%s not allowed: %s:%d"

956 +msgstr "%s no permitido: %s:%d"

957 +

958 +#: attr.c:408

959 msgid ""

960 "Negative patterns are ignored in git attributes\n"

961 "Use '\\!' for literal leading exclamation."

@@ -935,17 +968,17 @@ msgstr ""

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

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

970

938 -#: bisect.c:676

971 +#: bisect.c:678

972 #, c-format

973 msgid "We cannot bisect more!\n"

974 msgstr "¡No podemos biseccionar más!\n"

975

943 -#: bisect.c:730

976 +#: bisect.c:733

977 #, c-format

978 msgid "Not a valid commit name %s"

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

980

948 -#: bisect.c:754

981 +#: bisect.c:758

982 #, c-format

983 msgid ""

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

@@ -954,7 +987,7 @@ msgstr ""

987 "La base de fisión %s está mal.\n"

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

989

957 -#: bisect.c:759

990 +#: bisect.c:763

991 #, c-format

992 msgid ""

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

@@ -963,7 +996,7 @@ msgstr ""

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

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

998

966 -#: bisect.c:764

999 +#: bisect.c:768

1000 #, c-format

1001 msgid ""

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

@@ -972,7 +1005,7 @@ msgstr ""

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

1006 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"

1007

975 -#: bisect.c:772

1008 +#: bisect.c:776

1009 #, c-format

1010 msgid ""

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

@@ -983,7 +1016,7 @@ msgstr ""

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

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

1018

986 -#: bisect.c:785

1019 +#: bisect.c:789

1020 #, c-format

1021 msgid ""

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

@@ -994,36 +1027,36 @@ msgstr ""

1027 "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"

1028 "Vamos a continuar de todas maneras."

1029

997 -#: bisect.c:818

1030 +#: bisect.c:822

1031 #, c-format

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

1033 msgstr "Biseccionando: una base de fisión debe ser probada\n"

1034

1002 -#: bisect.c:858

1035 +#: bisect.c:865

1036 #, c-format

1037 msgid "a %s revision is needed"

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

1039

1007 -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1040 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

1041 #, c-format

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

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

1044

1012 -#: bisect.c:928 builtin/merge.c:138

1045 +#: bisect.c:937 builtin/merge.c:139

1046 #, c-format

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

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

1049

1017 -#: bisect.c:958

1050 +#: bisect.c:967

1051 msgid "reading bisect refs failed"

1052 msgstr "falló leer las refs de bisect"

1053

1021 -#: bisect.c:977

1054 +#: bisect.c:986

1055 #, c-format

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

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

1058

1026 -#: bisect.c:985

1059 +#: bisect.c:994

1060 #, c-format

1061 msgid ""

1062 "No testable commit found.\n"

@@ -1032,7 +1065,7 @@ msgstr ""

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

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

1067

1035 -#: bisect.c:1004

1068 +#: bisect.c:1013

1069 #, c-format

1070 msgid "(roughly %d step)"

1071 msgid_plural "(roughly %d steps)"

@@ -1042,47 +1075,47 @@ msgstr[1] "(aproximadamente %d pasos)"

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

1076 #. steps)" translation.

1077 #.

1045 -#: bisect.c:1010

1078 +#: bisect.c:1019

1079 #, c-format

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

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

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

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

1084

1052 -#: blame.c:1787

1085 +#: blame.c:1792

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

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

1088

1056 -#: blame.c:1801

1089 +#: blame.c:1806

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

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

1092

1060 -#: blame.c:1822

1093 +#: blame.c:1827

1094 msgid "--reverse and --first-parent together require specified latest commit"

1095 msgstr ""

1096 "--reverse y --first-parent juntos requieren especificar el último commit"

1097

1065 -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1066 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1067 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1098 +#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1099 +#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1100 +#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1101 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1102 #: builtin/shortlog.c:192

1103 msgid "revision walk setup failed"

1104 msgstr "falló la configuración del camino de revisión"

1105

1073 -#: blame.c:1849

1106 +#: blame.c:1854

1107 msgid ""

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

1109 msgstr ""

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

1111 "del primer padre"

1112

1080 -#: blame.c:1860

1113 +#: blame.c:1865

1114 #, c-format

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

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

1117

1085 -#: blame.c:1871

1118 +#: blame.c:1876

1119 #, c-format

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

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

@@ -1211,27 +1244,27 @@ msgstr ""

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

1245 "el push."

1246

1214 -#: branch.c:279

1247 +#: branch.c:280

1248 #, c-format

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

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

1251

1219 -#: branch.c:299

1252 +#: branch.c:300

1253 #, c-format

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

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

1256

1224 -#: branch.c:304

1257 +#: branch.c:305

1258 #, c-format

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

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

1261

1229 -#: branch.c:358

1262 +#: branch.c:359

1263 #, c-format

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

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

1266

1234 -#: branch.c:381

1267 +#: branch.c:382

1268 #, c-format

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

1270 msgstr "HEAD del árbol de trabajo %s no está actualizada"

@@ -1246,70 +1279,70 @@ msgstr "'%s' no se ve como un archivo bundle v2"

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

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

1281

1249 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1250 -#: builtin/commit.c:774

1282 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1283 +#: builtin/commit.c:776

1284 #, c-format

1285 msgid "could not open '%s'"

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

1287

1255 -#: bundle.c:141

1288 +#: bundle.c:143

1289 msgid "Repository lacks these prerequisite commits:"

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

1291

1259 -#: bundle.c:192

1292 +#: bundle.c:194

1293 #, c-format

1294 msgid "The bundle contains this ref:"

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

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

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

1298

1266 -#: bundle.c:199

1299 +#: bundle.c:201

1300 msgid "The bundle records a complete history."

1301 msgstr "El bundle registra una historia completa."

1302

1270 -#: bundle.c:201

1303 +#: bundle.c:203

1304 #, c-format

1305 msgid "The bundle requires this ref:"

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

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

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

1309

1277 -#: bundle.c:267

1310 +#: bundle.c:269

1311 msgid "unable to dup bundle descriptor"

1312 msgstr "incapaz de duplicar bundle descriptor"

1313

1281 -#: bundle.c:274

1314 +#: bundle.c:276

1315 msgid "Could not spawn pack-objects"

1316 msgstr "No se pudo crear los pack-objetcts"

1317

1285 -#: bundle.c:285

1318 +#: bundle.c:287

1319 msgid "pack-objects died"

1320 msgstr "pack-objects murió"

1321

1289 -#: bundle.c:327

1322 +#: bundle.c:329

1323 msgid "rev-list died"

1324 msgstr "rev-list murió"

1325

1293 -#: bundle.c:376

1326 +#: bundle.c:378

1327 #, c-format

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

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

1330

1298 -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1331 +#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1332 #, c-format

1333 msgid "unrecognized argument: %s"

1334 msgstr "argumento no reconocido: %s"

1335

1303 -#: bundle.c:464

1336 +#: bundle.c:465

1337 msgid "Refusing to create empty bundle."

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

1339

1307 -#: bundle.c:474

1340 +#: bundle.c:475

1341 #, c-format

1342 msgid "cannot create '%s'"

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

1344

1312 -#: bundle.c:498

1345 +#: bundle.c:500

1346 msgid "index-pack died"

1347 msgstr "index-pack murió"

1348

@@ -1318,8 +1351,8 @@ msgstr "index-pack murió"

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

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

1353

1321 -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1322 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1354 +#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1355 +#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1356 #: builtin/replace.c:448

1357 #, c-format

1358 msgid "could not parse %s"

@@ -1350,27 +1383,27 @@ msgstr ""

1383 "Apapa este mensaje ejecutando\n"

1384 "\"git config advice.graftFileDeprecated false\""

1385

1353 -#: commit.c:1115

1386 +#: commit.c:1122

1387 #, c-format

1388 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

1389 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."

1390

1358 -#: commit.c:1118

1391 +#: commit.c:1125

1392 #, c-format

1393 msgid "Commit %s has a bad GPG signature allegedly by %s."

1394 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."

1395

1363 -#: commit.c:1121

1396 +#: commit.c:1128

1397 #, c-format

1398 msgid "Commit %s does not have a GPG signature."

1399 msgstr "Commit %s no tiene una firma GPG."

1400

1368 -#: commit.c:1124

1401 +#: commit.c:1131

1402 #, c-format

1403 msgid "Commit %s has a good GPG signature by %s\n"

1404 msgstr "El Commit %s tiene una buena firma GPG por %s\n"

1405

1373 -#: commit.c:1378

1406 +#: commit.c:1385

1407 msgid ""

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

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

@@ -1381,93 +1414,134 @@ msgstr ""

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

1415 "su proyecto.\n"

1416

1384 -#: commit-graph.c:108

1417 +#: commit-graph.c:101

1418 #, c-format

1419 msgid "graph file %s is too small"

1420 msgstr "archivo graph %s es muy pequeño"

1421

1389 -#: commit-graph.c:115

1422 +#: commit-graph.c:136

1423 #, c-format

1424 msgid "graph signature %X does not match signature %X"

1425 msgstr "firma de graph %X no concuerda con firma %X"

1426

1394 -#: commit-graph.c:122

1427 +#: commit-graph.c:143

1428 #, c-format

1429 msgid "graph version %X does not match version %X"

1430 msgstr "versión de graph %X no concuerda con versión %X"

1431

1399 -#: commit-graph.c:129

1432 +#: commit-graph.c:150

1433 #, c-format

1434 msgid "hash version %X does not match version %X"

1435 msgstr "versión de hash %X no concuerda con versión %X"

1436

1404 -#: commit-graph.c:153

1437 +#: commit-graph.c:173

1438 +msgid "chunk lookup table entry missing; graph file may be incomplete"

1439 +msgstr "falta tabla de lookup del chunk; graph puede estar incompleto"

1440 +

1441 +#: commit-graph.c:184

1442 #, c-format

1443 msgid "improper chunk offset %08x%08x"

1444 msgstr "offset del chunk impropio %08x%08x"

1445

1409 -#: commit-graph.c:189

1446 +#: commit-graph.c:221

1447 #, c-format

1448 msgid "chunk id %08x appears multiple times"

1449 msgstr "id de chunk %08x parece tener múltiples tiempos"

1450

1414 -#: commit-graph.c:308

1451 +#: commit-graph.c:334

1452 #, c-format

1453 msgid "could not find commit %s"

1454 msgstr "no se pudo encontrar commit %s"

1455

1419 -#: commit-graph.c:617 builtin/pack-objects.c:2652

1456 +#: commit-graph.c:671 builtin/pack-objects.c:2646

1457 #, c-format

1458 msgid "unable to get type of object %s"

1459 msgstr "incapaz de obtener el tipo de objeto: %s"

1460

1424 -#: commit-graph.c:651

1425 -msgid "Annotating commits in commit graph"

1426 -msgstr "Anotando commits en commit graph"

1461 +#: commit-graph.c:704

1462 +msgid "Loading known commits in commit graph"

1463 +msgstr "Cargando commits conocidos en commit graph"

1464 +

1465 +#: commit-graph.c:720

1466 +msgid "Expanding reachable commits in commit graph"

1467 +msgstr "Expandiendo commits alcanzables en commit graph"

1468 +

1469 +#: commit-graph.c:732

1470 +msgid "Clearing commit marks in commit graph"

1471 +msgstr "Limpiando marcas de commits en commit graph"

1472

1428 -#: commit-graph.c:691

1473 +#: commit-graph.c:752

1474 msgid "Computing commit graph generation numbers"

1475 msgstr "Calculando números de generación de commit graph"

1476

1432 -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1433 -msgid "Finding commits for commit graph"

1434 -msgstr "Encontrando commits para commit graph"

1477 +#: commit-graph.c:869

1478 +#, c-format

1479 +msgid "Finding commits for commit graph in %d pack"

1480 +msgid_plural "Finding commits for commit graph in %d packs"

1481 +msgstr[0] "Encontrando commits para commit graph en %d pack"

1482 +msgstr[1] "Encontrando commits para commit graph en %d packs"

1483

1436 -#: commit-graph.c:812

1484 +#: commit-graph.c:882

1485 #, c-format

1486 msgid "error adding pack %s"

1487 msgstr "error agregando pack %s"

1488

1441 -#: commit-graph.c:814

1489 +#: commit-graph.c:884

1490 #, c-format

1491 msgid "error opening index for %s"

1492 msgstr "error abriendo index para %s"

1493

1446 -#: commit-graph.c:868

1494 +#: commit-graph.c:898

1495 +#, c-format

1496 +msgid "Finding commits for commit graph from %d ref"

1497 +msgid_plural "Finding commits for commit graph from %d refs"

1498 +msgstr[0] "Encontrando commits para commit graph de %d ref"

1499 +msgstr[1] "Encontrando commits para commit graph de %d refs"

1500 +

1501 +#: commit-graph.c:930

1502 +msgid "Finding commits for commit graph among packed objects"

1503 +msgstr "Encontrando commits para commit graph entre los objetos empaquetados"

1504 +

1505 +#: commit-graph.c:943

1506 +msgid "Counting distinct commits in commit graph"

1507 +msgstr "Contando commits distintos en commit graph"

1508 +

1509 +#: commit-graph.c:956

1510 #, c-format

1511 msgid "the commit graph format cannot write %d commits"

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

1513

1451 -#: commit-graph.c:895

1514 +#: commit-graph.c:965

1515 +msgid "Finding extra edges in commit graph"

1516 +msgstr "Encontrando esquinas extra en commit graph"

1517 +

1518 +#: commit-graph.c:989

1519 msgid "too many commits to write graph"

1520 msgstr "demasiados commits para escribir el gráfico"

1521

1455 -#: commit-graph.c:902 midx.c:769

1522 +#: commit-graph.c:996 midx.c:769

1523 #, c-format

1524 msgid "unable to create leading directories of %s"

1525 msgstr "no se pudo crear directorios principales para %s"

1526

1460 -#: commit-graph.c:1002

1527 +#: commit-graph.c:1036

1528 +#, c-format

1529 +msgid "Writing out commit graph in %d pass"

1530 +msgid_plural "Writing out commit graph in %d passes"

1531 +msgstr[0] "Escribiendo commit graph en %d paso"

1532 +msgstr[1] "Escribiendo commit graph en %d pasos"

1533 +

1534 +#: commit-graph.c:1109

1535 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

1536 msgstr ""

1537 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "

1538 "corrupto"

1539

1466 -#: commit-graph.c:1046

1540 +#: commit-graph.c:1153

1541 msgid "Verifying commits in commit graph"

1542 msgstr "Verificando commits en commit graph"

1543

1470 -#: compat/obstack.c:405 compat/obstack.c:407

1544 +#: compat/obstack.c:406 compat/obstack.c:408

1545 msgid "memory exhausted"

1546 msgstr "memoria agotada"

1547

@@ -1510,7 +1584,7 @@ msgstr "llave no contiene una sección: %s"

1584 msgid "key does not contain variable name: %s"

1585 msgstr "llave no contiene el nombre de variable: %s"

1586

1513 -#: config.c:378 sequencer.c:2296

1587 +#: config.c:378 sequencer.c:2330

1588 #, c-format

1589 msgid "invalid key: %s"

1590 msgstr "llave inválida: %s"

@@ -1648,7 +1722,7 @@ msgstr "valor malformado para %s: %s"

1722 msgid "must be one of nothing, matching, simple, upstream or current"

1723 msgstr "debe ser uno de nothing, matching, simple, upstream o current"

1724

1651 -#: config.c:1481 builtin/pack-objects.c:3391

1725 +#: config.c:1481 builtin/pack-objects.c:3394

1726 #, c-format

1727 msgid "bad pack compression level %d"

1728 msgstr "nivel de compresión de pack erróneo %d"

@@ -1724,62 +1798,62 @@ msgstr "%s tiene múltiples valores"

1798 msgid "failed to write new configuration file %s"

1799 msgstr "falló al escribir nuevo archivo de configuración %s"

1800

1727 -#: config.c:2717 config.c:3041

1801 +#: config.c:2716 config.c:3040

1802 #, c-format

1803 msgid "could not lock config file %s"

1804 msgstr "no se pudo bloquear archivo de configuración %s"

1805

1732 -#: config.c:2728

1806 +#: config.c:2727

1807 #, c-format

1808 msgid "opening %s"

1809 msgstr "abriendo %s"

1810

1737 -#: config.c:2763 builtin/config.c:327

1811 +#: config.c:2762 builtin/config.c:328

1812 #, c-format

1813 msgid "invalid pattern: %s"

1814 msgstr "patrón inválido: %s"

1815

1742 -#: config.c:2788

1816 +#: config.c:2787

1817 #, c-format

1818 msgid "invalid config file %s"

1819 msgstr "archivo de configuración inválido: %s"

1820

1747 -#: config.c:2801 config.c:3054

1821 +#: config.c:2800 config.c:3053

1822 #, c-format

1823 msgid "fstat on %s failed"

1824 msgstr "fstat en %s falló"

1825

1752 -#: config.c:2812

1826 +#: config.c:2811

1827 #, c-format

1828 msgid "unable to mmap '%s'"

1829 msgstr "no es posible hacer mmap '%s'"

1830

1757 -#: config.c:2821 config.c:3059

1831 +#: config.c:2820 config.c:3058

1832 #, c-format

1833 msgid "chmod on %s failed"

1834 msgstr "chmod en %s falló"

1835

1762 -#: config.c:2906 config.c:3156

1836 +#: config.c:2905 config.c:3155

1837 #, c-format

1838 msgid "could not write config file %s"

1839 msgstr "no se pudo escribir el archivo de configuración %s"

1840

1767 -#: config.c:2940

1841 +#: config.c:2939

1842 #, c-format

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

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

1845

1772 -#: config.c:2942 builtin/remote.c:782

1846 +#: config.c:2941 builtin/remote.c:782

1847 #, c-format

1848 msgid "could not unset '%s'"

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

1850

1777 -#: config.c:3032

1851 +#: config.c:3031

1852 #, c-format

1853 msgid "invalid section name: %s"

1854 msgstr "sección de nombre inválida: %s"

1855

1782 -#: config.c:3199

1856 +#: config.c:3198

1857 #, c-format

1858 msgid "missing value for '%s'"

1859 msgstr "valor faltante para '%s'"

@@ -1832,50 +1906,45 @@ msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"

1906 msgid "repository on the other end cannot be shallow"

1907 msgstr "el repositorio en el otro final no puede ser superficial"

1908

1835 -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1836 -#, c-format

1837 -msgid "remote error: %s"

1838 -msgstr "error remoto: %s"

1839 -

1840 -#: connect.c:316

1909 +#: connect.c:313

1910 msgid "invalid packet"

1911 msgstr "paquete inválido"

1912

1844 -#: connect.c:336

1913 +#: connect.c:333

1914 #, c-format

1915 msgid "protocol error: unexpected '%s'"

1916 msgstr "error de protocolo: '%s' inesperado"

1917

1849 -#: connect.c:444

1918 +#: connect.c:441

1919 #, c-format

1920 msgid "invalid ls-refs response: %s"

1921 msgstr "respuesta de referencias ls-refs inválida: %s"

1922

1854 -#: connect.c:448

1923 +#: connect.c:445

1924 msgid "expected flush after ref listing"

1925 msgstr "flush esperado tras listado de refs"

1926

1858 -#: connect.c:547

1927 +#: connect.c:544

1928 #, c-format

1929 msgid "protocol '%s' is not supported"

1930 msgstr "protocolo '%s' no es soportado"

1931

1863 -#: connect.c:598

1932 +#: connect.c:595

1933 msgid "unable to set SO_KEEPALIVE on socket"

1934 msgstr "no es posible configurar SO_KEEPALIVE en el socket"

1935

1867 -#: connect.c:638 connect.c:701

1936 +#: connect.c:635 connect.c:698

1937 #, c-format

1938 msgid "Looking up %s ... "

1939 msgstr "Revisando %s... "

1940

1872 -#: connect.c:642

1941 +#: connect.c:639

1942 #, c-format

1943 msgid "unable to look up %s (port %s) (%s)"

1944 msgstr "no se puede revisar %s (puerto %s) (%s)"

1945

1946 #. TRANSLATORS: this is the end of "Looking up %s ... "

1878 -#: connect.c:646 connect.c:717

1947 +#: connect.c:643 connect.c:714

1948 #, c-format

1949 msgid ""

1950 "done.\n"

@@ -1884,7 +1953,7 @@ msgstr ""

1953 "hecho.\n"

1954 "Conectando a %s (puerto %s) ... "

1955

1887 -#: connect.c:668 connect.c:745

1956 +#: connect.c:665 connect.c:742

1957 #, c-format

1958 msgid ""

1959 "unable to connect to %s:\n"

@@ -1894,62 +1963,62 @@ msgstr ""

1963 "%s"

1964

1965 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1897 -#: connect.c:674 connect.c:751

1966 +#: connect.c:671 connect.c:748

1967 msgid "done."

1968 msgstr "hecho."

1969

1901 -#: connect.c:705

1970 +#: connect.c:702

1971 #, c-format

1972 msgid "unable to look up %s (%s)"

1973 msgstr "no es posible revisar %s (%s)"

1974

1906 -#: connect.c:711

1975 +#: connect.c:708

1976 #, c-format

1977 msgid "unknown port %s"

1978 msgstr "puerto desconocido %s"

1979

1911 -#: connect.c:848 connect.c:1174

1980 +#: connect.c:845 connect.c:1171

1981 #, c-format

1982 msgid "strange hostname '%s' blocked"

1983 msgstr "hostname extraño '%s' bloqueado"

1984

1916 -#: connect.c:850

1985 +#: connect.c:847

1986 #, c-format

1987 msgid "strange port '%s' blocked"

1988 msgstr "puerto extraño '%s' bloqueado"

1989

1921 -#: connect.c:860

1990 +#: connect.c:857

1991 #, c-format

1992 msgid "cannot start proxy %s"

1993 msgstr "no se puede comenzar proxy %s"

1994

1926 -#: connect.c:927

1995 +#: connect.c:924

1996 msgid "no path specified; see 'git help pull' for valid url syntax"

1997 msgstr ""

1998 "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"

1999

1931 -#: connect.c:1122

2000 +#: connect.c:1119

2001 msgid "ssh variant 'simple' does not support -4"

2002 msgstr "variante 'simple' de ssh no soporta -4"

2003

1935 -#: connect.c:1134

2004 +#: connect.c:1131

2005 msgid "ssh variant 'simple' does not support -6"

2006 msgstr "variante 'simple' de ssh no soporta -6"

2007

1939 -#: connect.c:1151

2008 +#: connect.c:1148

2009 msgid "ssh variant 'simple' does not support setting port"

2010 msgstr "variante ssh 'simple' no soporta configurar puerto"

2011

1943 -#: connect.c:1262

2012 +#: connect.c:1259

2013 #, c-format

2014 msgid "strange pathname '%s' blocked"

2015 msgstr "ruta extraña '%s' bloqueada"

2016

1948 -#: connect.c:1307

2017 +#: connect.c:1304

2018 msgid "unable to fork"

2019 msgstr "no es posible hacer fork"

2020

1952 -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2021 +#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

2022 msgid "Checking connectivity"

2023 msgstr "Verificando conectividad"

2024

@@ -1965,17 +2034,17 @@ msgstr "falló escribir a rev-list"

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

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

2036

1968 -#: convert.c:194

2037 +#: convert.c:193

2038 #, c-format

2039 msgid "illegal crlf_action %d"

2040 msgstr "crlf_action %d ilegal"

2041

1973 -#: convert.c:207

2042 +#: convert.c:206

2043 #, c-format

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

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

2046

1978 -#: convert.c:209

2047 +#: convert.c:208

2048 #, c-format

2049 msgid ""

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

@@ -1984,12 +2053,12 @@ msgstr ""

2053 "CRLF será remplazado por LF en %s.\n"

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

2055

1987 -#: convert.c:217

2056 +#: convert.c:216

2057 #, c-format

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

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

2060

1992 -#: convert.c:219

2061 +#: convert.c:218

2062 #, c-format

2063 msgid ""

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

@@ -1998,12 +2067,12 @@ msgstr ""

2067 "LF será reemplazado por CRLF en %s.\n"

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

2069

2001 -#: convert.c:280

2070 +#: convert.c:279

2071 #, c-format

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

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

2074

2006 -#: convert.c:287

2075 +#: convert.c:286

2076 #, c-format

2077 msgid ""

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

@@ -2012,12 +2081,12 @@ msgstr ""

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

2082 "working-tree-encoding."

2083

2015 -#: convert.c:305

2084 +#: convert.c:304

2085 #, c-format

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

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

2088

2020 -#: convert.c:307

2089 +#: convert.c:306

2090 #, c-format

2091 msgid ""

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

@@ -2026,37 +2095,37 @@ msgstr ""

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

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

2097

2029 -#: convert.c:425 convert.c:496

2098 +#: convert.c:424 convert.c:495

2099 #, c-format

2100 msgid "failed to encode '%s' from %s to %s"

2101 msgstr "falló al codificar '%s' de %s a %s"

2102

2034 -#: convert.c:468

2103 +#: convert.c:467

2104 #, c-format

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

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

2107

2039 -#: convert.c:674

2108 +#: convert.c:673

2109 #, c-format

2110 msgid "cannot fork to run external filter '%s'"

2111 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"

2112

2044 -#: convert.c:694

2113 +#: convert.c:693

2114 #, c-format

2115 msgid "cannot feed the input to external filter '%s'"

2116 msgstr "no se pueden alimentar de input a los filtros externos '%s'"

2117

2049 -#: convert.c:701

2118 +#: convert.c:700

2119 #, c-format

2120 msgid "external filter '%s' failed %d"

2121 msgstr "filtro externo '%s' falló %d"

2122

2054 -#: convert.c:736 convert.c:739

2123 +#: convert.c:735 convert.c:738

2124 #, c-format

2125 msgid "read from external filter '%s' failed"

2126 msgstr "lectura de filtro externo '%s' falló"

2127

2059 -#: convert.c:742 convert.c:796

2128 +#: convert.c:741 convert.c:796

2129 #, c-format

2130 msgid "external filter '%s' failed"

2131 msgstr "filtro externo '%s' falló"

@@ -2092,53 +2161,53 @@ msgstr "%s: falló al limpiar filtro '%s'"

2161 msgid "%s: smudge filter %s failed"

2162 msgstr "%s: filtro smudge %s falló"

2163

2095 -#: date.c:116

2164 +#: date.c:137

2165 msgid "in the future"

2166 msgstr "en el futuro"

2167

2099 -#: date.c:122

2168 +#: date.c:143

2169 #, c-format

2170 msgid "%<PRIuMAX> second ago"

2171 msgid_plural "%<PRIuMAX> seconds ago"

2172 msgstr[0] "hace %<PRIuMAX> segundo"

2173 msgstr[1] "hace %<PRIuMAX> segundos"

2174

2106 -#: date.c:129

2175 +#: date.c:150

2176 #, c-format

2177 msgid "%<PRIuMAX> minute ago"

2178 msgid_plural "%<PRIuMAX> minutes ago"

2179 msgstr[0] "hace %<PRIuMAX> minuto"

2180 msgstr[1] "hace %<PRIuMAX> minutos"

2181

2113 -#: date.c:136

2182 +#: date.c:157

2183 #, c-format

2184 msgid "%<PRIuMAX> hour ago"

2185 msgid_plural "%<PRIuMAX> hours ago"

2186 msgstr[0] "hace %<PRIuMAX> hora"

2187 msgstr[1] "hace %<PRIuMAX> horas"

2188

2120 -#: date.c:143

2189 +#: date.c:164

2190 #, c-format

2191 msgid "%<PRIuMAX> day ago"

2192 msgid_plural "%<PRIuMAX> days ago"

2193 msgstr[0] "hace %<PRIuMAX> día"

2194 msgstr[1] "hace %<PRIuMAX> días"

2195

2127 -#: date.c:149

2196 +#: date.c:170

2197 #, c-format

2198 msgid "%<PRIuMAX> week ago"

2199 msgid_plural "%<PRIuMAX> weeks ago"

2200 msgstr[0] "hace %<PRIuMAX> semana"

2201 msgstr[1] "hace %<PRIuMAX> semanas"

2202

2134 -#: date.c:156

2203 +#: date.c:177

2204 #, c-format

2205 msgid "%<PRIuMAX> month ago"

2206 msgid_plural "%<PRIuMAX> months ago"

2207 msgstr[0] "hace %<PRIuMAX> mes"

2208 msgstr[1] "hace %<PRIuMAX> meses"

2209

2141 -#: date.c:167

2210 +#: date.c:188

2211 #, c-format

2212 msgid "%<PRIuMAX> year"

2213 msgid_plural "%<PRIuMAX> years"

@@ -2146,40 +2215,40 @@ msgstr[0] "%<PRIuMAX> año"

2215 msgstr[1] "%<PRIuMAX> años"

2216

2217 #. TRANSLATORS: "%s" is "<n> years"

2149 -#: date.c:170

2218 +#: date.c:191

2219 #, c-format

2220 msgid "%s, %<PRIuMAX> month ago"

2221 msgid_plural "%s, %<PRIuMAX> months ago"

2222 msgstr[0] "%s, y %<PRIuMAX> mes atrás"

2223 msgstr[1] "%s, y %<PRIuMAX> meses atrás"

2224

2156 -#: date.c:175 date.c:180

2225 +#: date.c:196 date.c:201

2226 #, c-format

2227 msgid "%<PRIuMAX> year ago"

2228 msgid_plural "%<PRIuMAX> years ago"

2229 msgstr[0] "hace %<PRIuMAX> año"

2230 msgstr[1] "hace %<PRIuMAX> años"

2231

2163 -#: delta-islands.c:268

2232 +#: delta-islands.c:272

2233 msgid "Propagating island marks"

2234 msgstr "Propagando marcas isla"

2235

2167 -#: delta-islands.c:286

2236 +#: delta-islands.c:290

2237 #, c-format

2238 msgid "bad tree object %s"

2239 msgstr "mal objeto árbol %s"

2240

2172 -#: delta-islands.c:330

2241 +#: delta-islands.c:334

2242 #, c-format

2243 msgid "failed to load island regex for '%s': %s"

2244 msgstr "falló al cargar isla de regex para '%s': %s"

2245

2177 -#: delta-islands.c:386

2246 +#: delta-islands.c:390

2247 #, c-format

2248 msgid "island regex from config has too many capture groups (max=%d)"

2249 msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"

2250

2182 -#: delta-islands.c:462

2251 +#: delta-islands.c:466

2252 #, c-format

2253 msgid "Marked %d islands, done.\n"

2254 msgstr "%d islas marcadas, listo.\n"

@@ -2216,26 +2285,31 @@ msgstr ""

2285 "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "

2286 "'dimmed_zebra', 'plain'"

2287

2219 -#: diff.c:316

2288 +#: diff.c:319

2289 #, c-format

2221 -msgid "ignoring unknown color-moved-ws mode '%s'"

2222 -msgstr "ignorando modo desconocido color-moved-ws '%s'"

2290 +msgid ""

2291 +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

2292 +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2293 +msgstr ""

2294 +"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-"

2295 +"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"

2296 +"change'"

2297

2224 -#: diff.c:323

2298 +#: diff.c:327

2299 msgid ""

2226 -"color-moved-ws: allow-indentation-change cannot be combined with other white "

2227 -"space modes"

2300 +"color-moved-ws: allow-indentation-change cannot be combined with other "

2301 +"whitespace modes"

2302 msgstr ""

2303 "color-moved-ws: allow-indentation-change no puede ser combinado con otros "

2304 "modos de espacios en blanco"

2305

2232 -#: diff.c:394

2306 +#: diff.c:400

2307 #, c-format

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

2309 msgstr ""

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

2311

2238 -#: diff.c:454

2312 +#: diff.c:460

2313 #, c-format

2314 msgid ""

2315 "Found errors in 'diff.dirstat' config variable:\n"

@@ -2244,24 +2318,24 @@ msgstr ""

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

2319 "%s"

2320

2247 -#: diff.c:4140

2321 +#: diff.c:4211

2322 #, c-format

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

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

2325

2252 -#: diff.c:4482

2326 +#: diff.c:4553

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

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

2329

2256 -#: diff.c:4485

2330 +#: diff.c:4556

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

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

2333

2260 -#: diff.c:4563

2334 +#: diff.c:4634

2335 msgid "--follow requires exactly one pathspec"

2336 msgstr "--follow requiere exactamente un pathspec"

2337

2264 -#: diff.c:4729

2338 +#: diff.c:4800

2339 #, c-format

2340 msgid ""

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

@@ -2270,22 +2344,22 @@ msgstr ""

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

2345 "%s"

2346

2273 -#: diff.c:4743

2347 +#: diff.c:4814

2348 #, c-format

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

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

2351

2278 -#: diff.c:5823

2352 +#: diff.c:5900

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

2354 msgstr ""

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

2356

2283 -#: diff.c:5826

2357 +#: diff.c:5903

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

2359 msgstr ""

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

2361

2288 -#: diff.c:5829

2362 +#: diff.c:5906

2363 #, c-format

2364 msgid ""

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

@@ -2293,41 +2367,41 @@ msgstr ""

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

2368 "intentar el comando."

2369

2296 -#: dir.c:576

2370 +#: dir.c:538

2371 #, c-format

2372 msgid "pathspec '%s' did not match any file(s) known to git"

2373 msgstr ""

2374 "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"

2375

2302 -#: dir.c:965

2376 +#: dir.c:927

2377 #, c-format

2378 msgid "cannot use %s as an exclude file"

2379 msgstr "no se puede usar %s como archivo de exclusión"

2380

2307 -#: dir.c:1880

2381 +#: dir.c:1842

2382 #, c-format

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

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

2385

2312 -#: dir.c:2122

2386 +#: dir.c:2084

2387 msgid "failed to get kernel name and information"

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

2389

2316 -#: dir.c:2246

2390 +#: dir.c:2208

2391 msgid "untracked cache is disabled on this system or location"

2392 msgstr "untracked cache está desactivado en este sistema o ubicación"

2393

2320 -#: dir.c:3047

2394 +#: dir.c:3009

2395 #, c-format

2396 msgid "index file corrupt in repo %s"

2397 msgstr "archivo índice corrompido en repositorio %s"

2398

2325 -#: dir.c:3092 dir.c:3097

2399 +#: dir.c:3054 dir.c:3059

2400 #, c-format

2401 msgid "could not create directories for %s"

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

2403

2330 -#: dir.c:3126

2404 +#: dir.c:3088

2405 #, c-format

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

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

@@ -2369,235 +2443,240 @@ msgstr "Remoto sin URL"

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

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

2445

2372 -#: fetch-pack.c:163

2446 +#: fetch-pack.c:154

2447 +msgid "git fetch-pack: expected a flush packet after shallow list"

2448 +msgstr ""

2449 +"git fetch-pack: se esperaba un flush packet luego de la lista superficial"

2450 +

2451 +#: fetch-pack.c:165

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

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

2454

2376 -#: fetch-pack.c:183

2455 +#: fetch-pack.c:185

2456 #, c-format

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

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

2459

2381 -#: fetch-pack.c:253

2460 +#: fetch-pack.c:256

2461 msgid "--stateless-rpc requires multi_ack_detailed"

2462 msgstr "--stateless-rpc requiere multi_ack_detailed"

2463

2385 -#: fetch-pack.c:347 fetch-pack.c:1277

2464 +#: fetch-pack.c:358 fetch-pack.c:1264

2465 #, c-format

2466 msgid "invalid shallow line: %s"

2467 msgstr "línea poco profunda inválida: %s"

2468

2390 -#: fetch-pack.c:353 fetch-pack.c:1283

2469 +#: fetch-pack.c:364 fetch-pack.c:1271

2470 #, c-format

2471 msgid "invalid unshallow line: %s"

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

2473

2395 -#: fetch-pack.c:355 fetch-pack.c:1285

2474 +#: fetch-pack.c:366 fetch-pack.c:1273

2475 #, c-format

2476 msgid "object not found: %s"

2477 msgstr "objeto no encontrado: %s"

2478

2400 -#: fetch-pack.c:358 fetch-pack.c:1288

2479 +#: fetch-pack.c:369 fetch-pack.c:1276

2480 #, c-format

2481 msgid "error in object: %s"

2482 msgstr "error en objeto: %s"

2483

2405 -#: fetch-pack.c:360 fetch-pack.c:1290

2484 +#: fetch-pack.c:371 fetch-pack.c:1278

2485 #, c-format

2486 msgid "no shallow found: %s"

2487 msgstr "superficie no encontrada: %s"

2488

2410 -#: fetch-pack.c:363 fetch-pack.c:1293

2489 +#: fetch-pack.c:374 fetch-pack.c:1282

2490 #, c-format

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

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

2493

2415 -#: fetch-pack.c:404

2494 +#: fetch-pack.c:415

2495 #, c-format

2496 msgid "got %s %d %s"

2497 msgstr "se obtuvo %s %d %s"

2498

2420 -#: fetch-pack.c:421

2499 +#: fetch-pack.c:432

2500 #, c-format

2501 msgid "invalid commit %s"

2502 msgstr "commit inválido %s"

2503

2425 -#: fetch-pack.c:452

2504 +#: fetch-pack.c:463

2505 msgid "giving up"

2506 msgstr "rindiéndose"

2507

2429 -#: fetch-pack.c:464 progress.c:229

2508 +#: fetch-pack.c:475 progress.c:229

2509 msgid "done"

2510 msgstr "listo"

2511

2433 -#: fetch-pack.c:476

2512 +#: fetch-pack.c:487

2513 #, c-format

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

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

2516

2438 -#: fetch-pack.c:522

2517 +#: fetch-pack.c:533

2518 #, c-format

2519 msgid "Marking %s as complete"

2520 msgstr "Marcando %s como completa"

2521

2443 -#: fetch-pack.c:764

2522 +#: fetch-pack.c:740

2523 #, c-format

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

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

2526

2448 -#: fetch-pack.c:803

2527 +#: fetch-pack.c:779

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

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

2530

2452 -#: fetch-pack.c:811

2531 +#: fetch-pack.c:787

2532 msgid "protocol error: bad pack header"

2533 msgstr "error de protocolo: paquete de header erróneo"

2534

2456 -#: fetch-pack.c:879

2535 +#: fetch-pack.c:855

2536 #, c-format

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

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

2539

2461 -#: fetch-pack.c:895

2540 +#: fetch-pack.c:871

2541 #, c-format

2542 msgid "%s failed"

2543 msgstr "%s falló"

2544

2466 -#: fetch-pack.c:897

2545 +#: fetch-pack.c:873

2546 msgid "error in sideband demultiplexer"

2547 msgstr "error en demultiplexor de banda lateral"

2548

2470 -#: fetch-pack.c:926

2549 +#: fetch-pack.c:902

2550 msgid "Server does not support shallow clients"

2551 msgstr "El servidor no soporta clientes superficiales"

2552

2474 -#: fetch-pack.c:930

2553 +#: fetch-pack.c:906

2554 msgid "Server supports multi_ack_detailed"

2555 msgstr "El servidor soporta ulti_ack_detailed"

2556

2478 -#: fetch-pack.c:933

2557 +#: fetch-pack.c:909

2558 msgid "Server supports no-done"

2559 msgstr "El servidor soporta no-done"

2560

2482 -#: fetch-pack.c:939

2561 +#: fetch-pack.c:915

2562 msgid "Server supports multi_ack"

2563 msgstr "El servidor soporta multi_ack"

2564

2486 -#: fetch-pack.c:943

2565 +#: fetch-pack.c:919

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

2567 msgstr "El servidor soporta side-band-64k"

2568

2490 -#: fetch-pack.c:947

2569 +#: fetch-pack.c:923

2570 msgid "Server supports side-band"

2571 msgstr "El servidor soporta side-band"

2572

2494 -#: fetch-pack.c:951

2573 +#: fetch-pack.c:927

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

2575 msgstr "El servidor soporta allow-tip-sha1-in-want"

2576

2498 -#: fetch-pack.c:955

2577 +#: fetch-pack.c:931

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

2579 msgstr "El servidor soporta allow-reachable-sha1-in-want"

2580

2502 -#: fetch-pack.c:965

2581 +#: fetch-pack.c:941

2582 msgid "Server supports ofs-delta"

2583 msgstr "El servidor soporta ofs-delta"

2584

2506 -#: fetch-pack.c:971 fetch-pack.c:1158

2585 +#: fetch-pack.c:947 fetch-pack.c:1140

2586 msgid "Server supports filter"

2587 msgstr "El servidor soporta filtro"

2588

2510 -#: fetch-pack.c:979

2589 +#: fetch-pack.c:955

2590 #, c-format

2591 msgid "Server version is %.*s"

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

2593

2515 -#: fetch-pack.c:985

2594 +#: fetch-pack.c:961

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

2596 msgstr "El servidor no soporta --shalow-since"

2597

2519 -#: fetch-pack.c:989

2598 +#: fetch-pack.c:965

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

2600 msgstr "El servidor no soporta --shalow-exclude"

2601

2523 -#: fetch-pack.c:991

2602 +#: fetch-pack.c:967

2603 msgid "Server does not support --deepen"

2604 msgstr "El servidor no soporta --deepen"

2605

2527 -#: fetch-pack.c:1008

2606 +#: fetch-pack.c:984

2607 msgid "no common commits"

2608 msgstr "no hay commits comunes"

2609

2531 -#: fetch-pack.c:1020 fetch-pack.c:1418

2610 +#: fetch-pack.c:996 fetch-pack.c:1419

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

2612 msgstr "git fetch-pack: fetch falló."

2613

2535 -#: fetch-pack.c:1153

2614 +#: fetch-pack.c:1134

2615 msgid "Server does not support shallow requests"

2616 msgstr "El servidor no soporta peticiones superficiales"

2617

2539 -#: fetch-pack.c:1199

2618 +#: fetch-pack.c:1184

2619 #, c-format

2620 msgid "error reading section header '%s'"

2621 msgstr "error leyendo sección header '%s'"

2622

2544 -#: fetch-pack.c:1205

2623 +#: fetch-pack.c:1190

2624 #, c-format

2625 msgid "expected '%s', received '%s'"

2626 msgstr "se esperaba '%s', se recibió '%s'"

2627

2549 -#: fetch-pack.c:1244

2628 +#: fetch-pack.c:1229

2629 #, c-format

2630 msgid "unexpected acknowledgment line: '%s'"

2631 msgstr "linea de confirmación inesperada: '%s'"

2632

2554 -#: fetch-pack.c:1249

2633 +#: fetch-pack.c:1234

2634 #, c-format

2635 msgid "error processing acks: %d"

2636 msgstr "error procesando acks: %d"

2637

2559 -#: fetch-pack.c:1259

2638 +#: fetch-pack.c:1244

2639 msgid "expected packfile to be sent after 'ready'"

2640 msgstr "espere que el packfile sea mandado luego del 'listo'"

2641

2563 -#: fetch-pack.c:1261

2642 +#: fetch-pack.c:1246

2643 msgid "expected no other sections to be sent after no 'ready'"

2644 msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"

2645

2567 -#: fetch-pack.c:1298

2646 +#: fetch-pack.c:1287

2647 #, c-format

2648 msgid "error processing shallow info: %d"

2649 msgstr "error procesando información superficial: %d"

2650

2572 -#: fetch-pack.c:1314

2651 +#: fetch-pack.c:1308

2652 #, c-format

2653 msgid "expected wanted-ref, got '%s'"

2654 msgstr "se esperaba wanted-ref, se obtuvo '%s'"

2655

2577 -#: fetch-pack.c:1324

2656 +#: fetch-pack.c:1318

2657 #, c-format

2658 msgid "unexpected wanted-ref: '%s'"

2659 msgstr "wanted-ref inesperado: '%s'"

2660

2582 -#: fetch-pack.c:1328

2661 +#: fetch-pack.c:1322

2662 #, c-format

2663 msgid "error processing wanted refs: %d"

2664 msgstr "error procesando refs deseadas: %d"

2665

2587 -#: fetch-pack.c:1642

2666 +#: fetch-pack.c:1646

2667 msgid "no matching remote head"

2668 msgstr "no concuerda el head remoto"

2669

2591 -#: fetch-pack.c:1660 builtin/clone.c:664

2670 +#: fetch-pack.c:1664 builtin/clone.c:671

2671 msgid "remote did not send all necessary objects"

2672 msgstr "remoto no mando todos los objetos necesarios"

2673

2595 -#: fetch-pack.c:1686

2674 +#: fetch-pack.c:1690

2675 #, c-format

2676 msgid "no such remote ref %s"

2677 msgstr "no existe ref remota %s"

2678

2600 -#: fetch-pack.c:1689

2679 +#: fetch-pack.c:1693

2680 #, c-format

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

2682 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"

@@ -2625,8 +2704,8 @@ msgstr "ignora color inválido '%.*s' en log.graphColors"

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

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

2706

2628 -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2629 -#: builtin/rm.c:134

2707 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

2708 +#: builtin/rm.c:135

2709 #, c-format

2710 msgid "failed to stat '%s'"

2711 msgstr "falló al marcar '%s'"

@@ -2688,41 +2767,41 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios"

2767 msgid "Low-level Commands / Internal Helpers"

2768 msgstr "Comandos de bajo nivel / Auxiliares internos"

2769

2691 -#: help.c:296

2770 +#: help.c:298

2771 #, c-format

2772 msgid "available git commands in '%s'"

2773 msgstr "comandos disponibles de git en '%s'"

2774

2696 -#: help.c:303

2775 +#: help.c:305

2776 msgid "git commands available from elsewhere on your $PATH"

2777 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"

2778

2700 -#: help.c:312

2779 +#: help.c:314

2780 msgid "These are common Git commands used in various situations:"

2781 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"

2782

2704 -#: help.c:361 git.c:90

2783 +#: help.c:363 git.c:90

2784 #, c-format

2785 msgid "unsupported command listing type '%s'"

2786 msgstr "comando de listado de tipos no soportado '%s'"

2787

2709 -#: help.c:408

2788 +#: help.c:410

2789 msgid "The common Git guides are:"

2790 msgstr "Las guías comunes de Git son:"

2791

2713 -#: help.c:517

2792 +#: help.c:519

2793 msgid "See 'git help <command>' to read about a specific subcommand"

2794 msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"

2795

2717 -#: help.c:522

2796 +#: help.c:524

2797 msgid "External commands"

2798 msgstr "Comandos externos"

2799

2721 -#: help.c:530

2800 +#: help.c:539

2801 msgid "Command aliases"

2802 msgstr "Aliases de comando"

2803

2725 -#: help.c:594

2804 +#: help.c:603

2805 #, c-format

2806 msgid ""

2807 "'%s' appears to be a git command, but we were not\n"

@@ -2731,31 +2810,31 @@ msgstr ""

2810 "'%s' parece ser un comando de git, pero no hemos\n"

2811 "podido ejecutarlo. Tal vez git-%s se ha roto?"

2812

2734 -#: help.c:653

2813 +#: help.c:662

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

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

2816

2738 -#: help.c:675

2817 +#: help.c:684

2818 #, c-format

2819 msgid "WARNING: You called a Git command named '%s', which does not exist."

2820 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."

2821

2743 -#: help.c:680

2822 +#: help.c:689

2823 #, c-format

2824 msgid "Continuing under the assumption that you meant '%s'."

2825 msgstr "Continuando asumiendo que quisiste decir '%s'."

2826

2748 -#: help.c:685

2827 +#: help.c:694

2828 #, c-format

2829 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2830 msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."

2831

2753 -#: help.c:693

2832 +#: help.c:702

2833 #, c-format

2834 msgid "git: '%s' is not a git command. See 'git --help'."

2835 msgstr "git: '%s'no es un comando de git. Mira 'git --help'."

2836

2758 -#: help.c:697

2837 +#: help.c:706

2838 msgid ""

2839 "\n"

2840 "The most similar command is"

@@ -2769,16 +2848,16 @@ msgstr[1] ""

2848 "\n"

2849 "Los comandos mas similares son"

2850

2772 -#: help.c:712

2851 +#: help.c:721

2852 msgid "git version [<options>]"

2853 msgstr "git versión [<opciones>]"

2854

2776 -#: help.c:780

2855 +#: help.c:789

2856 #, c-format

2857 msgid "%s: %s - %s"

2858 msgstr "%s: %s - %s"

2859

2781 -#: help.c:784

2860 +#: help.c:793

2861 msgid ""

2862 "\n"

2863 "Did you mean this?"

@@ -2846,20 +2925,20 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

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

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

2927

2849 -#: ident.c:419 builtin/commit.c:606

2928 +#: ident.c:419 builtin/commit.c:608

2929 #, c-format

2930 msgid "invalid date format: %s"

2931 msgstr "formato de fecha inválido: %s"

2932

2854 -#: list-objects-filter-options.c:35

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

2934 msgid "multiple filter-specs cannot be combined"

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

2936

2937 #: list-objects-filter-options.c:58

2859 -msgid "only 'tree:0' is supported"

2860 -msgstr "solo 'tree:0' es soportado"

2938 +msgid "expected 'tree:<depth>'"

2939 +msgstr "se esperaba 'tree:<depth>'"

2940

2862 -#: list-objects-filter-options.c:137

2941 +#: list-objects-filter-options.c:152

2942 msgid "cannot change partial clone promisor remote"

2943 msgstr "no se puede cambiar un clon parcial remoto promisor"

2944

@@ -2892,94 +2971,94 @@ msgstr "No se pudo crear '%s.lock': %s"

2971 msgid "failed to read the cache"

2972 msgstr "falló al leer la cache"

2973

2895 -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2896 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2974 +#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

2975 +#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

2976 msgid "unable to write new index file"

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

2978

2900 -#: merge-recursive.c:323

2979 +#: merge-recursive.c:332

2980 msgid "(bad commit)\n"

2981 msgstr "(commit erróneo)\n"

2982

2904 -#: merge-recursive.c:345

2983 +#: merge-recursive.c:355

2984 #, c-format

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

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

2987

2909 -#: merge-recursive.c:353

2988 +#: merge-recursive.c:364

2989 #, c-format

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

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

2992

2914 -#: merge-recursive.c:435

2993 +#: merge-recursive.c:447

2994 msgid "error building trees"

2995 msgstr "error construyendo árboles"

2996

2918 -#: merge-recursive.c:906

2997 +#: merge-recursive.c:902

2998 #, c-format

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

3000 msgstr "falló al crear la ruta '%s'%s"

3001

2923 -#: merge-recursive.c:917

3002 +#: merge-recursive.c:913

3003 #, c-format

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

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

3006

2928 -#: merge-recursive.c:931 merge-recursive.c:950

3007 +#: merge-recursive.c:927 merge-recursive.c:946

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

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

3010

2932 -#: merge-recursive.c:940

3011 +#: merge-recursive.c:936

3012 #, c-format

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

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

3015

2937 -#: merge-recursive.c:982 builtin/cat-file.c:39

3016 +#: merge-recursive.c:978 builtin/cat-file.c:40

3017 #, c-format

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

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

3020

2942 -#: merge-recursive.c:984

3021 +#: merge-recursive.c:980

3022 #, c-format

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

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

3025

2947 -#: merge-recursive.c:1008

3026 +#: merge-recursive.c:1004

3027 #, c-format

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

3029 msgstr "falló al abrir '%s': %s"

3030

2952 -#: merge-recursive.c:1019

3031 +#: merge-recursive.c:1015

3032 #, c-format

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

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

3035

2957 -#: merge-recursive.c:1024

3036 +#: merge-recursive.c:1020

3037 #, c-format

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

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

3040

2962 -#: merge-recursive.c:1212

3041 +#: merge-recursive.c:1211

3042 #, c-format

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

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

3045

2967 -#: merge-recursive.c:1219

3046 +#: merge-recursive.c:1218

3047 #, c-format

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

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

3050

2972 -#: merge-recursive.c:1226

3051 +#: merge-recursive.c:1225

3052 #, c-format

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

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

3055

2977 -#: merge-recursive.c:1234 merge-recursive.c:1246

3056 +#: merge-recursive.c:1233 merge-recursive.c:1245

3057 #, c-format

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

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

3060

2982 -#: merge-recursive.c:1237 merge-recursive.c:1249

3061 +#: merge-recursive.c:1236 merge-recursive.c:1248

3062 #, c-format

3063 msgid "Fast-forwarding submodule %s"

3064 msgstr "Avance rápido en submódulo %s"

@@ -3021,28 +3100,28 @@ msgstr ""

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

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

3102

3024 -#: merge-recursive.c:1358

3103 +#: merge-recursive.c:1361

3104 msgid "Failed to execute internal merge"

3105 msgstr "Falló al ejecutar la fusión interna"

3106

3028 -#: merge-recursive.c:1363

3107 +#: merge-recursive.c:1366

3108 #, c-format

3109 msgid "Unable to add %s to database"

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

3111

3033 -#: merge-recursive.c:1395

3112 +#: merge-recursive.c:1398

3113 #, c-format

3114 msgid "Auto-merging %s"

3115 msgstr "Auto-fusionando %s"

3116

3038 -#: merge-recursive.c:1416

3117 +#: merge-recursive.c:1419

3118 #, c-format

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

3120 msgstr ""

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

3122 "cambio."

3123

3045 -#: merge-recursive.c:1483

3124 +#: merge-recursive.c:1486

3125 #, c-format

3126 msgid ""

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

@@ -3051,7 +3130,7 @@ msgstr ""

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

3131 "en el árbol."

3132

3054 -#: merge-recursive.c:1488

3133 +#: merge-recursive.c:1491

3134 #, c-format

3135 msgid ""

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

@@ -3060,7 +3139,7 @@ msgstr ""

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

3140 "permanece en el árbol."

3141

3063 -#: merge-recursive.c:1495

3142 +#: merge-recursive.c:1498

3143 #, c-format

3144 msgid ""

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

@@ -3069,7 +3148,7 @@ msgstr ""

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

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

3150

3072 -#: merge-recursive.c:1500

3151 +#: merge-recursive.c:1503

3152 #, c-format

3153 msgid ""

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

@@ -3078,32 +3157,44 @@ msgstr ""

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

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

3159

3081 -#: merge-recursive.c:1534

3160 +#: merge-recursive.c:1537

3161 msgid "rename"

3162 msgstr "renombrar"

3163

3085 -#: merge-recursive.c:1534

3164 +#: merge-recursive.c:1537

3165 msgid "renamed"

3166 msgstr "renombrado"

3167

3089 -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3090 -#: merge-recursive.c:3124

3168 +#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3169 #, c-format

3170 msgid "Refusing to lose dirty file at %s"

3171 msgstr "Rehusando perder el archivo sucio en %s"

3172

3095 -#: merge-recursive.c:1602

3173 +#: merge-recursive.c:1643

3174 +#, c-format

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

3176 +msgstr ""

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

3178 +"interponiendo."

3179 +

3180 +#: merge-recursive.c:1706

3181 +#, c-format

3182 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

3183 +msgstr ""

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

3185 +

3186 +#: merge-recursive.c:1734

3187 #, c-format

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

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

3190

3100 -#: merge-recursive.c:1607

3191 +#: merge-recursive.c:1739

3192 #, c-format

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

3194 msgstr ""

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

3196

3106 -#: merge-recursive.c:1633

3197 +#: merge-recursive.c:1759

3198 #, c-format

3199 msgid ""

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

@@ -3112,30 +3203,18 @@ msgstr ""

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

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

3205

3115 -#: merge-recursive.c:1638

3206 +#: merge-recursive.c:1764

3207 msgid " (left unresolved)"

3208 msgstr " (dejado sin resolver)"

3209

3119 -#: merge-recursive.c:1699

3210 +#: merge-recursive.c:1868

3211 #, c-format

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

3213 msgstr ""

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

3215 "%s"

3216

3126 -#: merge-recursive.c:1734

3127 -#, c-format

3128 -msgid "Renaming %s to %s and %s to %s instead"

3129 -msgstr "Renombrando %s a %s y %s a %s más bien"

3130 -

3131 -#: merge-recursive.c:1746

3132 -#, c-format

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

3134 -msgstr ""

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

3136 -"interponiendo."

3137 -

3138 -#: merge-recursive.c:1952

3217 +#: merge-recursive.c:2064

3218 #, c-format

3219 msgid ""

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

@@ -3146,7 +3225,7 @@ msgstr ""

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

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

3227

3149 -#: merge-recursive.c:1984

3228 +#: merge-recursive.c:2096

3229 #, c-format

3230 msgid ""

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

@@ -3156,7 +3235,7 @@ msgstr ""

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

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

3237

3159 -#: merge-recursive.c:1994

3238 +#: merge-recursive.c:2106

3239 #, c-format

3240 msgid ""

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

@@ -3165,7 +3244,7 @@ msgstr ""

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

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

3246

3168 -#: merge-recursive.c:2086

3247 +#: merge-recursive.c:2198

3248 #, c-format

3249 msgid ""

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

@@ -3174,7 +3253,7 @@ msgstr ""

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

3254 "Renombrar directorio %s->%s en %s"

3255

3177 -#: merge-recursive.c:2331

3256 +#: merge-recursive.c:2443

3257 #, c-format

3258 msgid ""

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

@@ -3183,88 +3262,82 @@ msgstr ""

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

3263 "renombrado."

3264

3186 -#: merge-recursive.c:2737

3187 -#, c-format

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

3189 -msgstr ""

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

3191 -

3192 -#: merge-recursive.c:2763

3193 -#, c-format

3194 -msgid "Adding merged %s"

3195 -msgstr "Agregar %s fusionado"

3196 -

3197 -#: merge-recursive.c:2770 merge-recursive.c:3127

3198 -#, c-format

3199 -msgid "Adding as %s instead"

3200 -msgstr "Agregando más bien como %s"

3201 -

3202 -#: merge-recursive.c:2934

3265 +#: merge-recursive.c:3022

3266 #, c-format

3267 msgid "cannot read object %s"

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

3269

3207 -#: merge-recursive.c:2937

3270 +#: merge-recursive.c:3025

3271 #, c-format

3272 msgid "object %s is not a blob"

3273 msgstr "objeto %s no es un blob"

3274

3212 -#: merge-recursive.c:3006

3275 +#: merge-recursive.c:3094

3276 msgid "modify"

3277 msgstr "modificar"

3278

3216 -#: merge-recursive.c:3006

3279 +#: merge-recursive.c:3094

3280 msgid "modified"

3281 msgstr "modificado"

3282

3220 -#: merge-recursive.c:3017

3283 +#: merge-recursive.c:3105

3284 msgid "content"

3285 msgstr "contenido"

3286

3224 -#: merge-recursive.c:3024

3287 +#: merge-recursive.c:3112

3288 msgid "add/add"

3289 msgstr "agregar/agregar"

3290

3228 -#: merge-recursive.c:3071

3291 +#: merge-recursive.c:3160

3292 #, c-format

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

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

3295

3233 -#: merge-recursive.c:3093 git-submodule.sh:858

3296 +#: merge-recursive.c:3182 git-submodule.sh:861

3297 msgid "submodule"

3298 msgstr "submódulo"

3299

3237 -#: merge-recursive.c:3094

3300 +#: merge-recursive.c:3183

3301 #, c-format

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

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

3304

3305 #: merge-recursive.c:3216

3306 #, c-format

3307 +msgid "Adding as %s instead"

3308 +msgstr "Agregando más bien como %s"

3309 +

3310 +#: merge-recursive.c:3319

3311 +#, c-format

3312 msgid "Removing %s"

3313 msgstr "Eliminando %s"

3314

3247 -#: merge-recursive.c:3242

3315 +#: merge-recursive.c:3345

3316 msgid "file/directory"

3317 msgstr "archivo/directorio"

3318

3251 -#: merge-recursive.c:3248

3319 +#: merge-recursive.c:3351

3320 msgid "directory/file"

3321 msgstr "directorio/archivo"

3322

3255 -#: merge-recursive.c:3255

3323 +#: merge-recursive.c:3358

3324 #, c-format

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

3326 msgstr ""

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

3328 "%s"

3329

3262 -#: merge-recursive.c:3264

3330 +#: merge-recursive.c:3367

3331 #, c-format

3332 msgid "Adding %s"

3333 msgstr "Agregando %s"

3334

3267 -#: merge-recursive.c:3300

3335 +#: merge-recursive.c:3376

3336 +#, c-format

3337 +msgid "CONFLICT (add/add): Merge conflict in %s"

3338 +msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

3339 +

3340 +#: merge-recursive.c:3417

3341 #, c-format

3342 msgid ""

3343 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3274,36 +3347,36 @@ msgstr ""

3347 "merge:\n"

3348 " %s"

3349

3277 -#: merge-recursive.c:3311

3350 +#: merge-recursive.c:3428

3351 msgid "Already up to date!"

3352 msgstr "¡Ya está actualizado!"

3353

3281 -#: merge-recursive.c:3320

3354 +#: merge-recursive.c:3437

3355 #, c-format

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

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

3358

3286 -#: merge-recursive.c:3419

3359 +#: merge-recursive.c:3536

3360 msgid "Merging:"

3361 msgstr "Fusionando:"

3362

3290 -#: merge-recursive.c:3432

3363 +#: merge-recursive.c:3549

3364 #, c-format

3365 msgid "found %u common ancestor:"

3366 msgid_plural "found %u common ancestors:"

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

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

3369

3297 -#: merge-recursive.c:3471

3370 +#: merge-recursive.c:3588

3371 msgid "merge returned no commit"

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

3373

3301 -#: merge-recursive.c:3537

3374 +#: merge-recursive.c:3654

3375 #, c-format

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

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

3378

3306 -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3379 +#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

3380 msgid "Unable to write index."

3381 msgstr "Incapaz de escribir el índice."

3382

@@ -3422,22 +3495,22 @@ msgstr "falló al cargar el pack-index para packfile %s"

3495 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3496 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3497

3425 -#: name-hash.c:532

3498 +#: name-hash.c:531

3499 #, c-format

3500 msgid "unable to create lazy_dir thread: %s"

3501 msgstr "no es posible crear hilo lazy_dir: %s"

3502

3430 -#: name-hash.c:554

3503 +#: name-hash.c:553

3504 #, c-format

3505 msgid "unable to create lazy_name thread: %s"

3506 msgstr "no es posible crear hilo lazy_name: %s"

3507

3435 -#: name-hash.c:560

3508 +#: name-hash.c:559

3509 #, c-format

3510 msgid "unable to join lazy_name thread: %s"

3511 msgstr "no es posible unir hilo lazy_name: %s"

3512

3440 -#: notes-merge.c:275

3513 +#: notes-merge.c:277

3514 #, c-format

3515 msgid ""

3516 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3449,23 +3522,23 @@ msgstr ""

3522 "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "

3523 "nota de fusión."

3524

3452 -#: notes-merge.c:282

3525 +#: notes-merge.c:284

3526 #, c-format

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

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

3529

3457 -#: notes-utils.c:45

3530 +#: notes-utils.c:46

3531 msgid "Cannot commit uninitialized/unreferenced notes tree"

3532 msgstr ""

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

3534 "referenciadas"

3535

3463 -#: notes-utils.c:104

3536 +#: notes-utils.c:105

3537 #, c-format

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

3539 msgstr "Valor erróneo para notes.rewriteMode: '%s'"

3540

3468 -#: notes-utils.c:114

3541 +#: notes-utils.c:115

3542 #, c-format

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

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

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

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

3548 #. its value.

3549 #.

3477 -#: notes-utils.c:144

3550 +#: notes-utils.c:145

3551 #, c-format

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

3553 msgstr "Valor erróneo para %s: '%s'"

@@ -3484,47 +3557,107 @@ msgstr "Valor erróneo para %s: '%s'"

3557 msgid "invalid object type \"%s\""

3558 msgstr "tipo de objeto \"%s\" inválido"

3559

3487 -#: object.c:173

3560 +#: object.c:174

3561 #, c-format

3562 msgid "object %s is a %s, not a %s"

3563 msgstr "objeto %s es un %s, no un %s"

3564

3492 -#: object.c:233

3565 +#: object.c:234

3566 #, c-format

3567 msgid "object %s has unknown type id %d"

3568 msgstr "el objeto %s tiene un id de tipo desconocido %d"

3569

3497 -#: object.c:246

3570 +#: object.c:247

3571 #, c-format

3572 msgid "unable to parse object: %s"

3573 msgstr "incapaz de analizar objeto: %s"

3574

3502 -#: object.c:266 object.c:277

3575 +#: object.c:267 object.c:278

3576 #, c-format

3504 -msgid "sha1 mismatch %s"

3505 -msgstr "sha1 no concuerda %s"

3577 +msgid "hash mismatch %s"

3578 +msgstr "hash no concuerda %s"

3579

3580 #: packfile.c:607

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

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

3583

3511 -#: packfile.c:1864

3584 +#: packfile.c:1870

3585 #, c-format

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

3587 msgstr ""

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

3589

3517 -#: packfile.c:1868

3590 +#: packfile.c:1874

3591 #, c-format

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

3593 msgstr ""

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

3595

3523 -#: parse-options.c:672

3596 +#: parse-options.c:35

3597 +#, c-format

3598 +msgid "%s requires a value"

3599 +msgstr "%s requiere un valor"

3600 +

3601 +#: parse-options.c:69

3602 +#, c-format

3603 +msgid "%s is incompatible with %s"

3604 +msgstr "%s es incompatible con %s"

3605 +

3606 +#: parse-options.c:74

3607 +#, c-format

3608 +msgid "%s : incompatible with something else"

3609 +msgstr "%s : incompatible con otra cosa"

3610 +

3611 +#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3612 +#, c-format

3613 +msgid "%s takes no value"

3614 +msgstr "%s no toma valores"

3615 +

3616 +#: parse-options.c:90

3617 +#, c-format

3618 +msgid "%s isn't available"

3619 +msgstr "%s no está disponible"

3620 +

3621 +#: parse-options.c:178

3622 +#, c-format

3623 +msgid "%s expects a numerical value"

3624 +msgstr "%s espera un valor numérico"

3625 +

3626 +#: parse-options.c:194

3627 +#, c-format

3628 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3629 +msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"

3630 +

3631 +#: parse-options.c:322

3632 +#, c-format

3633 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

3634 +msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

3635 +

3636 +#: parse-options.c:356 parse-options.c:364

3637 +#, c-format

3638 +msgid "did you mean `--%s` (with two dashes ?)"

3639 +msgstr "¿quisiste decir `--%s` (con dos guiones)?"

3640 +

3641 +#: parse-options.c:649

3642 +#, c-format

3643 +msgid "unknown option `%s'"

3644 +msgstr "opción `%s' desconocida"

3645 +

3646 +#: parse-options.c:651

3647 +#, c-format

3648 +msgid "unknown switch `%c'"

3649 +msgstr "switch desconocido `%c'"

3650 +

3651 +#: parse-options.c:653

3652 +#, c-format

3653 +msgid "unknown non-ascii option in string: `%s'"

3654 +msgstr "opcion desconocida en string no ascii: `%s'"

3655 +

3656 +#: parse-options.c:675

3657 msgid "..."

3658 msgstr "..."

3659

3527 -#: parse-options.c:691

3660 +#: parse-options.c:694

3661 #, c-format

3662 msgid "usage: %s"

3663 msgstr "uso: %s"

@@ -3532,26 +3665,36 @@ msgstr "uso: %s"

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

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

3667 #.

3535 -#: parse-options.c:697

3668 +#: parse-options.c:700

3669 #, c-format

3670 msgid " or: %s"

3671 msgstr " o: %s"

3672

3540 -#: parse-options.c:700

3673 +#: parse-options.c:703

3674 #, c-format

3675 msgid " %s"

3676 msgstr " %s"

3677

3545 -#: parse-options.c:739

3678 +#: parse-options.c:742

3679 msgid "-NUM"

3680 msgstr "-NUM"

3681

3549 -#: parse-options-cb.c:37

3682 +#: parse-options-cb.c:21

3683 +#, c-format

3684 +msgid "option `%s' expects a numerical value"

3685 +msgstr "opción `%s' espera un valor numérico"

3686 +

3687 +#: parse-options-cb.c:38

3688 #, c-format

3689 msgid "malformed expiration date '%s'"

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

3691

3554 -#: parse-options-cb.c:109

3692 +#: parse-options-cb.c:51

3693 +#, c-format

3694 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

3695 +msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

3696 +

3697 +#: parse-options-cb.c:110

3698 #, c-format

3699 msgid "malformed object name '%s'"

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

@@ -3561,30 +3704,30 @@ msgstr "nombre de objeto mal formado '%s'"

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

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

3706

3564 -#: pathspec.c:129

3707 +#: pathspec.c:128

3708 msgid "Escape character '\\' not allowed as last character in attr value"

3709 msgstr ""

3710 "Carácter de escape '\\' no permitido como último carácter en el valor attr"

3711

3569 -#: pathspec.c:147

3712 +#: pathspec.c:146

3713 msgid "Only one 'attr:' specification is allowed."

3714 msgstr "Solo una especificación 'attr' es permitida."

3715

3573 -#: pathspec.c:150

3716 +#: pathspec.c:149

3717 msgid "attr spec must not be empty"

3718 msgstr "especificación attr no puede estar vacía"

3719

3577 -#: pathspec.c:193

3720 +#: pathspec.c:192

3721 #, c-format

3722 msgid "invalid attribute name %s"

3723 msgstr "nombre de atributo %s inválido"

3724

3582 -#: pathspec.c:258

3725 +#: pathspec.c:257

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

3727 msgstr ""

3728 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"

3729

3587 -#: pathspec.c:265

3730 +#: pathspec.c:264

3731 msgid ""

3732 "global 'literal' pathspec setting is incompatible with all other global "

3733 "pathspec settings"

@@ -3592,46 +3735,46 @@ msgstr ""

3735 "la configuración global de 'literal' para patrones de ruta es incompatible "

3736 "con las demás configuraciones globales de patrones de ruta"

3737

3595 -#: pathspec.c:305

3738 +#: pathspec.c:304

3739 msgid "invalid parameter for pathspec magic 'prefix'"

3740 msgstr "parámetro no válido para el prefijo 'magic pathspec'"

3741

3599 -#: pathspec.c:326

3742 +#: pathspec.c:325

3743 #, c-format

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

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

3746

3604 -#: pathspec.c:331

3747 +#: pathspec.c:330

3748 #, c-format

3749 msgid "Missing ')' at the end of pathspec magic in '%s'"

3750 msgstr "Falta ')' al final del magic pathspec en '%s'"

3751

3609 -#: pathspec.c:369

3752 +#: pathspec.c:368

3753 #, c-format

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

3755 msgstr "Magic pathspec '%c' no implementado en '%s'"

3756

3614 -#: pathspec.c:428

3757 +#: pathspec.c:427

3758 #, c-format

3759 msgid "%s: 'literal' and 'glob' are incompatible"

3760 msgstr "%s: 'literal' y 'glob' son incompatibles"

3761

3619 -#: pathspec.c:441

3762 +#: pathspec.c:440

3763 #, c-format

3764 msgid "%s: '%s' is outside repository"

3765 msgstr "%s: '%s' está fuera del repositorio"

3766

3624 -#: pathspec.c:515

3767 +#: pathspec.c:514

3768 #, c-format

3769 msgid "'%s' (mnemonic: '%c')"

3770 msgstr "'%s' (nemotécnico: '%c')"

3771

3629 -#: pathspec.c:525

3772 +#: pathspec.c:524

3773 #, c-format

3774 msgid "%s: pathspec magic not supported by this command: %s"

3775 msgstr "%s: magic pathspec no soportado por este comando: %s"

3776

3634 -#: pathspec.c:592

3777 +#: pathspec.c:591

3778 #, c-format

3779 msgid "pathspec '%s' is beyond a symbolic link"

3780 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

@@ -3640,50 +3783,55 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

3783 msgid "flush packet write failed"

3784 msgstr "limpieza de escritura de paquetes falló"

3785

3643 -#: pkt-line.c:142 pkt-line.c:228

3786 +#: pkt-line.c:144 pkt-line.c:230

3787 msgid "protocol error: impossibly long line"

3788 msgstr "error de protocolo: línea imposiblemente larga"

3789

3647 -#: pkt-line.c:158 pkt-line.c:160

3790 +#: pkt-line.c:160 pkt-line.c:162

3791 msgid "packet write with format failed"

3792 msgstr "escritura de paquetes con formato falló"

3793

3651 -#: pkt-line.c:192

3794 +#: pkt-line.c:194

3795 msgid "packet write failed - data exceeds max packet size"

3796 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"

3797

3655 -#: pkt-line.c:199 pkt-line.c:206

3798 +#: pkt-line.c:201 pkt-line.c:208

3799 msgid "packet write failed"

3800 msgstr "escritura de paquetes falló"

3801

3659 -#: pkt-line.c:291

3802 +#: pkt-line.c:293

3803 msgid "read error"

3804 msgstr "error de lectura"

3805

3663 -#: pkt-line.c:299

3806 +#: pkt-line.c:301

3807 msgid "the remote end hung up unexpectedly"

3808 msgstr "el remoto se colgó de manera inesperada"

3809

3667 -#: pkt-line.c:327

3810 +#: pkt-line.c:329

3811 #, c-format

3812 msgid "protocol error: bad line length character: %.4s"

3813 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"

3814

3672 -#: pkt-line.c:337 pkt-line.c:342

3815 +#: pkt-line.c:339 pkt-line.c:344

3816 #, c-format

3817 msgid "protocol error: bad line length %d"

3818 msgstr "error de protocolo: mal largo de línea %d"

3819

3677 -#: preload-index.c:118

3820 +#: pkt-line.c:353

3821 +#, c-format

3822 +msgid "remote error: %s"

3823 +msgstr "error remoto: %s"

3824 +

3825 +#: preload-index.c:119

3826 msgid "Refreshing index"

3827 msgstr "Refrescando index"

3828

3681 -#: preload-index.c:137

3829 +#: preload-index.c:138

3830 #, c-format

3831 msgid "unable to create threaded lstat: %s"

3832 msgstr "no es posible crear lstat hilado: %s"

3833

3686 -#: pretty.c:962

3834 +#: pretty.c:963

3835 msgid "unable to parse --pretty format"

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

3837

@@ -3695,7 +3843,7 @@ msgstr "no se pudo comenzar `log`"

3843 msgid "could not read `log` output"

3844 msgstr "no se pudo leer output de `log`"

3845

3698 -#: range-diff.c:74 sequencer.c:4764

3846 +#: range-diff.c:74 sequencer.c:4828

3847 #, c-format

3848 msgid "could not parse commit '%s'"

3849 msgstr "no se pudo analizar commit '%s'"

@@ -3709,11 +3857,46 @@ msgstr "falló al generar diff"

3857 msgid "could not parse log for '%s'"

3858 msgstr "no se pudo leer el log para '%s'"

3859

3712 -#: read-cache.c:1490

3860 +#: read-cache.c:673

3861 +#, c-format

3862 +msgid "will not add file alias '%s' ('%s' already exists in index)"

3863 +msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)"

3864 +

3865 +#: read-cache.c:689

3866 +msgid "cannot create an empty blob in the object database"

3867 +msgstr "no se puede crear un blob vacío en la base de datos de objetos"

3868 +

3869 +#: read-cache.c:710

3870 +#, c-format

3871 +msgid "%s: can only add regular files, symbolic links or git-directories"

3872 +msgstr ""

3873 +"%s: solo puede agregar archivos regulares, symbolic links o git-directories"

3874 +

3875 +#: read-cache.c:765

3876 +#, c-format

3877 +msgid "unable to index file '%s'"

3878 +msgstr "no es posible indexar archivo '%s'"

3879 +

3880 +#: read-cache.c:784

3881 +#, c-format

3882 +msgid "unable to add '%s' to index"

3883 +msgstr "No es posible agregar '%s' al index"

3884 +

3885 +#: read-cache.c:795

3886 +#, c-format

3887 +msgid "unable to stat '%s'"

3888 +msgstr "incapaz de correr stat en '%s'"

3889 +

3890 +#: read-cache.c:1304

3891 +#, c-format

3892 +msgid "'%s' appears as both a file and as a directory"

3893 +msgstr "'%s' parece ser un directorio y un archivo a la vez"

3894 +

3895 +#: read-cache.c:1489

3896 msgid "Refresh index"

3897 msgstr "Refrescar index"

3898

3716 -#: read-cache.c:1604

3899 +#: read-cache.c:1603

3900 #, c-format

3901 msgid ""

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

@@ -3722,7 +3905,7 @@ msgstr ""

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

3906 "Usando versión %i"

3907

3725 -#: read-cache.c:1614

3908 +#: read-cache.c:1613

3909 #, c-format

3910 msgid ""

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

@@ -3731,59 +3914,143 @@ msgstr ""

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

3915 "Usando versión %i"

3916

3734 -#: read-cache.c:1792

3917 +#: read-cache.c:1684

3918 +#, c-format

3919 +msgid "bad signature 0x%08x"

3920 +msgstr "mala firma 0x%08x"

3921 +

3922 +#: read-cache.c:1687

3923 +#, c-format

3924 +msgid "bad index version %d"

3925 +msgstr "mala versión del índice %d"

3926 +

3927 +#: read-cache.c:1696

3928 +msgid "bad index file sha1 signature"

3929 +msgstr "mala firma sha1 del archivo index"

3930 +

3931 +#: read-cache.c:1726

3932 +#, c-format

3933 +msgid "index uses %.4s extension, which we do not understand"

3934 +msgstr "index usa %.4s extensiones, cosa que no entendemos"

3935 +

3936 +#: read-cache.c:1728

3937 +#, c-format

3938 +msgid "ignoring %.4s extension"

3939 +msgstr "ignorando extensión %.4s"

3940 +

3941 +#: read-cache.c:1765

3942 +#, c-format

3943 +msgid "unknown index entry format 0x%08x"

3944 +msgstr "Formato de index desconocido 0x%08x"

3945 +

3946 +#: read-cache.c:1781

3947 #, c-format

3948 msgid "malformed name field in the index, near path '%s'"

3949 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

3950

3739 -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3740 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3741 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3742 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3743 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3951 +#: read-cache.c:1836

3952 +msgid "unordered stage entries in index"

3953 +msgstr "entradas en stage desordenadas en index"

3954 +

3955 +#: read-cache.c:1839

3956 +#, c-format

3957 +msgid "multiple stage entries for merged file '%s'"

3958 +msgstr "múltiples entradas extrañas para archivo fusionado '%s'"

3959 +

3960 +#: read-cache.c:1842

3961 +#, c-format

3962 +msgid "unordered stage entries for '%s'"

3963 +msgstr "entradas de stage desordenadas para '%s'"

3964 +

3965 +#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3966 +#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3967 +#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3968 +#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

3969 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

3970 +#: builtin/submodule--helper.c:330

3971 msgid "index file corrupt"

3972 msgstr "archivo índice corrompido"

3973

3747 -#: read-cache.c:2101

3974 +#: read-cache.c:2090

3975 #, c-format

3976 msgid "unable to create load_cache_entries thread: %s"

3977 msgstr "no es posible crear hilo load_cache_entries: %s"

3978

3752 -#: read-cache.c:2114

3979 +#: read-cache.c:2103

3980 #, c-format

3981 msgid "unable to join load_cache_entries thread: %s"

3982 msgstr "no es posible unir hilo load_cache_entires: %s"

3983

3757 -#: read-cache.c:2201

3984 +#: read-cache.c:2136

3985 +#, c-format

3986 +msgid "%s: index file open failed"

3987 +msgstr "%s: falló al abrir el archivo index"

3988 +

3989 +#: read-cache.c:2140

3990 +#, c-format

3991 +msgid "%s: cannot stat the open index"

3992 +msgstr "%s: no se puede hacer stat del index abierto"

3993 +

3994 +#: read-cache.c:2144

3995 +#, c-format

3996 +msgid "%s: index file smaller than expected"

3997 +msgstr "%s: archivo index más pequeño de lo esperado"

3998 +

3999 +#: read-cache.c:2148

4000 +#, c-format

4001 +msgid "%s: unable to map index file"

4002 +msgstr "%s: no se pudo mapear el archivo index"

4003 +

4004 +#: read-cache.c:2190

4005 #, c-format

4006 msgid "unable to create load_index_extensions thread: %s"

4007 msgstr "no es posible crear hilo load_index_extensions: %s"

4008

3762 -#: read-cache.c:2228

4009 +#: read-cache.c:2217

4010 #, c-format

4011 msgid "unable to join load_index_extensions thread: %s"

4012 msgstr "no es posible unir hilo load_index_extensions: %s"

4013

3767 -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

4014 +#: read-cache.c:2239

4015 +#, c-format

4016 +msgid "could not freshen shared index '%s'"

4017 +msgstr "no se pudo refrescar el index compartido '%s'"

4018 +

4019 +#: read-cache.c:2274

4020 +#, c-format

4021 +msgid "broken index, expect %s in %s, got %s"

4022 +msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

4023 +

4024 +#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4025 #, c-format

4026 msgid "could not close '%s'"

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

4028

3772 -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

4029 +#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4030 #, c-format

4031 msgid "could not stat '%s'"

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

4033

3777 -#: read-cache.c:3068

4034 +#: read-cache.c:3057

4035 #, c-format

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

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

4038

3782 -#: read-cache.c:3080

4039 +#: read-cache.c:3069

4040 #, c-format

4041 msgid "unable to unlink: %s"

4042 msgstr "no es posible eliminar el vinculo: %s"

4043

4044 +#: read-cache.c:3088

4045 +#, c-format

4046 +msgid "cannot fix permission bits on '%s'"

4047 +msgstr "no se pudo arreglar bits de permisos en '%s'"

4048 +

4049 +#: read-cache.c:3237

4050 +#, c-format

4051 +msgid "%s: cannot drop to stage #0"

4052 +msgstr "%s: no se puede eliminar a stage #0"

4053 +

4054 #: rebase-interactive.c:10

4055 msgid ""

4056 "\n"

@@ -3870,8 +4137,8 @@ msgstr ""

4137 msgid "Note that empty commits are commented out"

4138 msgstr "Tenga en cuenta que los commits vacíos están comentados"

4139

3873 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3874 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

4140 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4141 +#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4142 #, c-format

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

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

@@ -3886,7 +4153,7 @@ msgstr "%s no apunta a ningún objeto válido!"

4153 msgid "ignoring dangling symref %s"

4154 msgstr "ignorando referencia rota %s"

4155

3889 -#: refs.c:585 ref-filter.c:1951

4156 +#: refs.c:585 ref-filter.c:1976

4157 #, c-format

4158 msgid "ignoring broken ref %s"

4159 msgstr "ignorando referencia rota %s"

@@ -3911,15 +4178,15 @@ msgstr "ref '%s' ya existe"

4178 msgid "unexpected object ID when writing '%s'"

4179 msgstr "ID de objecto inesperado cuando se escribía '%s'"

4180

3914 -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3915 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

4181 +#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4182 +#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4183 #: wrapper.c:656

4184 #, c-format

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

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

4187

3921 -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3922 -#: builtin/am.c:728

4188 +#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4189 +#: builtin/am.c:713 builtin/rebase.c:575

4190 #, c-format

4191 msgid "could not open '%s' for writing"

4192 msgstr "no se pudo abrir '%s' para escritura"

@@ -3994,7 +4261,7 @@ msgstr "no se pudo eliminar la referencia: %s"

4261 msgid "invalid refspec '%s'"

4262 msgstr "refspec inválido: '%s'"

4263

3997 -#: ref-filter.c:39 wt-status.c:1855

4264 +#: ref-filter.c:39 wt-status.c:1861

4265 msgid "gone"

4266 msgstr "desaparecido"

4267

@@ -4043,149 +4310,154 @@ msgstr "argumento: %s no reconocido %%(%s)"

4310 msgid "%%(objecttype) does not take arguments"

4311 msgstr "%%(objecttype) no toma ningún argumento"

4312

4046 -#: ref-filter.c:235

4313 +#: ref-filter.c:245

4314 +#, c-format

4315 +msgid "unrecognized %%(objectsize) argument: %s"

4316 +msgstr "%%(objectsize) no reconocido argumento: %s"

4317 +

4318 +#: ref-filter.c:253

4319 #, c-format

4048 -msgid "%%(objectsize) does not take arguments"

4049 -msgstr "%%(objectsize) no toma argumentos"

4320 +msgid "%%(deltabase) does not take arguments"

4321 +msgstr "%%(deltabase) no toma argumentos"

4322

4051 -#: ref-filter.c:247

4323 +#: ref-filter.c:265

4324 #, c-format

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

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

4327

4056 -#: ref-filter.c:256

4328 +#: ref-filter.c:274

4329 #, c-format

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

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

4332

4061 -#: ref-filter.c:278

4333 +#: ref-filter.c:296

4334 #, c-format

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

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

4337

4066 -#: ref-filter.c:307

4338 +#: ref-filter.c:325

4339 #, c-format

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

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

4342

4071 -#: ref-filter.c:309

4343 +#: ref-filter.c:327

4344 #, c-format

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

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

4347

4076 -#: ref-filter.c:324

4348 +#: ref-filter.c:342

4349 #, c-format

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

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

4352

4081 -#: ref-filter.c:328

4353 +#: ref-filter.c:346

4354 #, c-format

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

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

4357

4086 -#: ref-filter.c:358

4358 +#: ref-filter.c:376

4359 #, c-format

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

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

4362

4091 -#: ref-filter.c:370

4363 +#: ref-filter.c:388

4364 #, c-format

4365 msgid "unrecognized position:%s"

4366 msgstr "posición desconocida: %s"

4367

4096 -#: ref-filter.c:377

4368 +#: ref-filter.c:395

4369 #, c-format

4370 msgid "unrecognized width:%s"

4371 msgstr "ancho desconocido: %s"

4372

4101 -#: ref-filter.c:386

4373 +#: ref-filter.c:404

4374 #, c-format

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

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

4377

4106 -#: ref-filter.c:394

4378 +#: ref-filter.c:412

4379 #, c-format

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

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

4382

4111 -#: ref-filter.c:412

4383 +#: ref-filter.c:430

4384 #, c-format

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

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

4387

4116 -#: ref-filter.c:508

4388 +#: ref-filter.c:527

4389 #, c-format

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

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

4392

4121 -#: ref-filter.c:535

4393 +#: ref-filter.c:554

4394 #, c-format

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

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

4397

4126 -#: ref-filter.c:539

4398 +#: ref-filter.c:558

4399 #, c-format

4400 msgid ""

4401 "not a git repository, but the field '%.*s' requires access to object data"

4402 msgstr ""

4403 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"

4404

4133 -#: ref-filter.c:663

4405 +#: ref-filter.c:682

4406 #, c-format

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

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

4409

4138 -#: ref-filter.c:726

4410 +#: ref-filter.c:745

4411 #, c-format

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

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

4414

4143 -#: ref-filter.c:728

4415 +#: ref-filter.c:747

4416 #, c-format

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

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

4419

4148 -#: ref-filter.c:730

4420 +#: ref-filter.c:749

4421 #, c-format

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

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

4424

4153 -#: ref-filter.c:758

4425 +#: ref-filter.c:777

4426 #, c-format

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

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

4429

4158 -#: ref-filter.c:760

4430 +#: ref-filter.c:779

4431 #, c-format

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

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

4434

4163 -#: ref-filter.c:762

4435 +#: ref-filter.c:781

4436 #, c-format

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

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

4439

4168 -#: ref-filter.c:777

4440 +#: ref-filter.c:796

4441 #, c-format

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

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

4444

4173 -#: ref-filter.c:834

4445 +#: ref-filter.c:853

4446 #, c-format

4447 msgid "malformed format string %s"

4448 msgstr "formato de cadena mal formado %s"

4449

4178 -#: ref-filter.c:1424

4450 +#: ref-filter.c:1447

4451 #, c-format

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

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

4454

4183 -#: ref-filter.c:1427

4455 +#: ref-filter.c:1450

4456 #, c-format

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

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

4459

4188 -#: ref-filter.c:1430

4460 +#: ref-filter.c:1453

4461 #, c-format

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

4463 msgstr "(no hay rama, comenzando biseccón en %s)"

@@ -4193,7 +4465,7 @@ msgstr "(no hay rama, comenzando biseccón en %s)"

4465 #. TRANSLATORS: make sure this matches "HEAD

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

4467 #.

4196 -#: ref-filter.c:1438

4468 +#: ref-filter.c:1461

4469 #, c-format

4470 msgid "(HEAD detached at %s)"

4471 msgstr "(HEAD desacoplado en %s)"

@@ -4201,143 +4473,289 @@ msgstr "(HEAD desacoplado en %s)"

4473 #. TRANSLATORS: make sure this matches "HEAD

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

4475 #.

4204 -#: ref-filter.c:1445

4476 +#: ref-filter.c:1468

4477 #, c-format

4478 msgid "(HEAD detached from %s)"

4479 msgstr "(HEAD desacoplado de %s)"

4480

4209 -#: ref-filter.c:1449

4481 +#: ref-filter.c:1472

4482 msgid "(no branch)"

4483 msgstr "(sin rama)"

4484

4213 -#: ref-filter.c:1483 ref-filter.c:1638

4485 +#: ref-filter.c:1506 ref-filter.c:1663

4486 #, c-format

4487 msgid "missing object %s for %s"

4488 msgstr "falta objeto %s para %s"

4489

4218 -#: ref-filter.c:1491

4490 +#: ref-filter.c:1516

4491 #, c-format

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

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

4494

4223 -#: ref-filter.c:1857

4495 +#: ref-filter.c:1882

4496 #, c-format

4497 msgid "malformed object at '%s'"

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

4499

4228 -#: ref-filter.c:1946

4500 +#: ref-filter.c:1971

4501 #, c-format

4502 msgid "ignoring ref with broken name %s"

4503 msgstr "ignorando referencia con nombre roto %s"

4504

4233 -#: ref-filter.c:2232

4505 +#: ref-filter.c:2257

4506 #, c-format

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

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

4509

4238 -#: ref-filter.c:2338

4510 +#: ref-filter.c:2352

4511 +#, c-format

4512 +msgid "option `%s' is incompatible with --merged"

4513 +msgstr "opción `%s' es incompatible con --merged"

4514 +

4515 +#: ref-filter.c:2355

4516 +#, c-format

4517 +msgid "option `%s' is incompatible with --no-merged"

4518 +msgstr "opción `%s' es incompatible con --no-merged"

4519 +

4520 +#: ref-filter.c:2365

4521 #, c-format

4522 msgid "malformed object name %s"

4523 msgstr "nombre de objeto mal formado %s"

4524

4243 -#: remote.c:607

4525 +#: ref-filter.c:2370

4526 +#, c-format

4527 +msgid "option `%s' must point to a commit"

4528 +msgstr "opción '%s' debe apuntar a un commit"

4529 +

4530 +#: remote.c:363

4531 +#, c-format

4532 +msgid "config remote shorthand cannot begin with '/': %s"

4533 +msgstr "config remote shorthand no puede comenzar con '/': %s"

4534 +

4535 +#: remote.c:410

4536 +msgid "more than one receivepack given, using the first"

4537 +msgstr "más de un receivepack dado, usando el primero"

4538 +

4539 +#: remote.c:418

4540 +msgid "more than one uploadpack given, using the first"

4541 +msgstr "más de un uploadpack dado, usando el primero"

4542 +

4543 +#: remote.c:608

4544 #, c-format

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

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

4547

4248 -#: remote.c:611

4548 +#: remote.c:612

4549 #, c-format

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

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

4552

4253 -#: remote.c:615

4553 +#: remote.c:616

4554 #, c-format

4555 msgid "%s tracks both %s and %s"

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

4557

4258 -#: remote.c:623

4259 -msgid "Internal error"

4260 -msgstr "Error interno"

4558 +#: remote.c:684

4559 +#, c-format

4560 +msgid "key '%s' of pattern had no '*'"

4561 +msgstr "llave '%s' de patrón no tuvo '*'"

4562 +

4563 +#: remote.c:694

4564 +#, c-format

4565 +msgid "value '%s' of pattern has no '*'"

4566 +msgstr "valor '%s' del patrón no tiene '*'"

4567 +

4568 +#: remote.c:1000

4569 +#, c-format

4570 +msgid "src refspec %s does not match any"

4571 +msgstr "src refsoec %s: no concuerda con ninguno"

4572 +

4573 +#: remote.c:1005

4574 +#, c-format

4575 +msgid "src refspec %s matches more than one"

4576 +msgstr "src refspec %s concuerda con más de uno"

4577 +

4578 +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

4579 +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

4580 +#. the <src>.

4581 +#.

4582 +#: remote.c:1020

4583 +#, c-format

4584 +msgid ""

4585 +"The destination you provided is not a full refname (i.e.,\n"

4586 +"starting with \"refs/\"). We tried to guess what you meant by:\n"

4587 +"\n"

4588 +"- Looking for a ref that matches '%s' on the remote side.\n"

4589 +"- Checking if the <src> being pushed ('%s')\n"

4590 +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

4591 +" refs/{heads,tags}/ prefix on the remote side.\n"

4592 +"\n"

4593 +"Neither worked, so we gave up. You must fully qualify the ref."

4594 +msgstr ""

4595 +"El destino que provees no es un full refname (i.e.,\n"

4596 +"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"

4597 +"\n"

4598 +"- Buscando un ref que concuerde con '%s' en el lado remoto.\n"

4599 +"- Revisando si el <src> es usado en el push('%s')\n"

4600 +" es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n"

4601 +" refs/{heads,tags}/ correspondiente al lado remoto.\n"

4602 +"\n"

4603 +"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "

4604 +"full ref."

4605 +

4606 +#: remote.c:1040

4607 +#, c-format

4608 +msgid ""

4609 +"The <src> part of the refspec is a commit object.\n"

4610 +"Did you mean to create a new branch by pushing to\n"

4611 +"'%s:refs/heads/%s'?"

4612 +msgstr ""

4613 +"La parte <src> del refspec es un objeto commit.\n"

4614 +"¿Quisiste crear un branch nuevo mediante un push a\n"

4615 +"'%s:refs/heads/%s'?"

4616 +

4617 +#: remote.c:1045

4618 +#, c-format

4619 +msgid ""

4620 +"The <src> part of the refspec is a tag object.\n"

4621 +"Did you mean to create a new tag by pushing to\n"

4622 +"'%s:refs/tags/%s'?"

4623 +msgstr ""

4624 +"The <src> part of the refspec is a tag object.\n"

4625 +"Did you mean to create a new tag by pushing to\n"

4626 +"'%s:refs/tags/%s'?"

4627 +

4628 +#: remote.c:1050

4629 +#, c-format

4630 +msgid ""

4631 +"The <src> part of the refspec is a tree object.\n"

4632 +"Did you mean to tag a new tree by pushing to\n"

4633 +"'%s:refs/tags/%s'?"

4634 +msgstr ""

4635 +"La parte <src> del refspec es un objeto tree.\n"

4636 +"¿Quisiste crear un tag nuevo mediante un push a\n"

4637 +"'%s:refs/heads/%s'?"

4638 +

4639 +#: remote.c:1055

4640 +#, c-format

4641 +msgid ""

4642 +"The <src> part of the refspec is a blob object.\n"

4643 +"Did you mean to tag a new blob by pushing to\n"

4644 +"'%s:refs/tags/%s'?"

4645 +msgstr ""

4646 +"La parte <src> del refspec es un objeto blob.\n"

4647 +"¿Quisiste crear un tag nuevo mediante un push a\n"

4648 +"'%s:refs/heads/%s'?"

4649 +

4650 +#: remote.c:1091

4651 +#, c-format

4652 +msgid "%s cannot be resolved to branch"

4653 +msgstr "%s no puede ser resolver a un branch"

4654 +

4655 +#: remote.c:1102

4656 +#, c-format

4657 +msgid "unable to delete '%s': remote ref does not exist"

4658 +msgstr "no es posible borrar '%s': ref remoto no existe"

4659 +

4660 +#: remote.c:1114

4661 +#, c-format

4662 +msgid "dst refspec %s matches more than one"

4663 +msgstr "dst refspec %s concuerda con más de uno"

4664 +

4665 +#: remote.c:1121

4666 +#, c-format

4667 +msgid "dst ref %s receives from more than one src"

4668 +msgstr "dst ref %s recibe de más de un src"

4669

4262 -#: remote.c:1569 remote.c:1670

4670 +#: remote.c:1624 remote.c:1725

4671 msgid "HEAD does not point to a branch"

4672 msgstr "HEAD no apunta a ninguna rama"

4673

4266 -#: remote.c:1578

4674 +#: remote.c:1633

4675 #, c-format

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

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

4678

4271 -#: remote.c:1581

4679 +#: remote.c:1636

4680 #, c-format

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

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

4683

4276 -#: remote.c:1587

4684 +#: remote.c:1642

4685 #, c-format

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

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

4688

4281 -#: remote.c:1602

4689 +#: remote.c:1657

4690 #, c-format

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

4692 msgstr ""

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

4694

4287 -#: remote.c:1614

4695 +#: remote.c:1669

4696 #, c-format

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

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

4699

4292 -#: remote.c:1624

4700 +#: remote.c:1679

4701 #, c-format

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

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

4704

4297 -#: remote.c:1637

4705 +#: remote.c:1692

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

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

4708

4301 -#: remote.c:1659

4709 +#: remote.c:1714

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

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

4712

4305 -#: remote.c:1935

4713 +#: remote.c:1840

4714 +#, c-format

4715 +msgid "couldn't find remote ref %s"

4716 +msgstr "No se puedo encontrar ref remota %s"

4717 +

4718 +#: remote.c:1853

4719 +#, c-format

4720 +msgid "* Ignoring funny ref '%s' locally"

4721 +msgstr "* Ignorando ref graciosa '%s' localmente"

4722 +

4723 +#: remote.c:1990

4724 #, c-format

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

4726 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"

4727

4310 -#: remote.c:1939

4728 +#: remote.c:1994

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

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

4731

4314 -#: remote.c:1942

4732 +#: remote.c:1997

4733 #, c-format

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

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

4736

4319 -#: remote.c:1946

4737 +#: remote.c:2001

4738 #, c-format

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

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

4741

4324 -#: remote.c:1949

4742 +#: remote.c:2004

4743 #, c-format

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

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

4746

4329 -#: remote.c:1953

4747 +#: remote.c:2008

4748 #, c-format

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

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

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

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

4753

4336 -#: remote.c:1959

4754 +#: remote.c:2014

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

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

4757

4340 -#: remote.c:1962

4758 +#: remote.c:2017

4759 #, c-format

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

4761 msgid_plural ""

@@ -4347,11 +4765,11 @@ msgstr[0] ""

4765 msgstr[1] ""

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

4767

4350 -#: remote.c:1970

4768 +#: remote.c:2025

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

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

4771

4354 -#: remote.c:1973

4772 +#: remote.c:2028

4773 #, c-format

4774 msgid ""

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

@@ -4366,10 +4784,15 @@ msgstr[1] ""

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

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

4786

4369 -#: remote.c:1983

4787 +#: remote.c:2038

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

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

4790

4791 +#: remote.c:2221

4792 +#, c-format

4793 +msgid "cannot parse expected object name '%s'"

4794 +msgstr "no se puede leer el nombre de objeto '%s'"

4795 +

4796 #: replace-object.c:21

4797 #, c-format

4798 msgid "bad replace ref name: %s"

@@ -4393,7 +4816,8 @@ msgstr "MERGE_RR corrupto"

4816 msgid "unable to write rerere record"

4817 msgstr "incapaz de escribir entrada rerere"

4818

4396 -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4819 +#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4820 +#: builtin/fsck.c:314

4821 #, c-format

4822 msgid "could not write '%s'"

4823 msgstr "no se pudo escribir '%s'"

@@ -4448,8 +4872,8 @@ msgstr "no se puede desvincular stray '%s'"

4872 msgid "Recorded preimage for '%s'"

4873 msgstr "Resolución precargada para '%s'"

4874

4451 -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4452 -#: builtin/submodule--helper.c:1423

4875 +#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4876 +#: builtin/submodule--helper.c:1427

4877 #, c-format

4878 msgid "could not create directory '%s'"

4879 msgstr "no se pudo crear el directorio '%s'"

@@ -4483,29 +4907,29 @@ msgstr "Se olvidó resolución para '%s'\n"

4907 msgid "unable to open rr-cache directory"

4908 msgstr "no es posible abrir directorio rr-cache"

4909

4486 -#: revision.c:2324

4910 +#: revision.c:2484

4911 msgid "your current branch appears to be broken"

4912 msgstr "tu rama actual parece estar rota"

4913

4490 -#: revision.c:2327

4914 +#: revision.c:2487

4915 #, c-format

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

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

4918

4495 -#: revision.c:2523

4919 +#: revision.c:2684

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

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

4922

4499 -#: run-command.c:740

4923 +#: run-command.c:742

4924 msgid "open /dev/null failed"

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

4926

4503 -#: run-command.c:1229

4927 +#: run-command.c:1231

4928 #, c-format

4929 msgid "cannot create async thread: %s"

4930 msgstr "no es posible crear hilo async: %s"

4931

4508 -#: run-command.c:1293

4932 +#: run-command.c:1295

4933 #, c-format

4934 msgid ""

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

@@ -4515,30 +4939,30 @@ msgstr ""

4939 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "

4940 "false`."

4941

4518 -#: send-pack.c:142

4942 +#: send-pack.c:141

4943 msgid "unexpected flush packet while reading remote unpack status"

4944 msgstr ""

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

4946

4523 -#: send-pack.c:144

4947 +#: send-pack.c:143

4948 #, c-format

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

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

4951

4528 -#: send-pack.c:146

4952 +#: send-pack.c:145

4953 #, c-format

4954 msgid "remote unpack failed: %s"

4955 msgstr "desempaquetado remoto falló: %s"

4956

4533 -#: send-pack.c:308

4957 +#: send-pack.c:306

4958 msgid "failed to sign the push certificate"

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

4960

4537 -#: send-pack.c:421

4961 +#: send-pack.c:420

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

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

4964

4541 -#: send-pack.c:423

4965 +#: send-pack.c:422

4966 msgid ""

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

4968 "signed push"

@@ -4546,42 +4970,42 @@ msgstr ""

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

4971 "(--signed )"

4972

4549 -#: send-pack.c:435

4973 +#: send-pack.c:434

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

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

4976

4553 -#: send-pack.c:440

4977 +#: send-pack.c:439

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

4979 msgstr "el destino no soporta opciones de push"

4980

4557 -#: sequencer.c:183

4981 +#: sequencer.c:184

4982 #, c-format

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

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

4985

4562 -#: sequencer.c:287

4986 +#: sequencer.c:288

4987 #, c-format

4988 msgid "could not delete '%s'"

4989 msgstr "no se pudo borrar '%s'"

4990

4567 -#: sequencer.c:313

4991 +#: sequencer.c:314

4992 msgid "revert"

4993 msgstr "revertir"

4994

4571 -#: sequencer.c:315

4995 +#: sequencer.c:316

4996 msgid "cherry-pick"

4997 msgstr "cherry-pick"

4998

4575 -#: sequencer.c:317

4999 +#: sequencer.c:318

5000 msgid "rebase -i"

5001 msgstr "rebase -i"

5002

4579 -#: sequencer.c:319

5003 +#: sequencer.c:320

5004 #, c-format

5005 msgid "unknown action: %d"

5006 msgstr "acción desconocida: %d"

5007

4584 -#: sequencer.c:376

5008 +#: sequencer.c:378

5009 msgid ""

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

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

@@ -4589,7 +5013,7 @@ msgstr ""

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

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

5015

4592 -#: sequencer.c:379

5016 +#: sequencer.c:381

5017 msgid ""

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

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

@@ -4599,39 +5023,39 @@ msgstr ""

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

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

5025

4602 -#: sequencer.c:392 sequencer.c:2632

5026 +#: sequencer.c:394 sequencer.c:2671

5027 #, c-format

5028 msgid "could not lock '%s'"

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

5030

4607 -#: sequencer.c:399

5031 +#: sequencer.c:401

5032 #, c-format

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

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

5035

4612 -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4613 -#: sequencer.c:2885

5036 +#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5037 +#: sequencer.c:2931

5038 #, c-format

5039 msgid "failed to finalize '%s'"

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

5041

4618 -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4619 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4620 -#: builtin/merge.c:1084 builtin/rebase.c:152

5042 +#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5043 +#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5044 +#: builtin/merge.c:1085 builtin/rebase.c:154

5045 #, c-format

5046 msgid "could not read '%s'"

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

5048

4625 -#: sequencer.c:453

5049 +#: sequencer.c:455

5050 #, c-format

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

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

5053

4630 -#: sequencer.c:457

5054 +#: sequencer.c:459

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

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

5057

4634 -#: sequencer.c:486

5058 +#: sequencer.c:491

5059 #, c-format

5060 msgid "%s: fast-forward"

5061 msgstr "%s: avance rápido"

@@ -4639,70 +5063,70 @@ msgstr "%s: avance rápido"

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

5064 #. "rebase -i".

5065 #.

4642 -#: sequencer.c:575

5066 +#: sequencer.c:582

5067 #, c-format

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

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

5070

4647 -#: sequencer.c:591

5071 +#: sequencer.c:598

5072 msgid "unable to update cache tree"

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

5074

4651 -#: sequencer.c:604

5075 +#: sequencer.c:612

5076 msgid "could not resolve HEAD commit"

5077 msgstr "no se pudo resolver el commit de HEAD"

5078

4655 -#: sequencer.c:684

5079 +#: sequencer.c:692

5080 #, c-format

5081 msgid "no key present in '%.*s'"

5082 msgstr "no hay llave presente en '%.*s'"

5083

4660 -#: sequencer.c:695

5084 +#: sequencer.c:703

5085 #, c-format

5086 msgid "unable to dequote value of '%s'"

5087 msgstr "no es posible dequote para '%s'"

5088

4665 -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4666 -#: builtin/am.c:811 builtin/merge.c:1081

5089 +#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5090 +#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5091 #, c-format

5092 msgid "could not open '%s' for reading"

5093 msgstr "no se pudo abrir '%s' para lectura"

5094

4671 -#: sequencer.c:742

5095 +#: sequencer.c:750

5096 msgid "'GIT_AUTHOR_NAME' already given"

5097 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

5098

4675 -#: sequencer.c:747

5099 +#: sequencer.c:755

5100 msgid "'GIT_AUTHOR_EMAIL' already given"

5101 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

5102

4679 -#: sequencer.c:752

5103 +#: sequencer.c:760

5104 msgid "'GIT_AUTHOR_DATE' already given"

5105 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

5106

4683 -#: sequencer.c:756

5107 +#: sequencer.c:764

5108 #, c-format

5109 msgid "unknown variable '%s'"

5110 msgstr "variable desconocida '%s'"

5111

4688 -#: sequencer.c:761

5112 +#: sequencer.c:769

5113 msgid "missing 'GIT_AUTHOR_NAME'"

5114 msgstr "falta 'GIT_AUTHOR_NAME'"

5115

4692 -#: sequencer.c:763

5116 +#: sequencer.c:771

5117 msgid "missing 'GIT_AUTHOR_EMAIL'"

5118 msgstr "falta 'GIT_AUTHOR_EMAIL'"

5119

4696 -#: sequencer.c:765

5120 +#: sequencer.c:773

5121 msgid "missing 'GIT_AUTHOR_DATE'"

5122 msgstr "falta 'GIT_AUTHOR_DATE'"

5123

4700 -#: sequencer.c:825

5124 +#: sequencer.c:833

5125 #, c-format

5126 msgid "invalid date format '%s' in '%s'"

5127 msgstr "formato de fecha inválido '%s' en '%s'"

5128

4705 -#: sequencer.c:842

5129 +#: sequencer.c:850

5130 #, c-format

5131 msgid ""

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

@@ -4732,15 +5156,15 @@ msgstr ""

5156 "\n"

5157 " git rebase --continue\n"

5158

4735 -#: sequencer.c:935

5159 +#: sequencer.c:945

5160 msgid "writing root commit"

5161 msgstr "escribiendo commit raíz"

5162

4739 -#: sequencer.c:1142

5163 +#: sequencer.c:1155

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

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

5166

4743 -#: sequencer.c:1149

5167 +#: sequencer.c:1162

5168 msgid ""

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

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

@@ -4767,7 +5191,7 @@ msgstr ""

5191 "\n"

5192 " git commit --amend --reset-author\n"

5193

4770 -#: sequencer.c:1162

5194 +#: sequencer.c:1175

5195 msgid ""

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

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

@@ -4791,299 +5215,294 @@ msgstr ""

5215 "\n"

5216 " git commit --amend --reset-author\n"

5217

4794 -#: sequencer.c:1202

5218 +#: sequencer.c:1217

5219 msgid "couldn't look up newly created commit"

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

5221

4798 -#: sequencer.c:1204

5222 +#: sequencer.c:1219

5223 msgid "could not parse newly created commit"

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

5225

4802 -#: sequencer.c:1250

5226 +#: sequencer.c:1265

5227 msgid "unable to resolve HEAD after creating commit"

5228 msgstr "no se pudo resolver HEAD tras crear el commit"

5229

4806 -#: sequencer.c:1252

5230 +#: sequencer.c:1267

5231 msgid "detached HEAD"

5232 msgstr "HEAD desacoplado"

5233

4810 -#: sequencer.c:1256

5234 +#: sequencer.c:1271

5235 msgid " (root-commit)"

5236 msgstr " (commit-raíz)"

5237

4814 -#: sequencer.c:1277

5238 +#: sequencer.c:1292

5239 msgid "could not parse HEAD"

5240 msgstr "no se pudo analizar HEAD"

5241

4818 -#: sequencer.c:1279

5242 +#: sequencer.c:1294

5243 #, c-format

5244 msgid "HEAD %s is not a commit!"

5245 msgstr "HEAD %s no es un commit!"

5246

4823 -#: sequencer.c:1283 builtin/commit.c:1543

5247 +#: sequencer.c:1298 builtin/commit.c:1546

5248 msgid "could not parse HEAD commit"

5249 msgstr "no se pudo analizar el commit de HEAD"

5250

4827 -#: sequencer.c:1334 sequencer.c:1934

5251 +#: sequencer.c:1350 sequencer.c:1964

5252 msgid "unable to parse commit author"

5253 msgstr "no es posible analizar el autor del commit"

5254

4831 -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

5255 +#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5256 msgid "git write-tree failed to write a tree"

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

5258

4835 -#: sequencer.c:1361 sequencer.c:1416

5259 +#: sequencer.c:1377 sequencer.c:1433

5260 #, c-format

5261 msgid "unable to read commit message from '%s'"

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

5263

4840 -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4841 -#: builtin/merge.c:883

5264 +#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5265 +#: builtin/merge.c:884

5266 msgid "failed to write commit object"

5267 msgstr "falló al escribir el objeto commit"

5268

4845 -#: sequencer.c:1443

5269 +#: sequencer.c:1460

5270 #, c-format

5271 msgid "could not parse commit %s"

5272 msgstr "no se pudo analizar commit %s"

5273

4850 -#: sequencer.c:1448

5274 +#: sequencer.c:1465

5275 #, c-format

5276 msgid "could not parse parent commit %s"

5277 msgstr "no se pudo analizar el commit padre %s"

5278

4855 -#: sequencer.c:1546 sequencer.c:1654

5279 +#: sequencer.c:1565 sequencer.c:1675

5280 #, c-format

5281 msgid "unknown command: %d"

5282 msgstr "comando desconocido: %d"

5283

4860 -#: sequencer.c:1601 sequencer.c:1626

5284 +#: sequencer.c:1622 sequencer.c:1647

5285 #, c-format

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

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

5288

4865 -#: sequencer.c:1611 sequencer.c:4744

5289 +#: sequencer.c:1632 sequencer.c:4808

5290 msgid "need a HEAD to fixup"

5291 msgstr "se necesita un HEAD para arreglar"

5292

4869 -#: sequencer.c:1613 sequencer.c:2912

5293 +#: sequencer.c:1634 sequencer.c:2958

5294 msgid "could not read HEAD"

5295 msgstr "no se pudo leer HEAD"

5296

4873 -#: sequencer.c:1615

5297 +#: sequencer.c:1636

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

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

5300

4877 -#: sequencer.c:1621

5301 +#: sequencer.c:1642

5302 #, c-format

5303 msgid "cannot write '%s'"

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

5305

4882 -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

5306 +#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

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

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

5309

4886 -#: sequencer.c:1636

5310 +#: sequencer.c:1657

5311 #, c-format

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

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

5314

4891 -#: sequencer.c:1643

5315 +#: sequencer.c:1664

5316 #, c-format

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

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

5319

4896 -#: sequencer.c:1649

5320 +#: sequencer.c:1670

5321 #, c-format

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

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

5324

4901 -#: sequencer.c:1732

5325 +#: sequencer.c:1758

5326 msgid "your index file is unmerged."

5327 msgstr "tu archivo índice no está fusionado."

5328

4905 -#: sequencer.c:1739

5329 +#: sequencer.c:1765

5330 msgid "cannot fixup root commit"

5331 msgstr "no se puede arreglar el commit raíz"

5332

4909 -#: sequencer.c:1758

5333 +#: sequencer.c:1784

5334 #, c-format

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

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

5337

4914 -#: sequencer.c:1766

5338 +#: sequencer.c:1792 sequencer.c:1800

5339 #, c-format

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

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

5342

4919 -#: sequencer.c:1770

4920 -#, c-format

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

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

4923 -

4924 -#: sequencer.c:1776

5343 +#: sequencer.c:1806

5344 #, c-format

5345 msgid "cannot get commit message for %s"

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

5347

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

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

4931 -#: sequencer.c:1795

5350 +#: sequencer.c:1825

5351 #, c-format

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

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

5354

4936 -#: sequencer.c:1860

5355 +#: sequencer.c:1890

5356 #, c-format

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

5358 msgstr "no se puede renombrar '%s' a '%s'"

5359

4941 -#: sequencer.c:1915

5360 +#: sequencer.c:1945

5361 #, c-format

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

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

5364

4946 -#: sequencer.c:1916

5365 +#: sequencer.c:1946

5366 #, c-format

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

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

5369

4951 -#: sequencer.c:1974

5370 +#: sequencer.c:2005

5371 #, c-format

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

5373 msgstr "git %s: falló al leer el índice"

5374

4956 -#: sequencer.c:1981

5375 +#: sequencer.c:2012

5376 #, c-format

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

5378 msgstr "git %s: falló al refrescar el índice"

5379

4961 -#: sequencer.c:2062

5380 +#: sequencer.c:2094

5381 #, c-format

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

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

5384

4966 -#: sequencer.c:2071

5385 +#: sequencer.c:2103

5386 #, c-format

5387 msgid "missing arguments for %s"

5388 msgstr "faltan argumentos para para %s"

5389

4971 -#: sequencer.c:2130

5390 +#: sequencer.c:2163

5391 #, c-format

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

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

5394

4976 -#: sequencer.c:2138

5395 +#: sequencer.c:2171

5396 #, c-format

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

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

5399

4981 -#: sequencer.c:2209

5400 +#: sequencer.c:2243

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

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

5403

4985 -#: sequencer.c:2211

5404 +#: sequencer.c:2245

5405 #, c-format

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

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

5408

4990 -#: sequencer.c:2216

5409 +#: sequencer.c:2250

5410 msgid "no commits parsed."

5411 msgstr "ningún commit analizado."

5412

4994 -#: sequencer.c:2227

5413 +#: sequencer.c:2261

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

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

5416

4998 -#: sequencer.c:2229

5417 +#: sequencer.c:2263

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

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

5420

5002 -#: sequencer.c:2299

5421 +#: sequencer.c:2333

5422 #, c-format

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

5424 msgstr "valor inválido para %s: %s"

5425

5007 -#: sequencer.c:2380

5426 +#: sequencer.c:2420

5427 msgid "unusable squash-onto"

5428 msgstr "squash-onto inservible"

5429

5011 -#: sequencer.c:2396

5430 +#: sequencer.c:2436

5431 #, c-format

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

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

5434

5016 -#: sequencer.c:2479 sequencer.c:4005

5435 +#: sequencer.c:2518 sequencer.c:4067

5436 msgid "empty commit set passed"

5437 msgstr "conjunto de commits vacío entregado"

5438

5020 -#: sequencer.c:2487

5439 +#: sequencer.c:2526

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

5441 msgstr "un cherry-pick o revert ya está en progreso"

5442

5024 -#: sequencer.c:2488

5443 +#: sequencer.c:2527

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

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

5446

5028 -#: sequencer.c:2491

5447 +#: sequencer.c:2530

5448 #, c-format

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

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

5451

5033 -#: sequencer.c:2505

5452 +#: sequencer.c:2544

5453 msgid "could not lock HEAD"

5454 msgstr "no se pudo bloquear HEAD"

5455

5037 -#: sequencer.c:2560 sequencer.c:3761

5456 +#: sequencer.c:2599 sequencer.c:3819

5457 msgid "no cherry-pick or revert in progress"

5458 msgstr "ningún cherry-pick o revert en progreso"

5459

5041 -#: sequencer.c:2562

5460 +#: sequencer.c:2601

5461 msgid "cannot resolve HEAD"

5462 msgstr "no se puede resolver HEAD"

5463

5045 -#: sequencer.c:2564 sequencer.c:2599

5464 +#: sequencer.c:2603 sequencer.c:2638

5465 msgid "cannot abort from a branch yet to be born"

5466 msgstr "no se puede abortar de una rama por nacer"

5467

5049 -#: sequencer.c:2585 builtin/grep.c:721

5468 +#: sequencer.c:2624 builtin/grep.c:732

5469 #, c-format

5470 msgid "cannot open '%s'"

5471 msgstr "no se puede abrir '%s'"

5472

5054 -#: sequencer.c:2587

5473 +#: sequencer.c:2626

5474 #, c-format

5475 msgid "cannot read '%s': %s"

5476 msgstr "no se puede leer '%s': %s"

5477

5059 -#: sequencer.c:2588

5478 +#: sequencer.c:2627

5479 msgid "unexpected end of file"

5480 msgstr "final de archivo inesperado"

5481

5063 -#: sequencer.c:2594

5482 +#: sequencer.c:2633

5483 #, c-format

5484 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5485 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"

5486

5068 -#: sequencer.c:2605

5487 +#: sequencer.c:2644

5488 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5489 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

5490

5072 -#: sequencer.c:2709 sequencer.c:3679

5491 +#: sequencer.c:2750 sequencer.c:3735

5492 #, c-format

5493 msgid "could not update %s"

5494 msgstr "no se puede actualizar %s"

5495

5077 -#: sequencer.c:2747 sequencer.c:3659

5496 +#: sequencer.c:2788 sequencer.c:3715

5497 msgid "cannot read HEAD"

5498 msgstr "no se puede leer HEAD"

5499

5081 -#: sequencer.c:2762

5500 +#: sequencer.c:2805

5501 #, c-format

5502 msgid "unable to copy '%s' to '%s'"

5503 msgstr "no se pudo copiar '%s' a '%s'"

5504

5086 -#: sequencer.c:2770

5505 +#: sequencer.c:2813

5506 #, c-format

5507 msgid ""

5508 "You can amend the commit now, with\n"

@@ -5102,27 +5521,27 @@ msgstr ""

5521 "\n"

5522 "\tgit rebase --continue\n"

5523

5105 -#: sequencer.c:2780

5524 +#: sequencer.c:2823

5525 #, c-format

5526 msgid "Could not apply %s... %.*s"

5527 msgstr "No se pudo aplicar %s... %.*s"

5528

5110 -#: sequencer.c:2787

5529 +#: sequencer.c:2830

5530 #, c-format

5531 msgid "Could not merge %.*s"

5532 msgstr "No se pudo fusionar %.*s"

5533

5115 -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5534 +#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

5535 #, c-format

5536 msgid "could not copy '%s' to '%s'"

5537 msgstr "no se pudo copiar '%s' a '%s'"

5538

5120 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

5121 -#: builtin/rebase.c:1372 builtin/rebase.c:1426

5539 +#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230

5540 +#: builtin/rebase.c:1591 builtin/rebase.c:1646

5541 msgid "could not read index"

5542 msgstr "no se pudo leer índice"

5543

5125 -#: sequencer.c:2829

5544 +#: sequencer.c:2875

5545 #, c-format

5546 msgid ""

5547 "execution failed: %s\n"

@@ -5137,11 +5556,11 @@ msgstr ""

5556 " git rebase --continue\n"

5557 "\n"

5558

5140 -#: sequencer.c:2835

5559 +#: sequencer.c:2881

5560 msgid "and made changes to the index and/or the working tree\n"

5561 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

5562

5144 -#: sequencer.c:2841

5563 +#: sequencer.c:2887

5564 #, c-format

5565 msgid ""

5566 "execution succeeded: %s\n"

@@ -5158,76 +5577,76 @@ msgstr ""

5577 " git rebase --continue\n"

5578 "\n"

5579

5161 -#: sequencer.c:2902

5580 +#: sequencer.c:2948

5581 #, c-format

5582 msgid "illegal label name: '%.*s'"

5583 msgstr "nombre de label ilegal: '%.*s'"

5584

5166 -#: sequencer.c:2954

5585 +#: sequencer.c:3002

5586 msgid "writing fake root commit"

5587 msgstr "escribiendo commit raíz falso"

5588

5170 -#: sequencer.c:2959

5589 +#: sequencer.c:3007

5590 msgid "writing squash-onto"

5591 msgstr "escribiendo squash-onto"

5592

5174 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5593 +#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

5594 #, c-format

5595 msgid "failed to find tree of %s"

5596 msgstr "falló al encontrar árbol de %s"

5597

5179 -#: sequencer.c:3015 builtin/rebase.c:604

5598 +#: sequencer.c:3063 builtin/rebase.c:448

5599 msgid "could not write index"

5600 msgstr "no se pudo escribir índice"

5601

5183 -#: sequencer.c:3042

5602 +#: sequencer.c:3090

5603 #, c-format

5604 msgid "could not resolve '%s'"

5605 msgstr "no se pudo resolver '%s'"

5606

5188 -#: sequencer.c:3068

5607 +#: sequencer.c:3118

5608 msgid "cannot merge without a current revision"

5609 msgstr "no se puede fusionar sin una versión actual"

5610

5192 -#: sequencer.c:3090

5611 +#: sequencer.c:3140

5612 #, c-format

5613 msgid "unable to parse '%.*s'"

5614 msgstr "no se puede analizar '%.*s'"

5615

5197 -#: sequencer.c:3099

5616 +#: sequencer.c:3149

5617 #, c-format

5618 msgid "nothing to merge: '%.*s'"

5619 msgstr "nada para fusionar: '%.*s'"

5620

5202 -#: sequencer.c:3111

5621 +#: sequencer.c:3161

5622 msgid "octopus merge cannot be executed on top of a [new root]"

5623 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"

5624

5206 -#: sequencer.c:3126

5625 +#: sequencer.c:3176

5626 #, c-format

5627 msgid "could not get commit message of '%s'"

5628 msgstr "no se puede leer el mensaje del commit '%s'"

5629

5211 -#: sequencer.c:3274

5630 +#: sequencer.c:3325

5631 #, c-format

5632 msgid "could not even attempt to merge '%.*s'"

5633 msgstr "no se pudo intentar fusionar '%.*s'"

5634

5216 -#: sequencer.c:3290

5635 +#: sequencer.c:3341

5636 msgid "merge: Unable to write new index file"

5637 msgstr "fusión: No se puede escribir el nuevo archivo índice"

5638

5220 -#: sequencer.c:3358 builtin/rebase.c:268

5639 +#: sequencer.c:3409 builtin/rebase.c:298

5640 #, c-format

5641 msgid "Applied autostash.\n"

5642 msgstr "Autostash aplicado.\n"

5643

5225 -#: sequencer.c:3370

5644 +#: sequencer.c:3421

5645 #, c-format

5646 msgid "cannot store %s"

5647 msgstr "no se puede guardar %s"

5648

5230 -#: sequencer.c:3373 builtin/rebase.c:284

5649 +#: sequencer.c:3424 builtin/rebase.c:314

5650 #, c-format

5651 msgid ""

5652 "Applying autostash resulted in conflicts.\n"

@@ -5239,31 +5658,31 @@ msgstr ""

5658 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

5659 "momento.\n"

5660

5242 -#: sequencer.c:3427

5661 +#: sequencer.c:3478

5662 #, c-format

5663 msgid "could not checkout %s"

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

5665

5247 -#: sequencer.c:3441

5666 +#: sequencer.c:3492

5667 #, c-format

5668 msgid "%s: not a valid OID"

5669 msgstr "%s no es OID válido"

5670

5252 -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5671 +#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

5672 msgid "could not detach HEAD"

5673 msgstr "no se puede desacoplar HEAD"

5674

5256 -#: sequencer.c:3461

5675 +#: sequencer.c:3512

5676 #, c-format

5677 msgid "Stopped at HEAD\n"

5678 msgstr "Detenido en HEAD\n"

5679

5261 -#: sequencer.c:3463

5680 +#: sequencer.c:3514

5681 #, c-format

5682 msgid "Stopped at %s\n"

5683 msgstr "Detenido en %s\n"

5684

5266 -#: sequencer.c:3471

5685 +#: sequencer.c:3522

5686 #, c-format

5687 msgid ""

5688 "Could not execute the todo command\n"

@@ -5284,48 +5703,48 @@ msgstr ""

5703 " git rebase --edit-todo\n"

5704 " git rebase --continue\n"

5705

5287 -#: sequencer.c:3543

5706 +#: sequencer.c:3597

5707 #, c-format

5708 msgid "Stopped at %s... %.*s\n"

5709 msgstr "Detenido en %s... %.*s\n"

5710

5292 -#: sequencer.c:3622

5711 +#: sequencer.c:3677

5712 #, c-format

5713 msgid "unknown command %d"

5714 msgstr "comando desconocido %d"

5715

5297 -#: sequencer.c:3667

5716 +#: sequencer.c:3723

5717 msgid "could not read orig-head"

5718 msgstr "no se puede leer orig-head"

5719

5301 -#: sequencer.c:3672 sequencer.c:4741

5720 +#: sequencer.c:3728 sequencer.c:4805

5721 msgid "could not read 'onto'"

5722 msgstr "no se puede leer 'onto'"

5723

5305 -#: sequencer.c:3686

5724 +#: sequencer.c:3742

5725 #, c-format

5726 msgid "could not update HEAD to %s"

5727 msgstr "no se puede actualizar HEAD a %s"

5728

5310 -#: sequencer.c:3772

5729 +#: sequencer.c:3831

5730 msgid "cannot rebase: You have unstaged changes."

5731 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

5732

5314 -#: sequencer.c:3781

5733 +#: sequencer.c:3840

5734 msgid "cannot amend non-existing commit"

5735 msgstr "no se puede arreglar un commit no existente"

5736

5318 -#: sequencer.c:3783

5737 +#: sequencer.c:3842

5738 #, c-format

5739 msgid "invalid file: '%s'"

5740 msgstr "archivo inválido: '%s'"

5741

5323 -#: sequencer.c:3785

5742 +#: sequencer.c:3844

5743 #, c-format

5744 msgid "invalid contents: '%s'"

5745 msgstr "contenido inválido: '%s'"

5746

5328 -#: sequencer.c:3788

5747 +#: sequencer.c:3847

5748 msgid ""

5749 "\n"

5750 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -5336,54 +5755,54 @@ msgstr ""

5755 "un commit con estos\n"

5756 "primero y luego ejecuta 'git rebase --continue' de nuevo."

5757

5339 -#: sequencer.c:3824 sequencer.c:3862

5758 +#: sequencer.c:3883 sequencer.c:3921

5759 #, c-format

5760 msgid "could not write file: '%s'"

5761 msgstr "no se pudo escribir el archivo: '%s'"

5762

5344 -#: sequencer.c:3877

5763 +#: sequencer.c:3936

5764 msgid "could not remove CHERRY_PICK_HEAD"

5765 msgstr "no se puede eliminar CHERRY_PICK_HEAD"

5766

5348 -#: sequencer.c:3884

5767 +#: sequencer.c:3943

5768 msgid "could not commit staged changes."

5769 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

5770

5352 -#: sequencer.c:3982

5771 +#: sequencer.c:4044

5772 #, c-format

5773 msgid "%s: can't cherry-pick a %s"

5774 msgstr "%s: no se puede aplicar cherry-pick a un %s"

5775

5357 -#: sequencer.c:3986

5776 +#: sequencer.c:4048

5777 #, c-format

5778 msgid "%s: bad revision"

5779 msgstr "%s: revisión errónea"

5780

5362 -#: sequencer.c:4021

5781 +#: sequencer.c:4083

5782 msgid "can't revert as initial commit"

5783 msgstr "no se puede revertir como commit inicial"

5784

5366 -#: sequencer.c:4466

5785 +#: sequencer.c:4529

5786 msgid "make_script: unhandled options"

5787 msgstr "make_script: opciones desconocidas"

5788

5370 -#: sequencer.c:4469

5789 +#: sequencer.c:4532

5790 msgid "make_script: error preparing revisions"

5791 msgstr "make_script: error preparando revisiones"

5792

5374 -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5793 +#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

5794 #, c-format

5795 msgid "unusable todo list: '%s'"

5796 msgstr "lista de pendientes inutilizable: '%s'"

5797

5379 -#: sequencer.c:4620

5798 +#: sequencer.c:4684

5799 #, c-format

5800 msgid ""

5801 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5802 msgstr ""

5803 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

5804

5386 -#: sequencer.c:4690

5805 +#: sequencer.c:4754

5806 #, c-format

5807 msgid ""

5808 "Warning: some commits may have been dropped accidentally.\n"

@@ -5392,7 +5811,7 @@ msgstr ""

5811 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

5812 "Commits botados (empezando con el mas nuevo):\n"

5813

5395 -#: sequencer.c:4697

5814 +#: sequencer.c:4761

5815 #, c-format

5816 msgid ""

5817 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5410,7 +5829,7 @@ msgstr ""

5829 "Los posibles comportamientos son: ignore,warn,error.\n"

5830 "\n"

5831

5413 -#: sequencer.c:4710

5832 +#: sequencer.c:4774

5833 #, c-format

5834 msgid ""

5835 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -5421,31 +5840,31 @@ msgstr ""

5840 "rebase --continue'.\n"

5841 "O se puede abortar el rebase con 'git rebase --abort'.\n"

5842

5424 -#: sequencer.c:4848 sequencer.c:4886

5843 +#: sequencer.c:4912 sequencer.c:4950

5844 msgid "nothing to do"

5845 msgstr "nada que hacer"

5846

5428 -#: sequencer.c:4852

5847 +#: sequencer.c:4916

5848 #, c-format

5849 msgid "Rebase %s onto %s (%d command)"

5850 msgid_plural "Rebase %s onto %s (%d commands)"

5851 msgstr[0] "Rebase %s en %s (%d comando)"

5852 msgstr[1] "Rebase %s en %s (%d comandos)"

5853

5435 -#: sequencer.c:4864

5854 +#: sequencer.c:4928

5855 #, c-format

5856 msgid "could not copy '%s' to '%s'."

l10n: es: 2.21.0 round 2