7b0e326ba9 · 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-05-15 09:11+0800\n"

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

10 +"POT-Creation-Date: 2020-07-10 09:53+0800\n"

11 +"PO-Revision-Date: 2020-07-26 10:11-0500\n"

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

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

14 "Language: es\n"

@@ -111,21 +111,21 @@ msgstr[1] "agregadas %d rutas\n"

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorando lo no fusionado: %s"

113

114 -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

114 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr "Solo cambiaron archivos binarios.\n"

118

119 -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

119 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Sin cambios.\n"

123

124 -#: add-interactive.c:935 git-add--interactive.perl:1376

124 +#: add-interactive.c:935 git-add--interactive.perl:1378

125 msgid "Patch update"

126 msgstr "Actualización del parche"

127

128 -#: add-interactive.c:974 git-add--interactive.perl:1754

128 +#: add-interactive.c:974 git-add--interactive.perl:1771

129 msgid "Review diff"

130 msgstr "Revisión de diff"

131

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

194 msgid "(empty) select nothing"

195 msgstr "(vacío) selecciona nada"

196

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

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

198 msgid "*** Commands ***"

199 msgstr "*** Comandos ***"

200

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

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

202 msgid "What now"

203 msgstr "Ahora que"

204

@@ -215,7 +215,7 @@ msgstr "no rastreado"

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

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

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

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

220 msgid "path"

221 msgstr "ruta"

@@ -224,27 +224,32 @@ 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:781 git-add--interactive.perl:1765

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

228 #, c-format

229 msgid "Bye.\n"

230 msgstr "Adiós.\n"

231

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

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

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:35 git-add--interactive.perl:1429

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

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:36 git-add--interactive.perl:1430

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

243 +#, c-format, perl-format

244 +msgid "Stage addition [y,n,q,a,d%s,?]? "

245 +msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? "

246 +

247 +#: add-patch.c:37 git-add--interactive.perl:1433

248 #, c-format, perl-format

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

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

251

247 -#: add-patch.c:38

252 +#: add-patch.c:39

253 msgid ""

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

255 "staging."

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

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

258 "para el área de stage."

259

255 -#: add-patch.c:41

260 +#: add-patch.c:42

261 msgid ""

262 "y - stage this hunk\n"

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

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

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

273 "archivo\n"

274

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

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

276 #, c-format, perl-format

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

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

279

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

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

281 #, c-format, perl-format

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

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

284

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

285 +#: add-patch.c:58 git-add--interactive.perl:1438

286 +#, c-format, perl-format

287 +msgid "Stash addition [y,n,q,a,d%s,?]? "

288 +msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? "

289 +

290 +#: add-patch.c:59 git-add--interactive.perl:1439

291 #, c-format, perl-format

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

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

294

285 -#: add-patch.c:59

295 +#: add-patch.c:61

296 msgid ""

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

298 "stashing."

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

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

301 "para aplicar stash."

302

293 -#: add-patch.c:62

303 +#: add-patch.c:64

304 msgid ""

305 "y - stash this hunk\n"

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

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

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

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

316

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

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

318 #, c-format, perl-format

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

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

321

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

322 +#: add-patch.c:81 git-add--interactive.perl:1443

323 #, c-format, perl-format

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

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

326

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

327 +#: add-patch.c:82 git-add--interactive.perl:1444

328 +#, c-format, perl-format

329 +msgid "Unstage addition [y,n,q,a,d%s,?]? "

330 +msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? "

331 +

332 +#: add-patch.c:83 git-add--interactive.perl:1445

333 #, c-format, perl-format

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

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

336

322 -#: add-patch.c:82

337 +#: add-patch.c:85

338 msgid ""

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

340 "unstaging."

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

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

343 "para sacar del área de stage."

344

330 -#: add-patch.c:85

345 +#: add-patch.c:88

346 msgid ""

347 "y - unstage this hunk\n"

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

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

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

358 "archivo\n"

359

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

360 +#: add-patch.c:103 git-add--interactive.perl:1448

361 #, c-format, perl-format

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

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

364

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

365 +#: add-patch.c:104 git-add--interactive.perl:1449

366 #, c-format, perl-format

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

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

369

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

370 +#: add-patch.c:105 git-add--interactive.perl:1450

371 +#, c-format, perl-format

372 +msgid "Apply addition to index [y,n,q,a,d%s,?]? "

373 +msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? "

374 +

375 +#: add-patch.c:106 git-add--interactive.perl:1451

376 #, c-format, perl-format

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

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

379

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

380 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221

381 msgid ""

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

383 "applying."

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

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

386 "inmediatamente para aplicar."

387

368 -#: add-patch.c:107

388 +#: add-patch.c:111

389 msgid ""

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

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

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

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

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

401

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

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

402 +#: add-patch.c:126 git-add--interactive.perl:1454

403 +#: git-add--interactive.perl:1472

404 #, c-format, perl-format

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

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

407

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

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

408 +#: add-patch.c:127 git-add--interactive.perl:1455

409 +#: git-add--interactive.perl:1473

410 #, c-format, perl-format

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

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

413

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

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

414 +#: add-patch.c:128 git-add--interactive.perl:1456

415 +#: git-add--interactive.perl:1474

416 +#, c-format, perl-format

417 +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

418 +msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "

419 +

420 +#: add-patch.c:129 git-add--interactive.perl:1457

421 +#: git-add--interactive.perl:1475

422 #, c-format, perl-format

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

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

425

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

426 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199

427 msgid ""

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

429 "discarding."

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

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

432 "inmediatamente para descarte."

433

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

434 +#: add-patch.c:134 add-patch.c:202

435 msgid ""

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

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

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

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

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

447

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

448 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

449 #, c-format, perl-format

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

451 msgstr ""

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

453

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

454 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

455 #, c-format, perl-format

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

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

458

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

459 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

460 +#, c-format, perl-format

461 +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

462 +msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

463 +

464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

465 #, c-format, perl-format

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

467 msgstr ""

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

469

439 -#: add-patch.c:151

470 +#: add-patch.c:157

471 msgid ""

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

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

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

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

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

483

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

484 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

485 #, c-format, perl-format

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

487 msgstr ""

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

489 "%s,?]? "

490

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

491 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

492 #, c-format, perl-format

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

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

495

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

496 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

497 +#, c-format, perl-format

498 +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

499 +msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "

500 +

501 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

502 #, c-format, perl-format

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

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

505

470 -#: add-patch.c:172

506 +#: add-patch.c:179

507 msgid ""

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

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

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

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

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

519

484 -#: add-patch.c:215

520 +#: add-patch.c:224

521 msgid ""

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

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

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

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

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

533

498 -#: add-patch.c:319

534 +#: add-patch.c:328

535 #, c-format

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

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

538

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

539 +#: add-patch.c:347 add-patch.c:351

540 #, c-format

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

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

543

508 -#: add-patch.c:396

544 +#: add-patch.c:405

545 msgid "could not parse diff"

546 msgstr "no se puede analizar diff"

547

512 -#: add-patch.c:415

548 +#: add-patch.c:424

549 msgid "could not parse colored diff"

550 msgstr "no se pudo analizar diff a colores"

551

516 -#: add-patch.c:429

552 +#: add-patch.c:438

553 #, c-format

554 msgid "failed to run '%s'"

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

556

521 -#: add-patch.c:588

557 +#: add-patch.c:602

558 msgid "mismatched output from interactive.diffFilter"

559 msgstr "output de interactive.diffFilter no concuerda"

560

525 -#: add-patch.c:589

561 +#: add-patch.c:603

562 msgid ""

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

564 "between its input and output lines."

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

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

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

568

533 -#: add-patch.c:762

569 +#: add-patch.c:776

570 #, c-format

571 msgid ""

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

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

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

576 "%.*s"

577

542 -#: add-patch.c:777

578 +#: add-patch.c:791

579 #, c-format

580 msgid ""

581 "hunks do not overlap:\n"

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

588 "\tno acaba con:\n"

589 "%.*s"

590

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

591 +#: add-patch.c:1067 git-add--interactive.perl:1114

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

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

594

559 -#: add-patch.c:1057

595 +#: add-patch.c:1071

596 #, c-format

597 msgid ""

598 "---\n"

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

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

607

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

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

609 +#: add-patch.c:1085 git-add--interactive.perl:1128

610 msgid ""

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

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

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

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

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

618

583 -#: add-patch.c:1104

619 +#: add-patch.c:1118

620 msgid "could not parse hunk header"

621 msgstr "no se puede analizar hunk header"

622

587 -#: add-patch.c:1149

623 +#: add-patch.c:1163

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

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

626

@@ -600,26 +636,26 @@ msgstr "falló 'git apply --cached'"

636 #. Consider translating (saying "no" discards!) as

637 #. (saying "n" for "no" discards!) if the translation

638 #. of the word "no" does not start with n.

603 -#: add-patch.c:1218 git-add--interactive.perl:1239

639 +#: add-patch.c:1232 git-add--interactive.perl:1241

640 msgid ""

641 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

642 msgstr ""

643 "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"

644 "n]? "

645

610 -#: add-patch.c:1261

646 +#: add-patch.c:1275

647 msgid "The selected hunks do not apply to the index!"

648 msgstr "¡Los hunks seleccionados no aplican al índice!"

649

614 -#: add-patch.c:1262 git-add--interactive.perl:1343

650 +#: add-patch.c:1276 git-add--interactive.perl:1345

651 msgid "Apply them to the worktree anyway? "

652 msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "

653

618 -#: add-patch.c:1269 git-add--interactive.perl:1346

654 +#: add-patch.c:1283 git-add--interactive.perl:1348

655 msgid "Nothing was applied.\n"

656 msgstr "Nada fue aplicado.\n"

657

622 -#: add-patch.c:1326

658 +#: add-patch.c:1340

659 msgid ""

660 "j - leave this hunk undecided, see next undecided hunk\n"

661 "J - leave this hunk undecided, see next hunk\n"

@@ -641,69 +677,69 @@ msgstr ""

677 "e - editar manualmente el hunk actual\n"

678 "? - imprimir ayuda\n"

679

644 -#: add-patch.c:1447 add-patch.c:1457

680 +#: add-patch.c:1463 add-patch.c:1473

681 msgid "No previous hunk"

682 msgstr "No el anterior hunk"

683

648 -#: add-patch.c:1452 add-patch.c:1462

684 +#: add-patch.c:1468 add-patch.c:1478

685 msgid "No next hunk"

686 msgstr "No el siguiente hunk"

687

652 -#: add-patch.c:1468

688 +#: add-patch.c:1484

689 msgid "No other hunks to goto"

690 msgstr "No hay más pedazos para el ir"

691

656 -#: add-patch.c:1479 git-add--interactive.perl:1577

692 +#: add-patch.c:1495 git-add--interactive.perl:1594

693 msgid "go to which hunk (<ret> to see more)? "

694 msgstr "¿a que hunk ir (<enter> para ver más)? "

695

660 -#: add-patch.c:1480 git-add--interactive.perl:1579

696 +#: add-patch.c:1496 git-add--interactive.perl:1596

697 msgid "go to which hunk? "

698 msgstr "¿a que hunk ir? "

699

664 -#: add-patch.c:1491

700 +#: add-patch.c:1507

701 #, c-format

702 msgid "Invalid number: '%s'"

703 msgstr "Numero inválido: '%s'"

704

669 -#: add-patch.c:1496

705 +#: add-patch.c:1512

706 #, c-format

707 msgid "Sorry, only %d hunk available."

708 msgid_plural "Sorry, only %d hunks available."

709 msgstr[0] "Lo siento, solo %d hunk disponible."

710 msgstr[1] "Lo siento, solo %d hunks disponibles."

711

676 -#: add-patch.c:1505

712 +#: add-patch.c:1521

713 msgid "No other hunks to search"

714 msgstr "No hay más pedazos para buscar"

715

680 -#: add-patch.c:1511 git-add--interactive.perl:1623

716 +#: add-patch.c:1527 git-add--interactive.perl:1640

717 msgid "search for regex? "

718 msgstr "¿buscar para regexp? "

719

684 -#: add-patch.c:1526

720 +#: add-patch.c:1542

721 #, c-format

722 msgid "Malformed search regexp %s: %s"

723 msgstr "Regexp para la búsqueda mal formado %s: %s"

724

689 -#: add-patch.c:1543

725 +#: add-patch.c:1559

726 msgid "No hunk matches the given pattern"

727 msgstr "No hay hunks que concuerden con el patrón entregado."

728

693 -#: add-patch.c:1550

729 +#: add-patch.c:1566

730 msgid "Sorry, cannot split this hunk"

731 msgstr "Perdón, no se puede dividir este pedazo"

732

697 -#: add-patch.c:1554

733 +#: add-patch.c:1570

734 #, c-format

735 msgid "Split into %d hunks."

736 msgstr "Cortar en %d hunk."

737

702 -#: add-patch.c:1558

738 +#: add-patch.c:1574

739 msgid "Sorry, cannot edit this hunk"

740 msgstr "Perdón, no se puede editar este pedazo"

741

706 -#: add-patch.c:1609

742 +#: add-patch.c:1625

743 msgid "'git apply' failed"

744 msgstr "falló 'git apply'"

745

@@ -1404,7 +1440,7 @@ msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"

1440

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

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

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

1443 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1444 msgid "action"

1445 msgstr "acción"

1446

@@ -1436,7 +1472,7 @@ msgid "allow overlapping hunks"

1472 msgstr "permitir solapamiento de hunks"

1473

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

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

1475 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

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

1477 msgid "be verbose"

1478 msgstr "ser verboso"

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

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

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

1536

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

1537 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1538 #, c-format

1539 msgid "deflate error (%d)"

1540 msgstr "error al desinflar (%d)"

@@ -1568,8 +1604,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1605

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

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

1607 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1608 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

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

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

1611 #: parse-options.h:190

@@ -1794,10 +1830,10 @@ msgid "--reverse and --first-parent together require specified latest commit"

1830 msgstr ""

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

1832

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

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

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

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

1836 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1837 #: builtin/shortlog.c:192

1838 msgid "revision walk setup failed"

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

@@ -1968,84 +2004,88 @@ msgstr "'%s' ya ha sido marcado en '%s'"

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

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

2006

1971 -#: bundle.c:36

2007 +#: bundle.c:47

2008 #, c-format

2009 msgid "'%s' does not look like a v2 bundle file"

2010 msgstr "'%s' no se ve como un archivo bundle v2"

2011

1976 -#: bundle.c:64

2012 +#: bundle.c:69

2013 +msgid "unknown hash algorithm length"

2014 +msgstr "largo del algoritmo hash desconocido"

2015 +

2016 +#: bundle.c:84

2017 #, c-format

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

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

2020

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

2021 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2022 #: builtin/commit.c:814

2023 #, c-format

2024 msgid "could not open '%s'"

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

2026

1987 -#: bundle.c:143

2027 +#: bundle.c:163

2028 msgid "Repository lacks these prerequisite commits:"

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

2030

1991 -#: bundle.c:146

2031 +#: bundle.c:166

2032 msgid "need a repository to verify a bundle"

2033 msgstr "se necesita un repositorio para verificar un bundle"

2034

1995 -#: bundle.c:197

2035 +#: bundle.c:217

2036 #, c-format

2037 msgid "The bundle contains this ref:"

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

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

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

2041

2002 -#: bundle.c:204

2042 +#: bundle.c:224

2043 msgid "The bundle records a complete history."

2044 msgstr "El bundle registra una historia completa."

2045

2006 -#: bundle.c:206

2046 +#: bundle.c:226

2047 #, c-format

2048 msgid "The bundle requires this ref:"

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

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

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

2052

2013 -#: bundle.c:273

2053 +#: bundle.c:293

2054 msgid "unable to dup bundle descriptor"

2055 msgstr "incapaz de duplicar bundle descriptor"

2056

2017 -#: bundle.c:280

2057 +#: bundle.c:300

2058 msgid "Could not spawn pack-objects"

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

2060

2021 -#: bundle.c:291

2061 +#: bundle.c:311

2062 msgid "pack-objects died"

2063 msgstr "pack-objects murió"

2064

2025 -#: bundle.c:333

2065 +#: bundle.c:353

2066 msgid "rev-list died"

2067 msgstr "rev-list murió"

2068

2029 -#: bundle.c:382

2069 +#: bundle.c:402

2070 #, c-format

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

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

2073

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

2074 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2075 #, c-format

2076 msgid "unrecognized argument: %s"

2077 msgstr "argumento no reconocido: %s"

2078

2039 -#: bundle.c:469

2079 +#: bundle.c:489

2080 msgid "Refusing to create empty bundle."

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

2082

2043 -#: bundle.c:479

2083 +#: bundle.c:499

2084 #, c-format

2085 msgid "cannot create '%s'"

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

2087

2048 -#: bundle.c:504

2088 +#: bundle.c:524

2089 msgid "index-pack died"

2090 msgstr "index-pack murió"

2091

@@ -2054,277 +2094,269 @@ msgstr "index-pack murió"

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

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

2096

2057 -#: commit-graph.c:183

2097 +#: commit-graph.c:238

2098 msgid "commit-graph file is too small"

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

2100

2061 -#: commit-graph.c:248

2101 +#: commit-graph.c:303

2102 #, c-format

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

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

2105

2066 -#: commit-graph.c:255

2106 +#: commit-graph.c:310

2107 #, c-format

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

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

2110

2071 -#: commit-graph.c:262

2111 +#: commit-graph.c:317

2112 #, c-format

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

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

2115

2076 -#: commit-graph.c:284

2116 +#: commit-graph.c:339

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

2118 msgstr ""

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

2120 "incompleto"

2121

2082 -#: commit-graph.c:294

2122 +#: commit-graph.c:349

2123 #, c-format

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

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

2126

2087 -#: commit-graph.c:362

2127 +#: commit-graph.c:417

2128 #, c-format

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

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

2131

2092 -#: commit-graph.c:436

2132 +#: commit-graph.c:491

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

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

2135

2096 -#: commit-graph.c:446

2136 +#: commit-graph.c:501

2137 msgid "commit-graph chain does not match"

2138 msgstr "cadena commit-graph no concuerda"

2139

2100 -#: commit-graph.c:494

2140 +#: commit-graph.c:549

2141 #, c-format

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

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

2144

2105 -#: commit-graph.c:518

2145 +#: commit-graph.c:573

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

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

2148

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

2149 +#: commit-graph.c:706 commit-graph.c:770

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

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

2152

2113 -#: commit-graph.c:672

2153 +#: commit-graph.c:727

2154 #, c-format

2155 msgid "could not find commit %s"

2156 msgstr "no se pudo encontrar commit %s"

2157

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

2158 +#: commit-graph.c:1009 builtin/am.c:1292

2159 #, c-format

2160 msgid "unable to parse commit %s"

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

2162

2123 -#: commit-graph.c:1096

2163 +#: commit-graph.c:1157

2164 msgid "Writing changed paths Bloom filters index"

2165 msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"

2166

2127 -#: commit-graph.c:1121

2167 +#: commit-graph.c:1182

2168 msgid "Writing changed paths Bloom filters data"

2169 msgstr "Escribiendo cambios de ruta de datos de filtros Bloom"

2170

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

2171 +#: commit-graph.c:1221 builtin/pack-objects.c:2832

2172 #, c-format

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

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

2175

2136 -#: commit-graph.c:1196

2176 +#: commit-graph.c:1257

2177 msgid "Loading known commits in commit graph"

2178 msgstr "Cargando commits conocidos en commit graph"

2179

2140 -#: commit-graph.c:1213

2180 +#: commit-graph.c:1274

2181 msgid "Expanding reachable commits in commit graph"

2182 msgstr "Expandiendo commits alcanzables en commit graph"

2183

2144 -#: commit-graph.c:1233

2184 +#: commit-graph.c:1294

2185 msgid "Clearing commit marks in commit graph"

2186 msgstr "Limpiando marcas de commits en commit graph"

2187

2148 -#: commit-graph.c:1252

2188 +#: commit-graph.c:1313

2189 msgid "Computing commit graph generation numbers"

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

2191

2152 -#: commit-graph.c:1300

2192 +#: commit-graph.c:1367

2193 msgid "Computing commit changed paths Bloom filters"

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

2195

2156 -#: commit-graph.c:1359

2196 +#: commit-graph.c:1423

2197 +msgid "Collecting referenced commits"

2198 +msgstr "Recolectando commits referenciados"

2199 +

2200 +#: commit-graph.c:1447

2201 #, c-format

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

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

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

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

2206

2163 -#: commit-graph.c:1372

2207 +#: commit-graph.c:1460

2208 #, c-format

2209 msgid "error adding pack %s"

2210 msgstr "error agregando pack %s"

2211

2168 -#: commit-graph.c:1376

2212 +#: commit-graph.c:1464

2213 #, c-format

2214 msgid "error opening index for %s"

2215 msgstr "error abriendo index para %s"

2216

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 -

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 -

2185 -#: commit-graph.c:1442

2217 +#: commit-graph.c:1503

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

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

2220

2189 -#: commit-graph.c:1457

2221 +#: commit-graph.c:1518

2222 msgid "Counting distinct commits in commit graph"

2223 msgstr "Contando commits distintos en commit graph"

2224

2193 -#: commit-graph.c:1489

2225 +#: commit-graph.c:1550

2226 msgid "Finding extra edges in commit graph"

2227 msgstr "Encontrando esquinas extra en commit graph"

2228

2197 -#: commit-graph.c:1538

2229 +#: commit-graph.c:1599

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

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

2232

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

2233 +#: commit-graph.c:1633 midx.c:812

2234 #, c-format

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

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

2237

2206 -#: commit-graph.c:1585

2238 +#: commit-graph.c:1646

2239 msgid "unable to create temporary graph layer"

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

2241

2210 -#: commit-graph.c:1590

2242 +#: commit-graph.c:1651

2243 #, c-format

2244 msgid "unable to adjust shared permissions for '%s'"

2245 msgstr "no se pudo poner permisos a '%s'"

2246

2215 -#: commit-graph.c:1667

2247 +#: commit-graph.c:1728

2248 #, c-format

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

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

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

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

2253

2222 -#: commit-graph.c:1712

2254 +#: commit-graph.c:1773

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

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

2257

2226 -#: commit-graph.c:1728

2258 +#: commit-graph.c:1789

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

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

2261

2230 -#: commit-graph.c:1748

2262 +#: commit-graph.c:1809

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

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

2265

2234 -#: commit-graph.c:1874

2266 +#: commit-graph.c:1935

2267 msgid "Scanning merged commits"

2268 msgstr "Escaneando commits fusionados"

2269

2238 -#: commit-graph.c:1885

2270 +#: commit-graph.c:1946

2271 #, c-format

2272 msgid "unexpected duplicate commit id %s"

2273 msgstr "id de commit duplicado inesperado %s"

2274

2243 -#: commit-graph.c:1908

2275 +#: commit-graph.c:1969

2276 msgid "Merging commit-graph"

2277 msgstr "Fusionando commit-graph"

2278

2247 -#: commit-graph.c:2096

2279 +#: commit-graph.c:2156

2280 #, c-format

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

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

2283

2252 -#: commit-graph.c:2107

2284 +#: commit-graph.c:2167

2285 msgid "too many commits to write graph"

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

2287

2256 -#: commit-graph.c:2200

2288 +#: commit-graph.c:2260

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

2290 msgstr ""

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

2292 "corrupto"

2293

2262 -#: commit-graph.c:2210

2294 +#: commit-graph.c:2270

2295 #, c-format

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

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

2298

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

2299 +#: commit-graph.c:2280 commit-graph.c:2295

2300 #, c-format

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

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

2303

2272 -#: commit-graph.c:2227

2304 +#: commit-graph.c:2287

2305 #, c-format

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

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

2308

2277 -#: commit-graph.c:2245

2309 +#: commit-graph.c:2305

2310 msgid "Verifying commits in commit graph"

2311 msgstr "Verificando commits en commit graph"

2312

2281 -#: commit-graph.c:2259

2313 +#: commit-graph.c:2320

2314 #, c-format

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

2316 msgstr ""

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

2318 "graph"

2319

2288 -#: commit-graph.c:2266

2320 +#: commit-graph.c:2327

2321 #, c-format

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

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

2324

2293 -#: commit-graph.c:2276

2325 +#: commit-graph.c:2337

2326 #, c-format

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

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

2329

2298 -#: commit-graph.c:2285

2330 +#: commit-graph.c:2346

2331 #, c-format

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

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

2334

2303 -#: commit-graph.c:2298

2335 +#: commit-graph.c:2360

2336 #, c-format

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

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

2339

2308 -#: commit-graph.c:2303

2340 +#: commit-graph.c:2365

2341 #, c-format

2342 msgid ""

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

2344 msgstr ""

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

2346

2315 -#: commit-graph.c:2307

2347 +#: commit-graph.c:2369

2348 #, c-format

2349 msgid ""

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

2351 msgstr ""

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

2353

2322 -#: commit-graph.c:2322

2354 +#: commit-graph.c:2385

2355 #, c-format

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

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

2358

2327 -#: commit-graph.c:2328

2359 +#: commit-graph.c:2391

2360 #, c-format

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

2362 msgstr ""

@@ -2361,27 +2393,27 @@ msgstr ""

2393 "Apapa este mensaje ejecutando\n"

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

2395

2364 -#: commit.c:1168

2396 +#: commit.c:1172

2397 #, c-format

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

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

2400

2369 -#: commit.c:1172

2401 +#: commit.c:1176

2402 #, c-format

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

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

2405

2374 -#: commit.c:1175

2406 +#: commit.c:1179

2407 #, c-format

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

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

2410

2379 -#: commit.c:1178

2411 +#: commit.c:1182

2412 #, c-format

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

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

2415

2384 -#: commit.c:1432

2416 +#: commit.c:1436

2417 msgid ""

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

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

@@ -2573,7 +2605,7 @@ msgstr "valor malformado para %s: %s"

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

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

2607

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

2608 +#: config.c:1533 builtin/pack-objects.c:3617

2609 #, c-format

2610 msgid "bad pack compression level %d"

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

@@ -2723,72 +2755,81 @@ msgstr ""

2755 msgid "server doesn't support '%s'"

2756 msgstr "servidor no soporta '%s'"

2757

2726 -#: connect.c:103

2758 +#: connect.c:118

2759 #, c-format

2760 msgid "server doesn't support feature '%s'"

2761 msgstr "servidor no soporta feature '%s'"

2762

2731 -#: connect.c:114

2763 +#: connect.c:129

2764 msgid "expected flush after capabilities"

2765 msgstr "se espera flush tras capacidades"

2766

2735 -#: connect.c:233

2767 +#: connect.c:263

2768 #, c-format

2769 msgid "ignoring capabilities after first line '%s'"

2770 msgstr "ignorando capacidades tras primera línea '%s'"

2771

2740 -#: connect.c:252

2772 +#: connect.c:284

2773 msgid "protocol error: unexpected capabilities^{}"

2774 msgstr "error de protocolo: capacidades imprevistas^{}"

2775

2744 -#: connect.c:273

2776 +#: connect.c:306

2777 #, c-format

2778 msgid "protocol error: expected shallow sha-1, got '%s'"

2779 msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"

2780

2749 -#: connect.c:275

2781 +#: connect.c:308

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

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

2784

2753 -#: connect.c:313

2785 +#: connect.c:347

2786 msgid "invalid packet"

2787 msgstr "paquete inválido"

2788

2757 -#: connect.c:333

2789 +#: connect.c:367

2790 #, c-format

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

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

2793

2762 -#: connect.c:441

2794 +#: connect.c:473

2795 +#, c-format

2796 +msgid "unknown object format '%s' specified by server"

2797 +msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"

2798 +

2799 +#: connect.c:500

2800 #, c-format

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

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

2803

2767 -#: connect.c:445

2804 +#: connect.c:504

2805 msgid "expected flush after ref listing"

2806 msgstr "flush esperado tras listado de refs"

2807

2771 -#: connect.c:544

2808 +#: connect.c:507

2809 +msgid "expected response end packet after ref listing"

2810 +msgstr "se esperaba un paquete final luego del ref listing"

2811 +

2812 +#: connect.c:640

2813 #, c-format

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

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

2816

2776 -#: connect.c:595

2817 +#: connect.c:691

2818 msgid "unable to set SO_KEEPALIVE on socket"

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

2820

2780 -#: connect.c:635 connect.c:698

2821 +#: connect.c:731 connect.c:794

2822 #, c-format

2823 msgid "Looking up %s ... "

2824 msgstr "Revisando %s... "

2825

2785 -#: connect.c:639

2826 +#: connect.c:735

2827 #, c-format

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

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

2830

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

2791 -#: connect.c:643 connect.c:714

2832 +#: connect.c:739 connect.c:810

2833 #, c-format

2834 msgid ""

2835 "done.\n"

@@ -2797,7 +2838,7 @@ msgstr ""

2838 "hecho.\n"

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

2840

2800 -#: connect.c:665 connect.c:742

2841 +#: connect.c:761 connect.c:838

2842 #, c-format

2843 msgid ""

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

@@ -2807,74 +2848,74 @@ msgstr ""

2848 "%s"

2849

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

2810 -#: connect.c:671 connect.c:748

2851 +#: connect.c:767 connect.c:844

2852 msgid "done."

2853 msgstr "hecho."

2854

2814 -#: connect.c:702

2855 +#: connect.c:798

2856 #, c-format

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

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

2859

2819 -#: connect.c:708

2860 +#: connect.c:804

2861 #, c-format

2862 msgid "unknown port %s"

2863 msgstr "puerto desconocido %s"

2864

2824 -#: connect.c:845 connect.c:1175

2865 +#: connect.c:941 connect.c:1271

2866 #, c-format

2867 msgid "strange hostname '%s' blocked"

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

2869

2829 -#: connect.c:847

2870 +#: connect.c:943

2871 #, c-format

2872 msgid "strange port '%s' blocked"

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

2874

2834 -#: connect.c:857

2875 +#: connect.c:953

2876 #, c-format

2877 msgid "cannot start proxy %s"

2878 msgstr "no se puede comenzar proxy %s"

2879

2839 -#: connect.c:928

2880 +#: connect.c:1024

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

2882 msgstr ""

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

2884

2844 -#: connect.c:1123

2885 +#: connect.c:1219

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

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

2888

2848 -#: connect.c:1135

2889 +#: connect.c:1231

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

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

2892

2852 -#: connect.c:1152

2893 +#: connect.c:1248

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

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

2896

2856 -#: connect.c:1264

2897 +#: connect.c:1360

2898 #, c-format

2899 msgid "strange pathname '%s' blocked"

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

2901

2861 -#: connect.c:1311

2902 +#: connect.c:1407

2903 msgid "unable to fork"

2904 msgstr "no es posible hacer fork"

2905

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

2906 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

2907 msgid "Checking connectivity"

2908 msgstr "Verificando conectividad"

2909

2869 -#: connected.c:119

2910 +#: connected.c:121

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

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

2913

2873 -#: connected.c:139

2914 +#: connected.c:141

2915 msgid "failed write to rev-list"

2916 msgstr "falló escribir a rev-list"

2917

2877 -#: connected.c:146

2918 +#: connected.c:148

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

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

2921

@@ -3137,17 +3178,17 @@ msgstr ""

3178 "No es un repositorio git. Use --no-index para comparar dos paths fuera del "

3179 "árbol de trabajo"

3180

3140 -#: diff.c:155

3181 +#: diff.c:156

3182 #, c-format

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

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

3185

3145 -#: diff.c:160

3186 +#: diff.c:161

3187 #, c-format

3188 msgid " Unknown dirstat parameter '%s'\n"

3189 msgstr " parámetro '%s' de dirstat desconocido\n"

3190

3150 -#: diff.c:296

3191 +#: diff.c:297

3192 msgid ""

3193 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3194 "'dimmed-zebra', 'plain'"

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

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

3197 "'dimmed_zebra', 'plain'"

3198

3158 -#: diff.c:324

3199 +#: diff.c:325

3200 #, c-format

3201 msgid ""

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

@@ -3165,7 +3206,7 @@ msgstr ""

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

3207 "change'"

3208

3168 -#: diff.c:332

3209 +#: diff.c:333

3210 msgid ""

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

3212 "whitespace modes"

@@ -3173,13 +3214,13 @@ msgstr ""

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

3215 "modos de espacios en blanco"

3216

3176 -#: diff.c:405

3217 +#: diff.c:410

3218 #, c-format

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

3220 msgstr ""

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

3222

3182 -#: diff.c:465

3223 +#: diff.c:470

3224 #, c-format

3225 msgid ""

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

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

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

3230 "%s"

3231

3191 -#: diff.c:4238

3232 +#: diff.c:4243

3233 #, c-format

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

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

3236

3196 -#: diff.c:4583

3237 +#: diff.c:4589

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

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

3240

3200 -#: diff.c:4586

3241 +#: diff.c:4592

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

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

3244

3204 -#: diff.c:4664

3245 +#: diff.c:4670

3246 msgid "--follow requires exactly one pathspec"

3247 msgstr "--follow requiere exactamente un pathspec"

3248

3208 -#: diff.c:4712

3249 +#: diff.c:4718

3250 #, c-format

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

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

3253

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

3254 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

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

3256 #, c-format

3257 msgid "%s expects a numerical value"

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

3259

3219 -#: diff.c:4749

3260 +#: diff.c:4755

3261 #, c-format

3262 msgid ""

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

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

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

3267 "%s"

3268

3228 -#: diff.c:4834

3269 +#: diff.c:4840

3270 #, c-format

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

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

3273

3233 -#: diff.c:4858

3274 +#: diff.c:4864

3275 #, c-format

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

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

3278

3238 -#: diff.c:4872

3279 +#: diff.c:4878

3280 #, c-format

3281 msgid "unable to resolve '%s'"

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

3283

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

3284 +#: diff.c:4928 diff.c:4934

3285 #, c-format

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

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

3288

3248 -#: diff.c:4940

3289 +#: diff.c:4946

3290 #, c-format

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

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

3293

3253 -#: diff.c:4961

3294 +#: diff.c:4967

3295 #, c-format

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

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

3298

3258 -#: diff.c:4980

3299 +#: diff.c:4986

3300 #, c-format

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

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

3303

3263 -#: diff.c:5020

3304 +#: diff.c:5026

3305 msgid ""

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

3307 "\"histogram\""

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

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

3310 "\"histogram\""

3311

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

3312 +#: diff.c:5062 diff.c:5082

3313 #, c-format

3314 msgid "invalid argument to %s"

3315 msgstr "argumento inválido para %s"

3316

3276 -#: diff.c:5214

3317 +#: diff.c:5219

3318 #, c-format

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

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

3321

3281 -#: diff.c:5270

3322 +#: diff.c:5275

3323 #, c-format

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

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

3326

3286 -#: diff.c:5293

3327 +#: diff.c:5298

3328 msgid "Diff output format options"

3329 msgstr "Opciones de formato de salida para diff"

3330

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

3331 +#: diff.c:5300 diff.c:5306

3332 msgid "generate patch"

3333 msgstr "generar parche"

3334

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

3335 +#: diff.c:5303 builtin/log.c:177

3336 msgid "suppress diff output"

3337 msgstr "suprimir salida de diff"

3338

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

3339 +#: diff.c:5308 diff.c:5422 diff.c:5429

3340 msgid "<n>"

3341 msgstr "<n>"

3342

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

3343 +#: diff.c:5309 diff.c:5312

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

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

3346

3306 -#: diff.c:5309

3347 +#: diff.c:5314

3348 msgid "generate the diff in raw format"

3349 msgstr "genera el diff en formato raw"

3350

3310 -#: diff.c:5312

3351 +#: diff.c:5317

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

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

3354

3314 -#: diff.c:5316

3355 +#: diff.c:5321

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

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

3358

3318 -#: diff.c:5320

3359 +#: diff.c:5325

3360 msgid "machine friendly --stat"

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

3362

3322 -#: diff.c:5323

3363 +#: diff.c:5328

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

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

3366

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

3367 +#: diff.c:5330 diff.c:5338

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

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

3370

3330 -#: diff.c:5326

3371 +#: diff.c:5331

3372 msgid ""

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

3374 msgstr ""

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

3376 "subdirectorio"

3377

3337 -#: diff.c:5330

3378 +#: diff.c:5335

3379 msgid "synonym for --dirstat=cumulative"

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

3381

3341 -#: diff.c:5334

3382 +#: diff.c:5339

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

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

3385

3345 -#: diff.c:5338

3386 +#: diff.c:5343

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

3388 msgstr ""

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

3390 "en blanco"

3391

3351 -#: diff.c:5341

3392 +#: diff.c:5346

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

3394 msgstr ""

3395 "resumen condensado de creaciones, cambios de nombres y cambios de modos"

3396

3356 -#: diff.c:5344

3397 +#: diff.c:5349

3398 msgid "show only names of changed files"

3399 msgstr "mostrar solo nombres de archivos cambiados"

3400

3360 -#: diff.c:5347

3401 +#: diff.c:5352

3402 msgid "show only names and status of changed files"

3403 msgstr "mostrar solo nombres y estados de archivos cambiados"

3404

3364 -#: diff.c:5349

3405 +#: diff.c:5354

3406 msgid "<width>[,<name-width>[,<count>]]"

3407 msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"

3408

3368 -#: diff.c:5350

3409 +#: diff.c:5355

3410 msgid "generate diffstat"

3411 msgstr "generar diffstat"

3412

3372 -#: diff.c:5352 diff.c:5355 diff.c:5358

3413 +#: diff.c:5357 diff.c:5360 diff.c:5363

3414 msgid "<width>"

3415 msgstr "<ancho>"

3416

3376 -#: diff.c:5353

3417 +#: diff.c:5358

3418 msgid "generate diffstat with a given width"

3419 msgstr "genera diffstat con un ancho dado"

3420

3380 -#: diff.c:5356

3421 +#: diff.c:5361

3422 msgid "generate diffstat with a given name width"

3423 msgstr "genera diffstat con un nombre de ancho dado"

3424

3384 -#: diff.c:5359

3425 +#: diff.c:5364

3426 msgid "generate diffstat with a given graph width"

3427 msgstr "genera diffstat con un ancho de graph dado"

3428

3388 -#: diff.c:5361

3429 +#: diff.c:5366

3430 msgid "<count>"

3431 msgstr "<cantidad>"

3432

3392 -#: diff.c:5362

3433 +#: diff.c:5367

3434 msgid "generate diffstat with limited lines"

3435 msgstr "genera diffstat con líneas limitadas"

3436

3396 -#: diff.c:5365

3437 +#: diff.c:5370

3438 msgid "generate compact summary in diffstat"

3439 msgstr "genera un resumen compacto de diffstat"

3440

3400 -#: diff.c:5368

3441 +#: diff.c:5373

3442 msgid "output a binary diff that can be applied"

3443 msgstr "muestra un diff binario que puede ser aplicado"

3444

3404 -#: diff.c:5371

3445 +#: diff.c:5376

3446 msgid "show full pre- and post-image object names on the \"index\" lines"

3447 msgstr ""

3448 "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"

3449 "\""

3450

3410 -#: diff.c:5373

3451 +#: diff.c:5378

3452 msgid "show colored diff"

3453 msgstr "mostrar diff colorido"

3454

3414 -#: diff.c:5374

3455 +#: diff.c:5379

3456 msgid "<kind>"

3457 msgstr "<tipo>"

3458

3418 -#: diff.c:5375

3459 +#: diff.c:5380

3460 msgid ""

3461 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3462 "diff"

@@ -3423,7 +3464,7 @@ msgstr ""

3464 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "

3465 "'new' del diff"

3466

3426 -#: diff.c:5378

3467 +#: diff.c:5383

3468 msgid ""

3469 "do not munge pathnames and use NULs as output field terminators in --raw or "

3470 "--numstat"

@@ -3431,89 +3472,89 @@ msgstr ""

3472 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "

3473 "o --numstat"

3474

3434 -#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3475 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3476 msgid "<prefix>"

3477 msgstr "<prefijo>"

3478

3438 -#: diff.c:5382

3479 +#: diff.c:5387

3480 msgid "show the given source prefix instead of \"a/\""

3481 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""

3482

3442 -#: diff.c:5385

3483 +#: diff.c:5390

3484 msgid "show the given destination prefix instead of \"b/\""

3485 msgstr "mostrar el prefijo de destino en lugar de \"b/\""

3486

3446 -#: diff.c:5388

3487 +#: diff.c:5393

3488 msgid "prepend an additional prefix to every line of output"

3489 msgstr "anteponer un prefijo adicional a cada línea mostrada"

3490

3450 -#: diff.c:5391

3491 +#: diff.c:5396

3492 msgid "do not show any source or destination prefix"

3493 msgstr "no mostrar ningún prefijo de fuente o destino"

3494

3454 -#: diff.c:5394

3495 +#: diff.c:5399

3496 msgid "show context between diff hunks up to the specified number of lines"

3497 msgstr ""

3498 "muestra el contexto entre hunks de diff hasta el número especificado de "

3499 "líneas"

3500

3460 -#: diff.c:5398 diff.c:5403 diff.c:5408

3501 +#: diff.c:5403 diff.c:5408 diff.c:5413

3502 msgid "<char>"

3503 msgstr "<char>"

3504

3464 -#: diff.c:5399

3505 +#: diff.c:5404

3506 msgid "specify the character to indicate a new line instead of '+'"

3507 msgstr "especifica el char para indicar una nueva línea en lugar de '+'"

3508

3468 -#: diff.c:5404

3509 +#: diff.c:5409

3510 msgid "specify the character to indicate an old line instead of '-'"

3511 msgstr "especifica el char para indicar una línea vieja en lugar de '-'"

3512

3472 -#: diff.c:5409

3513 +#: diff.c:5414

3514 msgid "specify the character to indicate a context instead of ' '"

3515 msgstr "especifica el char para indicar un contexto en lugar de ' '"

3516

3476 -#: diff.c:5412

3517 +#: diff.c:5417

3518 msgid "Diff rename options"

3519 msgstr "Opciones de diff rename"

3520

3480 -#: diff.c:5413

3521 +#: diff.c:5418

3522 msgid "<n>[/<m>]"

3523 msgstr "<n>[/<m>]"

3524

3484 -#: diff.c:5414

3525 +#: diff.c:5419

3526 msgid "break complete rewrite changes into pairs of delete and create"

3527 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"

3528

3488 -#: diff.c:5418

3529 +#: diff.c:5423

3530 msgid "detect renames"

3531 msgstr "detectar renombrados"

3532

3492 -#: diff.c:5422

3533 +#: diff.c:5427

3534 msgid "omit the preimage for deletes"

3535 msgstr "omite la preimage para borrados"

3536

3496 -#: diff.c:5425

3537 +#: diff.c:5430

3538 msgid "detect copies"

3539 msgstr "detectar copias"

3540

3500 -#: diff.c:5429

3541 +#: diff.c:5434

3542 msgid "use unmodified files as source to find copies"

3543 msgstr "usa archivos no modificados como fuente para encontrar copias"

3544

3504 -#: diff.c:5431

3545 +#: diff.c:5436

3546 msgid "disable rename detection"

3547 msgstr "deshabilita detección de renombres"

3548

3508 -#: diff.c:5434

3549 +#: diff.c:5439

3550 msgid "use empty blobs as rename source"

3551 msgstr "usa blobs vacíos como fuente de renombre"

3552

3512 -#: diff.c:5436

3553 +#: diff.c:5441

3554 msgid "continue listing the history of a file beyond renames"

3555 msgstr "continua listando el historial de un archivo más allá de renombres"

3556

3516 -#: diff.c:5439

3557 +#: diff.c:5444

3558 msgid ""

3559 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3560 "given limit"

@@ -3521,155 +3562,155 @@ msgstr ""

3562 "previene detección de renombre/copias si el número de objetivos para "

3563 "renombres/copias excede el límite dado"

3564

3524 -#: diff.c:5441

3565 +#: diff.c:5446

3566 msgid "Diff algorithm options"

3567 msgstr "Opciones de algoritmos de diff"

3568

3528 -#: diff.c:5443

3569 +#: diff.c:5448

3570 msgid "produce the smallest possible diff"

3571 msgstr "produce el diff más pequeño posible"

3572

3532 -#: diff.c:5446

3573 +#: diff.c:5451

3574 msgid "ignore whitespace when comparing lines"

3575 msgstr "ignorar espacios en blanco cuando comparando líneas"

3576

3536 -#: diff.c:5449

3577 +#: diff.c:5454

3578 msgid "ignore changes in amount of whitespace"

3579 msgstr "ignorar cambios en la cantidad de líneas en blanco"

3580

3540 -#: diff.c:5452

3581 +#: diff.c:5457

3582 msgid "ignore changes in whitespace at EOL"

3583 msgstr "ignorar cambios en espacios en blanco en EOL"

3584

3544 -#: diff.c:5455

3585 +#: diff.c:5460

3586 msgid "ignore carrier-return at the end of line"

3587 msgstr "ignora carrier-return al final de la línea"

3588

3548 -#: diff.c:5458

3589 +#: diff.c:5463

3590 msgid "ignore changes whose lines are all blank"

3591 msgstr "ignora cambios cuyas líneas son todas en blanco"

3592

3552 -#: diff.c:5461

3593 +#: diff.c:5466

3594 msgid "heuristic to shift diff hunk boundaries for easy reading"

3595 msgstr "heurística para cambiar los límites de hunk para una fácil lectura"

3596

3556 -#: diff.c:5464

3597 +#: diff.c:5469

3598 msgid "generate diff using the \"patience diff\" algorithm"

3599 msgstr "genera un diff usando algoritmo \"patience diff\""

3600

3560 -#: diff.c:5468

3601 +#: diff.c:5473

3602 msgid "generate diff using the \"histogram diff\" algorithm"

3603 msgstr "genera un diff usando algoritmo \"histogram diff\""

3604

3564 -#: diff.c:5470

3605 +#: diff.c:5475

3606 msgid "<algorithm>"

3607 msgstr "<algoritmo>"

3608

3568 -#: diff.c:5471

3609 +#: diff.c:5476

3610 msgid "choose a diff algorithm"

3611 msgstr "escoge un algoritmo para diff"

3612

3572 -#: diff.c:5473

3613 +#: diff.c:5478

3614 msgid "<text>"

3615 msgstr "<texto>"

3616

3576 -#: diff.c:5474

3617 +#: diff.c:5479

3618 msgid "generate diff using the \"anchored diff\" algorithm"

3619 msgstr "genera un diff usando algoritmo \"anchored diff\""

3620

3580 -#: diff.c:5476 diff.c:5485 diff.c:5488

3621 +#: diff.c:5481 diff.c:5490 diff.c:5493

3622 msgid "<mode>"

3623 msgstr "<modo>"

3624

3584 -#: diff.c:5477

3625 +#: diff.c:5482

3626 msgid "show word diff, using <mode> to delimit changed words"

3627 msgstr ""

3628 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"

3629

3589 -#: diff.c:5479 diff.c:5482 diff.c:5527

3630 +#: diff.c:5484 diff.c:5487 diff.c:5532

3631 msgid "<regex>"

3632 msgstr "<regex>"

3633

3593 -#: diff.c:5480

3634 +#: diff.c:5485

3635 msgid "use <regex> to decide what a word is"

3636 msgstr "usa <regex> para decidir que palabra es"

3637

3597 -#: diff.c:5483

3638 +#: diff.c:5488

3639 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3640 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"

3641

3601 -#: diff.c:5486

3642 +#: diff.c:5491

3643 msgid "moved lines of code are colored differently"

3644 msgstr "líneas movidas de código están coloreadas diferente"

3645

3605 -#: diff.c:5489

3646 +#: diff.c:5494

3647 msgid "how white spaces are ignored in --color-moved"

3648 msgstr "como espacios en blanco son ignorados en --color-moved"

3649

3609 -#: diff.c:5492

3650 +#: diff.c:5497

3651 msgid "Other diff options"

3652 msgstr "Otras opciones de diff"

3653

3613 -#: diff.c:5494

3654 +#: diff.c:5499

3655 msgid "when run from subdir, exclude changes outside and show relative paths"

3656 msgstr ""

3657 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "

3658 "paths relativos"

3659

3619 -#: diff.c:5498

3660 +#: diff.c:5503

3661 msgid "treat all files as text"

3662 msgstr "tratar todos los archivos como texto"

3663

3623 -#: diff.c:5500

3664 +#: diff.c:5505

3665 msgid "swap two inputs, reverse the diff"

3666 msgstr "cambia dos inputs, invierte el diff"

3667

3627 -#: diff.c:5502

3668 +#: diff.c:5507

3669 msgid "exit with 1 if there were differences, 0 otherwise"

3670 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"

3671

3631 -#: diff.c:5504

3672 +#: diff.c:5509

3673 msgid "disable all output of the program"

3674 msgstr "deshabilita todo el output del programa"

3675

3635 -#: diff.c:5506

3676 +#: diff.c:5511

3677 msgid "allow an external diff helper to be executed"

3678 msgstr "permite la ejecución de un diff helper externo"

3679

3639 -#: diff.c:5508

3680 +#: diff.c:5513

3681 msgid "run external text conversion filters when comparing binary files"

3682 msgstr ""

3683 "ejecuta filtros de conversión de texto externos cuando comparando binarios"

3684

3644 -#: diff.c:5510

3685 +#: diff.c:5515

3686 msgid "<when>"

3687 msgstr "<cuando>"

3688

3648 -#: diff.c:5511

3689 +#: diff.c:5516

3690 msgid "ignore changes to submodules in the diff generation"

3691 msgstr "ignorar cambios a submódulos en la generación de diff"

3692

3652 -#: diff.c:5514

3693 +#: diff.c:5519

3694 msgid "<format>"

3695 msgstr "<formato>"

3696

3656 -#: diff.c:5515

3697 +#: diff.c:5520

3698 msgid "specify how differences in submodules are shown"

3699 msgstr "especifica como son mostradas las diferencias en submódulos"

3700

3660 -#: diff.c:5519

3701 +#: diff.c:5524

3702 msgid "hide 'git add -N' entries from the index"

3703 msgstr "ocultar entradas 'git add -N' del index"

3704

3664 -#: diff.c:5522

3705 +#: diff.c:5527

3706 msgid "treat 'git add -N' entries as real in the index"

3707 msgstr "trata entradas 'git add -N' como reales en el index"

3708

3668 -#: diff.c:5524

3709 +#: diff.c:5529

3710 msgid "<string>"

3711 msgstr "<string>"

3712

3672 -#: diff.c:5525

3713 +#: diff.c:5530

3714 msgid ""

3715 "look for differences that change the number of occurrences of the specified "

3716 "string"

@@ -3677,7 +3718,7 @@ msgstr ""

3718 "busca por diferencias que cambien el número de ocurrencias para el string "

3719 "especificado"

3720

3680 -#: diff.c:5528

3721 +#: diff.c:5533

3722 msgid ""

3723 "look for differences that change the number of occurrences of the specified "

3724 "regex"

@@ -3685,23 +3726,23 @@ msgstr ""

3726 "busca por diferencias que cambien el número de ocurrencias para el regex "

3727 "especificado"

3728

3688 -#: diff.c:5531

3729 +#: diff.c:5536

3730 msgid "show all changes in the changeset with -S or -G"

3731 msgstr "mostrar todos los cambios en el changeset con -S o -G"

3732

3692 -#: diff.c:5534

3733 +#: diff.c:5539

3734 msgid "treat <string> in -S as extended POSIX regular expression"

3735 msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"

3736

3696 -#: diff.c:5537

3737 +#: diff.c:5542

3738 msgid "control the order in which files appear in the output"

3739 msgstr "controlar el orden en el que los archivos aparecen en la salida"

3740

3700 -#: diff.c:5538

3741 +#: diff.c:5543

3742 msgid "<object-id>"

3743 msgstr "<id-objeto>"

3744

3704 -#: diff.c:5539

3745 +#: diff.c:5544

3746 msgid ""

3747 "look for differences that change the number of occurrences of the specified "

3748 "object"

@@ -3709,33 +3750,33 @@ msgstr ""

3750 "busca por diferencias que cambien el número de ocurrencias para el objeto "

3751 "especificado"

3752

3712 -#: diff.c:5541

3753 +#: diff.c:5546

3754 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3755 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3756

3716 -#: diff.c:5542

3757 +#: diff.c:5547

3758 msgid "select files by diff type"

3759 msgstr "selecciona archivos por tipo de diff"

3760

3720 -#: diff.c:5544

3761 +#: diff.c:5549

3762 msgid "<file>"

3763 msgstr "<archivo>"

3764

3724 -#: diff.c:5545

3765 +#: diff.c:5550

3766 msgid "Output to a specific file"

3767 msgstr "Output a un archivo específico"

3768

3728 -#: diff.c:6200

3769 +#: diff.c:6205

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

3771 msgstr ""

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

3773

3733 -#: diff.c:6203

3774 +#: diff.c:6208

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

3776 msgstr ""

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

3778

3738 -#: diff.c:6206

3779 +#: diff.c:6211

3780 #, c-format

3781 msgid ""

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

@@ -3752,61 +3793,61 @@ msgstr "falló al leer orden de archivos '%s'"

3793 msgid "Performing inexact rename detection"

3794 msgstr "Realizando una detección de cambios de nombre inexacta"

3795

3755 -#: dir.c:555

3796 +#: dir.c:573

3797 #, c-format

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

3799 msgstr ""

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

3801

3761 -#: dir.c:695 dir.c:724 dir.c:737

3802 +#: dir.c:713 dir.c:742 dir.c:755

3803 #, c-format

3804 msgid "unrecognized pattern: '%s'"

3805 msgstr "patrón desconocido: '%s'"

3806

3766 -#: dir.c:754 dir.c:768

3807 +#: dir.c:772 dir.c:786

3808 #, c-format

3809 msgid "unrecognized negative pattern: '%s'"

3810 msgstr "patrón negativo no reconocido: '%s'"

3811

3771 -#: dir.c:786

3812 +#: dir.c:804

3813 #, c-format

3814 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3815 msgstr ""

3816 "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"

3817

3777 -#: dir.c:796

3818 +#: dir.c:814

3819 msgid "disabling cone pattern matching"

3820 msgstr "deshabilitar coincidencia de patrónes cono"

3821

3781 -#: dir.c:1173

3822 +#: dir.c:1191

3823 #, c-format

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

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

3826

3786 -#: dir.c:2275

3827 +#: dir.c:2296

3828 #, c-format

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

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

3831

3791 -#: dir.c:2575

3832 +#: dir.c:2596

3833 msgid "failed to get kernel name and information"

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

3835

3795 -#: dir.c:2699

3836 +#: dir.c:2720

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

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

3839

3799 -#: dir.c:3481

3840 +#: dir.c:3502

3841 #, c-format

3842 msgid "index file corrupt in repo %s"

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

3844

3804 -#: dir.c:3526 dir.c:3531

3845 +#: dir.c:3547 dir.c:3552

3846 #, c-format

3847 msgid "could not create directories for %s"

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

3849

3809 -#: dir.c:3560

3850 +#: dir.c:3581

3851 #, c-format

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

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

@@ -3816,11 +3857,11 @@ msgstr "no se pudo migrar el directorio git de '%s' a '%s'"

3857 msgid "hint: Waiting for your editor to close the file...%c"

3858 msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"

3859

3819 -#: entry.c:178

3860 +#: entry.c:177

3861 msgid "Filtering content"

3862 msgstr "Filtrando contenido"

3863

3823 -#: entry.c:479

3864 +#: entry.c:478

3865 #, c-format

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

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

@@ -3840,228 +3881,246 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"

3881 msgid "too many args to run %s"

3882 msgstr "demasiados argumentos para correr %s"

3883

3843 -#: fetch-pack.c:151

3884 +#: fetch-pack.c:152

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

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

3887

3847 -#: fetch-pack.c:154

3888 +#: fetch-pack.c:155

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

3890 msgstr ""

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

3892

3852 -#: fetch-pack.c:165

3893 +#: fetch-pack.c:166

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

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

3896

3856 -#: fetch-pack.c:185

3897 +#: fetch-pack.c:186

3898 #, c-format

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

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

3901

3861 -#: fetch-pack.c:196

3902 +#: fetch-pack.c:197

3903 msgid "unable to write to remote"

3904 msgstr "no se puede escribir al remoto"

3905

3865 -#: fetch-pack.c:258

3906 +#: fetch-pack.c:259

3907 msgid "--stateless-rpc requires multi_ack_detailed"

3908 msgstr "--stateless-rpc requiere multi_ack_detailed"

3909

3869 -#: fetch-pack.c:357 fetch-pack.c:1364

3910 +#: fetch-pack.c:358 fetch-pack.c:1408

3911 #, c-format

3912 msgid "invalid shallow line: %s"

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

3914

3874 -#: fetch-pack.c:363 fetch-pack.c:1370

3915 +#: fetch-pack.c:364 fetch-pack.c:1414

3916 #, c-format

3917 msgid "invalid unshallow line: %s"

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

3919

3879 -#: fetch-pack.c:365 fetch-pack.c:1372

3920 +#: fetch-pack.c:366 fetch-pack.c:1416

3921 #, c-format

3922 msgid "object not found: %s"

3923 msgstr "objeto no encontrado: %s"

3924

3884 -#: fetch-pack.c:368 fetch-pack.c:1375

3925 +#: fetch-pack.c:369 fetch-pack.c:1419

3926 #, c-format

3927 msgid "error in object: %s"

3928 msgstr "error en objeto: %s"

3929

3889 -#: fetch-pack.c:370 fetch-pack.c:1377

3930 +#: fetch-pack.c:371 fetch-pack.c:1421

3931 #, c-format

3932 msgid "no shallow found: %s"

3933 msgstr "superficie no encontrada: %s"

3934

3894 -#: fetch-pack.c:373 fetch-pack.c:1381

3935 +#: fetch-pack.c:374 fetch-pack.c:1425

3936 #, c-format

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

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

3939

3899 -#: fetch-pack.c:415

3940 +#: fetch-pack.c:416

3941 #, c-format

3942 msgid "got %s %d %s"

3943 msgstr "se obtuvo %s %d %s"

3944

3904 -#: fetch-pack.c:432

3945 +#: fetch-pack.c:433

3946 #, c-format

3947 msgid "invalid commit %s"

3948 msgstr "commit inválido %s"

3949

3909 -#: fetch-pack.c:463

3950 +#: fetch-pack.c:464

3951 msgid "giving up"

3952 msgstr "rindiéndose"

3953

3913 -#: fetch-pack.c:476 progress.c:340

3954 +#: fetch-pack.c:477 progress.c:336

3955 msgid "done"

3956 msgstr "listo"

3957

3917 -#: fetch-pack.c:488

3958 +#: fetch-pack.c:489

3959 #, c-format

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

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

3962

3922 -#: fetch-pack.c:534

3963 +#: fetch-pack.c:535

3964 #, c-format

3965 msgid "Marking %s as complete"

3966 msgstr "Marcando %s como completa"

3967

3927 -#: fetch-pack.c:755

3968 +#: fetch-pack.c:756

3969 #, c-format

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

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

3972

3932 -#: fetch-pack.c:819

3973 +#: fetch-pack.c:821

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

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

3976

3936 -#: fetch-pack.c:827

3977 +#: fetch-pack.c:829

3978 msgid "protocol error: bad pack header"

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

3980

3940 -#: fetch-pack.c:901

3981 +#: fetch-pack.c:910

3982 #, c-format

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

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

3985

3945 -#: fetch-pack.c:917

3986 +#: fetch-pack.c:927

3987 #, c-format

3988 msgid "%s failed"

3989 msgstr "%s falló"

3990

3950 -#: fetch-pack.c:919

3991 +#: fetch-pack.c:929

3992 msgid "error in sideband demultiplexer"

3993 msgstr "error en demultiplexor de banda lateral"

3994

3954 -#: fetch-pack.c:966

3995 +#: fetch-pack.c:976

3996 #, c-format

3997 msgid "Server version is %.*s"

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

3999

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

4000 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

4001 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

4002 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

4003 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4004 #, c-format

4005 msgid "Server supports %s"

4006 msgstr "El servidor soporta %s"

4007

3967 -#: fetch-pack.c:973

4008 +#: fetch-pack.c:983

4009 msgid "Server does not support shallow clients"

4010 msgstr "El servidor no soporta clientes superficiales"

4011

3971 -#: fetch-pack.c:1033

4012 +#: fetch-pack.c:1043

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

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

4015

3975 -#: fetch-pack.c:1038

4016 +#: fetch-pack.c:1048

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

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

4019

3979 -#: fetch-pack.c:1042

4020 +#: fetch-pack.c:1052

4021 msgid "Server does not support --deepen"

4022 msgstr "El servidor no soporta --deepen"

4023

3983 -#: fetch-pack.c:1059

4024 +#: fetch-pack.c:1054

4025 +msgid "Server does not support this repository's object format"

4026 +msgstr "El servidor no soporta el formato de objetos de este repositorio"

4027 +

4028 +#: fetch-pack.c:1071

4029 msgid "no common commits"

4030 msgstr "no hay commits comunes"

4031

3987 -#: fetch-pack.c:1071 fetch-pack.c:1563

4032 +#: fetch-pack.c:1083 fetch-pack.c:1639

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

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

4035

4036 #: fetch-pack.c:1211

4037 +#, c-format

4038 +msgid "mismatched algorithms: client %s; server %s"

4039 +msgstr "algoritmos no compatibles: cliente %s; servidor %s"

4040 +

4041 +#: fetch-pack.c:1215

4042 +#, c-format

4043 +msgid "the server does not support algorithm '%s'"

4044 +msgstr "servidor no soporta el algoritmo '%s'"

4045 +

4046 +#: fetch-pack.c:1235

4047 msgid "Server does not support shallow requests"

4048 msgstr "El servidor no soporta peticiones superficiales"

4049

3995 -#: fetch-pack.c:1218

4050 +#: fetch-pack.c:1242

4051 msgid "Server supports filter"

4052 msgstr "El servidor soporta filtro"

4053

3999 -#: fetch-pack.c:1242

4054 +#: fetch-pack.c:1286

4055 msgid "unable to write request to remote"

4056 msgstr "no se puede escribir request al remoto"

4057

4003 -#: fetch-pack.c:1260

4058 +#: fetch-pack.c:1304

4059 #, c-format

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

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

4062

4008 -#: fetch-pack.c:1266

4063 +#: fetch-pack.c:1310

4064 #, c-format

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

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

4067

4013 -#: fetch-pack.c:1327

4068 +#: fetch-pack.c:1371

4069 #, c-format

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

4071 msgstr "línea de confirmación inesperada: '%s'"

4072

4018 -#: fetch-pack.c:1332

4073 +#: fetch-pack.c:1376

4074 #, c-format

4075 msgid "error processing acks: %d"

4076 msgstr "error procesando acks: %d"

4077

4023 -#: fetch-pack.c:1342

4078 +#: fetch-pack.c:1386

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

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

4081

4027 -#: fetch-pack.c:1344

4082 +#: fetch-pack.c:1388

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

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

4085

4031 -#: fetch-pack.c:1386

4086 +#: fetch-pack.c:1430

4087 #, c-format

4088 msgid "error processing shallow info: %d"

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

4090

4036 -#: fetch-pack.c:1433

4091 +#: fetch-pack.c:1477

4092 #, c-format

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

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

4095

4041 -#: fetch-pack.c:1438

4096 +#: fetch-pack.c:1482

4097 #, c-format

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

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

4100

4046 -#: fetch-pack.c:1443

4101 +#: fetch-pack.c:1487

4102 #, c-format

4103 msgid "error processing wanted refs: %d"

4104 msgstr "error procesando refs deseadas: %d"

4105

4051 -#: fetch-pack.c:1789

4106 +#: fetch-pack.c:1517

4107 +msgid "git fetch-pack: expected response end packet"

4108 +msgstr "git fetch-pack: se espera un paquete final de respuesta"

4109 +

4110 +#: fetch-pack.c:1921

4111 msgid "no matching remote head"

4112 msgstr "no concuerda el head remoto"

4113

4055 -#: fetch-pack.c:1812 builtin/clone.c:692

4114 +#: fetch-pack.c:1944 builtin/clone.c:692

4115 msgid "remote did not send all necessary objects"

4116 msgstr "remoto no mando todos los objetos necesarios"

4117

4059 -#: fetch-pack.c:1839

4118 +#: fetch-pack.c:1971

4119 #, c-format

4120 msgid "no such remote ref %s"

4121 msgstr "no existe ref remota %s"

4122

4064 -#: fetch-pack.c:1842

4123 +#: fetch-pack.c:1974

4124 #, c-format

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

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

@@ -4097,7 +4156,7 @@ msgstr ""

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

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

4158

4100 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4159 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4160 #: builtin/rm.c:135

4161 #, c-format

4162 msgid "failed to stat '%s'"

@@ -4241,16 +4300,16 @@ msgstr[1] ""

4300 "\n"

4301 "Los comandos más similares son"

4302

4244 -#: help.c:653

4303 +#: help.c:654

4304 msgid "git version [<options>]"

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

4306

4248 -#: help.c:708

4307 +#: help.c:709

4308 #, c-format

4309 msgid "%s: %s - %s"

4310 msgstr "%s: %s - %s"

4311

4253 -#: help.c:712

4312 +#: help.c:713

4313 msgid ""

4314 "\n"

4315 "Did you mean this?"

@@ -4349,6 +4408,12 @@ msgstr "se espera algo luego de combine:"

4408 msgid "multiple filter-specs cannot be combined"

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

4410

4411 +#: list-objects-filter-options.c:330

4412 +msgid "unable to upgrade repository format to support partial clone"

4413 +msgstr ""

4414 +"no es posible actualizar el formato del repositorio para soportar clonado "

4415 +"parcial"

4416 +

4417 #: list-objects-filter.c:492

4418 #, c-format

4419 msgid "unable to access sparse blob in '%s'"

@@ -4588,7 +4653,7 @@ msgstr "renombrar"

4653 msgid "renamed"

4654 msgstr "renombrado"

4655

4591 -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4656 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

4657 #, c-format

4658 msgid "Refusing to lose dirty file at %s"

4659 msgstr "Rehusando perder el archivo sucio en %s"

@@ -4630,14 +4695,14 @@ msgstr ""

4695 msgid " (left unresolved)"

4696 msgstr " (dejado sin resolver)"

4697

4633 -#: merge-recursive.c:1793

4698 +#: merge-recursive.c:1805

4699 #, c-format

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

4701 msgstr ""

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

4703 "%s"

4704

4640 -#: merge-recursive.c:2056

4705 +#: merge-recursive.c:2068

4706 #, c-format

4707 msgid ""

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

@@ -4648,7 +4713,7 @@ msgstr ""

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

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

4715

4651 -#: merge-recursive.c:2088

4716 +#: merge-recursive.c:2100

4717 #, c-format

4718 msgid ""

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

@@ -4658,7 +4723,7 @@ msgstr ""

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

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

4725

4661 -#: merge-recursive.c:2098

4726 +#: merge-recursive.c:2110

4727 #, c-format

4728 msgid ""

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

@@ -4667,7 +4732,7 @@ msgstr ""

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

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

4734

4670 -#: merge-recursive.c:2190

4735 +#: merge-recursive.c:2202

4736 #, c-format

4737 msgid ""

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

@@ -4676,7 +4741,7 @@ msgstr ""

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

4742 "Renombrar directorio %s->%s en %s"

4743

4679 -#: merge-recursive.c:2435

4744 +#: merge-recursive.c:2447

4745 #, c-format

4746 msgid ""

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

@@ -4685,52 +4750,52 @@ msgstr ""

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

4751 "renombrado."

4752

4688 -#: merge-recursive.c:2961

4753 +#: merge-recursive.c:2973

4754 #, c-format

4755 msgid "cannot read object %s"

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

4757

4693 -#: merge-recursive.c:2964

4758 +#: merge-recursive.c:2976

4759 #, c-format

4760 msgid "object %s is not a blob"

4761 msgstr "objeto %s no es un blob"

4762

4698 -#: merge-recursive.c:3028

4763 +#: merge-recursive.c:3040

4764 msgid "modify"

4765 msgstr "modificar"

4766

4702 -#: merge-recursive.c:3028

4767 +#: merge-recursive.c:3040

4768 msgid "modified"

4769 msgstr "modificado"

4770

4706 -#: merge-recursive.c:3040

4771 +#: merge-recursive.c:3052

4772 msgid "content"

4773 msgstr "contenido"

4774

4710 -#: merge-recursive.c:3044

4775 +#: merge-recursive.c:3056

4776 msgid "add/add"

4777 msgstr "agregar/agregar"

4778

4714 -#: merge-recursive.c:3067

4779 +#: merge-recursive.c:3079

4780 #, c-format

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

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

4783

4719 -#: merge-recursive.c:3089 git-submodule.sh:985

4784 +#: merge-recursive.c:3101 git-submodule.sh:959

4785 msgid "submodule"

4786 msgstr "submódulo"

4787

4723 -#: merge-recursive.c:3090

4788 +#: merge-recursive.c:3102

4789 #, c-format

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

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

4792

4728 -#: merge-recursive.c:3120

4793 +#: merge-recursive.c:3132

4794 #, c-format

4795 msgid "Adding as %s instead"

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

4797

4733 -#: merge-recursive.c:3203

4798 +#: merge-recursive.c:3215

4799 #, c-format

4800 msgid ""

4801 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4739,7 +4804,7 @@ msgstr ""

4804 "Path actualizado: %s agregado en %s dentro de un directorio que fue "

4805 "renombrado en %s; moviéndolo a %s."

4806

4742 -#: merge-recursive.c:3206

4807 +#: merge-recursive.c:3218

4808 #, c-format

4809 msgid ""

4810 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4748,7 +4813,7 @@ msgstr ""

4813 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

4814 "que fue renombrado en %s, sugerimos que debería ser movido a %s."

4815

4751 -#: merge-recursive.c:3210

4816 +#: merge-recursive.c:3222

4817 #, c-format

4818 msgid ""

4819 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4757,7 +4822,7 @@ msgstr ""

4822 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

4823 "renombrado en %s; moviéndolo a %s."

4824

4760 -#: merge-recursive.c:3213

4825 +#: merge-recursive.c:3225

4826 #, c-format

4827 msgid ""

4828 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4767,61 +4832,61 @@ msgstr ""

4832 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

4833 "movido a %s."

4834

4770 -#: merge-recursive.c:3327

4835 +#: merge-recursive.c:3339

4836 #, c-format

4837 msgid "Removing %s"

4838 msgstr "Eliminando %s"

4839

4775 -#: merge-recursive.c:3350

4840 +#: merge-recursive.c:3362

4841 msgid "file/directory"

4842 msgstr "archivo/directorio"

4843

4779 -#: merge-recursive.c:3355

4844 +#: merge-recursive.c:3367

4845 msgid "directory/file"

4846 msgstr "directorio/archivo"

4847

4783 -#: merge-recursive.c:3362

4848 +#: merge-recursive.c:3374

4849 #, c-format

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

4851 msgstr ""

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

4853 "%s"

4854

4790 -#: merge-recursive.c:3371

4855 +#: merge-recursive.c:3383

4856 #, c-format

4857 msgid "Adding %s"

4858 msgstr "Agregando %s"

4859

4795 -#: merge-recursive.c:3380

4860 +#: merge-recursive.c:3392

4861 #, c-format

4862 msgid "CONFLICT (add/add): Merge conflict in %s"

4863 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

4864

4800 -#: merge-recursive.c:3424

4865 +#: merge-recursive.c:3436

4866 msgid "Already up to date!"

4867 msgstr "¡Ya está actualizado!"

4868

4804 -#: merge-recursive.c:3433

4869 +#: merge-recursive.c:3445

4870 #, c-format

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

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

4873

4809 -#: merge-recursive.c:3537

4874 +#: merge-recursive.c:3549

4875 msgid "Merging:"

4876 msgstr "Fusionando:"

4877

4813 -#: merge-recursive.c:3550

4878 +#: merge-recursive.c:3562

4879 #, c-format

4880 msgid "found %u common ancestor:"

4881 msgid_plural "found %u common ancestors:"

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

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

4884

4820 -#: merge-recursive.c:3600

4885 +#: merge-recursive.c:3612

4886 msgid "merge returned no commit"

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

4888

4824 -#: merge-recursive.c:3659

4889 +#: merge-recursive.c:3671

4890 #, c-format

4891 msgid ""

4892 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4831,12 +4896,12 @@ msgstr ""

4896 "merge:\n"

4897 " %s"

4898

4834 -#: merge-recursive.c:3756

4899 +#: merge-recursive.c:3768

4900 #, c-format

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

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

4903

4839 -#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885

4904 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4905 msgid "Unable to write index."

4906 msgstr "Incapaz de escribir el índice."

4907

@@ -4845,7 +4910,7 @@ msgid "failed to read the cache"

4910 msgstr "falló al leer la cache"

4911

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

4913 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4914 #: builtin/stash.c:265

4915 msgid "unable to write new index file"

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

@@ -5096,22 +5161,22 @@ msgstr "incapaz de analizar objeto: %s"

5161 msgid "hash mismatch %s"

5162 msgstr "hash no concuerda %s"

5163

5099 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5164 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5165 #, c-format

5166 msgid "unable to get size of %s"

5167 msgstr "no se pudo obtener el tamaño de %s"

5168

5104 -#: packfile.c:629

5169 +#: packfile.c:630

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

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

5172

5108 -#: packfile.c:1899

5173 +#: packfile.c:1900

5174 #, c-format

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

5176 msgstr ""

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

5178

5114 -#: packfile.c:1903

5179 +#: packfile.c:1904

5180 #, c-format

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

5182 msgstr ""

@@ -5317,44 +5382,48 @@ msgid "unable to write delim packet"

5382 msgstr "no es posible escribir delim packet"

5383

5384 #: pkt-line.c:106

5385 +msgid "unable to write stateless separator packet"

5386 +msgstr "no es posible escribir un paquete separador sin estado (stateless)"

5387 +

5388 +#: pkt-line.c:113

5389 msgid "flush packet write failed"

5390 msgstr "limpieza de escritura de paquetes falló"

5391

5323 -#: pkt-line.c:146 pkt-line.c:232

5392 +#: pkt-line.c:153 pkt-line.c:239

5393 msgid "protocol error: impossibly long line"

5394 msgstr "error de protocolo: línea imposiblemente larga"

5395

5327 -#: pkt-line.c:162 pkt-line.c:164

5396 +#: pkt-line.c:169 pkt-line.c:171

5397 msgid "packet write with format failed"

5398 msgstr "escritura de paquetes con formato falló"

5399

5331 -#: pkt-line.c:196

5400 +#: pkt-line.c:203

5401 msgid "packet write failed - data exceeds max packet size"

5402 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"

5403

5335 -#: pkt-line.c:203 pkt-line.c:210

5404 +#: pkt-line.c:210 pkt-line.c:217

5405 msgid "packet write failed"

5406 msgstr "escritura de paquetes falló"

5407

5339 -#: pkt-line.c:295

5408 +#: pkt-line.c:302

5409 msgid "read error"

5410 msgstr "error de lectura"

5411

5343 -#: pkt-line.c:303

5412 +#: pkt-line.c:310

5413 msgid "the remote end hung up unexpectedly"

5414 msgstr "el remoto se colgó de manera inesperada"

5415

5347 -#: pkt-line.c:331

5416 +#: pkt-line.c:338

5417 #, c-format

5418 msgid "protocol error: bad line length character: %.4s"

5419 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"

5420

5352 -#: pkt-line.c:341 pkt-line.c:346

5421 +#: pkt-line.c:352 pkt-line.c:357

5422 #, c-format

5423 msgid "protocol error: bad line length %d"

5424 msgstr "error de protocolo: mal largo de línea %d"

5425

5357 -#: pkt-line.c:362

5426 +#: pkt-line.c:373

5427 #, c-format

5428 msgid "remote error: %s"

5429 msgstr "error remoto: %s"

@@ -5533,7 +5602,7 @@ msgstr "entradas de stage desordenadas para '%s'"

5602

5603 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5604 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5536 -#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5605 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5606 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5607 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5608 #: builtin/submodule--helper.c:332

@@ -5590,7 +5659,7 @@ msgstr "no se pudo refrescar el index compartido '%s'"

5659 msgid "broken index, expect %s in %s, got %s"

5660 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

5661

5593 -#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5662 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5663 #, c-format

5664 msgid "could not close '%s'"

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

@@ -5727,7 +5796,7 @@ msgstr ""

5796 "\n"

5797

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

5799 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5800 #, c-format

5801 msgid "could not write '%s'"

5802 msgstr "no se pudo escribir '%s'"

@@ -5772,7 +5841,7 @@ msgstr ""

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

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

5843

5775 -#: ref-filter.c:42 wt-status.c:1936

5844 +#: ref-filter.c:42 wt-status.c:1977

5845 msgid "gone"

5846 msgstr "desaparecido"

5847

@@ -5997,7 +6066,7 @@ msgstr "objeto mal formado en '%s'"

6066 msgid "ignoring ref with broken name %s"

6067 msgstr "ignorando referencia con nombre roto %s"

6068

6000 -#: ref-filter.c:2095 refs.c:625

6069 +#: ref-filter.c:2095 refs.c:657

6070 #, c-format

6071 msgid "ignoring broken ref %s"

6072 msgstr "ignorando referencia rota %s"

@@ -6027,94 +6096,108 @@ msgstr "nombre de objeto mal formado %s"

6096 msgid "option `%s' must point to a commit"

6097 msgstr "opción '%s' debe apuntar a un commit"

6098

6030 -#: refs.c:262

6099 +#: refs.c:264

6100 #, c-format

6101 msgid "%s does not point to a valid object!"

6102 msgstr "¡%s no apunta a ningún objeto válido!"

6103

6035 -#: refs.c:623

6104 +#: refs.c:572

6105 +#, c-format

6106 +msgid "could not retrieve `%s`"

6107 +msgstr "no se pudo recibir `%s`"

6108 +

6109 +#: refs.c:579

6110 +#, c-format

6111 +msgid "invalid branch name: %s = %s"

6112 +msgstr "Nombre de rama inválido: %s = %s"

6113 +

6114 +#: refs.c:655

6115 #, c-format

6116 msgid "ignoring dangling symref %s"

6117 msgstr "ignorando referencia rota %s"

6118

6040 -#: refs.c:760

6119 +#: refs.c:792

6120 #, c-format

6121 msgid "could not open '%s' for writing: %s"

6122 msgstr "no se pudo abrir '%s' para escritura: %s"

6123

6045 -#: refs.c:770 refs.c:821

6124 +#: refs.c:802 refs.c:853

6125 #, c-format

6126 msgid "could not read ref '%s'"

6127 msgstr "no se pudo leer la referencia '%s'"

6128

6050 -#: refs.c:776

6129 +#: refs.c:808

6130 #, c-format

6131 msgid "ref '%s' already exists"

6132 msgstr "ref '%s' ya existe"

6133

6055 -#: refs.c:781

6134 +#: refs.c:813

6135 #, c-format

6136 msgid "unexpected object ID when writing '%s'"

6137 msgstr "ID de objecto inesperado al escribir '%s'"

6138

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

6139 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6140 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6141 +#: wrapper.c:628

6142 #, c-format

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

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

6145

6067 -#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6146 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6147 #: builtin/rebase.c:852

6148 #, c-format

6149 msgid "could not open '%s' for writing"

6150 msgstr "no se pudo abrir '%s' para escritura"

6151

6073 -#: refs.c:823

6152 +#: refs.c:855

6153 #, c-format

6154 msgid "unexpected object ID when deleting '%s'"

6155 msgstr "ID de objecto inesperado al borrar '%s'"

6156

6078 -#: refs.c:954

6157 +#: refs.c:986

6158 #, c-format

6159 msgid "log for ref %s has gap after %s"

6160 msgstr "log de ref %s tiene un vacío tras %s"

6161

6083 -#: refs.c:960

6162 +#: refs.c:992

6163 #, c-format

6164 msgid "log for ref %s unexpectedly ended on %s"

6165 msgstr "log de ref %s finalizado inesperadamente en %s"

6166

6088 -#: refs.c:1019

6167 +#: refs.c:1051

6168 #, c-format

6169 msgid "log for %s is empty"

6170 msgstr "log de %s está vacío"

6171

6093 -#: refs.c:1111

6172 +#: refs.c:1143

6173 #, c-format

6174 msgid "refusing to update ref with bad name '%s'"

6175 msgstr "rehusando actualizar ref con mal nombre '%s'"

6176

6098 -#: refs.c:1187

6177 +#: refs.c:1219

6178 #, c-format

6179 msgid "update_ref failed for ref '%s': %s"

6180 msgstr "update_ref falló para ref '%s': %s"

6181

6103 -#: refs.c:1979

6182 +#: refs.c:2011

6183 #, c-format

6184 msgid "multiple updates for ref '%s' not allowed"

6185 msgstr "múltiples actualizaciones para ref '%s' no permitidas"

6186

6108 -#: refs.c:2011

6187 +#: refs.c:2098

6188 msgid "ref updates forbidden inside quarantine environment"

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

6190

6112 -#: refs.c:2107 refs.c:2137

6191 +#: refs.c:2109

6192 +msgid "ref updates aborted by hook"

6193 +msgstr "ref update abortado por el hook"

6194 +

6195 +#: refs.c:2209 refs.c:2239

6196 #, c-format

6197 msgid "'%s' exists; cannot create '%s'"

6198 msgstr "'%s' existe; no se puede crear '%s'"

6199

6117 -#: refs.c:2113 refs.c:2148

6200 +#: refs.c:2215 refs.c:2250

6201 #, c-format

6202 msgid "cannot process '%s' and '%s' at the same time"

6203 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

@@ -6401,7 +6484,7 @@ msgstr[1] ""

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

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

6486

6404 -#: remote.c:2233

6487 +#: remote.c:2241

6488 #, c-format

6489 msgid "cannot parse expected object name '%s'"

6490 msgstr "no se puede leer el nombre de objeto '%s'"

@@ -6528,20 +6611,20 @@ msgstr "no se pudo determinar revisión HEAD"

6611 msgid "failed to find tree of %s"

6612 msgstr "falló al encontrar árbol de %s"

6613

6531 -#: revision.c:2655

6614 +#: revision.c:2661

6615 msgid "your current branch appears to be broken"

6616 msgstr "tu rama actual parece estar rota"

6617

6535 -#: revision.c:2658

6618 +#: revision.c:2664

6619 #, c-format

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

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

6622

6540 -#: revision.c:2866

6623 +#: revision.c:2873

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

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

6626

6544 -#: revision.c:2870

6627 +#: revision.c:2877

6628 msgid "-L does not yet support diff formats besides -p and -s"

6629 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

6630

@@ -6583,11 +6666,15 @@ msgstr "desempaquetado remoto falló: %s"

6666 msgid "failed to sign the push certificate"

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

6668

6586 -#: send-pack.c:399

6669 +#: send-pack.c:394

6670 +msgid "the receiving end does not support this repository's hash algorithm"

6671 +msgstr "el destino no soporta el algoritmo de hash de este repositorio"

6672 +

6673 +#: send-pack.c:403

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

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

6676

6590 -#: send-pack.c:401

6677 +#: send-pack.c:405

6678 msgid ""

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

6680 "signed push"

@@ -6595,11 +6682,11 @@ msgstr ""

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

6683 "(--signed )"

6684

6598 -#: send-pack.c:413

6685 +#: send-pack.c:417

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

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

6688

6602 -#: send-pack.c:418

6689 +#: send-pack.c:422

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

6691 msgstr "el destino no soporta opciones de push"

6692

@@ -6720,7 +6807,7 @@ msgstr "no hay llave presente en '%.*s'"

6807 msgid "unable to dequote value of '%s'"

6808 msgstr "no es posible dequote para '%s'"

6809

6723 -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6810 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6811 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6812 #, c-format

6813 msgid "could not open '%s' for reading"

@@ -7560,85 +7647,85 @@ msgstr ""

7647 msgid "this operation must be run in a work tree"

7648 msgstr "esta operación debe ser realizada en un árbol de trabajo"

7649

7563 -#: setup.c:569

7650 +#: setup.c:604

7651 #, c-format

7652 msgid "Expected git repo version <= %d, found %d"

7653 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

7654

7568 -#: setup.c:577

7655 +#: setup.c:612

7656 msgid "unknown repository extensions found:"

7657 msgstr "se encontró extensión de repositorio desconocida:"

7658

7572 -#: setup.c:596

7659 +#: setup.c:631

7660 #, c-format

7661 msgid "error opening '%s'"

7662 msgstr "error abriendo '%s'"

7663

7577 -#: setup.c:598

7664 +#: setup.c:633

7665 #, c-format

7666 msgid "too large to be a .git file: '%s'"

7667 msgstr "muy grande para ser un archivo .git: '%s'"

7668

7582 -#: setup.c:600

7669 +#: setup.c:635

7670 #, c-format

7671 msgid "error reading %s"

7672 msgstr "error leyendo %s"

7673

7587 -#: setup.c:602

7674 +#: setup.c:637

7675 #, c-format

7676 msgid "invalid gitfile format: %s"

7677 msgstr "formato gitfile inválido: %s"

7678

7592 -#: setup.c:604

7679 +#: setup.c:639

7680 #, c-format

7681 msgid "no path in gitfile: %s"

7682 msgstr "no hay ruta en gitfile: %s"

7683

7597 -#: setup.c:606

7684 +#: setup.c:641

7685 #, c-format

7686 msgid "not a git repository: %s"

7687 msgstr "no es un repositorio git: %s"

7688

7602 -#: setup.c:708

7689 +#: setup.c:743

7690 #, c-format

7691 msgid "'$%s' too big"

7692 msgstr "'$%s' muy grande"

7693

7607 -#: setup.c:722

7694 +#: setup.c:757

7695 #, c-format

7696 msgid "not a git repository: '%s'"

7697 msgstr "no es un repositorio git: '%s'"

7698

7612 -#: setup.c:751 setup.c:753 setup.c:784

7699 +#: setup.c:786 setup.c:788 setup.c:819

7700 #, c-format

7701 msgid "cannot chdir to '%s'"

7702 msgstr "no se puede aplicar chdir a '%s'"

7703

7617 -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869

7704 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

7705 msgid "cannot come back to cwd"

7706 msgstr "no se puede volver a cwd"

7707

7621 -#: setup.c:883

7708 +#: setup.c:918

7709 #, c-format

7710 msgid "failed to stat '%*s%s%s'"

7711 msgstr "falló al determinar '%*s%s%s'"

7712

7626 -#: setup.c:1121

7713 +#: setup.c:1156

7714 msgid "Unable to read current working directory"

7715 msgstr "Incapaz de leer el directorio de trabajo actual"

7716

7630 -#: setup.c:1130 setup.c:1136

7717 +#: setup.c:1165 setup.c:1171

7718 #, c-format

7719 msgid "cannot change to '%s'"

7720 msgstr "no se puede cambiar a '%s'"

7721

7635 -#: setup.c:1141

7722 +#: setup.c:1176

7723 #, c-format

7724 msgid "not a git repository (or any of the parent directories): %s"

7725 msgstr ""

7726 "no es un repositorio git (ni ninguno de los directorios superiores): %s"

7727

7641 -#: setup.c:1147

7728 +#: setup.c:1182

7729 #, c-format

7730 msgid ""

7731 "not a git repository (or any parent up to mount point %s)\n"

@@ -7648,7 +7735,7 @@ msgstr ""

7735 "Parando en el límite del sistema de archivos "

7736 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

7737

7651 -#: setup.c:1258

7738 +#: setup.c:1293

7739 #, c-format

7740 msgid ""

7741 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7657,15 +7744,15 @@ msgstr ""

7744 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

7745 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

7746

7660 -#: setup.c:1304

7747 +#: setup.c:1340

7748 msgid "open /dev/null or dup failed"

7749 msgstr "falló al abrir /dev/null o dup"

7750

7664 -#: setup.c:1319

7751 +#: setup.c:1355

7752 msgid "fork failed"

7753 msgstr "falló fork"

7754

7668 -#: setup.c:1324

7755 +#: setup.c:1360

7756 msgid "setsid failed"

7757 msgstr "falló setsid"

7758

@@ -7849,7 +7936,7 @@ msgstr "deflateEnd en objeto %s falló (%d)"

7936 msgid "confused by unstable object source data for %s"

7937 msgstr "confundido por fuente de data de objetos inestable para %s"

7938

7852 -#: sha1-file.c:1906 builtin/pack-objects.c:1055

7939 +#: sha1-file.c:1906 builtin/pack-objects.c:1085

7940 #, c-format

7941 msgid "failed utime() on %s"

7942 msgstr "falló utime() en %s"

@@ -8027,43 +8114,43 @@ msgid "invalid object name '%.*s'."

8114 msgstr "nombre de objeto no válido: '%.*s'."

8115

8116 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

8030 -#: strbuf.c:853

8117 +#: strbuf.c:848

8118 #, c-format

8119 msgid "%u.%2.2u GiB"

8120 msgstr "%u.%2.2u GiB"

8121

8122 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

8036 -#: strbuf.c:855

8123 +#: strbuf.c:850

8124 #, c-format

8125 msgid "%u.%2.2u GiB/s"

8126 msgstr "%u.%2.2u GiB/s"

8127

8128 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

8042 -#: strbuf.c:863

8129 +#: strbuf.c:858

8130 #, c-format

8131 msgid "%u.%2.2u MiB"

8132 msgstr "%u.%2.2u MiB"

8133

8134 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

8048 -#: strbuf.c:865

8135 +#: strbuf.c:860

8136 #, c-format

8137 msgid "%u.%2.2u MiB/s"

8138 msgstr "%u.%2.2u MiB/s"

8139

8140 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

8054 -#: strbuf.c:872

8141 +#: strbuf.c:867

8142 #, c-format

8143 msgid "%u.%2.2u KiB"

8144 msgstr "%u.%2.2u KiB"

8145

8146 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

8060 -#: strbuf.c:874

8147 +#: strbuf.c:869

8148 #, c-format

8149 msgid "%u.%2.2u KiB/s"

8150 msgstr "%u.%2.2u KiB/s"

8151

8152 #. TRANSLATORS: IEC 80000-13:2008 byte

8066 -#: strbuf.c:880

8153 +#: strbuf.c:875

8154 #, c-format

8155 msgid "%u byte"

8156 msgid_plural "%u bytes"

@@ -8071,14 +8158,14 @@ msgstr[0] "%u byte"

8158 msgstr[1] "%u bytes"

8159

8160 #. TRANSLATORS: IEC 80000-13:2008 byte/second

8074 -#: strbuf.c:882

8161 +#: strbuf.c:877

8162 #, c-format

8163 msgid "%u byte/s"

8164 msgid_plural "%u bytes/s"

8165 msgstr[0] "%u bytes/s"

8166 msgstr[1] "%u bytes/s"

8167

8081 -#: strbuf.c:1180

8168 +#: strbuf.c:1175

8169 #, c-format

8170 msgid "could not edit '%s'"

8171 msgstr "no se pudo editar '%s'"

@@ -8326,7 +8413,7 @@ msgstr "no se pudo leer el archivo de entrada '%s'"

8413 msgid "could not read from stdin"

8414 msgstr "no se pudo leer desde stdin"

8415

8329 -#: trailer.c:1011 wrapper.c:665

8416 +#: trailer.c:1011 wrapper.c:673

8417 #, c-format

8418 msgid "could not stat %s"

8419 msgstr "no se pudo definir %s"

@@ -8350,20 +8437,20 @@ msgstr "no se pudo abrir el archivo temporal"

8437 msgid "could not rename temporary file to %s"

8438 msgstr "no se pudo renombrar el archivo temporal a %s"

8439

8353 -#: transport-helper.c:61 transport-helper.c:90

8440 +#: transport-helper.c:62 transport-helper.c:91

8441 msgid "full write to remote helper failed"

8442 msgstr "escritura total al helper remoto falló"

8443

8357 -#: transport-helper.c:144

8444 +#: transport-helper.c:145

8445 #, c-format

8446 msgid "unable to find remote helper for '%s'"

8447 msgstr "no es posible encontrar helper remoto para '%s'"

8448

8362 -#: transport-helper.c:160 transport-helper.c:571

8449 +#: transport-helper.c:161 transport-helper.c:575

8450 msgid "can't dup helper output fd"

8451 msgstr "no se puede duplicar output de fd del helper"

8452

8366 -#: transport-helper.c:211

8453 +#: transport-helper.c:214

8454 #, c-format

8455 msgid ""

8456 "unknown mandatory capability %s; this remote helper probably needs newer "

@@ -8372,157 +8459,162 @@ msgstr ""

8459 "capacidad mandatoria desconocida %s; este helper remoto probablemente "

8460 "necesita una nueva versión de Git"

8461

8375 -#: transport-helper.c:217

8462 +#: transport-helper.c:220

8463 msgid "this remote helper should implement refspec capability"

8464 msgstr "este helper remoto debería implementar capacidad refspec"

8465

8379 -#: transport-helper.c:284 transport-helper.c:425

8466 +#: transport-helper.c:287 transport-helper.c:429

8467 #, c-format

8468 msgid "%s unexpectedly said: '%s'"

8469 msgstr "%s dijo inesperadamente: '%s'"

8470

8384 -#: transport-helper.c:414

8471 +#: transport-helper.c:417

8472 #, c-format

8473 msgid "%s also locked %s"

8474 msgstr "%s también bloqueó %s"

8475

8389 -#: transport-helper.c:493

8476 +#: transport-helper.c:497

8477 msgid "couldn't run fast-import"

8478 msgstr "no se pudo ejecutar fast-import"

8479

8393 -#: transport-helper.c:516

8480 +#: transport-helper.c:520

8481 msgid "error while running fast-import"

8482 msgstr "error al ejecutar fast-import"

8483

8397 -#: transport-helper.c:545 transport-helper.c:1135

8484 +#: transport-helper.c:549 transport-helper.c:1156

8485 #, c-format

8486 msgid "could not read ref %s"

8487 msgstr "no se pudo leer la referencia %s"

8488

8402 -#: transport-helper.c:590

8489 +#: transport-helper.c:594

8490 #, c-format

8491 msgid "unknown response to connect: %s"

8492 msgstr "respuesta para conectar desconocida: %s"

8493

8407 -#: transport-helper.c:612

8494 +#: transport-helper.c:616

8495 msgid "setting remote service path not supported by protocol"

8496 msgstr "configurando servicio de ruta remota no soportado por el protocolo"

8497

8411 -#: transport-helper.c:614

8498 +#: transport-helper.c:618

8499 msgid "invalid remote service path"

8500 msgstr "ruta de servicio remoto inválida"

8501

8415 -#: transport-helper.c:657 transport.c:1339

8502 +#: transport-helper.c:661 transport.c:1347

8503 msgid "operation not supported by protocol"

8504 msgstr "operación no soportada por protocolo"

8505

8419 -#: transport-helper.c:660

8506 +#: transport-helper.c:664

8507 #, c-format

8508 msgid "can't connect to subservice %s"

8509 msgstr "no se puede conectar al subservicio %s"

8510

8424 -#: transport-helper.c:736

8511 +#: transport-helper.c:740

8512 #, c-format

8513 msgid "expected ok/error, helper said '%s'"

8514 msgstr "se esperaba ok/error, helper dijo '%s'"

8515

8429 -#: transport-helper.c:789

8516 +#: transport-helper.c:793

8517 #, c-format

8518 msgid "helper reported unexpected status of %s"

8519 msgstr "helper reportó estado inesperado de %s"

8520

8434 -#: transport-helper.c:850

8521 +#: transport-helper.c:854

8522 #, c-format

8523 msgid "helper %s does not support dry-run"

8524 msgstr "helper %s no soporta dry-run"

8525

8439 -#: transport-helper.c:853

8526 +#: transport-helper.c:857

8527 #, c-format

8528 msgid "helper %s does not support --signed"

8529 msgstr "helper %s no soporta --signed"

8530

8444 -#: transport-helper.c:856

8531 +#: transport-helper.c:860

8532 #, c-format

8533 msgid "helper %s does not support --signed=if-asked"

8534 msgstr "helper %s no soporta --signed=if-asked"

8535

8449 -#: transport-helper.c:861

8536 +#: transport-helper.c:865

8537 #, c-format

8538 msgid "helper %s does not support --atomic"

8539 msgstr "helper %s no soporta --atomic"

8540

8454 -#: transport-helper.c:867

8541 +#: transport-helper.c:871

8542 #, c-format

8543 msgid "helper %s does not support 'push-option'"

8544 msgstr "helper %s no soporta 'push-option'"

8545

8459 -#: transport-helper.c:966

8546 +#: transport-helper.c:970

8547 msgid "remote-helper doesn't support push; refspec needed"

8548 msgstr "remote-helper no soporta push; se necesita refspec"

8549

8463 -#: transport-helper.c:971

8550 +#: transport-helper.c:975

8551 #, c-format

8552 msgid "helper %s does not support 'force'"

8553 msgstr "helper %s no soporta 'force'"

8554

8468 -#: transport-helper.c:1018

8555 +#: transport-helper.c:1022

8556 msgid "couldn't run fast-export"

8557 msgstr "no se pudo ejecutar fast-export"

8558

8472 -#: transport-helper.c:1023

8559 +#: transport-helper.c:1027

8560 msgid "error while running fast-export"

8561 msgstr "error al ejecutar fast-export"

8562

8476 -#: transport-helper.c:1048

8563 +#: transport-helper.c:1052

8564 #, c-format

8565 msgid ""

8566 "No refs in common and none specified; doing nothing.\n"

8480 -"Perhaps you should specify a branch such as 'master'.\n"

8567 +"Perhaps you should specify a branch.\n"

8568 msgstr ""

8569 "No hay refs comunes y ninguno especificado; no se hace nada.\n"

8483 -"Tal vez deberías especificar un branch como 'master'.\n"

8570 +"Tal vez deberías especificar un branch.\n"

8571 +

8572 +#: transport-helper.c:1133

8573 +#, c-format

8574 +msgid "unsupported object format '%s'"

8575 +msgstr "formado de objeto no soportado '%s'"

8576

8485 -#: transport-helper.c:1121

8577 +#: transport-helper.c:1142

8578 #, c-format

8579 msgid "malformed response in ref list: %s"

8580 msgstr "respuesta malformada en lista de refs: %s"

8581

8490 -#: transport-helper.c:1273

8582 +#: transport-helper.c:1294

8583 #, c-format

8584 msgid "read(%s) failed"

8585 msgstr "leer(%s) falló"

8586

8495 -#: transport-helper.c:1300

8587 +#: transport-helper.c:1321

8588 #, c-format

8589 msgid "write(%s) failed"

8590 msgstr "escribir(%s) falló"

8591

8500 -#: transport-helper.c:1349

8592 +#: transport-helper.c:1370

8593 #, c-format

8594 msgid "%s thread failed"

8595 msgstr "hilo %s falló"

8596

8505 -#: transport-helper.c:1353

8597 +#: transport-helper.c:1374

8598 #, c-format

8599 msgid "%s thread failed to join: %s"

8600 msgstr "hilo %s falló al unirse: %s"

8601

8510 -#: transport-helper.c:1372 transport-helper.c:1376

8602 +#: transport-helper.c:1393 transport-helper.c:1397

8603 #, c-format

8604 msgid "can't start thread for copying data: %s"

8605 msgstr "no se puede iniciar el hilo para copiar data: %s"

8606

8515 -#: transport-helper.c:1413

8607 +#: transport-helper.c:1434

8608 #, c-format

8609 msgid "%s process failed to wait"

8610 msgstr "proceso %s falló al esperar"

8611

8520 -#: transport-helper.c:1417

8612 +#: transport-helper.c:1438

8613 #, c-format

8614 msgid "%s process failed"

8615 msgstr "proceso %s falló"

8616

8525 -#: transport-helper.c:1435 transport-helper.c:1444

8617 +#: transport-helper.c:1456 transport-helper.c:1465

8618 msgid "can't start thread for copying data"

8619 msgstr "no se puede iniciar hilo para copiar data"

8620

@@ -8536,33 +8628,33 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"

8628 msgid "could not read bundle '%s'"

8629 msgstr "no se pudo leer el conjunto '%s'"

8630

8539 -#: transport.c:214

8631 +#: transport.c:220

8632 #, c-format

8633 msgid "transport: invalid depth option '%s'"

8634 msgstr "transport: opción inválida '%s'"

8635

8544 -#: transport.c:266

8636 +#: transport.c:272

8637 msgid "see protocol.version in 'git help config' for more details"

8638 msgstr "ver protocol.version en 'git help config' para más información"

8639

8548 -#: transport.c:267

8640 +#: transport.c:273

8641 msgid "server options require protocol version 2 or later"

8642 msgstr "opciones del servidor requieren protocolo versión 2 o posterior"

8643

8552 -#: transport.c:632

8644 +#: transport.c:631

8645 msgid "could not parse transport.color.* config"

8646 msgstr "no se pudo analizar valor de configuración transport.color.*"

8647

8556 -#: transport.c:705

8648 +#: transport.c:704

8649 msgid "support for protocol v2 not implemented yet"

8650 msgstr "soporte para protocolo v2 no implementado todavía"

8651

8560 -#: transport.c:839

8652 +#: transport.c:838

8653 #, c-format

8654 msgid "unknown value for config '%s': %s"

8655 msgstr "valor desconocido para configuración '%s': %s"

8656

8565 -#: transport.c:905

8657 +#: transport.c:904

8658 #, c-format

8659 msgid "transport '%s' not allowed"

8660 msgstr "transporte '%s' no permitido"

@@ -8571,7 +8663,7 @@ msgstr "transporte '%s' no permitido"

8663 msgid "git-over-rsync is no longer supported"

8664 msgstr "git-over-rsync ya no es soportado"

8665

8574 -#: transport.c:1052

8666 +#: transport.c:1059

8667 #, c-format

8668 msgid ""

8669 "The following submodule paths contain changes that can\n"

@@ -8580,7 +8672,7 @@ msgstr ""

8672 "La siguiente ruta de submódulo contiene cambios que no\n"

8673 "pueden ser encontrados en ningún remoto:\n"

8674

8583 -#: transport.c:1056

8675 +#: transport.c:1063

8676 #, c-format

8677 msgid ""

8678 "\n"

@@ -8607,11 +8699,11 @@ msgstr ""

8699 "para hacer un push al remoto.\n"

8700 "\n"

8701

8610 -#: transport.c:1064

8702 +#: transport.c:1071

8703 msgid "Aborting."

8704 msgstr "Abortando."

8705

8614 -#: transport.c:1209

8706 +#: transport.c:1216

8707 msgid "failed to push all needed submodules"

8708 msgstr "falló al hacer push a todos los submódulos necesarios"

8709

@@ -8900,7 +8992,7 @@ msgstr ""

8992 msgid "Updating index flags"

8993 msgstr "Actualizando flags del index"

8994

8903 -#: upload-pack.c:1337

8995 +#: upload-pack.c:1415

8996 msgid "expected flush after fetch arguments"

8997 msgstr "se espera flush tras argumentos fetch"

8998

@@ -8937,50 +9029,50 @@ msgstr "segmento de ruta '..' inválido"

9029 msgid "Fetching objects"

9030 msgstr "Haciendo fetch a objetos"

9031

8940 -#: worktree.c:262 builtin/am.c:2098

9032 +#: worktree.c:248 builtin/am.c:2098

9033 #, c-format

9034 msgid "failed to read '%s'"

9035 msgstr "falló al leer '%s'"

9036

8945 -#: worktree.c:309

9037 +#: worktree.c:295

9038 #, c-format

9039 msgid "'%s' at main working tree is not the repository directory"

9040 msgstr ""

9041 "'%s' en el árbol de trabajo principal no es el directorio del repositorio"

9042

8951 -#: worktree.c:320

9043 +#: worktree.c:306

9044 #, c-format

9045 msgid "'%s' file does not contain absolute path to the working tree location"

9046 msgstr ""

9047 "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "

9048 "trabajo"

9049

8958 -#: worktree.c:332

9050 +#: worktree.c:318

9051 #, c-format

9052 msgid "'%s' does not exist"

9053 msgstr "'%s' no existe"

9054

8963 -#: worktree.c:338

9055 +#: worktree.c:324

9056 #, c-format

9057 msgid "'%s' is not a .git file, error code %d"

9058 msgstr "'%s' no es un archivo .git, código de error %d"

9059

8968 -#: worktree.c:347

9060 +#: worktree.c:333

9061 #, c-format

9062 msgid "'%s' does not point back to '%s'"

9063 msgstr "'%s' no apunta de vuelta a '%s'"

9064

8973 -#: wrapper.c:186 wrapper.c:356

9065 +#: wrapper.c:194 wrapper.c:364

9066 #, c-format

9067 msgid "could not open '%s' for reading and writing"

9068 msgstr "no se pudo abrir '%s' para lectura y escritura"

9069

8978 -#: wrapper.c:387 wrapper.c:588

9070 +#: wrapper.c:395 wrapper.c:596

9071 #, c-format

9072 msgid "unable to access '%s'"

9073 msgstr "no es posible acceder '%s'"

9074

8983 -#: wrapper.c:596

9075 +#: wrapper.c:604

9076 msgid "unable to get current working directory"

9077 msgstr "no es posible obtener el directorio de trabajo actual"

9078

@@ -9375,39 +9467,44 @@ msgstr "Estás aplicando un bisect."

9467 msgid " (use \"git bisect reset\" to get back to the original branch)"

9468 msgstr " (usa \"git bisect reset\" para volver a la rama original)"

9469

9378 -#: wt-status.c:1692

9470 +#: wt-status.c:1494

9471 +#, c-format

9472 +msgid "You are in a sparse checkout with %d%% of tracked files present."

9473 +msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes."

9474 +

9475 +#: wt-status.c:1733

9476 msgid "On branch "

9477 msgstr "En la rama "

9478

9382 -#: wt-status.c:1699

9479 +#: wt-status.c:1740

9480 msgid "interactive rebase in progress; onto "

9481 msgstr "rebase interactivo en progreso; en "

9482

9386 -#: wt-status.c:1701

9483 +#: wt-status.c:1742

9484 msgid "rebase in progress; onto "

9485 msgstr "rebase en progreso; en "

9486

9390 -#: wt-status.c:1711

9487 +#: wt-status.c:1752

9488 msgid "Not currently on any branch."

9489 msgstr "Actualmente no estás en ninguna rama."

9490

9394 -#: wt-status.c:1728

9491 +#: wt-status.c:1769

9492 msgid "Initial commit"

9493 msgstr "Confirmación inicial"

9494

9398 -#: wt-status.c:1729

9495 +#: wt-status.c:1770

9496 msgid "No commits yet"

9497 msgstr "No hay commits todavía"

9498

9402 -#: wt-status.c:1743

9499 +#: wt-status.c:1784

9500 msgid "Untracked files"

9501 msgstr "Archivos sin seguimiento"

9502

9406 -#: wt-status.c:1745

9503 +#: wt-status.c:1786

9504 msgid "Ignored files"

9505 msgstr "Archivos ignorados"

9506

9410 -#: wt-status.c:1749

9507 +#: wt-status.c:1790

9508 #, c-format

9509 msgid ""

9510 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9418,31 +9515,31 @@ msgstr ""

9515 "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"

9516 "nuevos archivos tú mismo (vea 'git help status')."

9517

9421 -#: wt-status.c:1755

9518 +#: wt-status.c:1796

9519 #, c-format

9520 msgid "Untracked files not listed%s"

9521 msgstr "Archivos no rastreados no son mostrados %s"

9522

9426 -#: wt-status.c:1757

9523 +#: wt-status.c:1798

9524 msgid " (use -u option to show untracked files)"

9525 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"

9526

9430 -#: wt-status.c:1763

9527 +#: wt-status.c:1804

9528 msgid "No changes"

9529 msgstr "Sin cambios"

9530

9434 -#: wt-status.c:1768

9531 +#: wt-status.c:1809

9532 #, c-format

9533 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

9534 msgstr ""

9535 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"

9536

9440 -#: wt-status.c:1771

9537 +#: wt-status.c:1812

9538 #, c-format

9539 msgid "no changes added to commit\n"

9540 msgstr "no se agregaron cambios al commit\n"

9541

9445 -#: wt-status.c:1774

9542 +#: wt-status.c:1815

9543 #, c-format

9544 msgid ""

9545 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -9451,67 +9548,67 @@ msgstr ""

9548 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "

9549 "(usa \"git add\" para hacerles seguimiento)\n"

9550

9454 -#: wt-status.c:1777

9551 +#: wt-status.c:1818

9552 #, c-format

9553 msgid "nothing added to commit but untracked files present\n"

9554 msgstr ""

9555 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "

9556 "presentes\n"

9557

9461 -#: wt-status.c:1780

9558 +#: wt-status.c:1821

9559 #, c-format

9560 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

9561 msgstr ""

9562 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "

9563 "hacerles seguimiento)\n"

9564

9468 -#: wt-status.c:1783 wt-status.c:1788

9565 +#: wt-status.c:1824 wt-status.c:1829

9566 #, c-format

9567 msgid "nothing to commit\n"

9568 msgstr "nada para hacer commit\n"

9569

9473 -#: wt-status.c:1786

9570 +#: wt-status.c:1827

9571 #, c-format

9572 msgid "nothing to commit (use -u to show untracked files)\n"

9573 msgstr ""

9574 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"

9575

9479 -#: wt-status.c:1790

9576 +#: wt-status.c:1831

9577 #, c-format

9578 msgid "nothing to commit, working tree clean\n"

9579 msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"

9580

9484 -#: wt-status.c:1903

9581 +#: wt-status.c:1944

9582 msgid "No commits yet on "

9583 msgstr "No hay commits todavía en "

9584

9488 -#: wt-status.c:1907

9585 +#: wt-status.c:1948

9586 msgid "HEAD (no branch)"

9587 msgstr "HEAD (sin rama)"

9588

9492 -#: wt-status.c:1938

9589 +#: wt-status.c:1979

9590 msgid "different"

9591 msgstr "diferente"

9592

9496 -#: wt-status.c:1940 wt-status.c:1948

9593 +#: wt-status.c:1981 wt-status.c:1989

9594 msgid "behind "

9595 msgstr "detrás "

9596

9500 -#: wt-status.c:1943 wt-status.c:1946

9597 +#: wt-status.c:1984 wt-status.c:1987

9598 msgid "ahead "

9599 msgstr "adelante "

9600

9601 #. TRANSLATORS: the action is e.g. "pull with rebase"

9505 -#: wt-status.c:2468

9602 +#: wt-status.c:2509

9603 #, c-format

9604 msgid "cannot %s: You have unstaged changes."

9605 msgstr "no se puede %s: Tienes cambios sin marcar."

9606

9510 -#: wt-status.c:2474

9607 +#: wt-status.c:2515

9608 msgid "additionally, your index contains uncommitted changes."

9609 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

9610

9514 -#: wt-status.c:2476

9611 +#: wt-status.c:2517

9612 #, c-format

9613 msgid "cannot %s: Your index contains uncommitted changes."

9614 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

@@ -9589,7 +9686,7 @@ msgstr "dry run ( ejecución en seco)"

9686 msgid "interactive picking"

9687 msgstr "selección interactiva"

9688

9592 -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308

9689 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

9690 msgid "select hunks interactively"

9691 msgstr "elegir hunks de forma interactiva"

9692

@@ -9717,12 +9814,12 @@ msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"

9814 msgid "--chmod param '%s' must be either -x or +x"

9815 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"

9816

9720 -#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351

9817 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

9818 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506

9819 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9820 msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"

9821

9725 -#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357

9822 +#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

9823 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512

9824 msgid "--pathspec-file-nul requires --pathspec-from-file"

9825 msgstr "--pathspec-file-nul requiere --pathspec-from-file"

@@ -9987,7 +10084,7 @@ msgstr "opción histórica -- no-op"

10084 msgid "allow fall back on 3way merging if needed"

10085 msgstr "permitir retroceso en fusión de 3-vías si es necesario"

10086

9990 -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16

10087 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

10088 #: builtin/repack.c:306 builtin/stash.c:816

10089 msgid "be quiet"

10090 msgstr "ser silencioso"

@@ -10043,7 +10140,7 @@ msgstr "n"

10140

10141 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38

10142 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

10046 -#: bugreport.c:131

10143 +#: bugreport.c:137

10144 msgid "format"

10145 msgstr "formato"

10146

@@ -10337,112 +10434,116 @@ msgstr ""

10434 "argumento inválido %s para 'git bisect terms'.\n"

10435 "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."

10436

10340 -#: builtin/bisect--helper.c:478

10437 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473

10438 +msgid "'' is not a valid term"

10439 +msgstr "'' no es un término válido"

10440 +

10441 +#: builtin/bisect--helper.c:483

10442 #, c-format

10443 msgid "unrecognized option: '%s'"

10444 msgstr "opción desconocida: '%s'"

10445

10345 -#: builtin/bisect--helper.c:482

10446 +#: builtin/bisect--helper.c:487

10447 #, c-format

10448 msgid "'%s' does not appear to be a valid revision"

10449 msgstr "'%s' no parece ser una revisión válida"

10450

10350 -#: builtin/bisect--helper.c:514

10451 +#: builtin/bisect--helper.c:519

10452 msgid "bad HEAD - I need a HEAD"

10453 msgstr "mal HEAD - Necesito un HEAD"

10454

10354 -#: builtin/bisect--helper.c:529

10455 +#: builtin/bisect--helper.c:534

10456 #, c-format

10457 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

10458 msgstr ""

10459 "error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."

10460

10360 -#: builtin/bisect--helper.c:550

10461 +#: builtin/bisect--helper.c:555

10462 msgid "won't bisect on cg-seek'ed tree"

10463 msgstr "no se bisecará en un árbol con cg-seek"

10464

10364 -#: builtin/bisect--helper.c:553

10465 +#: builtin/bisect--helper.c:558

10466 msgid "bad HEAD - strange symbolic ref"

10467 msgstr "mal HEAD - ref simbólico extraño"

10468

10368 -#: builtin/bisect--helper.c:577

10469 +#: builtin/bisect--helper.c:582

10470 #, c-format

10471 msgid "invalid ref: '%s'"

10472 msgstr "ref inválido: '%s'"

10473

10373 -#: builtin/bisect--helper.c:633

10474 +#: builtin/bisect--helper.c:638

10475 msgid "perform 'git bisect next'"

10476 msgstr "realiza 'git bisect next'"

10477

10377 -#: builtin/bisect--helper.c:635

10478 +#: builtin/bisect--helper.c:640

10479 msgid "write the terms to .git/BISECT_TERMS"

10480 msgstr "escribe los términos a .git/BISECT_TERMS"

10481

10381 -#: builtin/bisect--helper.c:637

10482 +#: builtin/bisect--helper.c:642

10483 msgid "cleanup the bisection state"

10484 msgstr "limpiar el estado de bisección"

10485

10385 -#: builtin/bisect--helper.c:639

10486 +#: builtin/bisect--helper.c:644

10487 msgid "check for expected revs"

10488 msgstr "revisar por revs esperados"

10489

10389 -#: builtin/bisect--helper.c:641

10490 +#: builtin/bisect--helper.c:646

10491 msgid "reset the bisection state"

10492 msgstr "reiniciar el estado de bisect"

10493

10393 -#: builtin/bisect--helper.c:643

10494 +#: builtin/bisect--helper.c:648

10495 msgid "write out the bisection state in BISECT_LOG"

10496 msgstr "escribir el estado de bisect en BISECT_LOG"

10497

10397 -#: builtin/bisect--helper.c:645

10498 +#: builtin/bisect--helper.c:650

10499 msgid "check and set terms in a bisection state"

10500 msgstr "revisar y configurar los terms en el estado de bisect"

10501

10401 -#: builtin/bisect--helper.c:647

10502 +#: builtin/bisect--helper.c:652

10503 msgid "check whether bad or good terms exist"

10504 msgstr "revisar si existen términos malos o buenos"

10505

10405 -#: builtin/bisect--helper.c:649

10506 +#: builtin/bisect--helper.c:654

10507 msgid "print out the bisect terms"

10508 msgstr "imprimir los terms del bisect"

10509

10409 -#: builtin/bisect--helper.c:651

10510 +#: builtin/bisect--helper.c:656

10511 msgid "start the bisect session"

10512 msgstr "comenzar la sesión de bisect"

10513

10413 -#: builtin/bisect--helper.c:653

10514 +#: builtin/bisect--helper.c:658

10515 msgid "update BISECT_HEAD instead of checking out the current commit"

10516 msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"

10517

10417 -#: builtin/bisect--helper.c:655

10518 +#: builtin/bisect--helper.c:660

10519 msgid "no log for BISECT_WRITE"

10520 msgstr "no hay log para BISECT_WRITE"

10521

10421 -#: builtin/bisect--helper.c:673

10522 +#: builtin/bisect--helper.c:678

10523 msgid "--write-terms requires two arguments"

10524 msgstr "--write-terms requiere dos argumentos"

10525

10425 -#: builtin/bisect--helper.c:677

10526 +#: builtin/bisect--helper.c:682

10527 msgid "--bisect-clean-state requires no arguments"

10528 msgstr "--bisect-clean-state no requiere argumentos"

10529

10429 -#: builtin/bisect--helper.c:684

10530 +#: builtin/bisect--helper.c:689

10531 msgid "--bisect-reset requires either no argument or a commit"

10532 msgstr "--bisect-reset requiere un commit o ningún argumento"

10533

10433 -#: builtin/bisect--helper.c:688

10534 +#: builtin/bisect--helper.c:693

10535 msgid "--bisect-write requires either 4 or 5 arguments"

10536 msgstr "--bisect-write requiere entre 4 o 5 argumentos"

10537

10437 -#: builtin/bisect--helper.c:694

10538 +#: builtin/bisect--helper.c:699

10539 msgid "--check-and-set-terms requires 3 arguments"

10540 msgstr "--bisect-clean-state no requiere argumentos"

10541

10441 -#: builtin/bisect--helper.c:700

10542 +#: builtin/bisect--helper.c:705

10543 msgid "--bisect-next-check requires 2 or 3 arguments"

10544 msgstr "--bisect-next-check requiere 2 o 3 argumentos"

10545

10445 -#: builtin/bisect--helper.c:706

10546 +#: builtin/bisect--helper.c:711

10547 msgid "--bisect-terms requires 0 or 1 argument"

10548 msgstr "--bisect-terms requiere 0 o 1 argumentos"

10549

@@ -11047,19 +11148,19 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"

11148 msgid "git bundle unbundle <file> [<refname>...]"

11149 msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"

11150

11050 -#: builtin/bundle.c:66 builtin/pack-objects.c:3376

11151 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448

11152 msgid "do not show progress meter"

11153 msgstr "no mostrar medidor de progreso"

11154

11054 -#: builtin/bundle.c:68 builtin/pack-objects.c:3378

11155 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450

11156 msgid "show progress meter"

11157 msgstr "mostrar medidor de progreso"

11158

11058 -#: builtin/bundle.c:70 builtin/pack-objects.c:3380

11159 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452

11160 msgid "show progress meter during object writing phase"

11161 msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"

11162

11062 -#: builtin/bundle.c:73 builtin/pack-objects.c:3383

11163 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455

11164 msgid "similar to --all-progress when progress meter is shown"

11165 msgstr "similar a --all-progress cuando medidor de progreso es mostrado"

11166

@@ -11099,11 +11200,11 @@ msgstr ""

11200

11201 #: builtin/cat-file.c:599

11202 msgid ""

11102 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11103 -"filters]"

11203 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11204 +"symlinks] [--textconv | --filters]"

11205 msgstr ""

11105 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11106 -"filters]"

11206 +"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"

11207 +"symlinks] [--textconv | --filters]"

11208

11209 #: builtin/cat-file.c:620

11210 msgid "only one batch option may be specified"

@@ -11137,7 +11238,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"

11238 msgid "for blob objects, run filters on object's content"

11239 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"

11240

11140 -#: builtin/cat-file.c:648 git-submodule.sh:984

11241 +#: builtin/cat-file.c:648 git-submodule.sh:958

11242 msgid "blob"

11243 msgstr "blob"

11244

@@ -11198,8 +11299,8 @@ msgstr "leer nombres de archivos de stdin"

11299 msgid "terminate input and output records by a NUL character"

11300 msgstr "terminar registros de entrada y salida con un carácter NUL"

11301

11201 -#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537

11202 -#: builtin/worktree.c:502

11302 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537

11303 +#: builtin/worktree.c:561

11304 msgid "suppress progress reporting"

11305 msgstr "suprimir el reporte de progreso"

11306

@@ -11293,7 +11394,7 @@ msgstr "escribir el contenido en un archivo temporal"

11394 #: builtin/checkout-index.c:178 builtin/column.c:31

11395 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403

11396 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

11296 -#: builtin/worktree.c:675

11397 +#: builtin/worktree.c:754

11398 msgid "string"

11399 msgstr "string"

11400

@@ -11408,11 +11509,11 @@ msgstr "'%s' o '%s' no puede ser usado con %s"

11509 msgid "path '%s' is unmerged"

11510 msgstr "ruta '%s' no esta fusionada"

11511

11411 -#: builtin/checkout.c:704

11512 +#: builtin/checkout.c:702

11513 msgid "you need to resolve your current index first"

11514 msgstr "necesitas resolver tu índice actual primero"

11515

11415 -#: builtin/checkout.c:758

11516 +#: builtin/checkout.c:756

11517 #, c-format

11518 msgid ""

11519 "cannot continue with staged changes in the following files:\n"

@@ -11421,50 +11522,50 @@ msgstr ""

11522 "no se puede continuar con los cambios en stage en los siguientes archivos:\n"

11523 "%s"

11524

11424 -#: builtin/checkout.c:861

11525 +#: builtin/checkout.c:859

11526 #, c-format

11527 msgid "Can not do reflog for '%s': %s\n"

11528 msgstr "No se puede hacer reflog para '%s': %s\n"

11529

11429 -#: builtin/checkout.c:903

11530 +#: builtin/checkout.c:901

11531 msgid "HEAD is now at"

11532 msgstr "HEAD está ahora en"

11533

11433 -#: builtin/checkout.c:907 builtin/clone.c:720

11534 +#: builtin/checkout.c:905 builtin/clone.c:720

11535 msgid "unable to update HEAD"

11536 msgstr "no es posible actualizar HEAD"

11537

11437 -#: builtin/checkout.c:911

11538 +#: builtin/checkout.c:909

11539 #, c-format

11540 msgid "Reset branch '%s'\n"

11541 msgstr "Reiniciar rama '%s'\n"

11542

11442 -#: builtin/checkout.c:914

11543 +#: builtin/checkout.c:912

11544 #, c-format

11545 msgid "Already on '%s'\n"

11546 msgstr "Ya en '%s'\n"

11547

11447 -#: builtin/checkout.c:918

11548 +#: builtin/checkout.c:916

11549 #, c-format

11550 msgid "Switched to and reset branch '%s'\n"

11551 msgstr "Rama reiniciada y cambiada a '%s'\n"

11552

11452 -#: builtin/checkout.c:920 builtin/checkout.c:1344

11553 +#: builtin/checkout.c:918 builtin/checkout.c:1342

11554 #, c-format

11555 msgid "Switched to a new branch '%s'\n"

11556 msgstr "Cambiado a nueva rama '%s'\n"

11557

11457 -#: builtin/checkout.c:922

11558 +#: builtin/checkout.c:920

11559 #, c-format

11560 msgid "Switched to branch '%s'\n"

11561 msgstr "Cambiado a rama '%s'\n"

11562

11462 -#: builtin/checkout.c:973

11563 +#: builtin/checkout.c:971

11564 #, c-format

11565 msgid " ... and %d more.\n"

11566 msgstr " ... y %d más.\n"

11567

11467 -#: builtin/checkout.c:979

11568 +#: builtin/checkout.c:977

11569 #, c-format

11570 msgid ""

11571 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -11487,7 +11588,7 @@ msgstr[1] ""

11588 "\n"

11589 "%s\n"

11590

11490 -#: builtin/checkout.c:998

11591 +#: builtin/checkout.c:996

11592 #, c-format

11593 msgid ""

11594 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -11514,19 +11615,19 @@ msgstr[1] ""

11615 " git branch <nombre-de-rama> %s\n"

11616 "\n"

11617

11517 -#: builtin/checkout.c:1033

11618 +#: builtin/checkout.c:1031

11619 msgid "internal error in revision walk"

11620 msgstr "error interno en camino de revisión"

11621

11521 -#: builtin/checkout.c:1037

11622 +#: builtin/checkout.c:1035

11623 msgid "Previous HEAD position was"

11624 msgstr "La posición previa de HEAD era"

11625

11525 -#: builtin/checkout.c:1077 builtin/checkout.c:1339

11626 +#: builtin/checkout.c:1075 builtin/checkout.c:1337

11627 msgid "You are on a branch yet to be born"

11628 msgstr "Estás en una rama por nacer"

11629

11529 -#: builtin/checkout.c:1152

11630 +#: builtin/checkout.c:1150

11631 #, c-format

11632 msgid ""

11633 "'%s' could be both a local file and a tracking branch.\n"

@@ -11535,7 +11636,7 @@ msgstr ""

11636 "'%s' puede ser tanto un archivo local como una rama de rastreo.\n"

11637 "Por favor use -- (y opcionalmente --no-guess) para desambiguar"

11638

11538 -#: builtin/checkout.c:1159

11639 +#: builtin/checkout.c:1157

11640 msgid ""

11641 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

11642 "you can do so by fully qualifying the name with the --track option:\n"

@@ -11556,51 +11657,51 @@ msgstr ""

11657 "de nombre <nombre> remota, como 'origin', considera configurar\n"

11658 "checkout.defaultRemote=origin en tu configuración."

11659

11559 -#: builtin/checkout.c:1169

11660 +#: builtin/checkout.c:1167

11661 #, c-format

11662 msgid "'%s' matched multiple (%d) remote tracking branches"

11663 msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto"

11664

11564 -#: builtin/checkout.c:1235

11665 +#: builtin/checkout.c:1233

11666 msgid "only one reference expected"

11667 msgstr "solo una referencia esperada"

11668

11568 -#: builtin/checkout.c:1252

11669 +#: builtin/checkout.c:1250

11670 #, c-format

11671 msgid "only one reference expected, %d given."

11672 msgstr "solo una referencia esperada, %d entregadas."

11673

11573 -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451

11674 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

11675 #, c-format

11676 msgid "invalid reference: %s"

11677 msgstr "referencia inválida: %s"

11678

11578 -#: builtin/checkout.c:1311 builtin/checkout.c:1677

11679 +#: builtin/checkout.c:1309 builtin/checkout.c:1675

11680 #, c-format

11681 msgid "reference is not a tree: %s"

11682 msgstr "la referencia no es n árbol: %s"

11683

11583 -#: builtin/checkout.c:1358

11684 +#: builtin/checkout.c:1356

11685 #, c-format

11686 msgid "a branch is expected, got tag '%s'"

11687 msgstr "se esperaba un branch, se obtuvo tag '%s'"

11688

11588 -#: builtin/checkout.c:1360

11689 +#: builtin/checkout.c:1358

11690 #, c-format

11691 msgid "a branch is expected, got remote branch '%s'"

11692 msgstr "se espera una rama, se obtuvo una rama remota '%s'"

11693

11593 -#: builtin/checkout.c:1361 builtin/checkout.c:1369

11694 +#: builtin/checkout.c:1359 builtin/checkout.c:1367

11695 #, c-format

11696 msgid "a branch is expected, got '%s'"

11697 msgstr "se esperaba branch, se obuto '%s'"

11698

11598 -#: builtin/checkout.c:1364

11699 +#: builtin/checkout.c:1362

11700 #, c-format

11701 msgid "a branch is expected, got commit '%s'"

11702 msgstr "se espera una rama, se obtuvo commit '%s'"

11703

11603 -#: builtin/checkout.c:1380

11704 +#: builtin/checkout.c:1378

11705 msgid ""

11706 "cannot switch branch while merging\n"

11707 "Consider \"git merge --quit\" or \"git worktree add\"."

@@ -11608,7 +11709,7 @@ msgstr ""

11709 "no se puede cambiar de branch durante un merge\n"

11710 "Considera \"git merge --quit\" o \"git worktree add\"."

11711

11611 -#: builtin/checkout.c:1384

11712 +#: builtin/checkout.c:1382

11713 msgid ""

11714 "cannot switch branch in the middle of an am session\n"

11715 "Consider \"git am --quit\" or \"git worktree add\"."

@@ -11616,7 +11717,7 @@ msgstr ""

11717 "no se puede cambiar de branch en medio de una sesión de am\n"

11718 "Considera \"git am --quit\" o \"git worktree add\"."

11719

11619 -#: builtin/checkout.c:1388

11720 +#: builtin/checkout.c:1386

11721 msgid ""

11722 "cannot switch branch while rebasing\n"

11723 "Consider \"git rebase --quit\" or \"git worktree add\"."

@@ -11624,7 +11725,7 @@ msgstr ""

11725 "no se puede cambiar de branch durante un rebase\n"

11726 "Considera \"git rebase --quit\" o \"git worktree add\"."

11727

11627 -#: builtin/checkout.c:1392

11728 +#: builtin/checkout.c:1390

11729 msgid ""

11730 "cannot switch branch while cherry-picking\n"

11731 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

@@ -11632,7 +11733,7 @@ msgstr ""

11733 "no se puede cambiar de branch durante un cherry-pick\n"

11734 "Considera \"git cherry-pick --quit\" o \"git worktree add\"."

11735

11635 -#: builtin/checkout.c:1396

11736 +#: builtin/checkout.c:1394

11737 msgid ""

11738 "cannot switch branch while reverting\n"

11739 "Consider \"git revert --quit\" or \"git worktree add\"."

@@ -11640,144 +11741,144 @@ msgstr ""

11741 "no se puede cambiar de branch durante un revert\n"

11742 "Considera \"git revert --quit\" o \"git worktree add\"."

11743

11643 -#: builtin/checkout.c:1400

11744 +#: builtin/checkout.c:1398

11745 msgid "you are switching branch while bisecting"

11746 msgstr "estás cambiando ramas durante un bisect"

11747

11647 -#: builtin/checkout.c:1407

11748 +#: builtin/checkout.c:1405

11749 msgid "paths cannot be used with switching branches"

11750 msgstr "rutas no pueden ser usadas con cambios de rama"

11751

11651 -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418

11752 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

11753 #, c-format

11754 msgid "'%s' cannot be used with switching branches"

11755 msgstr "'%s' no puede ser usado con cambios de ramas"

11756

11656 -#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428

11657 -#: builtin/checkout.c:1433 builtin/checkout.c:1438

11757 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426

11758 +#: builtin/checkout.c:1431 builtin/checkout.c:1436

11759 #, c-format

11760 msgid "'%s' cannot be used with '%s'"

11761 msgstr "'%s' no puede ser usado con '%s'"

11762

11662 -#: builtin/checkout.c:1435

11763 +#: builtin/checkout.c:1433

11764 #, c-format

11765 msgid "'%s' cannot take <start-point>"

11766 msgstr "'%s' no puede tomar <punto de partida>"

11767

11667 -#: builtin/checkout.c:1443

11768 +#: builtin/checkout.c:1441

11769 #, c-format

11770 msgid "Cannot switch branch to a non-commit '%s'"

11771 msgstr "No se puede cambiar rama a un '%s' sin commits"

11772

11672 -#: builtin/checkout.c:1450

11773 +#: builtin/checkout.c:1448

11774 msgid "missing branch or commit argument"

11775 msgstr "falta branch o commit como argumento"

11776

11676 -#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80

11677 -#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288

11777 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82

11778 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

11779 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561

11780 #: builtin/send-pack.c:173

11781 msgid "force progress reporting"

11782 msgstr "forzar el reporte de progreso"

11783

11683 -#: builtin/checkout.c:1493

11784 +#: builtin/checkout.c:1491

11785 msgid "perform a 3-way merge with the new branch"

11786 msgstr "realizar una fusión de tres vías con la rama nueva"

11787

11687 -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322

11788 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

11789 msgid "style"

11790 msgstr "estilo"

11791

11691 -#: builtin/checkout.c:1495

11792 +#: builtin/checkout.c:1493

11793 msgid "conflict style (merge or diff3)"

11794 msgstr "conflicto de estilos (merge o diff3)"

11795

11695 -#: builtin/checkout.c:1507 builtin/worktree.c:499

11796 +#: builtin/checkout.c:1505 builtin/worktree.c:558

11797 msgid "detach HEAD at named commit"

11798 msgstr "desacoplar HEAD en el commit nombrado"

11799

11699 -#: builtin/checkout.c:1508

11800 +#: builtin/checkout.c:1506

11801 msgid "set upstream info for new branch"

11802 msgstr "configurar info de upstream para una rama nueva"

11803

11703 -#: builtin/checkout.c:1510

11804 +#: builtin/checkout.c:1508

11805 msgid "force checkout (throw away local modifications)"

11806 msgstr "forzar el checkout (descartar modificaciones locales)"

11807

11707 -#: builtin/checkout.c:1512

11808 +#: builtin/checkout.c:1510

11809 msgid "new-branch"

11810 msgstr "nueva-rama"

11811

11711 -#: builtin/checkout.c:1512

11812 +#: builtin/checkout.c:1510

11813 msgid "new unparented branch"

11814 msgstr "nueva rama no emparentada"

11815

11715 -#: builtin/checkout.c:1514 builtin/merge.c:292

11816 +#: builtin/checkout.c:1512 builtin/merge.c:292

11817 msgid "update ignored files (default)"

11818 msgstr "actualizar archivos ignorados (default)"

11819

11719 -#: builtin/checkout.c:1517

11820 +#: builtin/checkout.c:1515

11821 msgid "do not check if another worktree is holding the given ref"

11822 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"

11823

11723 -#: builtin/checkout.c:1530

11824 +#: builtin/checkout.c:1528

11825 msgid "checkout our version for unmerged files"

11826 msgstr "hacer checkout a nuestra versión para archivos sin fusionar"

11827

11727 -#: builtin/checkout.c:1533

11828 +#: builtin/checkout.c:1531

11829 msgid "checkout their version for unmerged files"

11830 msgstr "hacer checkout a su versión para los archivos sin fusionar"

11831

11731 -#: builtin/checkout.c:1537

11832 +#: builtin/checkout.c:1535

11833 msgid "do not limit pathspecs to sparse entries only"

11834 msgstr "no limitar pathspecs a dispersar entradas solamente"

11835

11735 -#: builtin/checkout.c:1592

11836 +#: builtin/checkout.c:1590

11837 #, c-format

11838 msgid "-%c, -%c and --orphan are mutually exclusive"

11839 msgstr "-%c, -%c y --orphan son mutuamente exclusivas"

11840

11740 -#: builtin/checkout.c:1596

11841 +#: builtin/checkout.c:1594

11842 msgid "-p and --overlay are mutually exclusive"

11843 msgstr "-p y --overlay son mutuamente exclusivas"

11844

11744 -#: builtin/checkout.c:1633

11845 +#: builtin/checkout.c:1631

11846 msgid "--track needs a branch name"

11847 msgstr "--track necesita el nombre de una rama"

11848

11748 -#: builtin/checkout.c:1638

11849 +#: builtin/checkout.c:1636

11850 #, c-format

11851 msgid "missing branch name; try -%c"

11852 msgstr "falta nombre de rama; prueba -%c"

11853

11753 -#: builtin/checkout.c:1670

11854 +#: builtin/checkout.c:1668

11855 #, c-format

11856 msgid "could not resolve %s"

11857 msgstr "no se pudo resolver %s"

11858

11758 -#: builtin/checkout.c:1686

11859 +#: builtin/checkout.c:1684

11860 msgid "invalid path specification"

11861 msgstr "especificación de ruta inválida"

11862

11762 -#: builtin/checkout.c:1693

11863 +#: builtin/checkout.c:1691

11864 #, c-format

11865 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

11866 msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"

11867

11767 -#: builtin/checkout.c:1697

11868 +#: builtin/checkout.c:1695

11869 #, c-format

11870 msgid "git checkout: --detach does not take a path argument '%s'"

11871 msgstr "git checkout: --detach no toma un argumento de ruta '%s'"

11872

11772 -#: builtin/checkout.c:1706

11873 +#: builtin/checkout.c:1704

11874 msgid "--pathspec-from-file is incompatible with --detach"

11875 msgstr "--pathspec-from-file es incompatible con --detach"

11876

11776 -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503

11877 +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

11878 msgid "--pathspec-from-file is incompatible with --patch"

11879 msgstr "--pathspec-from-file es incompatible con --patch"

11880

11780 -#: builtin/checkout.c:1720

11881 +#: builtin/checkout.c:1718

11882 msgid ""

11883 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

11884 "checking out of the index."

@@ -11785,69 +11886,70 @@ msgstr ""

11886 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"

11887 "se revisa fuera del índice."

11888

11788 -#: builtin/checkout.c:1725

11889 +#: builtin/checkout.c:1723

11890 msgid "you must specify path(s) to restore"

11891 msgstr "debes especificar path(s) para restaurar"

11892

11792 -#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802

11793 -#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170

11794 -#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497

11893 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800

11894 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170

11895 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554

11896 +#: builtin/worktree.c:556

11897 msgid "branch"

11898 msgstr "rama"

11899

11798 -#: builtin/checkout.c:1752

11900 +#: builtin/checkout.c:1750

11901 msgid "create and checkout a new branch"

11902 msgstr "crear y hacer checkout a una nueva rama"

11903

11802 -#: builtin/checkout.c:1754

11904 +#: builtin/checkout.c:1752

11905 msgid "create/reset and checkout a branch"

11906 msgstr "crear/reiniciar y hacer checkout a una rama"

11907

11806 -#: builtin/checkout.c:1755

11908 +#: builtin/checkout.c:1753

11909 msgid "create reflog for new branch"

11910 msgstr "crear un reflog para una nueva rama"

11911

11810 -#: builtin/checkout.c:1757

11912 +#: builtin/checkout.c:1755

11913 msgid "second guess 'git checkout <no-such-branch>' (default)"

11914 msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"

11915

11814 -#: builtin/checkout.c:1758

11916 +#: builtin/checkout.c:1756

11917 msgid "use overlay mode (default)"

11918 msgstr "usar modo overlay (default)"

11919

11818 -#: builtin/checkout.c:1803

11920 +#: builtin/checkout.c:1801

11921 msgid "create and switch to a new branch"

11922 msgstr "crear y hacer switch a una nueva rama"

11923

11822 -#: builtin/checkout.c:1805

11924 +#: builtin/checkout.c:1803

11925 msgid "create/reset and switch to a branch"

11926 msgstr "crear/reiniciar y hacer switch a una rama"

11927

11826 -#: builtin/checkout.c:1807

11928 +#: builtin/checkout.c:1805

11929 msgid "second guess 'git switch <no-such-branch>'"

11930 msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"

11931

11830 -#: builtin/checkout.c:1809

11932 +#: builtin/checkout.c:1807

11933 msgid "throw away local modifications"

11934 msgstr "descartar modificaciones locales"

11935

11834 -#: builtin/checkout.c:1843

11936 +#: builtin/checkout.c:1841

11937 msgid "which tree-ish to checkout from"

11938 msgstr "de qué árbol hacer el checkout"

11939

11838 -#: builtin/checkout.c:1845

11940 +#: builtin/checkout.c:1843

11941 msgid "restore the index"

11942 msgstr "restaurar el index"

11943

11842 -#: builtin/checkout.c:1847

11944 +#: builtin/checkout.c:1845

11945 msgid "restore the working tree (default)"

11946 msgstr "restaurar el árbol de trabajo (default)"

11947

11846 -#: builtin/checkout.c:1849

11948 +#: builtin/checkout.c:1847

11949 msgid "ignore unmerged entries"

11950 msgstr "ignorar entradas no fusionadas"

11951

11850 -#: builtin/checkout.c:1850

11952 +#: builtin/checkout.c:1848

11953 msgid "use overlay mode"

11954 msgstr "usar modo overlay"

11955

@@ -12010,11 +12112,7 @@ msgstr "borrar archivos ignorados, también"

12112 msgid "remove only ignored files"

12113 msgstr "borrar solo archivos ignorados"

12114

12013 -#: builtin/clean.c:931

12014 -msgid "-x and -X cannot be used together"

12015 -msgstr "-x y -X no pueden ser usadas juntas"

12016 -

12017 -#: builtin/clean.c:935

12115 +#: builtin/clean.c:929

12116 msgid ""

12117 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

12118 "clean"

@@ -12022,7 +12120,7 @@ msgstr ""

12120 "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "

12121 "rehusando el clean"

12122

12025 -#: builtin/clean.c:938

12123 +#: builtin/clean.c:932

12124 msgid ""

12125 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

12126 "refusing to clean"

@@ -12030,6 +12128,10 @@ msgstr ""

12128 "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "

12129 "rehusando el clean"

12130

12131 +#: builtin/clean.c:944

12132 +msgid "-x and -X cannot be used together"

12133 +msgstr "-x y -X no pueden ser usadas juntas"

12134 +

12135 #: builtin/clone.c:45

12136 msgid "git clone [<options>] [--] <repo> [<dir>]"

12137 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"

@@ -12038,7 +12140,7 @@ msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"

12140 msgid "don't create a checkout"

12141 msgstr "no crear checkout"

12142

12041 -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536

12143 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

12144 msgid "create a bare repository"

12145 msgstr "crear un repositorio vacío"

12146

@@ -12070,11 +12172,11 @@ msgstr "inicializar submódulos en el clonado"

12172 msgid "number of submodules cloned in parallel"

12173 msgstr "numero de submódulos clonados en paralelo"

12174

12073 -#: builtin/clone.c:111 builtin/init-db.c:533

12175 +#: builtin/clone.c:111 builtin/init-db.c:551

12176 msgid "template-directory"

12177 msgstr "directorio-template"

12178

12077 -#: builtin/clone.c:112 builtin/init-db.c:534

12179 +#: builtin/clone.c:112 builtin/init-db.c:552

12180 msgid "directory from which templates will be used"

12181 msgstr "directorio del cual los templates serán usados"

12182

@@ -12088,8 +12190,8 @@ msgstr "repositorio de referencia"

12190 msgid "use --reference only while cloning"

12191 msgstr "usa--reference solamente si estás clonado"

12192

12091 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

12092 -#: builtin/pack-objects.c:3442 builtin/repack.c:329

12193 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562

12194 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

12195 msgid "name"

12196 msgstr "nombre"

12197

@@ -12114,7 +12216,7 @@ msgstr "profundidad"

12216 msgid "create a shallow clone of that depth"

12217 msgstr "crear un clon superficial para esa profundidad"

12218

12117 -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431

12219 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

12220 #: builtin/pull.c:211

12221 msgid "time"

12222 msgstr "tiempo"

@@ -12145,11 +12247,11 @@ msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"

12247 msgid "any cloned submodules will be shallow"

12248 msgstr "cualquier submódulo clonado será superficial"

12249

12148 -#: builtin/clone.c:137 builtin/init-db.c:542

12250 +#: builtin/clone.c:137 builtin/init-db.c:560

12251 msgid "gitdir"

12252 msgstr "gitdir"

12253

12152 -#: builtin/clone.c:138 builtin/init-db.c:543

12254 +#: builtin/clone.c:138 builtin/init-db.c:561

12255 msgid "separate git dir from working tree"

12256 msgstr "separa git dir del árbol de trabajo"

12257

@@ -12278,7 +12380,7 @@ msgstr "no se puede reempaquetar para limpiar"

12380 msgid "cannot unlink temporary alternates file"

12381 msgstr "no se puede desvincular archivos alternos temporales"

12382

12281 -#: builtin/clone.c:971 builtin/receive-pack.c:1972

12383 +#: builtin/clone.c:971 builtin/receive-pack.c:1982

12384 msgid "Too many arguments."

12385 msgstr "Muchos argumentos."

12386

@@ -12295,48 +12397,48 @@ msgstr "Las opciones --bare y --origin %s son incompatibles."

12397 msgid "--bare and --separate-git-dir are incompatible."

12398 msgstr "--bare y --separate-git-dir son incompatibles."

12399

12298 -#: builtin/clone.c:1004

12400 +#: builtin/clone.c:1007

12401 #, c-format

12402 msgid "repository '%s' does not exist"

12403 msgstr "repositorio '%s' no existe"

12404

12303 -#: builtin/clone.c:1010 builtin/fetch.c:1789

12405 +#: builtin/clone.c:1011 builtin/fetch.c:1794

12406 #, c-format

12407 msgid "depth %s is not a positive number"

12408 msgstr "profundidad %s no es un numero positivo"

12409

12308 -#: builtin/clone.c:1020

12410 +#: builtin/clone.c:1021

12411 #, c-format

12412 msgid "destination path '%s' already exists and is not an empty directory."

12413 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."

12414

12313 -#: builtin/clone.c:1030

12415 +#: builtin/clone.c:1033

12416 #, c-format

12417 msgid "working tree '%s' already exists."

12418 msgstr "directorio de trabajo '%s' ya existe."

12419

12318 -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271

12319 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327

12420 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271

12421 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

12422 #, c-format

12423 msgid "could not create leading directories of '%s'"

12424 msgstr "no se pudo crear directorios principales de '%s'"

12425

12324 -#: builtin/clone.c:1050

12426 +#: builtin/clone.c:1053

12427 #, c-format

12428 msgid "could not create work tree dir '%s'"

12429 msgstr "no se pudo crear un árbol de trabajo '%s'"

12430

12329 -#: builtin/clone.c:1070

12431 +#: builtin/clone.c:1073

12432 #, c-format

12433 msgid "Cloning into bare repository '%s'...\n"

12434 msgstr "Clonando en un repositorio vacío '%s'...\n"

12435

12334 -#: builtin/clone.c:1072

12436 +#: builtin/clone.c:1075

12437 #, c-format

12438 msgid "Cloning into '%s'...\n"

12439 msgstr "Clonando en '%s'...\n"

12440

12339 -#: builtin/clone.c:1096

12441 +#: builtin/clone.c:1099

12442 msgid ""

12443 "clone --recursive is not compatible with both --reference and --reference-if-"

12444 "able"

@@ -12344,36 +12446,36 @@ msgstr ""

12446 "clone --recursive no es compatible con --reference y --reference-if-able al "

12447 "mismo tiempo"

12448

12347 -#: builtin/clone.c:1160

12449 +#: builtin/clone.c:1164

12450 msgid "--depth is ignored in local clones; use file:// instead."

12451 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."

12452

12351 -#: builtin/clone.c:1162

12453 +#: builtin/clone.c:1166

12454 msgid "--shallow-since is ignored in local clones; use file:// instead."

12455 msgstr "--shallow-since es ignorado en el clon local; use file:// ."

12456

12355 -#: builtin/clone.c:1164

12457 +#: builtin/clone.c:1168

12458 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

12459 msgstr "--shallow-exclude es ignorado en clones locales; use file://."

12460

12359 -#: builtin/clone.c:1166

12461 +#: builtin/clone.c:1170

12462 msgid "--filter is ignored in local clones; use file:// instead."

12463 msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."

12464

12363 -#: builtin/clone.c:1169

12465 +#: builtin/clone.c:1173

12466 msgid "source repository is shallow, ignoring --local"

12467 msgstr "repositorio fuente es superficial, ignorando --local"

12468

12367 -#: builtin/clone.c:1174

12469 +#: builtin/clone.c:1178

12470 msgid "--local is ignored"

12471 msgstr "--local es ignorado"

12472

12371 -#: builtin/clone.c:1249 builtin/clone.c:1257

12473 +#: builtin/clone.c:1262 builtin/clone.c:1270

12474 #, c-format

12475 msgid "Remote branch %s not found in upstream %s"

12476 msgstr "Rama remota %s no encontrada en upstream %s"

12477

12376 -#: builtin/clone.c:1260

12478 +#: builtin/clone.c:1273

12479 msgid "You appear to have cloned an empty repository."

12480 msgstr "Pareces haber clonado un repositorio sin contenido."

12481

@@ -12409,13 +12511,13 @@ msgstr "Realizando padding entre columnas"

12511 msgid "--command must be the first argument"

12512 msgstr "--command debe ser el primer argumento"

12513

12412 -#: builtin/commit-graph.c:11 builtin/commit-graph.c:19

12514 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

12515 msgid ""

12516 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12517 msgstr ""

12518 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12519

12418 -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24

12520 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

12521 msgid ""

12522 "git commit-graph write [--object-dir <objdir>] [--append] [--"

12523 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

@@ -12425,79 +12527,88 @@ msgstr ""

12527 "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

12528 "paths] [--[no-]progress] <opciones de split>"

12529

12428 -#: builtin/commit-graph.c:60

12530 +#: builtin/commit-graph.c:62

12531 #, c-format

12532 msgid "could not find object directory matching %s"

12533 msgstr "no se pudo entoncrar el objeto directorio concordante con %s"

12534

12433 -#: builtin/commit-graph.c:76 builtin/commit-graph.c:152

12434 -#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678

12535 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177

12536 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

12537 msgid "dir"

12538 msgstr "dir"

12539

12438 -#: builtin/commit-graph.c:77 builtin/commit-graph.c:153

12439 -#: builtin/commit-graph.c:258

12540 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178

12541 +#: builtin/commit-graph.c:277

12542 msgid "The object directory to store the graph"

12543 msgstr "El directorio de objetos para guardar el gráfico"

12544

12443 -#: builtin/commit-graph.c:79

12545 +#: builtin/commit-graph.c:81

12546 msgid "if the commit-graph is split, only verify the tip file"

12547 msgstr "si el commit-graph está cortado, solo verifica la punta del archivo"

12548

12447 -#: builtin/commit-graph.c:102

12549 +#: builtin/commit-graph.c:104

12550 #, c-format

12551 msgid "Could not open commit-graph '%s'"

12552 msgstr "No se pudo abrir commit-graph '%s'"

12553

12452 -#: builtin/commit-graph.c:136

12554 +#: builtin/commit-graph.c:138

12555 #, c-format

12556 msgid "unrecognized --split argument, %s"

12557 msgstr "argumento --split no reconocido, %s"

12558

12457 -#: builtin/commit-graph.c:155

12559 +#: builtin/commit-graph.c:151

12560 +#, c-format

12561 +msgid "unexpected non-hex object ID: %s"

12562 +msgstr "ID de objeto no hex inesperado :%s"

12563 +

12564 +#: builtin/commit-graph.c:156

12565 +#, c-format

12566 +msgid "invalid object: %s"

12567 +msgstr "no es un objeto válido: %s"

12568 +

12569 +#: builtin/commit-graph.c:180

12570 msgid "start walk at all refs"

12571 msgstr "comenzar caminata en todas las refs"

12572

12461 -#: builtin/commit-graph.c:157

12573 +#: builtin/commit-graph.c:182

12574 msgid "scan pack-indexes listed by stdin for commits"

12575 msgstr "escanear paquete de índices por stdin por commits"

12576

12465 -#: builtin/commit-graph.c:159

12577 +#: builtin/commit-graph.c:184

12578 msgid "start walk at commits listed by stdin"

12579 msgstr "comenzar a caminar a los commits listados por stdin"

12580

12469 -#: builtin/commit-graph.c:161

12581 +#: builtin/commit-graph.c:186

12582 msgid "include all commits already in the commit-graph file"

12583 msgstr "inclye todos los commits que ya están en el archivo commit-graph"

12584

12473 -#: builtin/commit-graph.c:163

12585 +#: builtin/commit-graph.c:188

12586 msgid "enable computation for changed paths"

12587 msgstr "habilitar computación para rutas cambiadas"

12588

12477 -#: builtin/commit-graph.c:166

12589 +#: builtin/commit-graph.c:191

12590 msgid "allow writing an incremental commit-graph file"

12591 msgstr "permitir escribir un archivo commit-graph incremental"

12592

12481 -#: builtin/commit-graph.c:170

12593 +#: builtin/commit-graph.c:195

12594 msgid "maximum number of commits in a non-base split commit-graph"

12595 msgstr "máximo número de commits en un commit-graph sin base cortada"

12596

12485 -#: builtin/commit-graph.c:172

12597 +#: builtin/commit-graph.c:197

12598 msgid "maximum ratio between two levels of a split commit-graph"

12599 msgstr "radio máximo entre dos niveles de corte de commit-graph"

12600

12489 -#: builtin/commit-graph.c:174

12601 +#: builtin/commit-graph.c:199

12602 msgid "only expire files older than a given date-time"

12603 msgstr "expirar objetos más viejos a una fecha dada"

12604

12493 -#: builtin/commit-graph.c:190

12605 +#: builtin/commit-graph.c:215

12606 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"

12607 msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"

12608

12497 -#: builtin/commit-graph.c:229

12498 -#, c-format

12499 -msgid "unexpected non-hex object ID: %s"

12500 -msgstr "ID de objeto no hex inesperado :%s"

12609 +#: builtin/commit-graph.c:245

12610 +msgid "Collecting commits from input"

12611 +msgstr "Recolectando commits del input"

12612

12613 #: builtin/commit-tree.c:18

12614 msgid ""

@@ -12903,7 +13014,7 @@ msgid "version"

13014 msgstr "version"

13015

13016 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

12906 -#: builtin/worktree.c:646

13017 +#: builtin/worktree.c:722

13018 msgid "machine-readable output"

13019 msgstr "output formato-maquina"

13020

@@ -12916,8 +13027,8 @@ msgid "terminate entries with NUL"

13027 msgstr "terminar entradas con NUL"

13028

13029 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

12919 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156

12920 -#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336

13030 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

13031 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

13032 msgid "mode"

13033 msgstr "modo"

13034

@@ -13606,35 +13717,45 @@ msgstr "--dirty es incompatible con commit-ismos"

13717 msgid "--broken is incompatible with commit-ishes"

13718 msgstr "--broken es incompatible con commit-ismos"

13719

13609 -#: builtin/diff.c:84

13720 +#: builtin/diff.c:91

13721 #, c-format

13722 msgid "'%s': not a regular file or symlink"

13723 msgstr "'%s': no es un archivo regular o un enlace simbólico"

13724

13614 -#: builtin/diff.c:235

13725 +#: builtin/diff.c:242

13726 #, c-format

13727 msgid "invalid option: %s"

13728 msgstr "opción inválida: %s"

13729

13619 -#: builtin/diff.c:350

13730 +#: builtin/diff.c:359

13731 +#, c-format

13732 +msgid "%s...%s: no merge base"

13733 +msgstr "%s...%s: se neceista una base de fusión"

13734 +

13735 +#: builtin/diff.c:469

13736 msgid "Not a git repository"

13737 msgstr "No es un repositorio git"

13738

13623 -#: builtin/diff.c:394

13739 +#: builtin/diff.c:514

13740 #, c-format

13741 msgid "invalid object '%s' given."

13742 msgstr "objeto '%s' entregado no es válido."

13743

13628 -#: builtin/diff.c:403

13744 +#: builtin/diff.c:525

13745 #, c-format

13746 msgid "more than two blobs given: '%s'"

13747 msgstr "más de dos blobs entregados: '%s'"

13748

13633 -#: builtin/diff.c:408

13749 +#: builtin/diff.c:530

13750 #, c-format

13751 msgid "unhandled object '%s' given."

13752 msgstr "objeto no manejado '%s' entregado."

13753

13754 +#: builtin/diff.c:564

13755 +#, c-format

13756 +msgid "%s...%s: multiple merge bases, using %s"

13757 +msgstr "%s...%s: múltiples bases de fusión, usando %s"

13758 +

13759 #: builtin/difftool.c:30

13760 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

13761 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"

@@ -13783,85 +13904,106 @@ msgstr ""

13904 msgid "git fast-export [rev-list-opts]"

13905 msgstr "git fast-export [rev-list-opts]"

13906

13786 -#: builtin/fast-export.c:853

13907 +#: builtin/fast-export.c:868

13908 msgid "Error: Cannot export nested tags unless --mark-tags is specified."

13909 msgstr ""

13910 "Error: No se puede exportar los tags anidados a menos que --mark-tags sea "

13911 "especificado."

13912

13792 -#: builtin/fast-export.c:1152

13913 +#: builtin/fast-export.c:1178

13914 +msgid "--anonymize-map token cannot be empty"

13915 +msgstr "token --anonymize-map no puede estar vacío"

13916 +

13917 +#: builtin/fast-export.c:1198

13918 msgid "show progress after <n> objects"

13919 msgstr "mostrar progreso después de <n> objetos"

13920

13796 -#: builtin/fast-export.c:1154

13921 +#: builtin/fast-export.c:1200

13922 msgid "select handling of signed tags"

13923 msgstr "seleccionar el manejo de tags firmados"

13924

13800 -#: builtin/fast-export.c:1157

13925 +#: builtin/fast-export.c:1203

13926 msgid "select handling of tags that tag filtered objects"

13927 msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"

13928

13804 -#: builtin/fast-export.c:1160

13929 +#: builtin/fast-export.c:1206

13930 msgid "select handling of commit messages in an alternate encoding"

13931 msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"

l10n: es: 2.28.0 round 1