848c9e1d9e · 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: 2020-03-11 15:26+0800\n"

11 -"PO-Revision-Date: 2020-03-11 23:18-0500\n"

10 +"POT-Creation-Date: 2020-05-15 09:11+0800\n"

11 +"PO-Revision-Date: 2020-05-17 18:49-0500\n"

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

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

14 "Language: es\n"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr "¿Ahh (%s)?"

25

26 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

27 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

28 -#: builtin/rebase.c:2086 builtin/rebase.c:2130

26 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

27 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

28 +#: builtin/rebase.c:1919

29 msgid "could not read index"

30 msgstr "no se pudo leer índice"

31

@@ -53,8 +53,7 @@ msgstr "Actualizar"

53 msgid "could not stage '%s'"

54 msgstr "no se pudo poner en stage '%s'"

55

56 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

57 -#: builtin/rebase.c:899

56 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

57 msgid "could not write index"

58 msgstr "no se pudo escribir índice"

59

@@ -70,8 +69,8 @@ msgstr[1] "actualizadas %d rutas\n"

69 msgid "note: %s is untracked now.\n"

70 msgstr "nota: %s no es rastreado ahora.\n"

71

73 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

74 -#: builtin/reset.c:144

72 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

73 +#: builtin/reset.c:145

74 #, c-format

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

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

@@ -195,11 +194,11 @@ msgstr "selecciona un objeto numerado"

194 msgid "(empty) select nothing"

195 msgstr "(vacío) selecciona nada"

196

198 -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

197 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851

198 msgid "*** Commands ***"

199 msgstr "*** Comandos ***"

200

202 -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

201 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848

202 msgid "What now"

203 msgstr "Ahora que"

204

@@ -211,12 +210,13 @@ msgstr "rastreado"

210 msgid "unstaged"

211 msgstr "no rastreado"

212

214 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

215 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

216 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

214 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

215 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

216 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

217 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

219 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213

218 +#: builtin/submodule--helper.c:2148 bugreport.c:129

219 +#: git-add--interactive.perl:213

220 msgid "path"

221 msgstr "ruta"

222

@@ -224,27 +224,27 @@ msgstr "ruta"

224 msgid "could not refresh index"

225 msgstr "no se pudo refrescar el index"

226

227 -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

227 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765

228 #, c-format

229 msgid "Bye.\n"

230 msgstr "Adiós.\n"

231

232 -#: add-patch.c:33 git-add--interactive.perl:1428

232 +#: add-patch.c:34 git-add--interactive.perl:1428

233 #, c-format, perl-format

234 msgid "Stage mode change [y,n,q,a,d%s,?]? "

235 msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "

236

237 -#: add-patch.c:34 git-add--interactive.perl:1429

237 +#: add-patch.c:35 git-add--interactive.perl:1429

238 #, c-format, perl-format

239 msgid "Stage deletion [y,n,q,a,d%s,?]? "

240 msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "

241

242 -#: add-patch.c:35 git-add--interactive.perl:1430

242 +#: add-patch.c:36 git-add--interactive.perl:1430

243 #, c-format, perl-format

244 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

245 msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "

246

247 -#: add-patch.c:37

247 +#: add-patch.c:38

248 msgid ""

249 "If the patch applies cleanly, the edited hunk will immediately be marked for "

250 "staging."

@@ -252,7 +252,7 @@ msgstr ""

252 "Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

253 "para el área de stage."

254

255 -#: add-patch.c:40

255 +#: add-patch.c:41

256 msgid ""

257 "y - stage this hunk\n"

258 "n - do not stage this hunk\n"

@@ -267,22 +267,22 @@ msgstr ""

267 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "

268 "archivo\n"

269

270 -#: add-patch.c:54 git-add--interactive.perl:1433

270 +#: add-patch.c:55 git-add--interactive.perl:1433

271 #, c-format, perl-format

272 msgid "Stash mode change [y,n,q,a,d%s,?]? "

273 msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "

274

275 -#: add-patch.c:55 git-add--interactive.perl:1434

275 +#: add-patch.c:56 git-add--interactive.perl:1434

276 #, c-format, perl-format

277 msgid "Stash deletion [y,n,q,a,d%s,?]? "

278 msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "

279

280 -#: add-patch.c:56 git-add--interactive.perl:1435

280 +#: add-patch.c:57 git-add--interactive.perl:1435

281 #, c-format, perl-format

282 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

283 msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "

284

285 -#: add-patch.c:58

285 +#: add-patch.c:59

286 msgid ""

287 "If the patch applies cleanly, the edited hunk will immediately be marked for "

288 "stashing."

@@ -290,7 +290,7 @@ msgstr ""

290 "Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

291 "para aplicar stash."

292

293 -#: add-patch.c:61

293 +#: add-patch.c:62

294 msgid ""

295 "y - stash this hunk\n"

296 "n - do not stash this hunk\n"

@@ -304,22 +304,22 @@ msgstr ""

304 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"

305 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n"

306

307 -#: add-patch.c:77 git-add--interactive.perl:1438

307 +#: add-patch.c:78 git-add--interactive.perl:1438

308 #, c-format, perl-format

309 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

310 msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "

311

312 -#: add-patch.c:78 git-add--interactive.perl:1439

312 +#: add-patch.c:79 git-add--interactive.perl:1439

313 #, c-format, perl-format

314 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

315 msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "

316

317 -#: add-patch.c:79 git-add--interactive.perl:1440

317 +#: add-patch.c:80 git-add--interactive.perl:1440

318 #, c-format, perl-format

319 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

320 msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "

321

322 -#: add-patch.c:81

322 +#: add-patch.c:82

323 msgid ""

324 "If the patch applies cleanly, the edited hunk will immediately be marked for "

325 "unstaging."

@@ -327,7 +327,7 @@ msgstr ""

327 "Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

328 "para sacar del área de stage."

329

330 -#: add-patch.c:84

330 +#: add-patch.c:85

331 msgid ""

332 "y - unstage this hunk\n"

333 "n - do not unstage this hunk\n"

@@ -342,22 +342,22 @@ msgstr ""

342 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "

343 "archivo\n"

344

345 -#: add-patch.c:99 git-add--interactive.perl:1443

345 +#: add-patch.c:100 git-add--interactive.perl:1443

346 #, c-format, perl-format

347 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

348 msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "

349

350 -#: add-patch.c:100 git-add--interactive.perl:1444

350 +#: add-patch.c:101 git-add--interactive.perl:1444

351 #, c-format, perl-format

352 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

353 msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "

354

355 -#: add-patch.c:101 git-add--interactive.perl:1445

355 +#: add-patch.c:102 git-add--interactive.perl:1445

356 #, c-format, perl-format

357 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

358 msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? "

359

360 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211

360 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212

361 msgid ""

362 "If the patch applies cleanly, the edited hunk will immediately be marked for "

363 "applying."

@@ -365,7 +365,7 @@ msgstr ""

365 "Si el parche aplica de forma limpia, el hunk editado sera marcado "

366 "inmediatamente para aplicar."

367

368 -#: add-patch.c:106

368 +#: add-patch.c:107

369 msgid ""

370 "y - apply this hunk to index\n"

371 "n - do not apply this hunk to index\n"

@@ -379,25 +379,25 @@ msgstr ""

379 "a - aplicar este hunk y todos los posteriores en el archivo\n"

380 "d - no aplicar este hunko ninguno de los posteriores en el archivo\n"

381

382 -#: add-patch.c:121 git-add--interactive.perl:1448

382 +#: add-patch.c:122 git-add--interactive.perl:1448

383 #: git-add--interactive.perl:1463

384 #, c-format, perl-format

385 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

386 msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "

387

388 -#: add-patch.c:122 git-add--interactive.perl:1449

388 +#: add-patch.c:123 git-add--interactive.perl:1449

389 #: git-add--interactive.perl:1464

390 #, c-format, perl-format

391 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

392 msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "

393

394 -#: add-patch.c:123 git-add--interactive.perl:1450

394 +#: add-patch.c:124 git-add--interactive.perl:1450

395 #: git-add--interactive.perl:1465

396 #, c-format, perl-format

397 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

398 msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "

399

400 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190

400 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191

401 msgid ""

402 "If the patch applies cleanly, the edited hunk will immediately be marked for "

403 "discarding."

@@ -405,7 +405,7 @@ msgstr ""

405 "Si el parche aplica de forma limpia, el hunk editado sera marcado "

406 "inmediatamente para descarte."

407

408 -#: add-patch.c:128 add-patch.c:193

408 +#: add-patch.c:129 add-patch.c:194

409 msgid ""

410 "y - discard this hunk from worktree\n"

411 "n - do not discard this hunk from worktree\n"

@@ -419,24 +419,24 @@ msgstr ""

419 "a - descartar este hunk y todos los posteriores en este archivo\n"

420 "d - no descartar este hunk o ninguno de los posteriores en el archivo\n"

421

422 -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

422 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

423 #, c-format, perl-format

424 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

425 msgstr ""

426 "¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

427

428 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

428 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

429 #, c-format, perl-format

430 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

431 msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

432

433 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

433 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

434 #, c-format, perl-format

435 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

436 msgstr ""

437 "¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

438

439 -#: add-patch.c:150

439 +#: add-patch.c:151

440 msgid ""

441 "y - discard this hunk from index and worktree\n"

442 "n - do not discard this hunk from index and worktree\n"

@@ -450,24 +450,24 @@ msgstr ""

450 "a - descartar este hunk y todos los posteriores en este archivo\n"

451 "d - no descartar este hunk o ninguno posterior en el archivo\n"

452

453 -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

453 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

454 #, c-format, perl-format

455 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

456 msgstr ""

457 "¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"

458 "%s,?]? "

459

460 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

460 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

461 #, c-format, perl-format

462 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

463 msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "

464

465 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

465 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

466 #, c-format, perl-format

467 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

468 msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "

469

470 -#: add-patch.c:171

470 +#: add-patch.c:172

471 msgid ""

472 "y - apply this hunk to index and worktree\n"

473 "n - do not apply this hunk to index and worktree\n"

@@ -481,7 +481,7 @@ msgstr ""

481 "a - aplicar este hunk y todos los posteriores en el archivo\n"

482 "d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"

483

484 -#: add-patch.c:214

484 +#: add-patch.c:215

485 msgid ""

486 "y - apply this hunk to worktree\n"

487 "n - do not apply this hunk to worktree\n"

@@ -495,34 +495,34 @@ msgstr ""

495 "a - aplicar este hunk y todos los posteriores en el archivo\n"

496 "d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"

497

498 -#: add-patch.c:318

498 +#: add-patch.c:319

499 #, c-format

500 msgid "could not parse hunk header '%.*s'"

501 msgstr "no se puede analizar hunk header '%.*s'"

502

503 -#: add-patch.c:337 add-patch.c:341

503 +#: add-patch.c:338 add-patch.c:342

504 #, c-format

505 msgid "could not parse colored hunk header '%.*s'"

506 msgstr "no se puede analizar hunk header '%.*s'"

507

508 -#: add-patch.c:395

508 +#: add-patch.c:396

509 msgid "could not parse diff"

510 msgstr "no se puede analizar diff"

511

512 -#: add-patch.c:414

512 +#: add-patch.c:415

513 msgid "could not parse colored diff"

514 msgstr "no se pudo analizar diff a colores"

515

516 -#: add-patch.c:428

516 +#: add-patch.c:429

517 #, c-format

518 msgid "failed to run '%s'"

519 msgstr "falló al ejecutar '%s'"

520

521 -#: add-patch.c:587

521 +#: add-patch.c:588

522 msgid "mismatched output from interactive.diffFilter"

523 msgstr "output de interactive.diffFilter no concuerda"

524

525 -#: add-patch.c:588

525 +#: add-patch.c:589

526 msgid ""

527 "Your filter must maintain a one-to-one correspondence\n"

528 "between its input and output lines."

@@ -530,7 +530,7 @@ msgstr ""

530 "Tu filtro tiene que mantener correspondencia de uno a uno\n"

531 "entre las líneas de entrada y salida."

532

533 -#: add-patch.c:761

533 +#: add-patch.c:762

534 #, c-format

535 msgid ""

536 "expected context line #%d in\n"

@@ -539,7 +539,7 @@ msgstr ""

539 "se esperaba línea de contexto #%d en\n"

540 "%.*s"

541

542 -#: add-patch.c:776

542 +#: add-patch.c:777

543 #, c-format

544 msgid ""

545 "hunks do not overlap:\n"

@@ -552,11 +552,11 @@ msgstr ""

552 "\tno acaba con:\n"

553 "%.*s"

554

555 -#: add-patch.c:1052 git-add--interactive.perl:1112

555 +#: add-patch.c:1053 git-add--interactive.perl:1112

556 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

557 msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"

558

559 -#: add-patch.c:1056

559 +#: add-patch.c:1057

560 #, c-format

561 msgid ""

562 "---\n"

@@ -570,7 +570,7 @@ msgstr ""

570 "Lineas comenzando con %c serán eliminadas.\n"

571

572 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

573 -#: add-patch.c:1070 git-add--interactive.perl:1126

573 +#: add-patch.c:1071 git-add--interactive.perl:1126

574 msgid ""

575 "If it does not apply cleanly, you will be given an opportunity to\n"

576 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -580,11 +580,11 @@ msgstr ""

580 "editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n"

581 "la edición es abortada y el hunk queda sin cambios.\n"

582

583 -#: add-patch.c:1103

583 +#: add-patch.c:1104

584 msgid "could not parse hunk header"

585 msgstr "no se puede analizar hunk header"

586

587 -#: add-patch.c:1148

587 +#: add-patch.c:1149

588 msgid "'git apply --cached' failed"

589 msgstr "falló 'git apply --cached'"

590

@@ -707,38 +707,47 @@ msgstr "Perdón, no se puede editar este pedazo"

707 msgid "'git apply' failed"

708 msgstr "falló 'git apply'"

709

710 -#: advice.c:115

710 +#: advice.c:140

711 +#, c-format

712 +msgid ""

713 +"\n"

714 +"Disable this message with \"git config advice.%s false\""

715 +msgstr ""

716 +"\n"

717 +"Desactivar este mensaje con \"git config advice.%s false\""

718 +

719 +#: advice.c:156

720 #, c-format

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

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

723

715 -#: advice.c:168

724 +#: advice.c:247

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

726 msgstr ""

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

728

720 -#: advice.c:170

729 +#: advice.c:249

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

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

732

724 -#: advice.c:172

733 +#: advice.c:251

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

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

736

728 -#: advice.c:174

737 +#: advice.c:253

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

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

740

732 -#: advice.c:176

741 +#: advice.c:255

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

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

744

736 -#: advice.c:178

745 +#: advice.c:257

746 #, c-format

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

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

749

741 -#: advice.c:186

750 +#: advice.c:265

751 msgid ""

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

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

@@ -746,23 +755,23 @@ msgstr ""

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

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

757

749 -#: advice.c:194

758 +#: advice.c:273

759 msgid "Exiting because of an unresolved conflict."

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

761

753 -#: advice.c:199 builtin/merge.c:1335

762 +#: advice.c:278 builtin/merge.c:1353

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

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

765

757 -#: advice.c:201

766 +#: advice.c:280

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

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

769

761 -#: advice.c:202

770 +#: advice.c:281

771 msgid "Exiting because of unfinished merge."

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

773

765 -#: advice.c:208

774 +#: advice.c:287

775 #, c-format

776 msgid ""

777 "Note: switching to '%s'.\n"

@@ -1062,7 +1071,7 @@ msgstr "el parche falló: %s:%ld"

1071 msgid "cannot checkout %s"

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

1073

1065 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1074 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1075 #, c-format

1076 msgid "failed to read %s"

1077 msgstr "no se pudo leer %s"

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

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

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

1271

1263 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1272 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1273 #, c-format

1274 msgid "cannot open %s"

1275 msgstr "no se puede abrir %s"

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

1337 msgid "apply changes matching the given path"

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

1339

1331 -#: apply.c:4973 builtin/am.c:2260

1340 +#: apply.c:4973 builtin/am.c:2259

1341 msgid "num"

1342 msgstr "num"

1343

@@ -1385,7 +1394,7 @@ msgid "build a temporary index based on embedded index information"

1394 msgstr ""

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

1396

1388 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1397 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1398 msgid "paths are separated with NUL character"

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

1400

@@ -1393,9 +1402,9 @@ msgstr "rutas están separadas con un carácter NULL"

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

1403 msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"

1404

1396 -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1405 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

1406 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1398 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1407 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1408 msgid "action"

1409 msgstr "acción"

1410

@@ -1427,8 +1436,8 @@ msgid "allow overlapping hunks"

1436 msgstr "permitir solapamiento de hunks"

1437

1438 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1430 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

1431 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1439 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774

1440 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1441 msgid "be verbose"

1442 msgstr "ser verboso"

1443

@@ -1442,7 +1451,7 @@ msgstr ""

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

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

1453

1445 -#: apply.c:5032 builtin/am.c:2248

1454 +#: apply.c:5032 builtin/am.c:2247

1455 msgid "root"

1456 msgstr "raíz"

1457

@@ -1450,6 +1459,55 @@ msgstr "raíz"

1459 msgid "prepend <root> to all filenames"

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

1461

1462 +#: archive-tar.c:125 archive-zip.c:351

1463 +#, c-format

1464 +msgid "cannot stream blob %s"

1465 +msgstr "no se puede transmitir el blob %s"

1466 +

1467 +#: archive-tar.c:266 archive-zip.c:369

1468 +#, c-format

1469 +msgid "unsupported file mode: 0%o (SHA1: %s)"

1470 +msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"

1471 +

1472 +#: archive-tar.c:293 archive-zip.c:359

1473 +#, c-format

1474 +msgid "cannot read %s"

1475 +msgstr "no se puede leer %s"

1476 +

1477 +#: archive-tar.c:465

1478 +#, c-format

1479 +msgid "unable to start '%s' filter"

1480 +msgstr "no se puede comenzar filtro '%s'"

1481 +

1482 +#: archive-tar.c:468

1483 +msgid "unable to redirect descriptor"

1484 +msgstr "incapaz de redirigir descriptor"

1485 +

1486 +#: archive-tar.c:475

1487 +#, c-format

1488 +msgid "'%s' filter reported error"

1489 +msgstr "filtro '%s' reportó un error"

1490 +

1491 +#: archive-zip.c:319

1492 +#, c-format

1493 +msgid "path is not valid UTF-8: %s"

1494 +msgstr "ruta no válida UTF-8: %s"

1495 +

1496 +#: archive-zip.c:323

1497 +#, c-format

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

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

1500 +

1501 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1502 +#, c-format

1503 +msgid "deflate error (%d)"

1504 +msgstr "error al desinflar (%d)"

1505 +

1506 +#: archive-zip.c:615

1507 +#, c-format

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

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

1510 +

1511 #: archive.c:14

1512 msgid "git archive [<options>] <tree-ish> [<path>...]"

1513 msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"

@@ -1469,172 +1527,123 @@ msgstr ""

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

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

1529

1472 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1530 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1531 #, c-format

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

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

1534

1477 -#: archive.c:396

1535 +#: archive.c:401

1536 #, c-format

1537 msgid "no such ref: %.*s"

1538 msgstr "no existe el ref: %.*s"

1539

1482 -#: archive.c:401

1540 +#: archive.c:407

1541 #, c-format

1542 msgid "not a valid object name: %s"

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

1544

1487 -#: archive.c:414

1545 +#: archive.c:420

1546 #, c-format

1547 msgid "not a tree object: %s"

1548 msgstr "no es un objeto tree: %s"

1549

1492 -#: archive.c:426

1550 +#: archive.c:432

1551 msgid "current working directory is untracked"

1552 msgstr "directorio de trabajo actual no rastreado"

1553

1496 -#: archive.c:457

1554 +#: archive.c:464

1555 msgid "fmt"

1556 msgstr "fmt"

1557

1500 -#: archive.c:457

1558 +#: archive.c:464

1559 msgid "archive format"

1560 msgstr "formato del archivo"

1561

1504 -#: archive.c:458 builtin/log.c:1653

1562 +#: archive.c:465 builtin/log.c:1674

1563 msgid "prefix"

1564 msgstr "prefijo"

1565

1508 -#: archive.c:459

1566 +#: archive.c:466

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

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

1569

1512 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1570 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1571 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1514 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

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

1572 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1573 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

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

1575 #: parse-options.h:190

1576 msgid "file"

1577 msgstr "carpeta"

1578

1521 -#: archive.c:461 builtin/archive.c:90

1579 +#: archive.c:468 builtin/archive.c:90

1580 msgid "write the archive to this file"

1581 msgstr "escribe el archivo en esta carpeta"

1582

1525 -#: archive.c:463

1583 +#: archive.c:470

1584 msgid "read .gitattributes in working directory"

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

1586

1529 -#: archive.c:464

1587 +#: archive.c:471

1588 msgid "report archived files on stderr"

1589 msgstr "reportar archivos archivados por stderr"

1590

1533 -#: archive.c:465

1591 +#: archive.c:472

1592 msgid "store only"

1593 msgstr "solo guardar"

1594

1537 -#: archive.c:466

1595 +#: archive.c:473

1596 msgid "compress faster"

1597 msgstr "comprimir más rápido"

1598

1541 -#: archive.c:474

1599 +#: archive.c:481

1600 msgid "compress better"

1601 msgstr "comprimir mejor"

1602

1545 -#: archive.c:477

1603 +#: archive.c:484

1604 msgid "list supported archive formats"

1605 msgstr "listar los formatos de carpeta soportados"

1606

1549 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1607 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1608 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1609 msgid "repo"

1610 msgstr "repo"

1611

1554 -#: archive.c:480 builtin/archive.c:92

1612 +#: archive.c:487 builtin/archive.c:92

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

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

1615

1558 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

1616 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1617 #: builtin/notes.c:498

1618 msgid "command"

1619 msgstr "comando"

1620

1563 -#: archive.c:482 builtin/archive.c:94

1621 +#: archive.c:489 builtin/archive.c:94

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

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

1624

1567 -#: archive.c:489

1625 +#: archive.c:496

1626 msgid "Unexpected option --remote"

1627 msgstr "Opción inesperada --remote"

1628

1571 -#: archive.c:491

1629 +#: archive.c:498

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

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

1632

1575 -#: archive.c:493

1633 +#: archive.c:500

1634 msgid "Unexpected option --output"

1635 msgstr "Opción inesperada --output"

1636

1579 -#: archive.c:515

1637 +#: archive.c:522

1638 #, c-format

1639 msgid "Unknown archive format '%s'"

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

1641

1584 -#: archive.c:522

1642 +#: archive.c:529

1643 #, c-format

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

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

1646

1589 -#: archive-tar.c:125 archive-zip.c:351

1590 -#, c-format

1591 -msgid "cannot stream blob %s"

1592 -msgstr "no se puede transmitir el blob %s"

1593 -

1594 -#: archive-tar.c:266 archive-zip.c:369

1595 -#, c-format

1596 -msgid "unsupported file mode: 0%o (SHA1: %s)"

1597 -msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"

1598 -

1599 -#: archive-tar.c:293 archive-zip.c:359

1600 -#, c-format

1601 -msgid "cannot read %s"

1602 -msgstr "no se puede leer %s"

1603 -

1604 -#: archive-tar.c:465

1605 -#, c-format

1606 -msgid "unable to start '%s' filter"

1607 -msgstr "no se puede comenzar filtro '%s'"

1608 -

1609 -#: archive-tar.c:468

1610 -msgid "unable to redirect descriptor"

1611 -msgstr "incapaz de redirigir descriptor"

1612 -

1613 -#: archive-tar.c:475

1614 -#, c-format

1615 -msgid "'%s' filter reported error"

1616 -msgstr "filtro '%s' reportó un error"

1617 -

1618 -#: archive-zip.c:319

1619 -#, c-format

1620 -msgid "path is not valid UTF-8: %s"

1621 -msgstr "ruta no válida UTF-8: %s"

1622 -

1623 -#: archive-zip.c:323

1624 -#, c-format

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

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

1627 -

1628 -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1629 -#, c-format

1630 -msgid "deflate error (%d)"

1631 -msgstr "error al desinflar (%d)"

1632 -

1633 -#: archive-zip.c:615

1634 -#, c-format

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

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

1637 -

1647 #: attr.c:212

1648 #, c-format

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

@@ -1727,12 +1736,12 @@ msgstr "Biseccionando: una base de fisión debe ser probada\n"

1736 msgid "a %s revision is needed"

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

1738

1730 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1739 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1740 #, c-format

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

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

1743

1735 -#: bisect.c:966 builtin/merge.c:149

1744 +#: bisect.c:966 builtin/merge.c:151

1745 #, c-format

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

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

@@ -1772,40 +1781,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1783

1775 -#: blame.c:2700

1784 +#: blame.c:2777

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

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

1787

1779 -#: blame.c:2714

1788 +#: blame.c:2791

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

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

1791

1783 -#: blame.c:2735

1792 +#: blame.c:2812

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

1794 msgstr ""

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

1796

1788 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1789 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1790 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1791 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1797 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1798 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1799 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1800 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1801 #: builtin/shortlog.c:192

1802 msgid "revision walk setup failed"

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

1804

1796 -#: blame.c:2762

1805 +#: blame.c:2839

1806 msgid ""

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

1808 msgstr ""

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

1810 "del primer padre"

1811

1803 -#: blame.c:2773

1812 +#: blame.c:2850

1813 #, c-format

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

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

1816

1808 -#: blame.c:2784

1817 +#: blame.c:2861

1818 #, c-format

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

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

@@ -1949,12 +1958,12 @@ msgstr "Nombre de objeto ambiguo: '%s'."

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

1959 msgstr "Punto de rama no válido: '%s'."

1960

1952 -#: branch.c:364

1961 +#: branch.c:365

1962 #, c-format

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

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

1965

1957 -#: branch.c:387

1966 +#: branch.c:388

1967 #, c-format

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

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

@@ -1969,8 +1978,8 @@ msgstr "'%s' no se ve como un archivo bundle v2"

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

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

1980

1972 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

1973 -#: builtin/commit.c:815

1981 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

1982 +#: builtin/commit.c:814

1983 #, c-format

1984 msgid "could not open '%s'"

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

@@ -2022,7 +2031,7 @@ msgstr "rev-list murió"

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

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

2033

2025 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

2034 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2035 #, c-format

2036 msgid "unrecognized argument: %s"

2037 msgstr "argumento no reconocido: %s"

@@ -2045,333 +2054,349 @@ msgstr "index-pack murió"

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

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

2056

2048 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2049 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2050 -#, c-format

2051 -msgid "could not parse %s"

2052 -msgstr "no se puede analizar %s"

2053 -

2054 -#: commit.c:53

2055 -#, c-format

2056 -msgid "%s %s is not a commit!"

2057 -msgstr "¡%s %s no es un commit!"

2058 -

2059 -#: commit.c:193

2060 -msgid ""

2061 -"Support for <GIT_DIR>/info/grafts is deprecated\n"

2062 -"and will be removed in a future Git version.\n"

2063 -"\n"

2064 -"Please use \"git replace --convert-graft-file\"\n"

2065 -"to convert the grafts into replace refs.\n"

2066 -"\n"

2067 -"Turn this message off by running\n"

2068 -"\"git config advice.graftFileDeprecated false\""

2069 -msgstr ""

2070 -"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"

2071 -"y será eliminado en una versión futura de Git.\n"

2072 -"\n"

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

2074 -"para convertir los grafts en refs.\n"

2075 -"\n"

2076 -"Apapa este mensaje ejecutando\n"

2077 -"\"git config advice.graftFileDeprecated false\""

2078 -

2079 -#: commit.c:1153

2080 -#, c-format

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

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

2083 -

2084 -#: commit.c:1157

2085 -#, c-format

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

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

2088 -

2089 -#: commit.c:1160

2090 -#, c-format

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

2092 -msgstr "Commit %s no tiene una firma GPG."

2093 -

2094 -#: commit.c:1163

2095 -#, c-format

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

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

2098 -

2099 -#: commit.c:1417

2100 -msgid ""

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

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

2103 -"variable i18n.commitencoding to the encoding your project uses.\n"

2104 -msgstr ""

2105 -"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"

2106 -"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"

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

2108 -"tu proyecto.\n"

2109 -

2110 -#: commit-graph.c:122

2057 +#: commit-graph.c:183

2058 msgid "commit-graph file is too small"

2059 msgstr "archivo commit-graph es muy pequeño"

2060

2114 -#: commit-graph.c:189

2061 +#: commit-graph.c:248

2062 #, c-format

2063 msgid "commit-graph signature %X does not match signature %X"

2064 msgstr "firma %X en commit-graph no concuerda con firma %X"

2065

2119 -#: commit-graph.c:196

2066 +#: commit-graph.c:255

2067 #, c-format

2068 msgid "commit-graph version %X does not match version %X"

2069 msgstr "versión de commit-graph %X no concuerda con versión %X"

2070

2124 -#: commit-graph.c:203

2071 +#: commit-graph.c:262

2072 #, c-format

2073 msgid "commit-graph hash version %X does not match version %X"

2074 msgstr "versión de hash de commit-graph %X no concuerda con versión %X"

2075

2129 -#: commit-graph.c:226

2076 +#: commit-graph.c:284

2077 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2078 msgstr ""

2079 "falta tabla de lookup del chunk en commit-graph; el archivo puede estar "

2080 "incompleto"

2081

2135 -#: commit-graph.c:237

2082 +#: commit-graph.c:294

2083 #, c-format

2084 msgid "commit-graph improper chunk offset %08x%08x"

2085 msgstr "offset del chunk de commit-graph inapropiado %08x%08x"

2086

2140 -#: commit-graph.c:280

2087 +#: commit-graph.c:362

2088 #, c-format

2089 msgid "commit-graph chunk id %08x appears multiple times"

2090 msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"

2091

2145 -#: commit-graph.c:343

2092 +#: commit-graph.c:436

2093 msgid "commit-graph has no base graphs chunk"

2094 msgstr "commit-graph no tiene una chunk base de graphs"

2095

2149 -#: commit-graph.c:353

2096 +#: commit-graph.c:446

2097 msgid "commit-graph chain does not match"

2098 msgstr "cadena commit-graph no concuerda"

2099

2153 -#: commit-graph.c:401

2100 +#: commit-graph.c:494

2101 #, c-format

2102 msgid "invalid commit-graph chain: line '%s' not a hash"

2103 msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"

2104

2158 -#: commit-graph.c:425

2105 +#: commit-graph.c:518

2106 msgid "unable to find all commit-graph files"

2107 msgstr "no es posible encontrar los archivos commit-graph"

2108

2162 -#: commit-graph.c:558 commit-graph.c:618

2109 +#: commit-graph.c:651 commit-graph.c:711

2110 msgid "invalid commit position. commit-graph is likely corrupt"

2111 msgstr "posición de commit inválida. commit-graph está probablemente corrupto"

2112

2166 -#: commit-graph.c:579

2113 +#: commit-graph.c:672

2114 #, c-format

2115 msgid "could not find commit %s"

2116 msgstr "no se pudo encontrar commit %s"

2117

2171 -#: commit-graph.c:852 builtin/am.c:1292

2118 +#: commit-graph.c:948 builtin/am.c:1292

2119 #, c-format

2120 msgid "unable to parse commit %s"

2121 msgstr "no es posible analizar el commit %s"

2122

2176 -#: commit-graph.c:1011 builtin/pack-objects.c:2782

2123 +#: commit-graph.c:1096

2124 +msgid "Writing changed paths Bloom filters index"

2125 +msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"

2126 +

2127 +#: commit-graph.c:1121

2128 +msgid "Writing changed paths Bloom filters data"

2129 +msgstr "Escribiendo cambios de ruta de datos de filtros Bloom"

2130 +

2131 +#: commit-graph.c:1160 builtin/pack-objects.c:2783

2132 #, c-format

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

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

2135

2181 -#: commit-graph.c:1043

2136 +#: commit-graph.c:1196

2137 msgid "Loading known commits in commit graph"

2138 msgstr "Cargando commits conocidos en commit graph"

2139

2185 -#: commit-graph.c:1060

2140 +#: commit-graph.c:1213

2141 msgid "Expanding reachable commits in commit graph"

2142 msgstr "Expandiendo commits alcanzables en commit graph"

2143

2189 -#: commit-graph.c:1079

2144 +#: commit-graph.c:1233

2145 msgid "Clearing commit marks in commit graph"

2146 msgstr "Limpiando marcas de commits en commit graph"

2147

2193 -#: commit-graph.c:1098

2148 +#: commit-graph.c:1252

2149 msgid "Computing commit graph generation numbers"

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

2151

2197 -#: commit-graph.c:1173

2152 +#: commit-graph.c:1300

2153 +msgid "Computing commit changed paths Bloom filters"

2154 +msgstr "Calculando números de generación de commit graph"

2155 +

2156 +#: commit-graph.c:1359

2157 #, c-format

2158 msgid "Finding commits for commit graph in %d pack"

2159 msgid_plural "Finding commits for commit graph in %d packs"

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

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

2162

2204 -#: commit-graph.c:1186

2163 +#: commit-graph.c:1372

2164 #, c-format

2165 msgid "error adding pack %s"

2166 msgstr "error agregando pack %s"

2167

2209 -#: commit-graph.c:1190

2168 +#: commit-graph.c:1376

2169 #, c-format

2170 msgid "error opening index for %s"

2171 msgstr "error abriendo index para %s"

2172

2214 -#: commit-graph.c:1214

2173 +#: commit-graph.c:1405

2174 #, c-format

2175 msgid "Finding commits for commit graph from %d ref"

2176 msgid_plural "Finding commits for commit graph from %d refs"

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

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

2179

2221 -#: commit-graph.c:1234

2180 +#: commit-graph.c:1426

2181 #, c-format

2182 msgid "invalid commit object id: %s"

2183 msgstr "id de objeto commit: %s inválido"

2184

2226 -#: commit-graph.c:1249

2185 +#: commit-graph.c:1442

2186 msgid "Finding commits for commit graph among packed objects"

2187 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"

2188

2230 -#: commit-graph.c:1264

2189 +#: commit-graph.c:1457

2190 msgid "Counting distinct commits in commit graph"

2191 msgstr "Contando commits distintos en commit graph"

2192

2234 -#: commit-graph.c:1294

2193 +#: commit-graph.c:1489

2194 msgid "Finding extra edges in commit graph"

2195 msgstr "Encontrando esquinas extra en commit graph"

2196

2238 -#: commit-graph.c:1340

2197 +#: commit-graph.c:1538

2198 msgid "failed to write correct number of base graph ids"

2199 msgstr "falló al escribir el número correcto de ids de base graph"

2200

2242 -#: commit-graph.c:1373 midx.c:814

2201 +#: commit-graph.c:1572 midx.c:812

2202 #, c-format

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

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

2205

2247 -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2206 +#: commit-graph.c:1585

2207 +msgid "unable to create temporary graph layer"

2208 +msgstr "no es posible crear un una capa de gráfico temporal"

2209 +

2210 +#: commit-graph.c:1590

2211 #, c-format

2249 -msgid "unable to create '%s'"

2250 -msgstr "no se puede crear '%s'"

2212 +msgid "unable to adjust shared permissions for '%s'"

2213 +msgstr "no se pudo poner permisos a '%s'"

2214

2252 -#: commit-graph.c:1445

2215 +#: commit-graph.c:1667

2216 #, c-format

2217 msgid "Writing out commit graph in %d pass"

2218 msgid_plural "Writing out commit graph in %d passes"

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

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

2221

2259 -#: commit-graph.c:1486

2222 +#: commit-graph.c:1712

2223 msgid "unable to open commit-graph chain file"

2224 msgstr "no se pudo abrir la cadena de archivos commit-graph"

2225

2263 -#: commit-graph.c:1498

2226 +#: commit-graph.c:1728

2227 msgid "failed to rename base commit-graph file"

2228 msgstr "no se pudo renombrar el archivo base commit-graph"

2229

2267 -#: commit-graph.c:1518

2230 +#: commit-graph.c:1748

2231 msgid "failed to rename temporary commit-graph file"

2232 msgstr "falló al renombrar el archivo temporal commit-graph"

2233

2271 -#: commit-graph.c:1631

2234 +#: commit-graph.c:1874

2235 msgid "Scanning merged commits"

2236 msgstr "Escaneando commits fusionados"

2237

2275 -#: commit-graph.c:1642

2238 +#: commit-graph.c:1885

2239 #, c-format

2240 msgid "unexpected duplicate commit id %s"

2241 msgstr "id de commit duplicado inesperado %s"

2242

2280 -#: commit-graph.c:1665

2243 +#: commit-graph.c:1908

2244 msgid "Merging commit-graph"

2245 msgstr "Fusionando commit-graph"

2246

2284 -#: commit-graph.c:1844

2247 +#: commit-graph.c:2096

2248 #, c-format

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

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

2251

2289 -#: commit-graph.c:1855

2252 +#: commit-graph.c:2107

2253 msgid "too many commits to write graph"

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

2255

2293 -#: commit-graph.c:1944

2256 +#: commit-graph.c:2200

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

2258 msgstr ""

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

2260 "corrupto"

2261

2299 -#: commit-graph.c:1954

2262 +#: commit-graph.c:2210

2263 #, c-format

2264 msgid "commit-graph has incorrect OID order: %s then %s"

2265 msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"

2266

2304 -#: commit-graph.c:1964 commit-graph.c:1979

2267 +#: commit-graph.c:2220 commit-graph.c:2235

2268 #, c-format

2269 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2270 msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"

2271

2309 -#: commit-graph.c:1971

2272 +#: commit-graph.c:2227

2273 #, c-format

2274 msgid "failed to parse commit %s from commit-graph"

2275 msgstr "falló al analizar commit %s para commit-graph"

2276

2314 -#: commit-graph.c:1989

2277 +#: commit-graph.c:2245

2278 msgid "Verifying commits in commit graph"

2279 msgstr "Verificando commits en commit graph"

2280

2318 -#: commit-graph.c:2003

2281 +#: commit-graph.c:2259

2282 #, c-format

2283 msgid "failed to parse commit %s from object database for commit-graph"

2284 msgstr ""

2285 "falló al analizar el commit %s de la base de datos de objetos para commit-"

2286 "graph"

2287

2325 -#: commit-graph.c:2010

2288 +#: commit-graph.c:2266

2289 #, c-format

2290 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2291 msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"

2292

2330 -#: commit-graph.c:2020

2293 +#: commit-graph.c:2276

2294 #, c-format

2295 msgid "commit-graph parent list for commit %s is too long"

2296 msgstr "lista padre de commit-graph para commit %s es muy larga"

2297

2335 -#: commit-graph.c:2029

2298 +#: commit-graph.c:2285

2299 #, c-format

2300 msgid "commit-graph parent for %s is %s != %s"

2301 msgstr "padre de commit-graph para %s es %s != %s"

2302

2340 -#: commit-graph.c:2042

2303 +#: commit-graph.c:2298

2304 #, c-format

2305 msgid "commit-graph parent list for commit %s terminates early"

2306 msgstr "lista padre de commit-graph para commit %s termina antes"

2307

2345 -#: commit-graph.c:2047

2308 +#: commit-graph.c:2303

2309 #, c-format

2310 msgid ""

2311 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2312 msgstr ""

2313 "commit-graph ha generado número cero para %s, pero no-cero para los demás"

2314

2352 -#: commit-graph.c:2051

2315 +#: commit-graph.c:2307

2316 #, c-format

2317 msgid ""

2318 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2319 msgstr ""

2320 "commit-graph tiene generación no-cero para %s, pero cero para los demás"

2321

2359 -#: commit-graph.c:2066

2322 +#: commit-graph.c:2322

2323 #, c-format

2324 msgid "commit-graph generation for commit %s is %u != %u"

2325 msgstr "generación commit-graph para commit %s es %u != %u"

2326

2364 -#: commit-graph.c:2072

2327 +#: commit-graph.c:2328

2328 #, c-format

2329 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2330 msgstr ""

2331 "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"

2332

2333 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2334 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2335 +#, c-format

2336 +msgid "could not parse %s"

2337 +msgstr "no se puede analizar %s"

2338 +

2339 +#: commit.c:54

2340 +#, c-format

2341 +msgid "%s %s is not a commit!"

2342 +msgstr "¡%s %s no es un commit!"

2343 +

2344 +#: commit.c:194

2345 +msgid ""

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

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

2348 +"\n"

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

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

2351 +"\n"

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

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

2354 +msgstr ""

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

2356 +"y será eliminado en una versión futura de Git.\n"

2357 +"\n"

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

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

2360 +"\n"

2361 +"Apapa este mensaje ejecutando\n"

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

2363 +

2364 +#: commit.c:1168

2365 +#, c-format

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

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

2368 +

2369 +#: commit.c:1172

2370 +#, c-format

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

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

2373 +

2374 +#: commit.c:1175

2375 +#, c-format

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

2377 +msgstr "Commit %s no tiene una firma GPG."

2378 +

2379 +#: commit.c:1178

2380 +#, c-format

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

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

2383 +

2384 +#: commit.c:1432

2385 +msgid ""

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

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

2388 +"variable i18n.commitencoding to the encoding your project uses.\n"

2389 +msgstr ""

2390 +"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"

2391 +"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"

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

2393 +"tu proyecto.\n"

2394 +

2395 #: compat/obstack.c:406 compat/obstack.c:408

2396 msgid "memory exhausted"

2397 msgstr "memoria agotada"

2398

2374 -#: config.c:124

2399 +#: config.c:125

2400 #, c-format

2401 msgid ""

2402 "exceeded maximum include depth (%d) while including\n"

@@ -2386,293 +2411,293 @@ msgstr ""

2411 "\t%s\n"

2412 "Esto puede ser causado por inclusiones circulares."

2413

2389 -#: config.c:140

2414 +#: config.c:141

2415 #, c-format

2416 msgid "could not expand include path '%s'"

2417 msgstr "no se pudo expandir rutas de inclusión '%s'"

2418

2394 -#: config.c:151

2419 +#: config.c:152

2420 msgid "relative config includes must come from files"

2421 msgstr "inclusiones de configuración relativas tienen que venir de archivos"

2422

2398 -#: config.c:197

2423 +#: config.c:198

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

2425 msgstr ""

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

2427

2403 -#: config.c:376

2428 +#: config.c:378

2429 #, c-format

2430 msgid "key does not contain a section: %s"

2431 msgstr "llave no contiene una sección: %s"

2432

2408 -#: config.c:382

2433 +#: config.c:384

2434 #, c-format

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

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

2437

2413 -#: config.c:406 sequencer.c:2444

2438 +#: config.c:408 sequencer.c:2456

2439 #, c-format

2440 msgid "invalid key: %s"

2441 msgstr "llave inválida: %s"

2442

2418 -#: config.c:412

2443 +#: config.c:414

2444 #, c-format

2445 msgid "invalid key (newline): %s"

2446 msgstr "llave inválida (nueva línea): %s"

2447

2423 -#: config.c:448 config.c:460

2448 +#: config.c:450 config.c:462

2449 #, c-format

2450 msgid "bogus config parameter: %s"

2451 msgstr "parámetro de configuración malogrado: %s"

2452

2428 -#: config.c:495

2453 +#: config.c:497

2454 #, c-format

2455 msgid "bogus format in %s"

2456 msgstr "formato malogrado en %s"

2457

2433 -#: config.c:821

2458 +#: config.c:836

2459 #, c-format

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

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

2462

2438 -#: config.c:825

2463 +#: config.c:840

2464 #, c-format

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

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

2467

2443 -#: config.c:829

2468 +#: config.c:844

2469 #, c-format

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

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

2472

2448 -#: config.c:833

2473 +#: config.c:848

2474 #, c-format

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

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

2477

2453 -#: config.c:837

2478 +#: config.c:852

2479 #, c-format

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

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

2482

2458 -#: config.c:841

2483 +#: config.c:856

2484 #, c-format

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

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

2487

2463 -#: config.c:978

2488 +#: config.c:993

2489 msgid "out of range"

2490 msgstr "fuera de rango"

2491

2467 -#: config.c:978

2492 +#: config.c:993

2493 msgid "invalid unit"

2494 msgstr "unidad inválida"

2495

2471 -#: config.c:979

2496 +#: config.c:994

2497 #, c-format

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

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

2500

2476 -#: config.c:998

2501 +#: config.c:1013

2502 #, c-format

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

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

2505

2481 -#: config.c:1001

2506 +#: config.c:1016

2507 #, c-format

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

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

2510

2486 -#: config.c:1004

2511 +#: config.c:1019

2512 #, c-format

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

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

2515

2491 -#: config.c:1007

2516 +#: config.c:1022

2517 #, c-format

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

2519 msgstr ""

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

2521

2497 -#: config.c:1010

2522 +#: config.c:1025

2523 #, c-format

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

2525 msgstr ""

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

2527

2503 -#: config.c:1013

2528 +#: config.c:1028

2529 #, c-format

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

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

2532

2508 -#: config.c:1108

2533 +#: config.c:1123

2534 #, c-format

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

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

2537

2513 -#: config.c:1117

2538 +#: config.c:1132

2539 #, c-format

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

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

2542

2518 -#: config.c:1208

2543 +#: config.c:1223

2544 #, c-format

2545 msgid "abbrev length out of range: %d"

2546 msgstr "largo de abreviatura fuera de rango: %d"

2547

2523 -#: config.c:1222 config.c:1233

2548 +#: config.c:1237 config.c:1248

2549 #, c-format

2550 msgid "bad zlib compression level %d"

2551 msgstr "nivel de compresión de zlib erróneo %d"

2552

2528 -#: config.c:1325

2553 +#: config.c:1340

2554 msgid "core.commentChar should only be one character"

2555 msgstr "core.commentChar debería tener solo un caracter"

2556

2532 -#: config.c:1358

2557 +#: config.c:1373

2558 #, c-format

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

2560 msgstr "modo inválido de creación de objetos: %s"

2561

2537 -#: config.c:1430

2562 +#: config.c:1445

2563 #, c-format

2564 msgid "malformed value for %s"

2565 msgstr "valor malformado para %s"

2566

2542 -#: config.c:1456

2567 +#: config.c:1471

2568 #, c-format

2569 msgid "malformed value for %s: %s"

2570 msgstr "valor malformado para %s: %s"

2571

2547 -#: config.c:1457

2572 +#: config.c:1472

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

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

2575

2551 -#: config.c:1518 builtin/pack-objects.c:3541

2576 +#: config.c:1533 builtin/pack-objects.c:3542

2577 #, c-format

2578 msgid "bad pack compression level %d"

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

2580

2556 -#: config.c:1639

2581 +#: config.c:1655

2582 #, c-format

2583 msgid "unable to load config blob object '%s'"

2584 msgstr "incapaz de cargar configuración de objeto blob '%s'"

2585

2561 -#: config.c:1642

2586 +#: config.c:1658

2587 #, c-format

2588 msgid "reference '%s' does not point to a blob"

2589 msgstr "referencia '%s' no apunta a un blob"

2590

2566 -#: config.c:1659

2591 +#: config.c:1675

2592 #, c-format

2593 msgid "unable to resolve config blob '%s'"

2594 msgstr "no se posible resolver configuración de blob '%s'"

2595

2571 -#: config.c:1689

2596 +#: config.c:1705

2597 #, c-format

2598 msgid "failed to parse %s"

2599 msgstr "no se pudo analizar %s"

2600

2576 -#: config.c:1743

2601 +#: config.c:1759

2602 msgid "unable to parse command-line config"

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

2604

2580 -#: config.c:2097

2605 +#: config.c:2113

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

2607 msgstr ""

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

2609

2585 -#: config.c:2267

2610 +#: config.c:2283

2611 #, c-format

2612 msgid "Invalid %s: '%s'"

2613 msgstr "Inválido %s: '%s'"

2614

2590 -#: config.c:2312

2615 +#: config.c:2328

2616 #, c-format

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

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

2619

2595 -#: config.c:2358

2620 +#: config.c:2374

2621 #, c-format

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

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

2624

2600 -#: config.c:2360

2625 +#: config.c:2376

2626 #, c-format

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

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

2629

2605 -#: config.c:2441

2630 +#: config.c:2457

2631 #, c-format

2632 msgid "invalid section name '%s'"

2633 msgstr "nombre de sección inválido '%s'"

2634

2610 -#: config.c:2473

2635 +#: config.c:2489

2636 #, c-format

2637 msgid "%s has multiple values"

2638 msgstr "%s tiene múltiples valores"

2639

2615 -#: config.c:2502

2640 +#: config.c:2518

2641 #, c-format

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

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

2644

2620 -#: config.c:2754 config.c:3078

2645 +#: config.c:2770 config.c:3094

2646 #, c-format

2647 msgid "could not lock config file %s"

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

2649

2625 -#: config.c:2765

2650 +#: config.c:2781

2651 #, c-format

2652 msgid "opening %s"

2653 msgstr "abriendo %s"

2654

2630 -#: config.c:2800 builtin/config.c:344

2655 +#: config.c:2816 builtin/config.c:344

2656 #, c-format

2657 msgid "invalid pattern: %s"

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

2659

2635 -#: config.c:2825

2660 +#: config.c:2841

2661 #, c-format

2662 msgid "invalid config file %s"

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

2664

2640 -#: config.c:2838 config.c:3091

2665 +#: config.c:2854 config.c:3107

2666 #, c-format

2667 msgid "fstat on %s failed"

2668 msgstr "fstat en %s falló"

2669

2645 -#: config.c:2849

2670 +#: config.c:2865

2671 #, c-format

2672 msgid "unable to mmap '%s'"

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

2674

2650 -#: config.c:2858 config.c:3096

2675 +#: config.c:2874 config.c:3112

2676 #, c-format

2677 msgid "chmod on %s failed"

2678 msgstr "chmod en %s falló"

2679

2655 -#: config.c:2943 config.c:3193

2680 +#: config.c:2959 config.c:3209

2681 #, c-format

2682 msgid "could not write config file %s"

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

2684

2660 -#: config.c:2977

2685 +#: config.c:2993

2686 #, c-format

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

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

2689

2665 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2690 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2691 #, c-format

2692 msgid "could not unset '%s'"

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

2694

2670 -#: config.c:3069

2695 +#: config.c:3085

2696 #, c-format

2697 msgid "invalid section name: %s"

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

2699

2675 -#: config.c:3236

2700 +#: config.c:3252

2701 #, c-format

2702 msgid "missing value for '%s'"

2703 msgstr "valor faltante para '%s'"

@@ -2837,19 +2862,19 @@ msgstr "ruta extraña '%s' bloqueada"

2862 msgid "unable to fork"

2863 msgstr "no es posible hacer fork"

2864

2840 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2865 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45

2866 msgid "Checking connectivity"

2867 msgstr "Verificando conectividad"

2868

2844 -#: connected.c:110

2869 +#: connected.c:119

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

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

2872

2848 -#: connected.c:130

2873 +#: connected.c:139

2874 msgid "failed write to rev-list"

2875 msgstr "falló escribir a rev-list"

2876

2852 -#: connected.c:137

2877 +#: connected.c:146

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

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

2880

@@ -2949,15 +2974,15 @@ msgstr "lectura de filtro externo '%s' falló"

2974 msgid "external filter '%s' failed"

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

2976

2952 -#: convert.c:839

2977 +#: convert.c:840

2978 msgid "unexpected filter type"

2979 msgstr "tipo de filtro inesperado"

2980

2956 -#: convert.c:850

2981 +#: convert.c:851

2982 msgid "path name too long for external filter"

2983 msgstr "nombre de ruta muy largo para filtro externo"

2984

2960 -#: convert.c:924

2985 +#: convert.c:943

2986 #, c-format

2987 msgid ""

2988 "external filter '%s' is not available anymore although not all paths have "

@@ -2966,20 +2991,48 @@ msgstr ""

2991 "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "

2992 "filtradas"

2993

2969 -#: convert.c:1223

2994 +#: convert.c:1243

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

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

2997

2973 -#: convert.c:1411 convert.c:1445

2998 +#: convert.c:1431 convert.c:1465

2999 #, c-format

3000 msgid "%s: clean filter '%s' failed"

3001 msgstr "%s: falló al limpiar filtro '%s'"

3002

2978 -#: convert.c:1489

3003 +#: convert.c:1511

3004 #, c-format

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

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

3007

3008 +#: credential.c:96

3009 +#, c-format

3010 +msgid "skipping credential lookup for key: credential.%s"

3011 +msgstr "saltando revisión de credenciales para llave: credencial. %s"

3012 +

3013 +#: credential.c:112

3014 +msgid "refusing to work with credential missing host field"

3015 +msgstr "rehusando trabajar con credenciales faltantes en el campo host"

3016 +

3017 +#: credential.c:114

3018 +msgid "refusing to work with credential missing protocol field"

3019 +msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo"

3020 +

3021 +#: credential.c:396

3022 +#, c-format

3023 +msgid "url contains a newline in its %s component: %s"

3024 +msgstr "url contiene un espace de línea en su componente %s: %s"

3025 +

3026 +#: credential.c:440

3027 +#, c-format

3028 +msgid "url has no scheme: %s"

3029 +msgstr "url no tiene scheme: %s"

3030 +

3031 +#: credential.c:513

3032 +#, c-format

3033 +msgid "credential url cannot be parsed: %s"

3034 +msgstr "url credencial no puede ser analizada: %s"

3035 +

3036 #: date.c:138

3037 msgid "in the future"

3038 msgstr "en el futuro"

@@ -3072,15 +3125,6 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"

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

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

3127

3075 -#: diffcore-order.c:24

3076 -#, c-format

3077 -msgid "failed to read orderfile '%s'"

3078 -msgstr "falló al leer orden de archivos '%s'"

3079 -

3080 -#: diffcore-rename.c:543

3081 -msgid "Performing inexact rename detection"

3082 -msgstr "Realizando una detección de cambios de nombre inexacta"

3083 -

3128 #: diff-no-index.c:238

3129 msgid "git diff --no-index [<options>] <path> <path>"

3130 msgstr "git diff --no-index [<opciones>] <path> <path>"

@@ -3144,35 +3188,35 @@ msgstr ""

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

3189 "%s"

3190

3147 -#: diff.c:4202

3191 +#: diff.c:4238

3192 #, c-format

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

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

3195

3152 -#: diff.c:4547

3196 +#: diff.c:4583

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

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

3199

3156 -#: diff.c:4550

3200 +#: diff.c:4586

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

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

3203

3160 -#: diff.c:4628

3204 +#: diff.c:4664

3205 msgid "--follow requires exactly one pathspec"

3206 msgstr "--follow requiere exactamente un pathspec"

3207

3164 -#: diff.c:4676

3208 +#: diff.c:4712

3209 #, c-format

3210 msgid "invalid --stat value: %s"

3211 msgstr "valor --stat inválido: %s"

3212

3169 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3213 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3214 #: parse-options.c:197 parse-options.c:201

3215 #, c-format

3216 msgid "%s expects a numerical value"

3217 msgstr "%s espera un valor numérico"

3218

3175 -#: diff.c:4713

3219 +#: diff.c:4749

3220 #, c-format

3221 msgid ""

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

@@ -3181,42 +3225,42 @@ msgstr ""

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

3226 "%s"

3227

3184 -#: diff.c:4798

3228 +#: diff.c:4834

3229 #, c-format

3230 msgid "unknown change class '%c' in --diff-filter=%s"

3231 msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"

3232

3189 -#: diff.c:4822

3233 +#: diff.c:4858

3234 #, c-format

3235 msgid "unknown value after ws-error-highlight=%.*s"

3236 msgstr "valor desconocido luego de ws-error-highlight=%.*s"

3237

3194 -#: diff.c:4836

3238 +#: diff.c:4872

3239 #, c-format

3240 msgid "unable to resolve '%s'"

3241 msgstr "no se puede resolver '%s'"

3242

3199 -#: diff.c:4886 diff.c:4892

3243 +#: diff.c:4922 diff.c:4928

3244 #, c-format

3245 msgid "%s expects <n>/<m> form"

3246 msgstr "%s espera forma <n>/<m>"

3247

3204 -#: diff.c:4904

3248 +#: diff.c:4940

3249 #, c-format

3250 msgid "%s expects a character, got '%s'"

3251 msgstr "%s esperaba un char, se obtuvo '%s'"

3252

3209 -#: diff.c:4925

3253 +#: diff.c:4961

3254 #, c-format

3255 msgid "bad --color-moved argument: %s"

3256 msgstr "mal argumento --color-moved: %s"

3257

3214 -#: diff.c:4944

3258 +#: diff.c:4980

3259 #, c-format

3260 msgid "invalid mode '%s' in --color-moved-ws"

3261 msgstr "modo inválido '%s' en --color-moved-ws"

3262

3219 -#: diff.c:4984

3263 +#: diff.c:5020

3264 msgid ""

3265 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3266 "\"histogram\""

@@ -3224,154 +3268,154 @@ msgstr ""

3268 "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "

3269 "\"histogram\""

3270

3227 -#: diff.c:5020 diff.c:5040

3271 +#: diff.c:5056 diff.c:5076

3272 #, c-format

3273 msgid "invalid argument to %s"

3274 msgstr "argumento inválido para %s"

3275

3232 -#: diff.c:5178

3276 +#: diff.c:5214

3277 #, c-format

3278 msgid "failed to parse --submodule option parameter: '%s'"

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

3280

3237 -#: diff.c:5234

3281 +#: diff.c:5270

3282 #, c-format

3283 msgid "bad --word-diff argument: %s"

3284 msgstr "mal argumento --word-diff: %s"

3285

3242 -#: diff.c:5257

3286 +#: diff.c:5293

3287 msgid "Diff output format options"

3288 msgstr "Opciones de formato de salida para diff"

3289

3246 -#: diff.c:5259 diff.c:5265

3290 +#: diff.c:5295 diff.c:5301

3291 msgid "generate patch"

3292 msgstr "generar parche"

3293

3250 -#: diff.c:5262 builtin/log.c:173

3294 +#: diff.c:5298 builtin/log.c:177

3295 msgid "suppress diff output"

3296 msgstr "suprimir salida de diff"

3297

3254 -#: diff.c:5267 diff.c:5381 diff.c:5388

3298 +#: diff.c:5303 diff.c:5417 diff.c:5424

3299 msgid "<n>"

3300 msgstr "<n>"

3301

3258 -#: diff.c:5268 diff.c:5271

3302 +#: diff.c:5304 diff.c:5307

3303 msgid "generate diffs with <n> lines context"

3304 msgstr "genera diffs con <n> líneas de contexto"

3305

3262 -#: diff.c:5273

3306 +#: diff.c:5309

3307 msgid "generate the diff in raw format"

3308 msgstr "genera el diff en formato raw"

3309

3266 -#: diff.c:5276

3310 +#: diff.c:5312

3311 msgid "synonym for '-p --raw'"

3312 msgstr "sinónimo para '-p --stat'"

3313

3270 -#: diff.c:5280

3314 +#: diff.c:5316

3315 msgid "synonym for '-p --stat'"

3316 msgstr "sinónimo para '-p --stat'"

3317

3274 -#: diff.c:5284

3318 +#: diff.c:5320

3319 msgid "machine friendly --stat"

3320 msgstr "--stat amigable para máquina"

3321

3278 -#: diff.c:5287

3322 +#: diff.c:5323

3323 msgid "output only the last line of --stat"

3324 msgstr "mostrar solo la última línea para --stat"

3325

3282 -#: diff.c:5289 diff.c:5297

3326 +#: diff.c:5325 diff.c:5333

3327 msgid "<param1,param2>..."

3328 msgstr "<param1,param2>..."

3329

3286 -#: diff.c:5290

3330 +#: diff.c:5326

3331 msgid ""

3332 "output the distribution of relative amount of changes for each sub-directory"

3333 msgstr ""

3334 "muestra la distribución de cantidades de cambios relativa para cada "

3335 "subdirectorio"

3336

3293 -#: diff.c:5294

3337 +#: diff.c:5330

3338 msgid "synonym for --dirstat=cumulative"

3339 msgstr "sinónimo para --dirstat=cumulative"

3340

3297 -#: diff.c:5298

3341 +#: diff.c:5334

3342 msgid "synonym for --dirstat=files,param1,param2..."

3343 msgstr "sinonimo para --dirstat=archivos,param1,param2..."

3344

3301 -#: diff.c:5302

3345 +#: diff.c:5338

3346 msgid "warn if changes introduce conflict markers or whitespace errors"

3347 msgstr ""

3348 "advierte si cambios introducen conflictos de markers o errores de espacios "

3349 "en blanco"

3350

3307 -#: diff.c:5305

3351 +#: diff.c:5341

3352 msgid "condensed summary such as creations, renames and mode changes"

3353 msgstr ""

3354 "resumen condensado de creaciones, cambios de nombres y cambios de modos"

3355

3312 -#: diff.c:5308

3356 +#: diff.c:5344

3357 msgid "show only names of changed files"

3358 msgstr "mostrar solo nombres de archivos cambiados"

3359

3316 -#: diff.c:5311

3360 +#: diff.c:5347

3361 msgid "show only names and status of changed files"

3362 msgstr "mostrar solo nombres y estados de archivos cambiados"

3363

3320 -#: diff.c:5313

3364 +#: diff.c:5349

3365 msgid "<width>[,<name-width>[,<count>]]"

3366 msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"

3367

3324 -#: diff.c:5314

3368 +#: diff.c:5350

3369 msgid "generate diffstat"

3370 msgstr "generar diffstat"

3371

3328 -#: diff.c:5316 diff.c:5319 diff.c:5322

3372 +#: diff.c:5352 diff.c:5355 diff.c:5358

3373 msgid "<width>"

3374 msgstr "<ancho>"

3375

3332 -#: diff.c:5317

3376 +#: diff.c:5353

3377 msgid "generate diffstat with a given width"

3378 msgstr "genera diffstat con un ancho dado"

3379

3336 -#: diff.c:5320

3380 +#: diff.c:5356

3381 msgid "generate diffstat with a given name width"

3382 msgstr "genera diffstat con un nombre de ancho dado"

3383

3340 -#: diff.c:5323

3384 +#: diff.c:5359

3385 msgid "generate diffstat with a given graph width"

3386 msgstr "genera diffstat con un ancho de graph dado"

3387

3344 -#: diff.c:5325

3388 +#: diff.c:5361

3389 msgid "<count>"

3390 msgstr "<cantidad>"

3391

3348 -#: diff.c:5326

3392 +#: diff.c:5362

3393 msgid "generate diffstat with limited lines"

3394 msgstr "genera diffstat con líneas limitadas"

3395

3352 -#: diff.c:5329

3396 +#: diff.c:5365

3397 msgid "generate compact summary in diffstat"

3398 msgstr "genera un resumen compacto de diffstat"

3399

3356 -#: diff.c:5332

3400 +#: diff.c:5368

3401 msgid "output a binary diff that can be applied"

3402 msgstr "muestra un diff binario que puede ser aplicado"

3403

3360 -#: diff.c:5335

3404 +#: diff.c:5371

3405 msgid "show full pre- and post-image object names on the \"index\" lines"

3406 msgstr ""

3407 "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"

3408 "\""

3409

3366 -#: diff.c:5337

3410 +#: diff.c:5373

3411 msgid "show colored diff"

3412 msgstr "mostrar diff colorido"

3413

3370 -#: diff.c:5338

3414 +#: diff.c:5374

3415 msgid "<kind>"

3416 msgstr "<tipo>"

3417

3374 -#: diff.c:5339

3418 +#: diff.c:5375

3419 msgid ""

3420 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3421 "diff"

@@ -3379,7 +3423,7 @@ msgstr ""

3423 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "

3424 "'new' del diff"

3425

3382 -#: diff.c:5342

3426 +#: diff.c:5378

3427 msgid ""

3428 "do not munge pathnames and use NULs as output field terminators in --raw or "

3429 "--numstat"

@@ -3387,89 +3431,89 @@ msgstr ""

3431 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "

3432 "o --numstat"

3433

3390 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3434 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3435 msgid "<prefix>"

3436 msgstr "<prefijo>"

3437

3394 -#: diff.c:5346

3438 +#: diff.c:5382

3439 msgid "show the given source prefix instead of \"a/\""

3440 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""

3441

3398 -#: diff.c:5349

3442 +#: diff.c:5385

3443 msgid "show the given destination prefix instead of \"b/\""

3444 msgstr "mostrar el prefijo de destino en lugar de \"b/\""

3445

3402 -#: diff.c:5352

3446 +#: diff.c:5388

3447 msgid "prepend an additional prefix to every line of output"

3448 msgstr "anteponer un prefijo adicional a cada línea mostrada"

3449

3406 -#: diff.c:5355

3450 +#: diff.c:5391

3451 msgid "do not show any source or destination prefix"

3452 msgstr "no mostrar ningún prefijo de fuente o destino"

3453

3410 -#: diff.c:5358

3454 +#: diff.c:5394

3455 msgid "show context between diff hunks up to the specified number of lines"

3456 msgstr ""

3457 "muestra el contexto entre hunks de diff hasta el número especificado de "

3458 "líneas"

3459

3416 -#: diff.c:5362 diff.c:5367 diff.c:5372

3460 +#: diff.c:5398 diff.c:5403 diff.c:5408

3461 msgid "<char>"

3462 msgstr "<char>"

3463

3420 -#: diff.c:5363

3464 +#: diff.c:5399

3465 msgid "specify the character to indicate a new line instead of '+'"

3466 msgstr "especifica el char para indicar una nueva línea en lugar de '+'"

3467

3424 -#: diff.c:5368

3468 +#: diff.c:5404

3469 msgid "specify the character to indicate an old line instead of '-'"

3470 msgstr "especifica el char para indicar una línea vieja en lugar de '-'"

3471

3428 -#: diff.c:5373

3472 +#: diff.c:5409

3473 msgid "specify the character to indicate a context instead of ' '"

3474 msgstr "especifica el char para indicar un contexto en lugar de ' '"

3475

3432 -#: diff.c:5376

3476 +#: diff.c:5412

3477 msgid "Diff rename options"

3478 msgstr "Opciones de diff rename"

3479

3436 -#: diff.c:5377

3480 +#: diff.c:5413

3481 msgid "<n>[/<m>]"

3482 msgstr "<n>[/<m>]"

3483

3440 -#: diff.c:5378

3484 +#: diff.c:5414

3485 msgid "break complete rewrite changes into pairs of delete and create"

3486 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"

3487

3444 -#: diff.c:5382

3488 +#: diff.c:5418

3489 msgid "detect renames"

3490 msgstr "detectar renombrados"

3491

3448 -#: diff.c:5386

3492 +#: diff.c:5422

3493 msgid "omit the preimage for deletes"

3494 msgstr "omite la preimage para borrados"

3495

3452 -#: diff.c:5389

3496 +#: diff.c:5425

3497 msgid "detect copies"

3498 msgstr "detectar copias"

3499

3456 -#: diff.c:5393

3500 +#: diff.c:5429

3501 msgid "use unmodified files as source to find copies"

3502 msgstr "usa archivos no modificados como fuente para encontrar copias"

3503

3460 -#: diff.c:5395

3504 +#: diff.c:5431

3505 msgid "disable rename detection"

3506 msgstr "deshabilita detección de renombres"

3507

3464 -#: diff.c:5398

3508 +#: diff.c:5434

3509 msgid "use empty blobs as rename source"

3510 msgstr "usa blobs vacíos como fuente de renombre"

3511

3468 -#: diff.c:5400

3512 +#: diff.c:5436

3513 msgid "continue listing the history of a file beyond renames"

3514 msgstr "continua listando el historial de un archivo más allá de renombres"

3515

3472 -#: diff.c:5403

3516 +#: diff.c:5439

3517 msgid ""

3518 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3519 "given limit"

@@ -3477,155 +3521,155 @@ msgstr ""

3521 "previene detección de renombre/copias si el número de objetivos para "

3522 "renombres/copias excede el límite dado"

3523

3480 -#: diff.c:5405

3524 +#: diff.c:5441

3525 msgid "Diff algorithm options"

3526 msgstr "Opciones de algoritmos de diff"

3527

3484 -#: diff.c:5407

3528 +#: diff.c:5443

3529 msgid "produce the smallest possible diff"

3530 msgstr "produce el diff más pequeño posible"

3531

3488 -#: diff.c:5410

3532 +#: diff.c:5446

3533 msgid "ignore whitespace when comparing lines"

3534 msgstr "ignorar espacios en blanco cuando comparando líneas"

3535

3492 -#: diff.c:5413

3536 +#: diff.c:5449

3537 msgid "ignore changes in amount of whitespace"

3538 msgstr "ignorar cambios en la cantidad de líneas en blanco"

3539

3496 -#: diff.c:5416

3540 +#: diff.c:5452

3541 msgid "ignore changes in whitespace at EOL"

3542 msgstr "ignorar cambios en espacios en blanco en EOL"

3543

3500 -#: diff.c:5419

3544 +#: diff.c:5455

3545 msgid "ignore carrier-return at the end of line"

3546 msgstr "ignora carrier-return al final de la línea"

3547

3504 -#: diff.c:5422

3548 +#: diff.c:5458

3549 msgid "ignore changes whose lines are all blank"

3550 msgstr "ignora cambios cuyas líneas son todas en blanco"

3551

3508 -#: diff.c:5425

3552 +#: diff.c:5461

3553 msgid "heuristic to shift diff hunk boundaries for easy reading"

3554 msgstr "heurística para cambiar los límites de hunk para una fácil lectura"

3555

3512 -#: diff.c:5428

3556 +#: diff.c:5464

3557 msgid "generate diff using the \"patience diff\" algorithm"

3558 msgstr "genera un diff usando algoritmo \"patience diff\""

3559

3516 -#: diff.c:5432

3560 +#: diff.c:5468

3561 msgid "generate diff using the \"histogram diff\" algorithm"

3562 msgstr "genera un diff usando algoritmo \"histogram diff\""

3563

3520 -#: diff.c:5434

3564 +#: diff.c:5470

3565 msgid "<algorithm>"

3566 msgstr "<algoritmo>"

3567

3524 -#: diff.c:5435

3568 +#: diff.c:5471

3569 msgid "choose a diff algorithm"

3570 msgstr "escoge un algoritmo para diff"

3571

3528 -#: diff.c:5437

3572 +#: diff.c:5473

3573 msgid "<text>"

3574 msgstr "<texto>"

3575

3532 -#: diff.c:5438

3576 +#: diff.c:5474

3577 msgid "generate diff using the \"anchored diff\" algorithm"

3578 msgstr "genera un diff usando algoritmo \"anchored diff\""

3579

3536 -#: diff.c:5440 diff.c:5449 diff.c:5452

3580 +#: diff.c:5476 diff.c:5485 diff.c:5488

3581 msgid "<mode>"

3582 msgstr "<modo>"

3583

3540 -#: diff.c:5441

3584 +#: diff.c:5477

3585 msgid "show word diff, using <mode> to delimit changed words"

3586 msgstr ""

3587 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"

3588

3545 -#: diff.c:5443 diff.c:5446 diff.c:5491

3589 +#: diff.c:5479 diff.c:5482 diff.c:5527

3590 msgid "<regex>"

3591 msgstr "<regex>"

3592

3549 -#: diff.c:5444

3593 +#: diff.c:5480

3594 msgid "use <regex> to decide what a word is"

3595 msgstr "usa <regex> para decidir que palabra es"

3596

3553 -#: diff.c:5447

3597 +#: diff.c:5483

3598 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3599 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"

3600

3557 -#: diff.c:5450

3601 +#: diff.c:5486

3602 msgid "moved lines of code are colored differently"

3603 msgstr "líneas movidas de código están coloreadas diferente"

3604

3561 -#: diff.c:5453

3605 +#: diff.c:5489

3606 msgid "how white spaces are ignored in --color-moved"

3607 msgstr "como espacios en blanco son ignorados en --color-moved"

3608

3565 -#: diff.c:5456

3609 +#: diff.c:5492

3610 msgid "Other diff options"

3611 msgstr "Otras opciones de diff"

3612

3569 -#: diff.c:5458

3613 +#: diff.c:5494

3614 msgid "when run from subdir, exclude changes outside and show relative paths"

3615 msgstr ""

3616 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "

3617 "paths relativos"

3618

3575 -#: diff.c:5462

3619 +#: diff.c:5498

3620 msgid "treat all files as text"

3621 msgstr "tratar todos los archivos como texto"

3622

3579 -#: diff.c:5464

3623 +#: diff.c:5500

3624 msgid "swap two inputs, reverse the diff"

3625 msgstr "cambia dos inputs, invierte el diff"

3626

3583 -#: diff.c:5466

3627 +#: diff.c:5502

3628 msgid "exit with 1 if there were differences, 0 otherwise"

3629 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"

3630

3587 -#: diff.c:5468

3631 +#: diff.c:5504

3632 msgid "disable all output of the program"

3633 msgstr "deshabilita todo el output del programa"

3634

3591 -#: diff.c:5470

3635 +#: diff.c:5506

3636 msgid "allow an external diff helper to be executed"

3637 msgstr "permite la ejecución de un diff helper externo"

3638

3595 -#: diff.c:5472

3639 +#: diff.c:5508

3640 msgid "run external text conversion filters when comparing binary files"

3641 msgstr ""

3642 "ejecuta filtros de conversión de texto externos cuando comparando binarios"

3643

3600 -#: diff.c:5474

3644 +#: diff.c:5510

3645 msgid "<when>"

3646 msgstr "<cuando>"

3647

3604 -#: diff.c:5475

3648 +#: diff.c:5511

3649 msgid "ignore changes to submodules in the diff generation"

3650 msgstr "ignorar cambios a submódulos en la generación de diff"

3651

3608 -#: diff.c:5478

3652 +#: diff.c:5514

3653 msgid "<format>"

3654 msgstr "<formato>"

3655

3612 -#: diff.c:5479

3656 +#: diff.c:5515

3657 msgid "specify how differences in submodules are shown"

3658 msgstr "especifica como son mostradas las diferencias en submódulos"

3659

3616 -#: diff.c:5483

3660 +#: diff.c:5519

3661 msgid "hide 'git add -N' entries from the index"

3662 msgstr "ocultar entradas 'git add -N' del index"

3663

3620 -#: diff.c:5486

3664 +#: diff.c:5522

3665 msgid "treat 'git add -N' entries as real in the index"

3666 msgstr "trata entradas 'git add -N' como reales en el index"

3667

3624 -#: diff.c:5488

3668 +#: diff.c:5524

3669 msgid "<string>"

3670 msgstr "<string>"

3671

3628 -#: diff.c:5489

3672 +#: diff.c:5525

3673 msgid ""

3674 "look for differences that change the number of occurrences of the specified "

3675 "string"

@@ -3633,7 +3677,7 @@ msgstr ""

3677 "busca por diferencias que cambien el número de ocurrencias para el string "

3678 "especificado"

3679

3636 -#: diff.c:5492

3680 +#: diff.c:5528

3681 msgid ""

3682 "look for differences that change the number of occurrences of the specified "

3683 "regex"

@@ -3641,23 +3685,23 @@ msgstr ""

3685 "busca por diferencias que cambien el número de ocurrencias para el regex "

3686 "especificado"

3687

3644 -#: diff.c:5495

3688 +#: diff.c:5531

3689 msgid "show all changes in the changeset with -S or -G"

3690 msgstr "mostrar todos los cambios en el changeset con -S o -G"

3691

3648 -#: diff.c:5498

3692 +#: diff.c:5534

3693 msgid "treat <string> in -S as extended POSIX regular expression"

3694 msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"

3695

3652 -#: diff.c:5501

3696 +#: diff.c:5537

3697 msgid "control the order in which files appear in the output"

3698 msgstr "controlar el orden en el que los archivos aparecen en la salida"

3699

3656 -#: diff.c:5502

3700 +#: diff.c:5538

3701 msgid "<object-id>"

3702 msgstr "<id-objeto>"

3703

3660 -#: diff.c:5503

3704 +#: diff.c:5539

3705 msgid ""

3706 "look for differences that change the number of occurrences of the specified "

3707 "object"

@@ -3665,33 +3709,33 @@ msgstr ""

3709 "busca por diferencias que cambien el número de ocurrencias para el objeto "

3710 "especificado"

3711

3668 -#: diff.c:5505

3712 +#: diff.c:5541

3713 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3714 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3715

3672 -#: diff.c:5506

3716 +#: diff.c:5542

3717 msgid "select files by diff type"

3718 msgstr "selecciona archivos por tipo de diff"

3719

3676 -#: diff.c:5508

3720 +#: diff.c:5544

3721 msgid "<file>"

3722 msgstr "<archivo>"

3723

3680 -#: diff.c:5509

3724 +#: diff.c:5545

3725 msgid "Output to a specific file"

3726 msgstr "Output a un archivo específico"

3727

3684 -#: diff.c:6164

3728 +#: diff.c:6200

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

3730 msgstr ""

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

3732

3689 -#: diff.c:6167

3733 +#: diff.c:6203

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

3735 msgstr ""

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

3737

3694 -#: diff.c:6170

3738 +#: diff.c:6206

3739 #, c-format

3740 msgid ""

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

@@ -3699,6 +3743,15 @@ msgstr ""

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

3744 "intentar el comando."

3745

3746 +#: diffcore-order.c:24

3747 +#, c-format

3748 +msgid "failed to read orderfile '%s'"

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

3750 +

3751 +#: diffcore-rename.c:592

3752 +msgid "Performing inexact rename detection"

3753 +msgstr "Realizando una detección de cambios de nombre inexacta"

3754 +

3755 #: dir.c:555

3756 #, c-format

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

@@ -3730,35 +3783,35 @@ msgstr "deshabilitar coincidencia de patrónes cono"

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

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

3785

3733 -#: dir.c:2144

3786 +#: dir.c:2275

3787 #, c-format

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

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

3790

3738 -#: dir.c:2479

3791 +#: dir.c:2575

3792 msgid "failed to get kernel name and information"

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

3794

3742 -#: dir.c:2603

3795 +#: dir.c:2699

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

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

3798

3746 -#: dir.c:3407

3799 +#: dir.c:3481

3800 #, c-format

3801 msgid "index file corrupt in repo %s"

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

3803

3751 -#: dir.c:3452 dir.c:3457

3804 +#: dir.c:3526 dir.c:3531

3805 #, c-format

3806 msgid "could not create directories for %s"

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

3808

3756 -#: dir.c:3486

3809 +#: dir.c:3560

3810 #, c-format

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

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

3813

3761 -#: editor.c:73

3814 +#: editor.c:74

3815 #, c-format

3816 msgid "hint: Waiting for your editor to close the file...%c"

3817 msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"

@@ -3767,17 +3820,17 @@ msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"

3820 msgid "Filtering content"

3821 msgstr "Filtrando contenido"

3822

3770 -#: entry.c:476

3823 +#: entry.c:479

3824 #, c-format

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

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

3827

3775 -#: environment.c:149

3828 +#: environment.c:150

3829 #, c-format

3830 msgid "bad git namespace path \"%s\""

3831 msgstr "ruta de namespace de git mala \"%s\""

3832

3780 -#: environment.c:331

3833 +#: environment.c:337

3834 #, c-format

3835 msgid "could not set GIT_DIR to '%s'"

3836 msgstr "no se pudo configurar GIT_DIR a '%s'"

@@ -3787,245 +3840,245 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"

3840 msgid "too many args to run %s"

3841 msgstr "demasiados argumentos para correr %s"

3842

3790 -#: fetch-pack.c:150

3843 +#: fetch-pack.c:151

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

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

3846

3794 -#: fetch-pack.c:153

3847 +#: fetch-pack.c:154

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

3849 msgstr ""

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

3851

3799 -#: fetch-pack.c:164

3852 +#: fetch-pack.c:165

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

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

3855

3803 -#: fetch-pack.c:184

3856 +#: fetch-pack.c:185

3857 #, c-format

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

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

3860

3808 -#: fetch-pack.c:195

3861 +#: fetch-pack.c:196

3862 msgid "unable to write to remote"

3863 msgstr "no se puede escribir al remoto"

3864

3812 -#: fetch-pack.c:257

3865 +#: fetch-pack.c:258

3866 msgid "--stateless-rpc requires multi_ack_detailed"

3867 msgstr "--stateless-rpc requiere multi_ack_detailed"

3868

3816 -#: fetch-pack.c:356 fetch-pack.c:1340

3869 +#: fetch-pack.c:357 fetch-pack.c:1364

3870 #, c-format

3871 msgid "invalid shallow line: %s"

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

3873

3821 -#: fetch-pack.c:362 fetch-pack.c:1346

3874 +#: fetch-pack.c:363 fetch-pack.c:1370

3875 #, c-format

3876 msgid "invalid unshallow line: %s"

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

3878

3826 -#: fetch-pack.c:364 fetch-pack.c:1348

3879 +#: fetch-pack.c:365 fetch-pack.c:1372

3880 #, c-format

3881 msgid "object not found: %s"

3882 msgstr "objeto no encontrado: %s"

3883

3831 -#: fetch-pack.c:367 fetch-pack.c:1351

3884 +#: fetch-pack.c:368 fetch-pack.c:1375

3885 #, c-format

3886 msgid "error in object: %s"

3887 msgstr "error en objeto: %s"

3888

3836 -#: fetch-pack.c:369 fetch-pack.c:1353

3889 +#: fetch-pack.c:370 fetch-pack.c:1377

3890 #, c-format

3891 msgid "no shallow found: %s"

3892 msgstr "superficie no encontrada: %s"

3893

3841 -#: fetch-pack.c:372 fetch-pack.c:1357

3894 +#: fetch-pack.c:373 fetch-pack.c:1381

3895 #, c-format

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

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

3898

3846 -#: fetch-pack.c:414

3899 +#: fetch-pack.c:415

3900 #, c-format

3901 msgid "got %s %d %s"

3902 msgstr "se obtuvo %s %d %s"

3903

3851 -#: fetch-pack.c:431

3904 +#: fetch-pack.c:432

3905 #, c-format

3906 msgid "invalid commit %s"

3907 msgstr "commit inválido %s"

3908

3856 -#: fetch-pack.c:462

3909 +#: fetch-pack.c:463

3910 msgid "giving up"

3911 msgstr "rindiéndose"

3912

3860 -#: fetch-pack.c:475 progress.c:323

3913 +#: fetch-pack.c:476 progress.c:340

3914 msgid "done"

3915 msgstr "listo"

3916

3864 -#: fetch-pack.c:487

3917 +#: fetch-pack.c:488

3918 #, c-format

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

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

3921

3869 -#: fetch-pack.c:533

3922 +#: fetch-pack.c:534

3923 #, c-format

3924 msgid "Marking %s as complete"

3925 msgstr "Marcando %s como completa"

3926

3874 -#: fetch-pack.c:754

3927 +#: fetch-pack.c:755

3928 #, c-format

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

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

3931

3879 -#: fetch-pack.c:818

3932 +#: fetch-pack.c:819

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

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

3935

3883 -#: fetch-pack.c:826

3936 +#: fetch-pack.c:827

3937 msgid "protocol error: bad pack header"

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

3939

3887 -#: fetch-pack.c:900

3940 +#: fetch-pack.c:901

3941 #, c-format

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

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

3944

3892 -#: fetch-pack.c:916

3945 +#: fetch-pack.c:917

3946 #, c-format

3947 msgid "%s failed"

3948 msgstr "%s falló"

3949

3897 -#: fetch-pack.c:918

3950 +#: fetch-pack.c:919

3951 msgid "error in sideband demultiplexer"

3952 msgstr "error en demultiplexor de banda lateral"

3953

3901 -#: fetch-pack.c:965

3954 +#: fetch-pack.c:966

3955 #, c-format

3956 msgid "Server version is %.*s"

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

3958

3906 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3907 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3908 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3909 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3959 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3960 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3961 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3962 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

3963 #, c-format

3964 msgid "Server supports %s"

3965 msgstr "El servidor soporta %s"

3966

3914 -#: fetch-pack.c:972

3967 +#: fetch-pack.c:973

3968 msgid "Server does not support shallow clients"

3969 msgstr "El servidor no soporta clientes superficiales"

3970

3918 -#: fetch-pack.c:1032

3971 +#: fetch-pack.c:1033

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

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

3974

3922 -#: fetch-pack.c:1037

3975 +#: fetch-pack.c:1038

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

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

3978

3926 -#: fetch-pack.c:1041

3979 +#: fetch-pack.c:1042

3980 msgid "Server does not support --deepen"

3981 msgstr "El servidor no soporta --deepen"

3982

3930 -#: fetch-pack.c:1058

3983 +#: fetch-pack.c:1059

3984 msgid "no common commits"

3985 msgstr "no hay commits comunes"

3986

3934 -#: fetch-pack.c:1070 fetch-pack.c:1536

3987 +#: fetch-pack.c:1071 fetch-pack.c:1563

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

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

3990

3938 -#: fetch-pack.c:1209

3991 +#: fetch-pack.c:1211

3992 msgid "Server does not support shallow requests"

3993 msgstr "El servidor no soporta peticiones superficiales"

3994

3942 -#: fetch-pack.c:1216

3995 +#: fetch-pack.c:1218

3996 msgid "Server supports filter"

3997 msgstr "El servidor soporta filtro"

3998

3946 -#: fetch-pack.c:1239

3999 +#: fetch-pack.c:1242

4000 msgid "unable to write request to remote"

4001 msgstr "no se puede escribir request al remoto"

4002

3950 -#: fetch-pack.c:1257

4003 +#: fetch-pack.c:1260

4004 #, c-format

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

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

4007

3955 -#: fetch-pack.c:1263

4008 +#: fetch-pack.c:1266

4009 #, c-format

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

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

4012

3960 -#: fetch-pack.c:1303

4013 +#: fetch-pack.c:1327

4014 #, c-format

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

4016 msgstr "línea de confirmación inesperada: '%s'"

4017

3965 -#: fetch-pack.c:1308

4018 +#: fetch-pack.c:1332

4019 #, c-format

4020 msgid "error processing acks: %d"

4021 msgstr "error procesando acks: %d"

4022

3970 -#: fetch-pack.c:1318

4023 +#: fetch-pack.c:1342

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

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

4026

3974 -#: fetch-pack.c:1320

4027 +#: fetch-pack.c:1344

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

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

4030

3978 -#: fetch-pack.c:1362

4031 +#: fetch-pack.c:1386

4032 #, c-format

4033 msgid "error processing shallow info: %d"

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

4035

3983 -#: fetch-pack.c:1409

4036 +#: fetch-pack.c:1433

4037 #, c-format

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

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

4040

3988 -#: fetch-pack.c:1414

4041 +#: fetch-pack.c:1438

4042 #, c-format

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

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

4045

3993 -#: fetch-pack.c:1419

4046 +#: fetch-pack.c:1443

4047 #, c-format

4048 msgid "error processing wanted refs: %d"

4049 msgstr "error procesando refs deseadas: %d"

4050

3998 -#: fetch-pack.c:1762

4051 +#: fetch-pack.c:1789

4052 msgid "no matching remote head"

4053 msgstr "no concuerda el head remoto"

4054

4002 -#: fetch-pack.c:1785 builtin/clone.c:689

4055 +#: fetch-pack.c:1812 builtin/clone.c:692

4056 msgid "remote did not send all necessary objects"

4057 msgstr "remoto no mando todos los objetos necesarios"

4058

4006 -#: fetch-pack.c:1812

4059 +#: fetch-pack.c:1839

4060 #, c-format

4061 msgid "no such remote ref %s"

4062 msgstr "no existe ref remota %s"

4063

4011 -#: fetch-pack.c:1815

4064 +#: fetch-pack.c:1842

4065 #, c-format

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

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

4068

4016 -#: gpg-interface.c:408

4017 -msgid "gpg failed to sign the data"

4018 -msgstr "gpg falló al firmar la data"

4019 -

4020 -#: gpg-interface.c:434

4069 +#: gpg-interface.c:272

4070 msgid "could not create temporary file"

4071 msgstr "no se pudo crear archivo temporal"

4072

4024 -#: gpg-interface.c:437

4073 +#: gpg-interface.c:275

4074 #, c-format

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

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

4077

4078 +#: gpg-interface.c:457

4079 +msgid "gpg failed to sign the data"

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

4081 +

4082 #: graph.c:98

4083 #, c-format

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

@@ -4044,7 +4097,7 @@ msgstr ""

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

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

4099

4047 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4100 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4101 #: builtin/rm.c:135

4102 #, c-format

4103 msgid "failed to stat '%s'"

@@ -4120,7 +4173,7 @@ msgstr "comandos disponibles de git desde otro lugar en tu $PATH"

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

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

4175

4123 -#: help.c:363 git.c:98

4176 +#: help.c:363 git.c:99

4177 #, c-format

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

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

@@ -4129,19 +4182,19 @@ msgstr "comando de listado de tipos no soportado '%s'"

4182 msgid "The common Git guides are:"

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

4184

4132 -#: help.c:512

4185 +#: help.c:427

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

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

4188

4136 -#: help.c:517

4189 +#: help.c:432

4190 msgid "External commands"

4191 msgstr "Comandos externos"

4192

4140 -#: help.c:532

4193 +#: help.c:447

4194 msgid "Command aliases"

4195 msgstr "Aliases de comando"

4196

4144 -#: help.c:596

4197 +#: help.c:511

4198 #, c-format

4199 msgid ""

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

@@ -4150,31 +4203,31 @@ msgstr ""

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

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

4205

4153 -#: help.c:655

4206 +#: help.c:570

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

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

4209

4157 -#: help.c:677

4210 +#: help.c:592

4211 #, c-format

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

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

4214

4162 -#: help.c:682

4215 +#: help.c:597

4216 #, c-format

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

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

4219

4167 -#: help.c:687

4220 +#: help.c:602

4221 #, c-format

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

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

4224

4172 -#: help.c:695

4225 +#: help.c:610

4226 #, c-format

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

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

4229

4177 -#: help.c:699

4230 +#: help.c:614

4231 msgid ""

4232 "\n"

4233 "The most similar command is"

@@ -4188,16 +4241,16 @@ msgstr[1] ""

4241 "\n"

4242 "Los comandos más similares son"

4243

4191 -#: help.c:714

4244 +#: help.c:653

4245 msgid "git version [<options>]"

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

4247

4195 -#: help.c:783

4248 +#: help.c:708

4249 #, c-format

4250 msgid "%s: %s - %s"

4251 msgstr "%s: %s - %s"

4252

4200 -#: help.c:787

4253 +#: help.c:712

4254 msgid ""

4255 "\n"

4256 "Did you mean this?"

@@ -4265,36 +4318,11 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

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

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

4320

4268 -#: ident.c:436 builtin/commit.c:635

4321 +#: ident.c:436 builtin/commit.c:634

4322 #, c-format

4323 msgid "invalid date format: %s"

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

4325

4273 -#: list-objects.c:127

4274 -#, c-format

4275 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4276 -msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"

4277 -

4278 -#: list-objects.c:140

4279 -#, c-format

4280 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4281 -msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"

4282 -

4283 -#: list-objects.c:375

4284 -#, c-format

4285 -msgid "unable to load root tree for commit %s"

4286 -msgstr "no se puede cargar árbol raíz para commit %s"

4287 -

4288 -#: list-objects-filter.c:492

4289 -#, c-format

4290 -msgid "unable to access sparse blob in '%s'"

4291 -msgstr "no es posible acceder al blob en '%s'"

4292 -

4293 -#: list-objects-filter.c:495

4294 -#, c-format

4295 -msgid "unable to parse sparse filter data in %s"

4296 -msgstr "incapaz de analizar filtro de data en %s"

4297 -

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

4327 msgid "expected 'tree:<depth>'"

4328 msgstr "se esperaba 'tree:<depth>'"

@@ -4321,7 +4349,32 @@ msgstr "se espera algo luego de combine:"

4349 msgid "multiple filter-specs cannot be combined"

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

4351

4324 -#: lockfile.c:151

4352 +#: list-objects-filter.c:492

4353 +#, c-format

4354 +msgid "unable to access sparse blob in '%s'"

4355 +msgstr "no es posible acceder al blob en '%s'"

4356 +

4357 +#: list-objects-filter.c:495

4358 +#, c-format

4359 +msgid "unable to parse sparse filter data in %s"

4360 +msgstr "incapaz de analizar filtro de data en %s"

4361 +

4362 +#: list-objects.c:127

4363 +#, c-format

4364 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4365 +msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"

4366 +

4367 +#: list-objects.c:140

4368 +#, c-format

4369 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4370 +msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"

4371 +

4372 +#: list-objects.c:375

4373 +#, c-format

4374 +msgid "unable to load root tree for commit %s"

4375 +msgstr "no se puede cargar árbol raíz para commit %s"

4376 +

4377 +#: lockfile.c:152

4378 #, c-format

4379 msgid ""

4380 "Unable to create '%s.lock': %s.\n"

@@ -4341,20 +4394,14 @@ msgstr ""

4394 "puede haber roto el repositorio antes:\n"

4395 "borra el archivo manualmente para continuar."

4396

4344 -#: lockfile.c:159

4397 +#: lockfile.c:160

4398 #, c-format

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

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

4401

4349 -#: merge.c:41

4350 -msgid "failed to read the cache"

4351 -msgstr "falló al leer la cache"

4352 -

4353 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4354 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4355 -#: builtin/stash.c:265

4356 -msgid "unable to write new index file"

4357 -msgstr "no es posible escribir el archivo índice"

4402 +#: ls-refs.c:109

4403 +msgid "expected flush after ls-refs arguments"

4404 +msgstr "se esperaba un flush luego de argumentos ls-refs"

4405

4406 #: merge-recursive.c:356

4407 msgid "(bad commit)\n"

@@ -4669,7 +4716,7 @@ msgstr "agregar/agregar"

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

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

4718

4672 -#: merge-recursive.c:3089 git-submodule.sh:1003

4719 +#: merge-recursive.c:3089 git-submodule.sh:985

4720 msgid "submodule"

4721 msgstr "submódulo"

4722

@@ -4789,10 +4836,20 @@ msgstr ""

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

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

4838

4792 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4839 +#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885

4840 msgid "Unable to write index."

4841 msgstr "Incapaz de escribir el índice."

4842

4843 +#: merge.c:41

4844 +msgid "failed to read the cache"

4845 +msgstr "falló al leer la cache"

4846 +

4847 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4848 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4849 +#: builtin/stash.c:265

4850 +msgid "unable to write new index file"

4851 +msgstr "no es posible escribir el archivo índice"

4852 +

4853 #: midx.c:68

4854 #, c-format

4855 msgid "multi-pack-index file %s is too small"

@@ -4844,108 +4901,116 @@ msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

4901 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4902 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

4903

4847 -#: midx.c:210

4904 +#: midx.c:208

4905 #, c-format

4906 msgid "bad pack-int-id: %u (%u total packs)"

4907 msgstr "mal pack-int-id: %u (%u paquetes totales)"

4908

4852 -#: midx.c:260

4909 +#: midx.c:258

4910 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4911 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4912

4856 -#: midx.c:288

4913 +#: midx.c:286

4914 msgid "error preparing packfile from multi-pack-index"

4915 msgstr "error preparando packfile de multi-pack-index"

4916

4860 -#: midx.c:472

4917 +#: midx.c:470

4918 #, c-format

4919 msgid "failed to add packfile '%s'"

4920 msgstr "falló al agregar packfile '%s'"

4921

4865 -#: midx.c:478

4922 +#: midx.c:476

4923 #, c-format

4924 msgid "failed to open pack-index '%s'"

4925 msgstr "falló al abrir pack-index '%s'"

4926

4870 -#: midx.c:538

4927 +#: midx.c:536

4928 #, c-format

4929 msgid "failed to locate object %d in packfile"

4930 msgstr "falló al ubicar objeto %d en packfile"

4931

4875 -#: midx.c:842

4932 +#: midx.c:840

4933 msgid "Adding packfiles to multi-pack-index"

4934 msgstr "Agregando packfiles a multi-pack-index"

4935

4879 -#: midx.c:875

4936 +#: midx.c:873

4937 #, c-format

4938 msgid "did not see pack-file %s to drop"

4939 msgstr "no se vió pack-file %s caer"

4940

4884 -#: midx.c:973

4941 +#: midx.c:925

4942 +msgid "no pack files to index."

4943 +msgstr "no hay archivos pack para indexar."

4944 +

4945 +#: midx.c:977

4946 msgid "Writing chunks to multi-pack-index"

4947 msgstr "Escribiendo chunks a multi-pack-index"

4948

4888 -#: midx.c:1052

4949 +#: midx.c:1056

4950 #, c-format

4951 msgid "failed to clear multi-pack-index at %s"

4952 msgstr "falló al limpiar multi-pack-index en %s"

4953

4893 -#: midx.c:1108

4954 +#: midx.c:1112

4955 msgid "Looking for referenced packfiles"

4956 msgstr "Buscando por packfiles referidos"

4957

4897 -#: midx.c:1123

4958 +#: midx.c:1127

4959 #, c-format

4960 msgid ""

4961 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4962 msgstr ""

4963 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4964

4904 -#: midx.c:1128

4965 +#: midx.c:1132

4966 +msgid "the midx contains no oid"

4967 +msgstr "el midx no contiene oid"

4968 +

4969 +#: midx.c:1141

4970 msgid "Verifying OID order in multi-pack-index"

4971 msgstr "Verificando orden de OID en multi-pack-index"

4972

4908 -#: midx.c:1137

4973 +#: midx.c:1150

4974 #, c-format

4975 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4976 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4977

4913 -#: midx.c:1157

4978 +#: midx.c:1170

4979 msgid "Sorting objects by packfile"

4980 msgstr "Ordenando objetos por packfile"

4981

4917 -#: midx.c:1164

4982 +#: midx.c:1177

4983 msgid "Verifying object offsets"

4984 msgstr "Verificando offsets de objetos"

4985

4921 -#: midx.c:1180

4986 +#: midx.c:1193

4987 #, c-format

4988 msgid "failed to load pack entry for oid[%d] = %s"

4989 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4990

4926 -#: midx.c:1186

4991 +#: midx.c:1199

4992 #, c-format

4993 msgid "failed to load pack-index for packfile %s"

4994 msgstr "falló al cargar el pack-index para packfile %s"

4995

4931 -#: midx.c:1195

4996 +#: midx.c:1208

4997 #, c-format

4998 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4999 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5000

4936 -#: midx.c:1220

5001 +#: midx.c:1233

5002 msgid "Counting referenced objects"

5003 msgstr "Contando objetos no referenciados"

5004

4940 -#: midx.c:1230

5005 +#: midx.c:1243

5006 msgid "Finding and deleting unreferenced packfiles"

5007 msgstr "Encontrando y borrando packfiles sin referencias"

5008

4944 -#: midx.c:1388

5009 +#: midx.c:1433

5010 msgid "could not start pack-objects"

5011 msgstr "no se pudo empezar los pack-objetcts"

5012

4948 -#: midx.c:1407

5013 +#: midx.c:1452

5014 msgid "could not finish pack-objects"

5015 msgstr "no se pudo finalizar pack-objetcts"

5016

@@ -5031,6 +5096,11 @@ msgstr "incapaz de analizar objeto: %s"

5096 msgid "hash mismatch %s"

5097 msgstr "hash no concuerda %s"

5098

5099 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5100 +#, c-format

5101 +msgid "unable to get size of %s"

5102 +msgstr "no se pudo obtener el tamaño de %s"

5103 +

5104 #: packfile.c:629

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

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

@@ -5047,10 +5117,25 @@ msgid "offset beyond end of pack index for %s (truncated index?)"

5117 msgstr ""

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

5119

5050 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5120 +#: parse-options-cb.c:20 parse-options-cb.c:24

5121 #, c-format

5052 -msgid "unable to get size of %s"

5053 -msgstr "no se pudo obtener el tamaño de %s"

5122 +msgid "option `%s' expects a numerical value"

5123 +msgstr "opción `%s' espera un valor numérico"

5124 +

5125 +#: parse-options-cb.c:41

5126 +#, c-format

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

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

5129 +

5130 +#: parse-options-cb.c:54

5131 +#, c-format

5132 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5133 +msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

5134 +

5135 +#: parse-options-cb.c:130 parse-options-cb.c:147

5136 +#, c-format

5137 +msgid "malformed object name '%s'"

5138 +msgstr "nombre de objeto mal formado '%s'"

5139

5140 #: parse-options.c:38

5141 #, c-format

@@ -5092,26 +5177,31 @@ msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

5177 msgid "did you mean `--%s` (with two dashes)?"

5178 msgstr "¿quisiste decir `--%s` (con dos guiones)?"

5179

5095 -#: parse-options.c:857

5180 +#: parse-options.c:663 parse-options.c:963

5181 +#, c-format

5182 +msgid "alias of --%s"

5183 +msgstr "alias de --%s"

5184 +

5185 +#: parse-options.c:854

5186 #, c-format

5187 msgid "unknown option `%s'"

5188 msgstr "opción `%s' desconocida"

5189

5100 -#: parse-options.c:859

5190 +#: parse-options.c:856

5191 #, c-format

5192 msgid "unknown switch `%c'"

5193 msgstr "switch desconocido `%c'"

5194

5105 -#: parse-options.c:861

5195 +#: parse-options.c:858

5196 #, c-format

5197 msgid "unknown non-ascii option in string: `%s'"

5198 msgstr "opción desconocida en string no ascii: `%s'"

5199

5110 -#: parse-options.c:885

5200 +#: parse-options.c:882

5201 msgid "..."

5202 msgstr "..."

5203

5114 -#: parse-options.c:904

5204 +#: parse-options.c:901

5205 #, c-format

5206 msgid "usage: %s"

5207 msgstr "uso: %s"

@@ -5119,45 +5209,20 @@ msgstr "uso: %s"

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

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

5211 #.

5122 -#: parse-options.c:910

5212 +#: parse-options.c:907

5213 #, c-format

5214 msgid " or: %s"

5215 msgstr " o: %s"

5216

5127 -#: parse-options.c:913

5217 +#: parse-options.c:910

5218 #, c-format

5219 msgid " %s"

5220 msgstr " %s"

5221

5132 -#: parse-options.c:952

5222 +#: parse-options.c:949

5223 msgid "-NUM"

5224 msgstr "-NUM"

5225

5136 -#: parse-options.c:966

5137 -#, c-format

5138 -msgid "alias of --%s"

5139 -msgstr "alias de --%s"

5140 -

5141 -#: parse-options-cb.c:20 parse-options-cb.c:24

5142 -#, c-format

5143 -msgid "option `%s' expects a numerical value"

5144 -msgstr "opción `%s' espera un valor numérico"

5145 -

5146 -#: parse-options-cb.c:41

5147 -#, c-format

5148 -msgid "malformed expiration date '%s'"

5149 -msgstr "fecha de expiración mal formada: '%s'"

5150 -

5151 -#: parse-options-cb.c:54

5152 -#, c-format

5153 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5154 -msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

5155 -

5156 -#: parse-options-cb.c:130 parse-options-cb.c:147

5157 -#, c-format

5158 -msgid "malformed object name '%s'"

5159 -msgstr "nombre de objeto mal formado '%s'"

5160 -

5226 #: path.c:915

5227 #, c-format

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

@@ -5218,27 +5283,27 @@ msgstr "Magic pathspec '%c' no implementado en '%s'"

5283 msgid "%s: 'literal' and 'glob' are incompatible"

5284 msgstr "%s: 'literal' y 'glob' son incompatibles"

5285

5221 -#: pathspec.c:442

5286 +#: pathspec.c:445

5287 #, c-format

5288 msgid "%s: '%s' is outside repository at '%s'"

5289 msgstr "%s: '%s' está fuera del repositorio en '%s'"

5290

5226 -#: pathspec.c:517

5291 +#: pathspec.c:521

5292 #, c-format

5293 msgid "'%s' (mnemonic: '%c')"

5294 msgstr "'%s' (nemotécnico: '%c')"

5295

5231 -#: pathspec.c:527

5296 +#: pathspec.c:531

5297 #, c-format

5298 msgid "%s: pathspec magic not supported by this command: %s"

5299 msgstr "%s: magic pathspec no soportado por este comando: %s"

5300

5236 -#: pathspec.c:594

5301 +#: pathspec.c:598

5302 #, c-format

5303 msgid "pathspec '%s' is beyond a symbolic link"

5304 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

5305

5241 -#: pathspec.c:639

5306 +#: pathspec.c:643

5307 #, c-format

5308 msgid "line is badly quoted: %s"

5309 msgstr "la línea está mál citada: %s"

@@ -5303,7 +5368,7 @@ msgstr "Refrescando index"

5368 msgid "unable to create threaded lstat: %s"

5369 msgstr "no es posible crear lstat hilado: %s"

5370

5306 -#: pretty.c:981

5371 +#: pretty.c:982

5372 msgid "unable to parse --pretty format"

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

5374

@@ -5316,29 +5381,42 @@ msgstr "Remoto sin URL"

5381 msgid "promisor remote name cannot begin with '/': %s"

5382 msgstr "nombre remoto promisor no puede comenzar con '/': %s"

5383

5319 -#: range-diff.c:75

5384 +#: prune-packed.c:35

5385 +msgid "Removing duplicate objects"

5386 +msgstr "Removiendo objetos duplicados"

5387 +

5388 +#: range-diff.c:77

5389 msgid "could not start `log`"

5390 msgstr "no se pudo comenzar `log`"

5391

5323 -#: range-diff.c:77

5392 +#: range-diff.c:79

5393 msgid "could not read `log` output"

5394 msgstr "no se pudo leer output de `log`"

5395

5327 -#: range-diff.c:96 sequencer.c:5020

5396 +#: range-diff.c:98 sequencer.c:5143

5397 #, c-format

5398 msgid "could not parse commit '%s'"

5399 msgstr "no se pudo analizar commit '%s'"

5400

5332 -#: range-diff.c:122

5401 +#: range-diff.c:112

5402 +#, c-format

5403 +msgid ""

5404 +"could not parse first line of `log` output: did not start with 'commit ': "

5405 +"'%s'"

5406 +msgstr ""

5407 +"no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': "

5408 +"'%s'"

5409 +

5410 +#: range-diff.c:137

5411 #, c-format

5412 msgid "could not parse git header '%.*s'"

5413 msgstr "no se puede analizar git header '%.*s'"

5414

5337 -#: range-diff.c:285

5415 +#: range-diff.c:301

5416 msgid "failed to generate diff"

5417 msgstr "falló al generar diff"

5418

5341 -#: range-diff.c:518 range-diff.c:520

5419 +#: range-diff.c:534 range-diff.c:536

5420 #, c-format

5421 msgid "could not parse log for '%s'"

5422 msgstr "no se pudo leer el log para '%s'"

@@ -5455,9 +5533,9 @@ msgstr "entradas de stage desordenadas para '%s'"

5533

5534 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5535 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5458 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5459 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5460 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5536 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5537 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5538 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5539 #: builtin/submodule--helper.c:332

5540 msgid "index file corrupt"

5541 msgstr "archivo índice corrompido"

@@ -5512,12 +5590,12 @@ msgstr "no se pudo refrescar el index compartido '%s'"

5590 msgid "broken index, expect %s in %s, got %s"

5591 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

5592

5515 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5593 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5594 #, c-format

5595 msgid "could not close '%s'"

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

5597

5520 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5598 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5599 #, c-format

5600 msgid "could not stat '%s'"

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

@@ -5648,14 +5726,14 @@ msgstr ""

5726 "Como sea, si quieres borrar todo, el rebase será abortado.\n"

5727 "\n"

5728

5651 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5652 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5729 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5730 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258

5731 #, c-format

5732 msgid "could not write '%s'"

5733 msgstr "no se pudo escribir '%s'"

5734

5657 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5658 -#: builtin/rebase.c:234

5735 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5736 +#: builtin/rebase.c:240

5737 #, c-format

5738 msgid "could not write '%s'."

5739 msgstr "no se pudo escribir '%s'."

@@ -5687,194 +5765,76 @@ msgstr ""

5765 "Los posibles comportamientos son: ignore,warn,error.\n"

5766 "\n"

5767

5690 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5691 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5692 -#: builtin/rebase.c:246

5768 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5769 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5770 +#: builtin/rebase.c:252

5771 #, c-format

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

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

5774

5697 -#: refs.c:262

5698 -#, c-format

5699 -msgid "%s does not point to a valid object!"

5700 -msgstr "¡%s no apunta a ningún objeto válido!"

5775 +#: ref-filter.c:42 wt-status.c:1936

5776 +msgid "gone"

5777 +msgstr "desaparecido"

5778

5702 -#: refs.c:667

5779 +#: ref-filter.c:43

5780 #, c-format

5704 -msgid "ignoring dangling symref %s"

5705 -msgstr "ignorando referencia rota %s"

5781 +msgid "ahead %d"

5782 +msgstr "adelante %d"

5783

5707 -#: refs.c:669 ref-filter.c:2098

5784 +#: ref-filter.c:44

5785 #, c-format

5709 -msgid "ignoring broken ref %s"

5710 -msgstr "ignorando referencia rota %s"

5786 +msgid "behind %d"

5787 +msgstr "detrás %d"

5788

5712 -#: refs.c:804

5789 +#: ref-filter.c:45

5790 #, c-format

5714 -msgid "could not open '%s' for writing: %s"

5715 -msgstr "no se pudo abrir '%s' para escritura: %s"

5791 +msgid "ahead %d, behind %d"

5792 +msgstr "delante %d, detrás %d"

5793

5717 -#: refs.c:814 refs.c:865

5794 +#: ref-filter.c:165

5795 #, c-format

5719 -msgid "could not read ref '%s'"

5720 -msgstr "no se pudo leer la referencia '%s'"

5796 +msgid "expected format: %%(color:<color>)"

5797 +msgstr "formato esperado: %%(color:<color>)"

5798

5722 -#: refs.c:820

5799 +#: ref-filter.c:167

5800 #, c-format

5724 -msgid "ref '%s' already exists"

5725 -msgstr "ref '%s' ya existe"

5801 +msgid "unrecognized color: %%(color:%s)"

5802 +msgstr "color no reconocido: %%(color:%s)"

5803

5727 -#: refs.c:825

5804 +#: ref-filter.c:189

5805 #, c-format

5729 -msgid "unexpected object ID when writing '%s'"

5730 -msgstr "ID de objecto inesperado al escribir '%s'"

5806 +msgid "Integer value expected refname:lstrip=%s"

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

5808

5732 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5733 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5734 -#: wrapper.c:620

5809 +#: ref-filter.c:193

5810 #, c-format

5736 -msgid "could not write to '%s'"

5737 -msgstr "no se pudo escribir en '%s'"

5811 +msgid "Integer value expected refname:rstrip=%s"

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

5813

5739 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5740 -#: builtin/rebase.c:1029

5814 +#: ref-filter.c:195

5815 #, c-format

5742 -msgid "could not open '%s' for writing"

5743 -msgstr "no se pudo abrir '%s' para escritura"

5816 +msgid "unrecognized %%(%s) argument: %s"

5817 +msgstr "argumento: %s no reconocido %%(%s)"

5818

5745 -#: refs.c:867

5819 +#: ref-filter.c:250

5820 #, c-format

5747 -msgid "unexpected object ID when deleting '%s'"

5748 -msgstr "ID de objecto inesperado al borrar '%s'"

5821 +msgid "%%(objecttype) does not take arguments"

5822 +msgstr "%%(objecttype) no toma ningún argumento"

5823

5750 -#: refs.c:998

5824 +#: ref-filter.c:272

5825 #, c-format

5752 -msgid "log for ref %s has gap after %s"

5753 -msgstr "log de ref %s tiene un vacío tras %s"

5826 +msgid "unrecognized %%(objectsize) argument: %s"

5827 +msgstr "%%(objectsize) no reconocido argumento: %s"

5828

5755 -#: refs.c:1004

5829 +#: ref-filter.c:280

5830 #, c-format

5757 -msgid "log for ref %s unexpectedly ended on %s"

5758 -msgstr "log de ref %s finalizado inesperadamente en %s"

5831 +msgid "%%(deltabase) does not take arguments"

5832 +msgstr "%%(deltabase) no toma argumentos"

5833

5760 -#: refs.c:1063

5834 +#: ref-filter.c:292

5835 #, c-format

5762 -msgid "log for %s is empty"

5763 -msgstr "log de %s está vacío"

5764 -

5765 -#: refs.c:1155

5766 -#, c-format

5767 -msgid "refusing to update ref with bad name '%s'"

5768 -msgstr "rehusando actualizar ref con mal nombre '%s'"

5769 -

5770 -#: refs.c:1231

5771 -#, c-format

5772 -msgid "update_ref failed for ref '%s': %s"

5773 -msgstr "update_ref falló para ref '%s': %s"

5774 -

5775 -#: refs.c:2023

5776 -#, c-format

5777 -msgid "multiple updates for ref '%s' not allowed"

5778 -msgstr "múltiples actualizaciones para ref '%s' no permitidas"

5779 -

5780 -#: refs.c:2055

5781 -msgid "ref updates forbidden inside quarantine environment"

5782 -msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

5783 -

5784 -#: refs.c:2151 refs.c:2181

5785 -#, c-format

5786 -msgid "'%s' exists; cannot create '%s'"

5787 -msgstr "'%s' existe; no se puede crear '%s'"

5788 -

5789 -#: refs.c:2157 refs.c:2192

5790 -#, c-format

5791 -msgid "cannot process '%s' and '%s' at the same time"

5792 -msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

5793 -

5794 -#: refs/files-backend.c:1233

5795 -#, c-format

5796 -msgid "could not remove reference %s"

5797 -msgstr "no se pudo eliminar la referencia %s"

5798 -

5799 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5800 -#: refs/packed-backend.c:1551

5801 -#, c-format

5802 -msgid "could not delete reference %s: %s"

5803 -msgstr "no se pudo eliminar la referencia %s: %s"

5804 -

5805 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5806 -#, c-format

5807 -msgid "could not delete references: %s"

5808 -msgstr "no se pudo eliminar la referencia: %s"

5809 -

5810 -#: refspec.c:137

5811 -#, c-format

5812 -msgid "invalid refspec '%s'"

5813 -msgstr "refspec inválido: '%s'"

5814 -

5815 -#: ref-filter.c:42 wt-status.c:1938

5816 -msgid "gone"

5817 -msgstr "desaparecido"

5818 -

5819 -#: ref-filter.c:43

5820 -#, c-format

5821 -msgid "ahead %d"

5822 -msgstr "adelante %d"

5823 -

5824 -#: ref-filter.c:44

5825 -#, c-format

5826 -msgid "behind %d"

5827 -msgstr "detrás %d"

5828 -

5829 -#: ref-filter.c:45

5830 -#, c-format

5831 -msgid "ahead %d, behind %d"

5832 -msgstr "delante %d, detrás %d"

5833 -

5834 -#: ref-filter.c:165

5835 -#, c-format

5836 -msgid "expected format: %%(color:<color>)"

5837 -msgstr "formato esperado: %%(color:<color>)"

5838 -

5839 -#: ref-filter.c:167

5840 -#, c-format

5841 -msgid "unrecognized color: %%(color:%s)"

5842 -msgstr "color no reconocido: %%(color:%s)"

5843 -

5844 -#: ref-filter.c:189

5845 -#, c-format

5846 -msgid "Integer value expected refname:lstrip=%s"

5847 -msgstr "Valor entero esperado refname:lstrip=%s"

5848 -

5849 -#: ref-filter.c:193

5850 -#, c-format

5851 -msgid "Integer value expected refname:rstrip=%s"

5852 -msgstr "Valor entero esperado refname:rstrip=%s"

5853 -

5854 -#: ref-filter.c:195

5855 -#, c-format

5856 -msgid "unrecognized %%(%s) argument: %s"

5857 -msgstr "argumento: %s no reconocido %%(%s)"

5858 -

5859 -#: ref-filter.c:250

5860 -#, c-format

5861 -msgid "%%(objecttype) does not take arguments"

5862 -msgstr "%%(objecttype) no toma ningún argumento"

5863 -

5864 -#: ref-filter.c:272

5865 -#, c-format

5866 -msgid "unrecognized %%(objectsize) argument: %s"

5867 -msgstr "%%(objectsize) no reconocido argumento: %s"

5868 -

5869 -#: ref-filter.c:280

5870 -#, c-format

5871 -msgid "%%(deltabase) does not take arguments"

5872 -msgstr "%%(deltabase) no toma argumentos"

5873 -

5874 -#: ref-filter.c:292

5875 -#, c-format

5876 -msgid "%%(body) does not take arguments"

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

5836 +msgid "%%(body) does not take arguments"

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

5838

5839 #: ref-filter.c:301

5840 #, c-format

@@ -5998,114 +5958,232 @@ msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

5958 msgid "malformed format string %s"

5959 msgstr "formato de cadena mal formado %s"

5960

6001 -#: ref-filter.c:1488

5961 +#: ref-filter.c:1486

5962 #, c-format

5963 msgid "no branch, rebasing %s"

5964 msgstr "no hay rama, rebasando %s"

5965

6006 -#: ref-filter.c:1491

5966 +#: ref-filter.c:1489

5967 #, c-format

5968 msgid "no branch, rebasing detached HEAD %s"

5969 msgstr "(o hay rama, rebasando con HEAD desacoplado %s"

5970

6011 -#: ref-filter.c:1494

5971 +#: ref-filter.c:1492

5972 #, c-format

5973 msgid "no branch, bisect started on %s"

5974 msgstr "no hay rama, comenzando biseccón en %s"

5975

6016 -#: ref-filter.c:1504

5976 +#: ref-filter.c:1502

5977 msgid "no branch"

5978 msgstr "sin rama"

5979

6020 -#: ref-filter.c:1540 ref-filter.c:1749

5980 +#: ref-filter.c:1538 ref-filter.c:1747

5981 #, c-format

5982 msgid "missing object %s for %s"

5983 msgstr "falta objeto %s para %s"

5984

6025 -#: ref-filter.c:1550

5985 +#: ref-filter.c:1548

5986 #, c-format

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

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

5989

6030 -#: ref-filter.c:2004

5990 +#: ref-filter.c:2001

5991 #, c-format

5992 msgid "malformed object at '%s'"

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

5994

6035 -#: ref-filter.c:2093

5995 +#: ref-filter.c:2090

5996 #, c-format

5997 msgid "ignoring ref with broken name %s"

5998 msgstr "ignorando referencia con nombre roto %s"

5999

6040 -#: ref-filter.c:2389

6000 +#: ref-filter.c:2095 refs.c:625

6001 +#, c-format

6002 +msgid "ignoring broken ref %s"

6003 +msgstr "ignorando referencia rota %s"

6004 +

6005 +#: ref-filter.c:2395

6006 #, c-format

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

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

6009

6045 -#: ref-filter.c:2489

6010 +#: ref-filter.c:2495

6011 #, c-format

6012 msgid "option `%s' is incompatible with --merged"

6013 msgstr "opción `%s' es incompatible con --merged"

6014

6050 -#: ref-filter.c:2492

6015 +#: ref-filter.c:2498

6016 #, c-format

6017 msgid "option `%s' is incompatible with --no-merged"

6018 msgstr "opción `%s' es incompatible con --no-merged"

6019

6055 -#: ref-filter.c:2502

6020 +#: ref-filter.c:2508

6021 #, c-format

6022 msgid "malformed object name %s"

6023 msgstr "nombre de objeto mal formado %s"

6024

6060 -#: ref-filter.c:2507

6025 +#: ref-filter.c:2513

6026 #, c-format

6027 msgid "option `%s' must point to a commit"

6028 msgstr "opción '%s' debe apuntar a un commit"

6029

6065 -#: remote.c:366

6030 +#: refs.c:262

6031 +#, c-format

6032 +msgid "%s does not point to a valid object!"

6033 +msgstr "¡%s no apunta a ningún objeto válido!"

6034 +

6035 +#: refs.c:623

6036 +#, c-format

6037 +msgid "ignoring dangling symref %s"

6038 +msgstr "ignorando referencia rota %s"

6039 +

6040 +#: refs.c:760

6041 +#, c-format

6042 +msgid "could not open '%s' for writing: %s"

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

6044 +

6045 +#: refs.c:770 refs.c:821

6046 +#, c-format

6047 +msgid "could not read ref '%s'"

6048 +msgstr "no se pudo leer la referencia '%s'"

6049 +

6050 +#: refs.c:776

6051 +#, c-format

6052 +msgid "ref '%s' already exists"

6053 +msgstr "ref '%s' ya existe"

6054 +

6055 +#: refs.c:781

6056 +#, c-format

6057 +msgid "unexpected object ID when writing '%s'"

6058 +msgstr "ID de objecto inesperado al escribir '%s'"

6059 +

6060 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6061 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6062 +#: wrapper.c:620

6063 +#, c-format

6064 +msgid "could not write to '%s'"

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

6066 +

6067 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6068 +#: builtin/rebase.c:852

6069 +#, c-format

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

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

6072 +

6073 +#: refs.c:823

6074 +#, c-format

6075 +msgid "unexpected object ID when deleting '%s'"

6076 +msgstr "ID de objecto inesperado al borrar '%s'"

6077 +

6078 +#: refs.c:954

6079 +#, c-format

6080 +msgid "log for ref %s has gap after %s"

6081 +msgstr "log de ref %s tiene un vacío tras %s"

6082 +

6083 +#: refs.c:960

6084 +#, c-format

6085 +msgid "log for ref %s unexpectedly ended on %s"

6086 +msgstr "log de ref %s finalizado inesperadamente en %s"

6087 +

6088 +#: refs.c:1019

6089 +#, c-format

6090 +msgid "log for %s is empty"

6091 +msgstr "log de %s está vacío"

6092 +

6093 +#: refs.c:1111

6094 +#, c-format

6095 +msgid "refusing to update ref with bad name '%s'"

6096 +msgstr "rehusando actualizar ref con mal nombre '%s'"

6097 +

6098 +#: refs.c:1187

6099 +#, c-format

6100 +msgid "update_ref failed for ref '%s': %s"

6101 +msgstr "update_ref falló para ref '%s': %s"

6102 +

6103 +#: refs.c:1979

6104 +#, c-format

6105 +msgid "multiple updates for ref '%s' not allowed"

6106 +msgstr "múltiples actualizaciones para ref '%s' no permitidas"

6107 +

6108 +#: refs.c:2011

6109 +msgid "ref updates forbidden inside quarantine environment"

6110 +msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

6111 +

6112 +#: refs.c:2107 refs.c:2137

6113 +#, c-format

6114 +msgid "'%s' exists; cannot create '%s'"

6115 +msgstr "'%s' existe; no se puede crear '%s'"

6116 +

6117 +#: refs.c:2113 refs.c:2148

6118 +#, c-format

6119 +msgid "cannot process '%s' and '%s' at the same time"

6120 +msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

6121 +

6122 +#: refs/files-backend.c:1233

6123 +#, c-format

6124 +msgid "could not remove reference %s"

6125 +msgstr "no se pudo eliminar la referencia %s"

6126 +

6127 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6128 +#: refs/packed-backend.c:1551

6129 +#, c-format

6130 +msgid "could not delete reference %s: %s"

6131 +msgstr "no se pudo eliminar la referencia %s: %s"

6132 +

6133 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6134 +#, c-format

6135 +msgid "could not delete references: %s"

6136 +msgstr "no se pudo eliminar la referencia: %s"

6137 +

6138 +#: refspec.c:137

6139 +#, c-format

6140 +msgid "invalid refspec '%s'"

6141 +msgstr "refspec inválido: '%s'"

6142 +

6143 +#: remote.c:355

6144 #, c-format

6145 msgid "config remote shorthand cannot begin with '/': %s"

6146 msgstr "config remote shorthand no puede comenzar con '/': %s"

6147

6070 -#: remote.c:414

6148 +#: remote.c:403

6149 msgid "more than one receivepack given, using the first"

6150 msgstr "más de un receivepack dado, usando el primero"

6151

6074 -#: remote.c:422

6152 +#: remote.c:411

6153 msgid "more than one uploadpack given, using the first"

6154 msgstr "más de un uploadpack dado, usando el primero"

6155

6078 -#: remote.c:612

6156 +#: remote.c:594

6157 #, c-format

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

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

6160

6083 -#: remote.c:616

6161 +#: remote.c:598

6162 #, c-format

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

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

6165

6088 -#: remote.c:620

6166 +#: remote.c:602

6167 #, c-format

6168 msgid "%s tracks both %s and %s"

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

6170

6093 -#: remote.c:688

6171 +#: remote.c:670

6172 #, c-format

6173 msgid "key '%s' of pattern had no '*'"

6174 msgstr "llave '%s' de patrón no tuvo '*'"

6175

6098 -#: remote.c:698

6176 +#: remote.c:680

6177 #, c-format

6178 msgid "value '%s' of pattern has no '*'"

6179 msgstr "valor '%s' del patrón no tiene '*'"

6180

6103 -#: remote.c:1004

6181 +#: remote.c:986

6182 #, c-format

6183 msgid "src refspec %s does not match any"

6184 msgstr "src refsoec %s: no concuerda con ninguno"

6185

6108 -#: remote.c:1009

6186 +#: remote.c:991

6187 #, c-format

6188 msgid "src refspec %s matches more than one"

6189 msgstr "src refspec %s concuerda con más de uno"

@@ -6114,7 +6192,7 @@ msgstr "src refspec %s concuerda con más de uno"

6192 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6193 #. the <src>.

6194 #.

6117 -#: remote.c:1024

6195 +#: remote.c:1006

6196 #, c-format

6197 msgid ""

6198 "The destination you provided is not a full refname (i.e.,\n"

@@ -6138,7 +6216,7 @@ msgstr ""

6216 "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "

6217 "full ref."

6218

6141 -#: remote.c:1044

6219 +#: remote.c:1026

6220 #, c-format

6221 msgid ""

6222 "The <src> part of the refspec is a commit object.\n"

@@ -6149,7 +6227,7 @@ msgstr ""

6227 "¿Quisiste crear un branch nuevo mediante un push a\n"

6228 "'%s:refs/heads/%s'?"

6229

6152 -#: remote.c:1049

6230 +#: remote.c:1031

6231 #, c-format

6232 msgid ""

6233 "The <src> part of the refspec is a tag object.\n"

@@ -6160,7 +6238,7 @@ msgstr ""

6238 "Did you mean to create a new tag by pushing to\n"

6239 "'%s:refs/tags/%s'?"

6240

6163 -#: remote.c:1054

6241 +#: remote.c:1036

6242 #, c-format

6243 msgid ""

6244 "The <src> part of the refspec is a tree object.\n"

@@ -6171,7 +6249,7 @@ msgstr ""

6249 "¿Quisiste crear un tag nuevo mediante un push a\n"

6250 "'%s:refs/heads/%s'?"

6251

6174 -#: remote.c:1059

6252 +#: remote.c:1041

6253 #, c-format

6254 msgid ""

6255 "The <src> part of the refspec is a blob object.\n"

@@ -6182,115 +6260,115 @@ msgstr ""

6260 "¿Quisiste crear un tag nuevo mediante un push a\n"

6261 "'%s:refs/heads/%s'?"

6262

6185 -#: remote.c:1095

6263 +#: remote.c:1077

6264 #, c-format

6265 msgid "%s cannot be resolved to branch"

6266 msgstr "%s no puede ser resolver a un branch"

6267

6190 -#: remote.c:1106

6268 +#: remote.c:1088

6269 #, c-format

6270 msgid "unable to delete '%s': remote ref does not exist"

6271 msgstr "no es posible borrar '%s': ref remoto no existe"

6272

6195 -#: remote.c:1118

6273 +#: remote.c:1100

6274 #, c-format

6275 msgid "dst refspec %s matches more than one"

6276 msgstr "dst refspec %s concuerda con más de uno"

6277

6200 -#: remote.c:1125

6278 +#: remote.c:1107

6279 #, c-format

6280 msgid "dst ref %s receives from more than one src"

6281 msgstr "dst ref %s recibe de más de un src"

6282

6205 -#: remote.c:1628 remote.c:1729

6283 +#: remote.c:1610 remote.c:1711

6284 msgid "HEAD does not point to a branch"

6285 msgstr "HEAD no apunta a ninguna rama"

6286

6209 -#: remote.c:1637

6287 +#: remote.c:1619

6288 #, c-format

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

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

6291

6214 -#: remote.c:1640

6292 +#: remote.c:1622

6293 #, c-format

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

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

6296

6219 -#: remote.c:1646

6297 +#: remote.c:1628

6298 #, c-format

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

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

6301

6224 -#: remote.c:1661

6302 +#: remote.c:1643

6303 #, c-format

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

6305 msgstr ""

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

6307

6230 -#: remote.c:1673

6308 +#: remote.c:1655

6309 #, c-format

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

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

6312

6235 -#: remote.c:1683

6313 +#: remote.c:1665

6314 #, c-format

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

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

6317

6240 -#: remote.c:1696

6318 +#: remote.c:1678

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

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

6321

6244 -#: remote.c:1718

6322 +#: remote.c:1700

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

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

6325

6248 -#: remote.c:1844

6326 +#: remote.c:1826

6327 #, c-format

6328 msgid "couldn't find remote ref %s"

6329 msgstr "no se puedo encontrar ref remota %s"

6330

6253 -#: remote.c:1857

6331 +#: remote.c:1839

6332 #, c-format

6333 msgid "* Ignoring funny ref '%s' locally"

6334 msgstr "* Ignorando ref graciosa '%s' localmente"

6335

6258 -#: remote.c:2020

6336 +#: remote.c:2002

6337 #, c-format

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

6339 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"

6340

6263 -#: remote.c:2024

6341 +#: remote.c:2006

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

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

6344

6267 -#: remote.c:2027

6345 +#: remote.c:2009

6346 #, c-format

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

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

6349

6272 -#: remote.c:2031

6350 +#: remote.c:2013

6351 #, c-format

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

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

6354

6277 -#: remote.c:2034

6355 +#: remote.c:2016

6356 #, c-format

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

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

6359

6282 -#: remote.c:2038

6360 +#: remote.c:2020

6361 #, c-format

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

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

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

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

6366

6289 -#: remote.c:2044

6367 +#: remote.c:2026

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

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

6370

6293 -#: remote.c:2047

6371 +#: remote.c:2029

6372 #, c-format

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

6374 msgid_plural ""

@@ -6300,11 +6378,11 @@ msgstr[0] ""

6378 msgstr[1] ""

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

6380

6303 -#: remote.c:2055

6381 +#: remote.c:2037

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

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

6384

6307 -#: remote.c:2058

6385 +#: remote.c:2040

6386 #, c-format

6387 msgid ""

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

@@ -6319,11 +6397,11 @@ msgstr[1] ""

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

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

6399

6322 -#: remote.c:2068

6400 +#: remote.c:2050

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

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

6403

6326 -#: remote.c:2251

6404 +#: remote.c:2233

6405 #, c-format

6406 msgid "cannot parse expected object name '%s'"

6407 msgstr "no se puede leer el nombre de objeto '%s'"

@@ -6343,6 +6421,11 @@ msgstr "duplicar ref de reemplazo: %s"

6421 msgid "replace depth too high for object %s"

6422 msgstr "remplazar profundiad muy elevada para objeto %s"

6423

6424 +#: repository.c:94 builtin/init-db.c:188

6425 +#, c-format

6426 +msgid "The hash algorithm %s is not supported in this build."

6427 +msgstr "El algoritmo hash %s no está soportado en este build."

6428 +

6429 #: rerere.c:217 rerere.c:226 rerere.c:229

6430 msgid "corrupt MERGE_RR"

6431 msgstr "MERGE_RR corrupto"

@@ -6401,7 +6484,7 @@ msgstr "no se puede desvincular stray '%s'"

6484 msgid "Recorded preimage for '%s'"

6485 msgstr "Resolución precargada para '%s'"

6486

6404 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6487 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6488 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6489 #, c-format

6490 msgid "could not create directory '%s'"

@@ -6436,20 +6519,29 @@ msgstr "Se olvidó resolución para '%s'\n"

6519 msgid "unable to open rr-cache directory"

6520 msgstr "no es posible abrir directorio rr-cache"

6521

6439 -#: revision.c:2497

6522 +#: reset.c:42

6523 +msgid "could not determine HEAD revision"

6524 +msgstr "no se pudo determinar revisión HEAD"

6525 +

6526 +#: reset.c:70 reset.c:76 sequencer.c:3318

6527 +#, c-format

6528 +msgid "failed to find tree of %s"

6529 +msgstr "falló al encontrar árbol de %s"

6530 +

6531 +#: revision.c:2655

6532 msgid "your current branch appears to be broken"

6533 msgstr "tu rama actual parece estar rota"

6534

6443 -#: revision.c:2500

6535 +#: revision.c:2658

6536 #, c-format

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

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

6539

6448 -#: revision.c:2708

6540 +#: revision.c:2866

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

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

6543

6452 -#: revision.c:2712

6544 +#: revision.c:2870

6545 msgid "-L does not yet support diff formats besides -p and -s"

6546 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

6547

@@ -6472,30 +6564,30 @@ msgstr ""

6564 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "

6565 "false`."

6566

6475 -#: send-pack.c:144

6567 +#: send-pack.c:145

6568 msgid "unexpected flush packet while reading remote unpack status"

6569 msgstr ""

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

6571

6480 -#: send-pack.c:146

6572 +#: send-pack.c:147

6573 #, c-format

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

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

6576

6485 -#: send-pack.c:148

6577 +#: send-pack.c:149

6578 #, c-format

6579 msgid "remote unpack failed: %s"

6580 msgstr "desempaquetado remoto falló: %s"

6581

6490 -#: send-pack.c:309

6582 +#: send-pack.c:308

6583 msgid "failed to sign the push certificate"

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

6585

6494 -#: send-pack.c:423

6586 +#: send-pack.c:399

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

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

6589

6498 -#: send-pack.c:425

6590 +#: send-pack.c:401

6591 msgid ""

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

6593 "signed push"

@@ -6503,47 +6595,47 @@ msgstr ""

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

6596 "(--signed )"

6597

6506 -#: send-pack.c:437

6598 +#: send-pack.c:413

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

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

6601

6510 -#: send-pack.c:442

6602 +#: send-pack.c:418

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

6604 msgstr "el destino no soporta opciones de push"

6605

6514 -#: sequencer.c:191

6606 +#: sequencer.c:192

6607 #, c-format

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

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

6610

6519 -#: sequencer.c:296

6611 +#: sequencer.c:297

6612 #, c-format

6613 msgid "could not delete '%s'"

6614 msgstr "no se pudo borrar '%s'"

6615

6524 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6616 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6617 #, c-format

6618 msgid "could not remove '%s'"

6619 msgstr "no se pudo eliminar'%s'"

6620

6529 -#: sequencer.c:325

6621 +#: sequencer.c:326

6622 msgid "revert"

6623 msgstr "revertir"

6624

6533 -#: sequencer.c:327

6625 +#: sequencer.c:328

6626 msgid "cherry-pick"

6627 msgstr "cherry-pick"

6628

6537 -#: sequencer.c:329

6629 +#: sequencer.c:330

6630 msgid "rebase"

6631 msgstr "rebase"

6632

6541 -#: sequencer.c:331

6633 +#: sequencer.c:332

6634 #, c-format

6635 msgid "unknown action: %d"

6636 msgstr "acción desconocida: %d"

6637

6546 -#: sequencer.c:389

6638 +#: sequencer.c:390

6639 msgid ""

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

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

@@ -6551,7 +6643,7 @@ msgstr ""

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

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

6645

6554 -#: sequencer.c:392

6646 +#: sequencer.c:393

6647 msgid ""

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

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

@@ -6561,44 +6653,43 @@ msgstr ""

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

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

6655

6564 -#: sequencer.c:405 sequencer.c:2901

6656 +#: sequencer.c:406 sequencer.c:2921

6657 #, c-format

6658 msgid "could not lock '%s'"

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

6660

6569 -#: sequencer.c:412

6661 +#: sequencer.c:413

6662 #, c-format

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

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

6665

6574 -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6575 -#: sequencer.c:3185

6666 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6667 +#: sequencer.c:3203

6668 #, c-format

6669 msgid "failed to finalize '%s'"

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

6671

6580 -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6581 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6582 -#: builtin/rebase.c:593

6672 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6673 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6674 #, c-format

6675 msgid "could not read '%s'"

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

6677

6587 -#: sequencer.c:466

6678 +#: sequencer.c:457

6679 #, c-format

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

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

6682

6592 -#: sequencer.c:470

6683 +#: sequencer.c:461

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

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

6686

6596 -#: sequencer.c:502

6687 +#: sequencer.c:493

6688 #, c-format

6689 msgid "%s: fast-forward"

6690 msgstr "%s: avance rápido"

6691

6601 -#: sequencer.c:541 builtin/tag.c:565

6692 +#: sequencer.c:532 builtin/tag.c:566

6693 #, c-format

6694 msgid "Invalid cleanup mode %s"

6695 msgstr "Modo cleanup inválido %s"

@@ -6606,65 +6697,65 @@ msgstr "Modo cleanup inválido %s"

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

6698 #. "rebase".

6699 #.

6609 -#: sequencer.c:635

6700 +#: sequencer.c:626

6701 #, c-format

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

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

6704

6614 -#: sequencer.c:652

6705 +#: sequencer.c:643

6706 msgid "unable to update cache tree"

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

6708

6618 -#: sequencer.c:666

6709 +#: sequencer.c:657

6710 msgid "could not resolve HEAD commit"

6711 msgstr "no se pudo resolver el commit de HEAD"

6712

6622 -#: sequencer.c:746

6713 +#: sequencer.c:737

6714 #, c-format

6715 msgid "no key present in '%.*s'"

6716 msgstr "no hay llave presente en '%.*s'"

6717

6627 -#: sequencer.c:757

6718 +#: sequencer.c:748

6719 #, c-format

6720 msgid "unable to dequote value of '%s'"

6721 msgstr "no es posible dequote para '%s'"

6722

6632 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6633 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6723 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6724 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6725 #, c-format

6726 msgid "could not open '%s' for reading"

6727 msgstr "no se pudo abrir '%s' para lectura"

6728

6638 -#: sequencer.c:804

6729 +#: sequencer.c:795

6730 msgid "'GIT_AUTHOR_NAME' already given"

6731 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

6732

6642 -#: sequencer.c:809

6733 +#: sequencer.c:800

6734 msgid "'GIT_AUTHOR_EMAIL' already given"

6735 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

6736

6646 -#: sequencer.c:814

6737 +#: sequencer.c:805

6738 msgid "'GIT_AUTHOR_DATE' already given"

6739 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

6740

6650 -#: sequencer.c:818

6741 +#: sequencer.c:809

6742 #, c-format

6743 msgid "unknown variable '%s'"

6744 msgstr "variable desconocida '%s'"

6745

6655 -#: sequencer.c:823

6746 +#: sequencer.c:814

6747 msgid "missing 'GIT_AUTHOR_NAME'"

6748 msgstr "falta 'GIT_AUTHOR_NAME'"

6749

6659 -#: sequencer.c:825

6750 +#: sequencer.c:816

6751 msgid "missing 'GIT_AUTHOR_EMAIL'"

6752 msgstr "falta 'GIT_AUTHOR_EMAIL'"

6753

6663 -#: sequencer.c:827

6754 +#: sequencer.c:818

6755 msgid "missing 'GIT_AUTHOR_DATE'"

6756 msgstr "falta 'GIT_AUTHOR_DATE'"

6757

6667 -#: sequencer.c:876

6758 +#: sequencer.c:867

6759 #, c-format

6760 msgid ""

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

@@ -6694,11 +6785,11 @@ msgstr ""

6785 "\n"

6786 " git rebase --continue\n"

6787

6697 -#: sequencer.c:1148

6788 +#: sequencer.c:1141

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

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

6791

6701 -#: sequencer.c:1154

6792 +#: sequencer.c:1147

6793 msgid ""

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

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

@@ -6725,7 +6816,7 @@ msgstr ""

6816 "\n"

6817 " git commit --amend --reset-author\n"

6818

6728 -#: sequencer.c:1167

6819 +#: sequencer.c:1160

6820 msgid ""

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

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

@@ -6749,324 +6840,329 @@ msgstr ""

6840 "\n"

6841 " git commit --amend --reset-author\n"

6842

6752 -#: sequencer.c:1209

6843 +#: sequencer.c:1202

6844 msgid "couldn't look up newly created commit"

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

6846

6756 -#: sequencer.c:1211

6847 +#: sequencer.c:1204

6848 msgid "could not parse newly created commit"

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

6850

6760 -#: sequencer.c:1257

6851 +#: sequencer.c:1250

6852 msgid "unable to resolve HEAD after creating commit"

6853 msgstr "no se pudo resolver HEAD tras crear el commit"

6854

6764 -#: sequencer.c:1259

6855 +#: sequencer.c:1252

6856 msgid "detached HEAD"

6857 msgstr "HEAD desacoplado"

6858

6768 -#: sequencer.c:1263

6859 +#: sequencer.c:1256

6860 msgid " (root-commit)"

6861 msgstr " (commit-raíz)"

6862

6772 -#: sequencer.c:1284

6863 +#: sequencer.c:1277

6864 msgid "could not parse HEAD"

6865 msgstr "no se pudo analizar HEAD"

6866

6776 -#: sequencer.c:1286

6867 +#: sequencer.c:1279

6868 #, c-format

6869 msgid "HEAD %s is not a commit!"

6870 msgstr "¡HEAD %s no es un commit!"

6871

6781 -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6872 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

6873 msgid "could not parse HEAD commit"

6874 msgstr "no se pudo analizar el commit de HEAD"

6875

6785 -#: sequencer.c:1342 sequencer.c:1968

6876 +#: sequencer.c:1335 sequencer.c:1980

6877 msgid "unable to parse commit author"

6878 msgstr "no es posible analizar el autor del commit"

6879

6789 -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6880 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

6881 msgid "git write-tree failed to write a tree"

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

6883

6793 -#: sequencer.c:1386 sequencer.c:1447

6884 +#: sequencer.c:1379 sequencer.c:1450

6885 #, c-format

6886 msgid "unable to read commit message from '%s'"

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

6888

6798 -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6799 -#: builtin/merge.c:911

6889 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

6890 +#: builtin/merge.c:919

6891 msgid "failed to write commit object"

6892 msgstr "falló al escribir el objeto commit"

6893

6803 -#: sequencer.c:1474

6894 +#: sequencer.c:1433 sequencer.c:4118

6895 +#, c-format

6896 +msgid "could not update %s"

6897 +msgstr "no se puede actualizar %s"

6898 +

6899 +#: sequencer.c:1481

6900 #, c-format

6901 msgid "could not parse commit %s"

6902 msgstr "no se pudo analizar commit %s"

6903

6808 -#: sequencer.c:1479

6904 +#: sequencer.c:1486

6905 #, c-format

6906 msgid "could not parse parent commit %s"

6907 msgstr "no se pudo analizar el commit padre %s"

6908

6813 -#: sequencer.c:1562 sequencer.c:1673

6909 +#: sequencer.c:1569 sequencer.c:1680

6910 #, c-format

6911 msgid "unknown command: %d"

6912 msgstr "comando desconocido: %d"

6913

6818 -#: sequencer.c:1620 sequencer.c:1645

6914 +#: sequencer.c:1627 sequencer.c:1652

6915 #, c-format

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

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

6918

6823 -#: sequencer.c:1630

6919 +#: sequencer.c:1637

6920 msgid "need a HEAD to fixup"

6921 msgstr "se necesita un HEAD para arreglar"

6922

6827 -#: sequencer.c:1632 sequencer.c:3212

6923 +#: sequencer.c:1639 sequencer.c:3230

6924 msgid "could not read HEAD"

6925 msgstr "no se pudo leer HEAD"

6926

6831 -#: sequencer.c:1634

6927 +#: sequencer.c:1641

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

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

6930

6835 -#: sequencer.c:1640

6931 +#: sequencer.c:1647

6932 #, c-format

6933 msgid "cannot write '%s'"

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

6935

6840 -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6936 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496

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

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

6939

6844 -#: sequencer.c:1655

6940 +#: sequencer.c:1662

6941 #, c-format

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

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

6944

6849 -#: sequencer.c:1662

6945 +#: sequencer.c:1669

6946 #, c-format

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

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

6949

6854 -#: sequencer.c:1668

6950 +#: sequencer.c:1675

6951 #, c-format

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

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

6954

6859 -#: sequencer.c:1756

6955 +#: sequencer.c:1763

6956 msgid "your index file is unmerged."

6957 msgstr "tu archivo índice no está fusionado."

6958

6863 -#: sequencer.c:1763

6959 +#: sequencer.c:1770

6960 msgid "cannot fixup root commit"

6961 msgstr "no se puede arreglar el commit raíz"

6962

6867 -#: sequencer.c:1782

6963 +#: sequencer.c:1789

6964 #, c-format

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

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

6967

6872 -#: sequencer.c:1790 sequencer.c:1798

6968 +#: sequencer.c:1797 sequencer.c:1805

6969 #, c-format

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

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

6972

6877 -#: sequencer.c:1804

6973 +#: sequencer.c:1811

6974 #, c-format

6975 msgid "cannot get commit message for %s"

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

6977

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

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

6884 -#: sequencer.c:1823

6980 +#: sequencer.c:1830

6981 #, c-format

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

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

6984

6889 -#: sequencer.c:1888

6985 +#: sequencer.c:1895

6986 #, c-format

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

6988 msgstr "no se puede renombrar '%s' a '%s'"

6989

6894 -#: sequencer.c:1943

6990 +#: sequencer.c:1952

6991 #, c-format

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

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

6994

6899 -#: sequencer.c:1944

6995 +#: sequencer.c:1953

6996 #, c-format

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

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

6999

6904 -#: sequencer.c:1961

7000 +#: sequencer.c:1972

7001 #, c-format

7002 msgid "dropping %s %s -- patch contents already upstream\n"

7003 msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n"

7004

6909 -#: sequencer.c:2018

7005 +#: sequencer.c:2030

7006 #, c-format

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

7008 msgstr "git %s: falló al leer el índice"

7009

6914 -#: sequencer.c:2025

7010 +#: sequencer.c:2037

7011 #, c-format

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

7013 msgstr "git %s: falló al refrescar el índice"

7014

6919 -#: sequencer.c:2102

7015 +#: sequencer.c:2114

7016 #, c-format

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

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

7019

6924 -#: sequencer.c:2111

7020 +#: sequencer.c:2123

7021 #, c-format

7022 msgid "missing arguments for %s"

7023 msgstr "faltan argumentos para para %s"

7024

6929 -#: sequencer.c:2142

7025 +#: sequencer.c:2154

7026 #, c-format

7027 msgid "could not parse '%s'"

7028 msgstr "no se puede analizar '%s'"

7029

6934 -#: sequencer.c:2203

7030 +#: sequencer.c:2215

7031 #, c-format

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

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

7034

6939 -#: sequencer.c:2214

7035 +#: sequencer.c:2226

7036 #, c-format

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

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

7039

6944 -#: sequencer.c:2298

7040 +#: sequencer.c:2310

7041 msgid "cancelling a cherry picking in progress"

7042 msgstr "cancelando cherry-pick en progreso"

7043

6948 -#: sequencer.c:2305

7044 +#: sequencer.c:2317

7045 msgid "cancelling a revert in progress"

7046 msgstr "cancelando revert en progreso"

7047

6952 -#: sequencer.c:2349

7048 +#: sequencer.c:2361

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

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

7051

6956 -#: sequencer.c:2351

7052 +#: sequencer.c:2363

7053 #, c-format

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

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

7056

6961 -#: sequencer.c:2356

7057 +#: sequencer.c:2368

7058 msgid "no commits parsed."

7059 msgstr "ningún commit analizado."

7060

6965 -#: sequencer.c:2367

7061 +#: sequencer.c:2379

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

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

7064

6969 -#: sequencer.c:2369

7065 +#: sequencer.c:2381

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

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

7068

6973 -#: sequencer.c:2447

7069 +#: sequencer.c:2459

7070 #, c-format

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

7072 msgstr "valor inválido para %s: %s"

7073

6978 -#: sequencer.c:2540

7074 +#: sequencer.c:2556

7075 msgid "unusable squash-onto"

7076 msgstr "squash-onto inservible"

7077

6982 -#: sequencer.c:2556

7078 +#: sequencer.c:2576

7079 #, c-format

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

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

7082

6987 -#: sequencer.c:2644 sequencer.c:4361

7083 +#: sequencer.c:2664 sequencer.c:4469

7084 msgid "empty commit set passed"

7085 msgstr "conjunto de commits vacío entregado"

7086

6991 -#: sequencer.c:2660

7087 +#: sequencer.c:2680

7088 msgid "revert is already in progress"

7089 msgstr "revert ya está en progreso"

7090

6995 -#: sequencer.c:2662

7091 +#: sequencer.c:2682

7092 #, c-format

7093 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7094 msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""

7095

7000 -#: sequencer.c:2665

7096 +#: sequencer.c:2685

7097 msgid "cherry-pick is already in progress"

7098 msgstr "cherry-pick ya está en progreso"

7099

7004 -#: sequencer.c:2667

7100 +#: sequencer.c:2687

7101 #, c-format

7102 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7103 msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""

7104

7009 -#: sequencer.c:2681

7105 +#: sequencer.c:2701

7106 #, c-format

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

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

7109

7014 -#: sequencer.c:2696

7110 +#: sequencer.c:2716

7111 msgid "could not lock HEAD"

7112 msgstr "no se pudo bloquear HEAD"

7113

7018 -#: sequencer.c:2756 sequencer.c:4099

7114 +#: sequencer.c:2776 sequencer.c:4206

7115 msgid "no cherry-pick or revert in progress"

7116 msgstr "ningún cherry-pick o revert en progreso"

7117

7022 -#: sequencer.c:2758 sequencer.c:2769

7118 +#: sequencer.c:2778 sequencer.c:2789

7119 msgid "cannot resolve HEAD"

7120 msgstr "no se puede resolver HEAD"

7121

7026 -#: sequencer.c:2760 sequencer.c:2804

7122 +#: sequencer.c:2780 sequencer.c:2824

7123 msgid "cannot abort from a branch yet to be born"

7124 msgstr "no se puede abortar de una rama por nacer"

7125

7030 -#: sequencer.c:2790 builtin/grep.c:724

7126 +#: sequencer.c:2810 builtin/grep.c:744

7127 #, c-format

7128 msgid "cannot open '%s'"

7129 msgstr "no se puede abrir '%s'"

7130

7035 -#: sequencer.c:2792

7131 +#: sequencer.c:2812

7132 #, c-format

7133 msgid "cannot read '%s': %s"

7134 msgstr "no se puede leer '%s': %s"

7135

7040 -#: sequencer.c:2793

7136 +#: sequencer.c:2813

7137 msgid "unexpected end of file"

7138 msgstr "final de archivo inesperado"

7139

7044 -#: sequencer.c:2799

7140 +#: sequencer.c:2819

7141 #, c-format

7142 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

7143 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"

7144

7049 -#: sequencer.c:2810

7145 +#: sequencer.c:2830

7146 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

7147 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"

7148

7053 -#: sequencer.c:2851

7149 +#: sequencer.c:2871

7150 msgid "no revert in progress"

7151 msgstr "no hay revert en progreso"

7152

7057 -#: sequencer.c:2859

7153 +#: sequencer.c:2879

7154 msgid "no cherry-pick in progress"

7155 msgstr "ningún cherry-pick en progreso"

7156

7061 -#: sequencer.c:2869

7157 +#: sequencer.c:2889

7158 msgid "failed to skip the commit"

7159 msgstr "falló al escribir el commit"

7160

7065 -#: sequencer.c:2876

7161 +#: sequencer.c:2896

7162 msgid "there is nothing to skip"

7163 msgstr "no hay nada que saltar"

7164

7069 -#: sequencer.c:2879

7165 +#: sequencer.c:2899

7166 #, c-format

7167 msgid ""

7168 "have you committed already?\n"

@@ -7075,21 +7171,16 @@ msgstr ""

7171 "¿ya has hecho el commit?\n"

7172 "intenta \"git %s --continue\""

7173

7078 -#: sequencer.c:3003 sequencer.c:4011

7079 -#, c-format

7080 -msgid "could not update %s"

7081 -msgstr "no se puede actualizar %s"

7082 -

l10n: es: 2.27.0 round 1