77200e9332 · 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: 2019-08-10 20:12+0800\n"

11 -"PO-Revision-Date: 2019-08-10 12:55-0500\n"

10 +"POT-Creation-Date: 2019-10-28 13:19+0800\n"

11 +"PO-Revision-Date: 2019-10-28 19:20-0500\n"

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

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

14 "Language: es\n"

@@ -61,7 +61,7 @@ msgstr ""

61 msgid "Exiting because of an unresolved conflict."

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

63

64 -#: advice.c:193 builtin/merge.c:1327

64 +#: advice.c:193 builtin/merge.c:1332

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

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

67

@@ -206,17 +206,7 @@ msgstr "modo inválido en la línea %d: %s"

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

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

208

209 -#: apply.c:1460

210 -#, c-format

211 -msgid "recount: unexpected line: %.*s"

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

213 -

214 -#: apply.c:1529

215 -#, c-format

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

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

218 -

219 -#: apply.c:1551

209 +#: apply.c:1372

210 #, c-format

211 msgid ""

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

@@ -231,83 +221,93 @@ msgstr[1] ""

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

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

223

234 -#: apply.c:1564

224 +#: apply.c:1385

225 #, c-format

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

227 msgstr ""

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

229

240 -#: apply.c:1752

230 +#: apply.c:1481

231 +#, c-format

232 +msgid "recount: unexpected line: %.*s"

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

234 +

235 +#: apply.c:1550

236 +#, c-format

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

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

239 +

240 +#: apply.c:1753

241 msgid "new file depends on old contents"

242 msgstr "el nuevo archivo depende de contenidos viejos"

243

244 -#: apply.c:1754

244 +#: apply.c:1755

245 msgid "deleted file still has contents"

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

247

248 -#: apply.c:1788

248 +#: apply.c:1789

249 #, c-format

250 msgid "corrupt patch at line %d"

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

252

253 -#: apply.c:1825

253 +#: apply.c:1826

254 #, c-format

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

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

257

258 -#: apply.c:1827

258 +#: apply.c:1828

259 #, c-format

260 msgid "deleted file %s still has contents"

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

262

263 -#: apply.c:1830

263 +#: apply.c:1831

264 #, c-format

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

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

267

268 -#: apply.c:1977

268 +#: apply.c:1978

269 #, c-format

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

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

272

273 -#: apply.c:2014

273 +#: apply.c:2015

274 #, c-format

275 msgid "unrecognized binary patch at line %d"

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

277

278 -#: apply.c:2176

278 +#: apply.c:2177

279 #, c-format

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

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

282

283 -#: apply.c:2262

283 +#: apply.c:2263

284 #, c-format

285 msgid "unable to read symlink %s"

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

287

288 -#: apply.c:2266

288 +#: apply.c:2267

289 #, c-format

290 msgid "unable to open or read %s"

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

292

293 -#: apply.c:2925

293 +#: apply.c:2926

294 #, c-format

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

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

297

298 -#: apply.c:3046

298 +#: apply.c:3047

299 #, c-format

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

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

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

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

304

305 -#: apply.c:3058

305 +#: apply.c:3059

306 #, c-format

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

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

309

310 -#: apply.c:3064

310 +#: apply.c:3065

311 #, c-format

312 msgid ""

313 "while searching for:\n"

@@ -316,23 +316,23 @@ msgstr ""

316 "mientras se busca:\n"

317 "%.*s"

318

319 -#: apply.c:3086

319 +#: apply.c:3087

320 #, c-format

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

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

323

324 -#: apply.c:3094

324 +#: apply.c:3095

325 #, c-format

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

327 msgstr ""

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

329

330 -#: apply.c:3141

330 +#: apply.c:3142

331 #, c-format

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

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

334

335 -#: apply.c:3151

335 +#: apply.c:3152

336 #, c-format

337 msgid ""

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

@@ -340,289 +340,289 @@ msgstr ""

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

341 "actuales."

342

343 -#: apply.c:3159

343 +#: apply.c:3160

344 #, c-format

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

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

347

348 -#: apply.c:3177

348 +#: apply.c:3178

349 #, c-format

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

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

352

353 -#: apply.c:3190

353 +#: apply.c:3191

354 #, c-format

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

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

357

358 -#: apply.c:3196

358 +#: apply.c:3197

359 #, c-format

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

361 msgstr ""

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

363 "obtuvo %s)"

364

365 -#: apply.c:3217

365 +#: apply.c:3218

366 #, c-format

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

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

369

370 -#: apply.c:3340

370 +#: apply.c:3341

371 #, c-format

372 msgid "cannot checkout %s"

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

374

375 -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

375 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

376 #, c-format

377 msgid "failed to read %s"

378 msgstr "no se pudo leer %s"

379

380 -#: apply.c:3400

380 +#: apply.c:3401

381 #, c-format

382 msgid "reading from '%s' beyond a symbolic link"

383 msgstr "leyendo de '%s' tras un enlace simbólico"

384

385 -#: apply.c:3429 apply.c:3672

385 +#: apply.c:3430 apply.c:3673

386 #, c-format

387 msgid "path %s has been renamed/deleted"

388 msgstr "la ruta %s ha sido renombrada/suprimida"

389

390 -#: apply.c:3515 apply.c:3687

390 +#: apply.c:3516 apply.c:3688

391 #, c-format

392 msgid "%s: does not exist in index"

393 msgstr "%s: no existe en el índice"

394

395 -#: apply.c:3524 apply.c:3695

395 +#: apply.c:3525 apply.c:3696

396 #, c-format

397 msgid "%s: does not match index"

398 msgstr "%s: no concuerda con el índice"

399

400 -#: apply.c:3559

400 +#: apply.c:3560

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

402 msgstr ""

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

404 "vías."

405

406 -#: apply.c:3562

406 +#: apply.c:3563

407 #, c-format

408 msgid "Falling back to three-way merge...\n"

409 msgstr "Retrocediendo en un merge de tres-vías...\n"

410

411 -#: apply.c:3578 apply.c:3582

411 +#: apply.c:3579 apply.c:3583

412 #, c-format

413 msgid "cannot read the current contents of '%s'"

414 msgstr "no se pueden leer los contenidos actuales de '%s'"

415

416 -#: apply.c:3594

416 +#: apply.c:3595

417 #, c-format

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

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

420

421 -#: apply.c:3608

421 +#: apply.c:3609

422 #, c-format

423 msgid "Applied patch to '%s' with conflicts.\n"

424 msgstr "Parche aplicado a '%s' con conflictos.\n"

425

426 -#: apply.c:3613

426 +#: apply.c:3614

427 #, c-format

428 msgid "Applied patch to '%s' cleanly.\n"

429 msgstr "Parche aplicado a '%s' limpiamente\n"

430

431 -#: apply.c:3639

431 +#: apply.c:3640

432 msgid "removal patch leaves file contents"

433 -msgstr "parche de remoción deja contenidos en el archivo"

433 +msgstr "parche de eliminación deja contenidos en el archivo"

434

435 -#: apply.c:3712

435 +#: apply.c:3713

436 #, c-format

437 msgid "%s: wrong type"

438 msgstr "%s: tipo incorrecto"

439

440 -#: apply.c:3714

440 +#: apply.c:3715

441 #, c-format

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

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

444

445 -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

445 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

446 #: read-cache.c:1309

447 #, c-format

448 msgid "invalid path '%s'"

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

450

451 -#: apply.c:3923

451 +#: apply.c:3924

452 #, c-format

453 msgid "%s: already exists in index"

454 msgstr "%s: ya existe en el índice"

455

456 -#: apply.c:3926

456 +#: apply.c:3927

457 #, c-format

458 msgid "%s: already exists in working directory"

459 msgstr "%s: ya existe en el directorio de trabajo"

460

461 -#: apply.c:3946

461 +#: apply.c:3947

462 #, c-format

463 msgid "new mode (%o) of %s does not match old mode (%o)"

464 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"

465

466 -#: apply.c:3951

466 +#: apply.c:3952

467 #, c-format

468 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

469 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"

470

471 -#: apply.c:3971

471 +#: apply.c:3972

472 #, c-format

473 msgid "affected file '%s' is beyond a symbolic link"

474 msgstr "archivo afectado '%s' está tras un enlace simbólico"

475

476 -#: apply.c:3975

476 +#: apply.c:3976

477 #, c-format

478 msgid "%s: patch does not apply"

479 msgstr "%s: el parche no aplica"

480

481 -#: apply.c:3990

481 +#: apply.c:3991

482 #, c-format

483 msgid "Checking patch %s..."

484 msgstr "Revisando el parche %s..."

485

486 -#: apply.c:4082

486 +#: apply.c:4083

487 #, c-format

488 msgid "sha1 information is lacking or useless for submodule %s"

489 msgstr "falta información del sha1 o es inútil para el submódulo %s"

490

491 -#: apply.c:4089

491 +#: apply.c:4090

492 #, c-format

493 msgid "mode change for %s, which is not in current HEAD"

494 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"

495

496 -#: apply.c:4092

496 +#: apply.c:4093

497 #, c-format

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

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

500

501 -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

501 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

502 #, c-format

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

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

505

506 -#: apply.c:4101

506 +#: apply.c:4102

507 #, c-format

508 msgid "could not add %s to temporary index"

509 msgstr "no se pudo añadir %s al índice temporal"

510

511 -#: apply.c:4111

511 +#: apply.c:4112

512 #, c-format

513 msgid "could not write temporary index to %s"

514 msgstr "no se pudo escribir un índice temporal para %s"

515

516 -#: apply.c:4249

516 +#: apply.c:4250

517 #, c-format

518 msgid "unable to remove %s from index"

519 msgstr "no se puede eliminar %s del índice"

520

521 -#: apply.c:4283

521 +#: apply.c:4284

522 #, c-format

523 msgid "corrupt patch for submodule %s"

524 msgstr "parche corrupto para el submódulo %s"

525

526 -#: apply.c:4289

526 +#: apply.c:4290

527 #, c-format

528 msgid "unable to stat newly created file '%s'"

529 msgstr "no es posible establecer el archivo recién creado '%s'"

530

531 -#: apply.c:4297

531 +#: apply.c:4298

532 #, c-format

533 msgid "unable to create backing store for newly created file %s"

534 msgstr ""

535 "no es posible crear una copia de seguridad para el archivo recién creado %s"

536

537 -#: apply.c:4303 apply.c:4448

537 +#: apply.c:4304 apply.c:4449

538 #, c-format

539 msgid "unable to add cache entry for %s"

540 msgstr "no es posible agregar una entrada en el cache para %s"

541

542 -#: apply.c:4346

542 +#: apply.c:4347

543 #, c-format

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

545 msgstr "falló escribir para '%s'"

546

547 -#: apply.c:4350

547 +#: apply.c:4351

548 #, c-format

549 msgid "closing file '%s'"

550 msgstr "cerrando archivo '%s'"

551

552 -#: apply.c:4420

552 +#: apply.c:4421

553 #, c-format

554 msgid "unable to write file '%s' mode %o"

555 msgstr "no es posible escribir el archivo '%s' modo %o"

556

557 -#: apply.c:4518

557 +#: apply.c:4519

558 #, c-format

559 msgid "Applied patch %s cleanly."

560 msgstr "Parche %s aplicado limpiamente."

561

562 -#: apply.c:4526

562 +#: apply.c:4527

563 msgid "internal error"

564 msgstr "error interno"

565

566 -#: apply.c:4529

566 +#: apply.c:4530

567 #, c-format

568 msgid "Applying patch %%s with %d reject..."

569 msgid_plural "Applying patch %%s with %d rejects..."

570 msgstr[0] "Aplicando parche %%s con %d rechazo..."

571 msgstr[1] "Aplicando parche %%s con %d rechazos..."

572

573 -#: apply.c:4540

573 +#: apply.c:4541

574 #, c-format

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

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

577

578 -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

578 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

579 #, c-format

580 msgid "cannot open %s"

581 msgstr "no se puede abrir %s"

582

583 -#: apply.c:4562

583 +#: apply.c:4563

584 #, c-format

585 msgid "Hunk #%d applied cleanly."

586 msgstr "Hunk #%d aplicado limpiamente."

587

588 -#: apply.c:4566

588 +#: apply.c:4567

589 #, c-format

590 msgid "Rejected hunk #%d."

591 msgstr "Hunk #%d rechazado."

592

593 -#: apply.c:4676

593 +#: apply.c:4686

594 #, c-format

595 msgid "Skipped patch '%s'."

596 msgstr "Parche '%s' saltado."

597

598 -#: apply.c:4684

598 +#: apply.c:4694

599 msgid "unrecognized input"

600 msgstr "input no reconocido"

601

602 -#: apply.c:4704

602 +#: apply.c:4714

603 msgid "unable to read index file"

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

605

606 -#: apply.c:4859

606 +#: apply.c:4871

607 #, c-format

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

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

610

611 -#: apply.c:4886

611 +#: apply.c:4898

612 #, c-format

613 msgid "squelched %d whitespace error"

614 msgid_plural "squelched %d whitespace errors"

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

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

617

618 -#: apply.c:4892 apply.c:4907

618 +#: apply.c:4904 apply.c:4919

619 #, c-format

620 msgid "%d line adds whitespace errors."

621 msgid_plural "%d lines add whitespace errors."

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

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

624

625 -#: apply.c:4900

625 +#: apply.c:4912

626 #, c-format

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

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

@@ -631,146 +631,146 @@ msgstr[0] ""

631 msgstr[1] ""

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

633

634 -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

634 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

635 msgid "Unable to write new index file"

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

637

638 -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

639 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

640 -#: builtin/pull.c:208 builtin/submodule--helper.c:407

638 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

639 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

640 +#: builtin/pull.c:209 builtin/submodule--helper.c:407

641 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

642 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

643 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

644 msgid "path"

645 msgstr "ruta"

646

647 -#: apply.c:4944

647 +#: apply.c:4956

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

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

650

651 -#: apply.c:4947

651 +#: apply.c:4959

652 msgid "apply changes matching the given path"

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

654

655 -#: apply.c:4949 builtin/am.c:2217

655 +#: apply.c:4961 builtin/am.c:2206

656 msgid "num"

657 msgstr "num"

658

659 -#: apply.c:4950

659 +#: apply.c:4962

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

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

662

663 -#: apply.c:4953

663 +#: apply.c:4965

664 msgid "ignore additions made by the patch"

665 msgstr "ignorar adiciones hechas por el parche"

666

667 -#: apply.c:4955

667 +#: apply.c:4967

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

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

670

671 -#: apply.c:4959

671 +#: apply.c:4971

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

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

674

675 -#: apply.c:4961

675 +#: apply.c:4973

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

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

678

679 -#: apply.c:4963

679 +#: apply.c:4975

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

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

682

683 -#: apply.c:4965

683 +#: apply.c:4977

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

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

686

687 -#: apply.c:4967

687 +#: apply.c:4979

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

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

690

691 -#: apply.c:4969

691 +#: apply.c:4981

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

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

694

695 -#: apply.c:4971

695 +#: apply.c:4983

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

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

698

699 -#: apply.c:4974

699 +#: apply.c:4986

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

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

702

703 -#: apply.c:4976

703 +#: apply.c:4988

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

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

706

707 -#: apply.c:4978

707 +#: apply.c:4990

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

709 msgstr ""

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

711

712 -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

712 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

713 msgid "paths are separated with NUL character"

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

715

716 -#: apply.c:4983

716 +#: apply.c:4995

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

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

719

720 -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

720 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

722 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

722 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

723 msgid "action"

724 msgstr "acción"

725

726 -#: apply.c:4985

726 +#: apply.c:4997

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

728 msgstr ""

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

730 "blanco"

731

732 -#: apply.c:4988 apply.c:4991

732 +#: apply.c:5000 apply.c:5003

733 msgid "ignore changes in whitespace when finding context"

734 msgstr ""

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

736

737 -#: apply.c:4994

737 +#: apply.c:5006

738 msgid "apply the patch in reverse"

739 msgstr "aplicar el parche en reversa"

740

741 -#: apply.c:4996

741 +#: apply.c:5008

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

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

744

745 -#: apply.c:4998

745 +#: apply.c:5010

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

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

748

749 -#: apply.c:5000

749 +#: apply.c:5012

750 msgid "allow overlapping hunks"

751 msgstr "permitir solapamiento de hunks"

752

753 -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

753 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

754 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

755 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

755 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

756 msgid "be verbose"

757 msgstr "ser verboso"

758

759 -#: apply.c:5003

759 +#: apply.c:5015

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

761 msgstr ""

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

763 "archivo"

764

765 -#: apply.c:5006

765 +#: apply.c:5018

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

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

768

769 -#: apply.c:5008 builtin/am.c:2205

769 +#: apply.c:5020 builtin/am.c:2194

770 msgid "root"

771 msgstr "raíz"

772

773 -#: apply.c:5009

773 +#: apply.c:5021

774 msgid "prepend <root> to all filenames"

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

776

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

825 msgid "archive format"

826 msgstr "formato del archivo"

827

828 -#: archive.c:458 builtin/log.c:1580

828 +#: archive.c:458 builtin/log.c:1581

829 msgid "prefix"

830 msgstr "prefijo"

831

@@ -833,11 +833,12 @@ msgstr "prefijo"

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

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

835

836 -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

837 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

838 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

839 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

840 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

836 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

837 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

838 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

841 +#: parse-options.h:186

842 msgid "file"

843 msgstr "carpeta"

844

@@ -869,7 +870,7 @@ msgstr "comprimir mejor"

870 msgid "list supported archive formats"

871 msgstr "listar los formatos de carpeta soportados"

872

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

873 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

874 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

875 msgid "repo"

876 msgstr "repo"

@@ -878,7 +879,7 @@ msgstr "repo"

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

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

881

881 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

882 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

883 #: builtin/notes.c:498

884 msgid "command"

885 msgstr "comando"

@@ -914,26 +915,26 @@ msgstr "Argumento no soportado para formato '%s': -%d"

915 msgid "cannot stream blob %s"

916 msgstr "no se puede transmitir el blob %s"

917

917 -#: archive-tar.c:260 archive-zip.c:363

918 +#: archive-tar.c:266 archive-zip.c:363

919 #, c-format

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

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

922

922 -#: archive-tar.c:287 archive-zip.c:353

923 +#: archive-tar.c:293 archive-zip.c:353

924 #, c-format

925 msgid "cannot read %s"

926 msgstr "no se puede leer %s"

927

927 -#: archive-tar.c:459

928 +#: archive-tar.c:465

929 #, c-format

930 msgid "unable to start '%s' filter"

931 msgstr "no se puede comenzar filtro '%s'"

932

932 -#: archive-tar.c:462

933 +#: archive-tar.c:468

934 msgid "unable to redirect descriptor"

935 msgstr "incapaz de redirigir descriptor"

936

936 -#: archive-tar.c:469

937 +#: archive-tar.c:475

938 #, c-format

939 msgid "'%s' filter reported error"

940 msgstr "filtro '%s' reportó un error"

@@ -958,17 +959,17 @@ msgstr "error al desinflar (%d)"

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

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

961

961 -#: attr.c:211

962 +#: attr.c:213

963 #, c-format

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

965 msgstr "%.*s no es un nombre de atributo válido"

966

966 -#: attr.c:368

967 +#: attr.c:370

968 #, c-format

969 msgid "%s not allowed: %s:%d"

970 msgstr "%s no permitido: %s:%d"

971

971 -#: attr.c:408

972 +#: attr.c:410

973 msgid ""

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

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

@@ -1027,7 +1028,7 @@ msgid ""

1028 msgstr ""

1029 "Algunas %s revisiones no son ancestros de la revisión %s.\n"

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

1030 -"Tal vez confundiste la revisión %s y %s?\n"

1031 +"¿Tal vez confundiste la revisión %s y %s?\n"

1032

1033 #: bisect.c:789

1034 #, c-format

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

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

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

1098

1098 -#: blame.c:2697

1099 +#: blame.c:2700

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

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

1102

1102 -#: blame.c:2711

1103 +#: blame.c:2714

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

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

1106

1106 -#: blame.c:2732

1107 +#: blame.c:2735

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

1109 msgstr ""

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

1111

1111 -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1112 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1113 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1114 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1112 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1113 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1114 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1115 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1116 #: builtin/shortlog.c:192

1117 msgid "revision walk setup failed"

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

1119

1119 -#: blame.c:2759

1120 +#: blame.c:2762

1121 msgid ""

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

1123 msgstr ""

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

1125 "del primer padre"

1126

1126 -#: blame.c:2770

1127 +#: blame.c:2773

1128 #, c-format

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

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

1131

1131 -#: blame.c:2781

1132 +#: blame.c:2784

1133 #, c-format

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

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

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

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

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

1295

1295 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1296 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1297 #: builtin/commit.c:791

1298 #, c-format

1299 msgid "could not open '%s'"

@@ -1345,7 +1346,7 @@ msgstr "rev-list murió"

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

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

1348

1348 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1349 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1350 #, c-format

1351 msgid "unrecognized argument: %s"

1352 msgstr "argumento no reconocido: %s"

@@ -1368,8 +1369,8 @@ msgstr "index-pack murió"

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

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

1371

1371 -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1372 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1372 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1373 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1374 #, c-format

1375 msgid "could not parse %s"

1376 msgstr "no se puede analizar %s"

@@ -1377,7 +1378,7 @@ msgstr "no se puede analizar %s"

1378 #: commit.c:52

1379 #, c-format

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

1380 -msgstr "%s %s no es un commit!"

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

1382

1383 #: commit.c:192

1384 msgid ""

@@ -1399,27 +1400,27 @@ msgstr ""

1400 "Apapa este mensaje ejecutando\n"

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

1402

1402 -#: commit.c:1127

1403 +#: commit.c:1128

1404 #, c-format

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

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

1407

1407 -#: commit.c:1130

1408 +#: commit.c:1131

1409 #, c-format

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

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

1412

1412 -#: commit.c:1133

1413 +#: commit.c:1134

1414 #, c-format

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

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

1417

1417 -#: commit.c:1136

1418 +#: commit.c:1137

1419 #, c-format

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

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

1422

1422 -#: commit.c:1390

1423 +#: commit.c:1391

1424 msgid ""

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

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

@@ -1482,199 +1483,214 @@ msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"

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

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

1485

1485 -#: commit-graph.c:554 commit-graph.c:614

1486 +#: commit-graph.c:561 commit-graph.c:621

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

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

1489

1489 -#: commit-graph.c:575

1490 +#: commit-graph.c:582

1491 #, c-format

1492 msgid "could not find commit %s"

1493 msgstr "no se pudo encontrar commit %s"

1494

1494 -#: commit-graph.c:1002 builtin/pack-objects.c:2657

1495 +#: commit-graph.c:855 builtin/am.c:1287

1496 +#, c-format

1497 +msgid "unable to parse commit %s"

1498 +msgstr "no es posible analizar el commit %s"

1499 +

1500 +#: commit-graph.c:859

1501 +#, c-format

1502 +msgid "unable to get tree for %s"

1503 +msgstr "no se pudo obtener árbol para %s"

1504 +

1505 +#: commit-graph.c:1017 builtin/pack-objects.c:2641

1506 #, c-format

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

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

1509

1499 -#: commit-graph.c:1034

1510 +#: commit-graph.c:1049

1511 msgid "Loading known commits in commit graph"

1512 msgstr "Cargando commits conocidos en commit graph"

1513

1503 -#: commit-graph.c:1051

1514 +#: commit-graph.c:1066

1515 msgid "Expanding reachable commits in commit graph"

1516 msgstr "Expandiendo commits alcanzables en commit graph"

1517

1507 -#: commit-graph.c:1070

1518 +#: commit-graph.c:1085

1519 msgid "Clearing commit marks in commit graph"

1520 msgstr "Limpiando marcas de commits en commit graph"

1521

1511 -#: commit-graph.c:1089

1522 +#: commit-graph.c:1104

1523 msgid "Computing commit graph generation numbers"

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

1525

1515 -#: commit-graph.c:1163

1526 +#: commit-graph.c:1179

1527 #, c-format

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

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

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

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

1532

1522 -#: commit-graph.c:1176

1533 +#: commit-graph.c:1192

1534 #, c-format

1535 msgid "error adding pack %s"

1536 msgstr "error agregando pack %s"

1537

1527 -#: commit-graph.c:1180

1538 +#: commit-graph.c:1196

1539 #, c-format

1540 msgid "error opening index for %s"

1541 msgstr "error abriendo index para %s"

1542

1532 -#: commit-graph.c:1204

1543 +#: commit-graph.c:1220

1544 #, c-format

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

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

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

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

1549

1539 -#: commit-graph.c:1238

1550 +#: commit-graph.c:1240

1551 +#, c-format

1552 +msgid "invalid commit object id: %s"

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

1554 +

1555 +#: commit-graph.c:1255

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

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

1558

1543 -#: commit-graph.c:1253

1559 +#: commit-graph.c:1270

1560 msgid "Counting distinct commits in commit graph"

1561 msgstr "Contando commits distintos en commit graph"

1562

1547 -#: commit-graph.c:1284

1563 +#: commit-graph.c:1300

1564 msgid "Finding extra edges in commit graph"

1565 msgstr "Encontrando esquinas extra en commit graph"

1566

1551 -#: commit-graph.c:1332

1567 +#: commit-graph.c:1346

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

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

1570

1555 -#: commit-graph.c:1365 midx.c:811

1571 +#: commit-graph.c:1379 midx.c:810

1572 #, c-format

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

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

1575

1560 -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1576 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1577 #, c-format

1578 msgid "unable to create '%s'"

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

1580

1565 -#: commit-graph.c:1437

1581 +#: commit-graph.c:1451

1582 #, c-format

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

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

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

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

1587

1572 -#: commit-graph.c:1478

1588 +#: commit-graph.c:1492

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

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

1591

1576 -#: commit-graph.c:1490

1592 +#: commit-graph.c:1504

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

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

1595

1580 -#: commit-graph.c:1510

1596 +#: commit-graph.c:1524

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

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

1599

1584 -#: commit-graph.c:1621

1600 +#: commit-graph.c:1635

1601 msgid "Scanning merged commits"

1602 msgstr "Escaneando commits fusionados"

1603

1588 -#: commit-graph.c:1632

1604 +#: commit-graph.c:1646

1605 #, c-format

1606 msgid "unexpected duplicate commit id %s"

1607 msgstr "id de commit duplicado inesperado %s"

1608

1593 -#: commit-graph.c:1657

1609 +#: commit-graph.c:1670

1610 msgid "Merging commit-graph"

1611 msgstr "Fusionando commit-graph"

1612

1597 -#: commit-graph.c:1844

1613 +#: commit-graph.c:1860

1614 #, c-format

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

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

1617

1602 -#: commit-graph.c:1855

1618 +#: commit-graph.c:1871

1619 msgid "too many commits to write graph"

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

1621

1606 -#: commit-graph.c:1945

1622 +#: commit-graph.c:1961

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

1624 msgstr ""

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

1626 "corrupto"

1627

1612 -#: commit-graph.c:1955

1628 +#: commit-graph.c:1971

1629 #, c-format

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

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

1632

1617 -#: commit-graph.c:1965 commit-graph.c:1980

1633 +#: commit-graph.c:1981 commit-graph.c:1996

1634 #, c-format

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

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

1637

1622 -#: commit-graph.c:1972

1638 +#: commit-graph.c:1988

1639 #, c-format

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

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

1642

1627 -#: commit-graph.c:1989

1643 +#: commit-graph.c:2006

1644 msgid "Verifying commits in commit graph"

1645 msgstr "Verificando commits en commit graph"

1646

1631 -#: commit-graph.c:2002

1647 +#: commit-graph.c:2020

1648 #, c-format

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

1650 msgstr ""

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

1652 "graph"

1653

1638 -#: commit-graph.c:2009

1654 +#: commit-graph.c:2027

1655 #, c-format

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

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

1658

1643 -#: commit-graph.c:2019

1659 +#: commit-graph.c:2037

1660 #, c-format

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

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

1663

1648 -#: commit-graph.c:2028

1664 +#: commit-graph.c:2046

1665 #, c-format

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

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

1668

1653 -#: commit-graph.c:2041

1669 +#: commit-graph.c:2059

1670 #, c-format

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

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

1673

1658 -#: commit-graph.c:2046

1674 +#: commit-graph.c:2064

1675 #, c-format

1676 msgid ""

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

1678 msgstr ""

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

1680

1665 -#: commit-graph.c:2050

1681 +#: commit-graph.c:2068

1682 #, c-format

1683 msgid ""

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

1685 msgstr ""

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

1687

1672 -#: commit-graph.c:2065

1688 +#: commit-graph.c:2083

1689 #, c-format

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

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

1692

1677 -#: commit-graph.c:2071

1693 +#: commit-graph.c:2089

1694 #, c-format

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

1696 msgstr ""

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

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

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

1741

1726 -#: config.c:406 sequencer.c:2463

1742 +#: config.c:406 sequencer.c:2401

1743 #, c-format

1744 msgid "invalid key: %s"

1745 msgstr "llave inválida: %s"

@@ -1847,152 +1863,145 @@ msgstr "core.commentChar debería tener solo un caracter"

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

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

1865

1850 -#: config.c:1430

1866 +#: config.c:1425

1867 #, c-format

1868 msgid "malformed value for %s"

1869 msgstr "valor malformado para %s"

1870

1855 -#: config.c:1456

1871 +#: config.c:1451

1872 #, c-format

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

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

1875

1860 -#: config.c:1457

1876 +#: config.c:1452

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

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

1879

1864 -#: config.c:1518 builtin/pack-objects.c:3410

1880 +#: config.c:1513 builtin/pack-objects.c:3394

1881 #, c-format

1882 msgid "bad pack compression level %d"

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

1884

1869 -#: config.c:1639

1885 +#: config.c:1634

1886 #, c-format

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

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

1889

1874 -#: config.c:1642

1890 +#: config.c:1637

1891 #, c-format

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

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

1894

1879 -#: config.c:1659

1895 +#: config.c:1654

1896 #, c-format

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

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

1899

1884 -#: config.c:1689

1900 +#: config.c:1684

1901 #, c-format

1902 msgid "failed to parse %s"

1903 msgstr "no se pudo analizar %s"

1904

1889 -#: config.c:1745

1905 +#: config.c:1740

1906 msgid "unable to parse command-line config"

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

1908

1893 -#: config.c:2094

1909 +#: config.c:2091

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

1911 msgstr ""

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

1913

1898 -#: config.c:2264

1914 +#: config.c:2261

1915 #, c-format

1916 msgid "Invalid %s: '%s'"

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

1918

1903 -#: config.c:2307

1904 -#, c-format

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

1906 -msgstr ""

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

1908 -"defecto"

1909 -

1910 -#: config.c:2333

1919 +#: config.c:2306

1920 #, c-format

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

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

1923

1915 -#: config.c:2379

1924 +#: config.c:2352

1925 #, c-format

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

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

1928

1920 -#: config.c:2381

1929 +#: config.c:2354

1930 #, c-format

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

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

1933

1925 -#: config.c:2462

1934 +#: config.c:2435

1935 #, c-format

1936 msgid "invalid section name '%s'"

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

1938

1930 -#: config.c:2494

1939 +#: config.c:2467

1940 #, c-format

1941 msgid "%s has multiple values"

1942 msgstr "%s tiene múltiples valores"

1943

1935 -#: config.c:2523

1944 +#: config.c:2496

1945 #, c-format

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

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

1948

1940 -#: config.c:2775 config.c:3099

1949 +#: config.c:2748 config.c:3072

1950 #, c-format

1951 msgid "could not lock config file %s"

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

1953

1945 -#: config.c:2786

1954 +#: config.c:2759

1955 #, c-format

1956 msgid "opening %s"

1957 msgstr "abriendo %s"

1958

1950 -#: config.c:2821 builtin/config.c:328

1959 +#: config.c:2794 builtin/config.c:328

1960 #, c-format

1961 msgid "invalid pattern: %s"

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

1963

1955 -#: config.c:2846

1964 +#: config.c:2819

1965 #, c-format

1966 msgid "invalid config file %s"

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

1968

1960 -#: config.c:2859 config.c:3112

1969 +#: config.c:2832 config.c:3085

1970 #, c-format

1971 msgid "fstat on %s failed"

1972 msgstr "fstat en %s falló"

1973

1965 -#: config.c:2870

1974 +#: config.c:2843

1975 #, c-format

1976 msgid "unable to mmap '%s'"

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

1978

1970 -#: config.c:2879 config.c:3117

1979 +#: config.c:2852 config.c:3090

1980 #, c-format

1981 msgid "chmod on %s failed"

1982 msgstr "chmod en %s falló"

1983

1975 -#: config.c:2964 config.c:3214

1984 +#: config.c:2937 config.c:3187

1985 #, c-format

1986 msgid "could not write config file %s"

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

1988

1980 -#: config.c:2998

1989 +#: config.c:2971

1990 #, c-format

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

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

1993

1985 -#: config.c:3000 builtin/remote.c:782

1994 +#: config.c:2973 builtin/remote.c:782

1995 #, c-format

1996 msgid "could not unset '%s'"

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

1998

1990 -#: config.c:3090

1999 +#: config.c:3063

2000 #, c-format

2001 msgid "invalid section name: %s"

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

2003

1995 -#: config.c:3257

2004 +#: config.c:3230

2005 #, c-format

2006 msgid "missing value for '%s'"

2007 msgstr "valor faltante para '%s'"

@@ -2116,7 +2125,7 @@ msgstr "no es posible revisar %s (%s)"

2125 msgid "unknown port %s"

2126 msgstr "puerto desconocido %s"

2127

2119 -#: connect.c:845 connect.c:1171

2128 +#: connect.c:845 connect.c:1175

2129 #, c-format

2130 msgid "strange hostname '%s' blocked"

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

@@ -2131,59 +2140,59 @@ msgstr "puerto extraño '%s' bloqueado"

2140 msgid "cannot start proxy %s"

2141 msgstr "no se puede comenzar proxy %s"

2142

2134 -#: connect.c:924

2143 +#: connect.c:928

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

2145 msgstr ""

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

2147

2139 -#: connect.c:1119

2148 +#: connect.c:1123

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

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

2151

2143 -#: connect.c:1131

2152 +#: connect.c:1135

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

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

2155

2147 -#: connect.c:1148

2156 +#: connect.c:1152

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

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

2159

2151 -#: connect.c:1260

2160 +#: connect.c:1264

2161 #, c-format

2162 msgid "strange pathname '%s' blocked"

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

2164

2156 -#: connect.c:1307

2165 +#: connect.c:1311

2166 msgid "unable to fork"

2167 msgstr "no es posible hacer fork"

2168

2160 -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2169 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2170 msgid "Checking connectivity"

2171 msgstr "Verificando conectividad"

2172

2164 -#: connected.c:98

2173 +#: connected.c:100

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

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

2176

2168 -#: connected.c:118

2177 +#: connected.c:120

2178 msgid "failed write to rev-list"

2179 msgstr "falló escribir a rev-list"

2180

2172 -#: connected.c:125

2181 +#: connected.c:127

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

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

2184

2176 -#: convert.c:193

2185 +#: convert.c:194

2186 #, c-format

2187 msgid "illegal crlf_action %d"

2188 msgstr "crlf_action %d ilegal"

2189

2181 -#: convert.c:206

2190 +#: convert.c:207

2191 #, c-format

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

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

2194

2186 -#: convert.c:208

2195 +#: convert.c:209

2196 #, c-format

2197 msgid ""

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

@@ -2192,12 +2201,12 @@ msgstr ""

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

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

2203

2195 -#: convert.c:216

2204 +#: convert.c:217

2205 #, c-format

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

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

2208

2200 -#: convert.c:218

2209 +#: convert.c:219

2210 #, c-format

2211 msgid ""

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

@@ -2206,12 +2215,12 @@ msgstr ""

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

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

2217

2209 -#: convert.c:279

2218 +#: convert.c:280

2219 #, c-format

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

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

2222

2214 -#: convert.c:286

2223 +#: convert.c:287

2224 #, c-format

2225 msgid ""

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

@@ -2220,12 +2229,12 @@ msgstr ""

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

2230 "working-tree-encoding."

2231

2223 -#: convert.c:304

2232 +#: convert.c:305

2233 #, c-format

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

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

2236

2228 -#: convert.c:306

2237 +#: convert.c:307

2238 #, c-format

2239 msgid ""

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

@@ -2234,50 +2243,50 @@ msgstr ""

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

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

2245

2237 -#: convert.c:424 convert.c:495

2246 +#: convert.c:425 convert.c:496

2247 #, c-format

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

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

2250

2242 -#: convert.c:467

2251 +#: convert.c:468

2252 #, c-format

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

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

2255

2247 -#: convert.c:673

2256 +#: convert.c:674

2257 #, c-format

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

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

2260

2252 -#: convert.c:693

2261 +#: convert.c:694

2262 #, c-format

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

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

2265

2257 -#: convert.c:700

2266 +#: convert.c:701

2267 #, c-format

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

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

2270

2262 -#: convert.c:735 convert.c:738

2271 +#: convert.c:736 convert.c:739

2272 #, c-format

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

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

2275

2267 -#: convert.c:741 convert.c:796

2276 +#: convert.c:742 convert.c:797

2277 #, c-format

2278 msgid "external filter '%s' failed"

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

2280

2272 -#: convert.c:844

2281 +#: convert.c:845

2282 msgid "unexpected filter type"

2283 msgstr "tipo de filtro inesperado"

2284

2276 -#: convert.c:855

2285 +#: convert.c:856

2286 msgid "path name too long for external filter"

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

2288

2280 -#: convert.c:929

2289 +#: convert.c:930

2290 #, c-format

2291 msgid ""

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

@@ -2286,67 +2295,67 @@ msgstr ""

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

2296 "filtradas"

2297

2289 -#: convert.c:1228

2298 +#: convert.c:1229

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

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

2301

2293 -#: convert.c:1398 convert.c:1432

2302 +#: convert.c:1417 convert.c:1451

2303 #, c-format

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

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

2306

2298 -#: convert.c:1476

2307 +#: convert.c:1495

2308 #, c-format

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

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

2311

2303 -#: date.c:137

2312 +#: date.c:138

2313 msgid "in the future"

2314 msgstr "en el futuro"

2315

2307 -#: date.c:143

2316 +#: date.c:144

2317 #, c-format

2318 msgid "%<PRIuMAX> second ago"

2319 msgid_plural "%<PRIuMAX> seconds ago"

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

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

2322

2314 -#: date.c:150

2323 +#: date.c:151

2324 #, c-format

2325 msgid "%<PRIuMAX> minute ago"

2326 msgid_plural "%<PRIuMAX> minutes ago"

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

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

2329

2321 -#: date.c:157

2330 +#: date.c:158

2331 #, c-format

2332 msgid "%<PRIuMAX> hour ago"

2333 msgid_plural "%<PRIuMAX> hours ago"

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

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

2336

2328 -#: date.c:164

2337 +#: date.c:165

2338 #, c-format

2339 msgid "%<PRIuMAX> day ago"

2340 msgid_plural "%<PRIuMAX> days ago"

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

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

2343

2335 -#: date.c:170

2344 +#: date.c:171

2345 #, c-format

2346 msgid "%<PRIuMAX> week ago"

2347 msgid_plural "%<PRIuMAX> weeks ago"

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

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

2350

2342 -#: date.c:177

2351 +#: date.c:178

2352 #, c-format

2353 msgid "%<PRIuMAX> month ago"

2354 msgid_plural "%<PRIuMAX> months ago"

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

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

2357

2349 -#: date.c:188

2358 +#: date.c:189

2359 #, c-format

2360 msgid "%<PRIuMAX> year"

2361 msgid_plural "%<PRIuMAX> years"

@@ -2354,14 +2363,14 @@ msgstr[0] "%<PRIuMAX> año"

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

2364

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

2357 -#: date.c:191

2366 +#: date.c:192

2367 #, c-format

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

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

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

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

2372

2364 -#: date.c:196 date.c:201

2373 +#: date.c:197 date.c:202

2374 #, c-format

2375 msgid "%<PRIuMAX> year ago"

2376 msgid_plural "%<PRIuMAX> years ago"

@@ -2397,7 +2406,7 @@ msgstr "%d islas marcadas, listo.\n"

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

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

2408

2400 -#: diffcore-rename.c:544

2409 +#: diffcore-rename.c:543

2410 msgid "Performing inexact rename detection"

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

2412

@@ -2464,35 +2473,35 @@ msgstr ""

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

2474 "%s"

2475

2467 -#: diff.c:4215

2476 +#: diff.c:4218

2477 #, c-format

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

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

2480

2472 -#: diff.c:4560

2481 +#: diff.c:4563

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

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

2484

2476 -#: diff.c:4563

2485 +#: diff.c:4566

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

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

2488

2480 -#: diff.c:4641

2489 +#: diff.c:4644

2490 msgid "--follow requires exactly one pathspec"

2491 msgstr "--follow requiere exactamente un pathspec"

2492

2484 -#: diff.c:4689

2493 +#: diff.c:4692

2494 #, c-format

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

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

2497

2489 -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2498 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2499 #: parse-options.c:199 parse-options.c:203

2500 #, c-format

2501 msgid "%s expects a numerical value"

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

2503

2495 -#: diff.c:4726

2504 +#: diff.c:4729

2505 #, c-format

2506 msgid ""

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

@@ -2501,42 +2510,42 @@ msgstr ""

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

2511 "%s"

2512

2504 -#: diff.c:4811

2513 +#: diff.c:4814

2514 #, c-format

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

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

2517

2509 -#: diff.c:4835

2518 +#: diff.c:4838

2519 #, c-format

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

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

2522

2514 -#: diff.c:4849

2523 +#: diff.c:4852

2524 #, c-format

2525 msgid "unable to resolve '%s'"

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

2527

2519 -#: diff.c:4899 diff.c:4905

2528 +#: diff.c:4902 diff.c:4908

2529 #, c-format

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

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

2532

2524 -#: diff.c:4917

2533 +#: diff.c:4920

2534 #, c-format

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

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

2537

2529 -#: diff.c:4938

2538 +#: diff.c:4941

2539 #, c-format

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

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

2542

2534 -#: diff.c:4957

2543 +#: diff.c:4960

2544 #, c-format

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

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

2547

2539 -#: diff.c:4997

2548 +#: diff.c:5000

2549 msgid ""

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

2551 "\"histogram\""

@@ -2544,154 +2553,154 @@ msgstr ""

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

2554 "\"histogram\""

2555

2547 -#: diff.c:5033 diff.c:5053

2556 +#: diff.c:5036 diff.c:5056

2557 #, c-format

2558 msgid "invalid argument to %s"

2559 msgstr "argumento inválido para %s"

2560

2552 -#: diff.c:5191

2561 +#: diff.c:5194

2562 #, c-format

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

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

2565

2557 -#: diff.c:5247

2566 +#: diff.c:5250

2567 #, c-format

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

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

2570

2562 -#: diff.c:5270

2571 +#: diff.c:5273

2572 msgid "Diff output format options"

2573 msgstr "Opciones de formato de salida para diff"

2574

2566 -#: diff.c:5272 diff.c:5278

2575 +#: diff.c:5275 diff.c:5281

2576 msgid "generate patch"

2577 msgstr "generar parche"

2578

2570 -#: diff.c:5275 builtin/log.c:172

2579 +#: diff.c:5278 builtin/log.c:172

2580 msgid "suppress diff output"

2581 msgstr "suprimir salida de diff"

2582

2574 -#: diff.c:5280 diff.c:5394 diff.c:5401

2583 +#: diff.c:5283 diff.c:5397 diff.c:5404

2584 msgid "<n>"

2585 msgstr "<n>"

2586

2578 -#: diff.c:5281 diff.c:5284

2587 +#: diff.c:5284 diff.c:5287

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

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

2590

2582 -#: diff.c:5286

2591 +#: diff.c:5289

2592 msgid "generate the diff in raw format"

2593 msgstr "genera el diff en formato raw"

2594

2586 -#: diff.c:5289

2595 +#: diff.c:5292

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

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

2598

2590 -#: diff.c:5293

2599 +#: diff.c:5296

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

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

2602

2594 -#: diff.c:5297

2603 +#: diff.c:5300

2604 msgid "machine friendly --stat"

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

2606

2598 -#: diff.c:5300

2607 +#: diff.c:5303

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

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

2610

2602 -#: diff.c:5302 diff.c:5310

2611 +#: diff.c:5305 diff.c:5313

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

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

2614

2606 -#: diff.c:5303

2615 +#: diff.c:5306

2616 msgid ""

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

2618 msgstr ""

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

2620 "subdirectorio"

2621

2613 -#: diff.c:5307

2622 +#: diff.c:5310

2623 msgid "synonym for --dirstat=cumulative"

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

2625

2617 -#: diff.c:5311

2626 +#: diff.c:5314

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

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

2629

2621 -#: diff.c:5315

2630 +#: diff.c:5318

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

2632 msgstr ""

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

2634 "en blanco"

2635

2627 -#: diff.c:5318

2636 +#: diff.c:5321

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

2638 msgstr ""

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

2640

2632 -#: diff.c:5321

2641 +#: diff.c:5324

2642 msgid "show only names of changed files"

2643 msgstr "mostrar solo nombres de archivos cambiados"

2644

2636 -#: diff.c:5324

2645 +#: diff.c:5327

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

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

2648

2640 -#: diff.c:5326

2649 +#: diff.c:5329

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

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

2652

2644 -#: diff.c:5327

2653 +#: diff.c:5330

2654 msgid "generate diffstat"

2655 msgstr "generar diffstat"

2656

2648 -#: diff.c:5329 diff.c:5332 diff.c:5335

2657 +#: diff.c:5332 diff.c:5335 diff.c:5338

2658 msgid "<width>"

2659 msgstr "<ancho>"

2660

2652 -#: diff.c:5330

2661 +#: diff.c:5333

2662 msgid "generate diffstat with a given width"

2663 msgstr "genera diffstat con un ancho dado"

2664

2656 -#: diff.c:5333

2665 +#: diff.c:5336

2666 msgid "generate diffstat with a given name width"

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

2668

2660 -#: diff.c:5336

2669 +#: diff.c:5339

2670 msgid "generate diffstat with a given graph width"

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

2672

2664 -#: diff.c:5338

2673 +#: diff.c:5341

2674 msgid "<count>"

2675 msgstr "<cantidad>"

2676

2668 -#: diff.c:5339

2677 +#: diff.c:5342

2678 msgid "generate diffstat with limited lines"

2679 msgstr "genera diffstat con líneas limitadas"

2680

2672 -#: diff.c:5342

2681 +#: diff.c:5345

2682 msgid "generate compact summary in diffstat"

2683 msgstr "genera un resumen compacto de diffstat"

2684

2676 -#: diff.c:5345

2685 +#: diff.c:5348

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

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

2688

2680 -#: diff.c:5348

2689 +#: diff.c:5351

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

2691 msgstr ""

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

2693 "\""

2694

2686 -#: diff.c:5350

2695 +#: diff.c:5353

2696 msgid "show colored diff"

2697 msgstr "mostrar diff colorido"

2698

2690 -#: diff.c:5351

2699 +#: diff.c:5354

2700 msgid "<kind>"

2701 msgstr "<tipo>"

2702

2694 -#: diff.c:5352

2703 +#: diff.c:5355

2704 msgid ""

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

2706 "diff"

@@ -2699,7 +2708,7 @@ msgstr ""

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

2709 "'new' del diff"

2710

2702 -#: diff.c:5355

2711 +#: diff.c:5358

2712 msgid ""

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

2714 "--numstat"

@@ -2707,89 +2716,89 @@ msgstr ""

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

2717 "o --numstat"

2718

2710 -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2719 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

2720 msgid "<prefix>"

2721 msgstr "<prefijo>"

2722

2714 -#: diff.c:5359

2723 +#: diff.c:5362

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

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

2726

2718 -#: diff.c:5362

2727 +#: diff.c:5365

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

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

2730

2722 -#: diff.c:5365

2731 +#: diff.c:5368

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

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

2734

2726 -#: diff.c:5368

2735 +#: diff.c:5371

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

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

2738

2730 -#: diff.c:5371

2739 +#: diff.c:5374

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

2741 msgstr ""

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

2743 "líneas"

2744

2736 -#: diff.c:5375 diff.c:5380 diff.c:5385

2745 +#: diff.c:5378 diff.c:5383 diff.c:5388

2746 msgid "<char>"

2747 msgstr "<char>"

2748

2740 -#: diff.c:5376

2749 +#: diff.c:5379

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

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

2752

2744 -#: diff.c:5381

2753 +#: diff.c:5384

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

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

2756

2748 -#: diff.c:5386

2757 +#: diff.c:5389

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

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

2760

2752 -#: diff.c:5389

2761 +#: diff.c:5392

2762 msgid "Diff rename options"

2763 msgstr "Opciones de diff rename"

2764

2756 -#: diff.c:5390

2765 +#: diff.c:5393

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

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

2768

2760 -#: diff.c:5391

2769 +#: diff.c:5394

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

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

2772

2764 -#: diff.c:5395

2773 +#: diff.c:5398

2774 msgid "detect renames"

2775 msgstr "detectar renombrados"

2776

2768 -#: diff.c:5399

2777 +#: diff.c:5402

2778 msgid "omit the preimage for deletes"

2779 msgstr "omite la preimage para borrados"

2780

2772 -#: diff.c:5402

2781 +#: diff.c:5405

2782 msgid "detect copies"

2783 msgstr "detectar copias"

2784

2776 -#: diff.c:5406

2785 +#: diff.c:5409

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

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

2788

2780 -#: diff.c:5408

2789 +#: diff.c:5411

2790 msgid "disable rename detection"

2791 msgstr "deshabilita detección de renombres"

2792

2784 -#: diff.c:5411

2793 +#: diff.c:5414

2794 msgid "use empty blobs as rename source"

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

2796

2788 -#: diff.c:5413

2797 +#: diff.c:5416

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

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

2800

2792 -#: diff.c:5416

2801 +#: diff.c:5419

2802 msgid ""

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

2804 "given limit"

@@ -2797,155 +2806,155 @@ msgstr ""

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

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

2808

2800 -#: diff.c:5418

2809 +#: diff.c:5421

2810 msgid "Diff algorithm options"

2811 msgstr "Opciones de algoritmos de diff"

2812

2804 -#: diff.c:5420

2813 +#: diff.c:5423

2814 msgid "produce the smallest possible diff"

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

2816

2808 -#: diff.c:5423

2817 +#: diff.c:5426

2818 msgid "ignore whitespace when comparing lines"

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

2820

2812 -#: diff.c:5426

2821 +#: diff.c:5429

2822 msgid "ignore changes in amount of whitespace"

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

2824

2816 -#: diff.c:5429

2825 +#: diff.c:5432

2826 msgid "ignore changes in whitespace at EOL"

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

2828

2820 -#: diff.c:5432

2829 +#: diff.c:5435

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

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

2832

2824 -#: diff.c:5435

2833 +#: diff.c:5438

2834 msgid "ignore changes whose lines are all blank"

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

2836

2828 -#: diff.c:5438

2837 +#: diff.c:5441

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

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

2840

2832 -#: diff.c:5441

2841 +#: diff.c:5444

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

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

2844

2836 -#: diff.c:5445

2845 +#: diff.c:5448

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

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

2848

2840 -#: diff.c:5447

2849 +#: diff.c:5450

2850 msgid "<algorithm>"

2851 msgstr "<algoritmo>"

2852

2844 -#: diff.c:5448

2853 +#: diff.c:5451

2854 msgid "choose a diff algorithm"

2855 msgstr "escoge un algoritmo para diff"

2856

2848 -#: diff.c:5450

2857 +#: diff.c:5453

2858 msgid "<text>"

2859 msgstr "<texto>"

2860

2852 -#: diff.c:5451

2861 +#: diff.c:5454

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

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

2864

2856 -#: diff.c:5453 diff.c:5462 diff.c:5465

2865 +#: diff.c:5456 diff.c:5465 diff.c:5468

2866 msgid "<mode>"

2867 msgstr "<modo>"

2868

2860 -#: diff.c:5454

2869 +#: diff.c:5457

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

2871 msgstr ""

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

2873

2865 -#: diff.c:5456 diff.c:5459 diff.c:5504

2874 +#: diff.c:5459 diff.c:5462 diff.c:5507

2875 msgid "<regex>"

2876 msgstr "<regex>"

2877

2869 -#: diff.c:5457

2878 +#: diff.c:5460

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

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

2881

2873 -#: diff.c:5460

2882 +#: diff.c:5463

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

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

2885

2877 -#: diff.c:5463

2886 +#: diff.c:5466

2887 msgid "moved lines of code are colored differently"

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

2889

2881 -#: diff.c:5466

2890 +#: diff.c:5469

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

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

2893

2885 -#: diff.c:5469

2894 +#: diff.c:5472

2895 msgid "Other diff options"

2896 msgstr "Otras opciones de diff"

2897

2889 -#: diff.c:5471

2898 +#: diff.c:5474

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

2900 msgstr ""

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

2902 "paths relativos"

2903

2895 -#: diff.c:5475

2904 +#: diff.c:5478

2905 msgid "treat all files as text"

2906 msgstr "tratar todos los archivos como texto"

2907

2899 -#: diff.c:5477

2908 +#: diff.c:5480

2909 msgid "swap two inputs, reverse the diff"

2910 msgstr "cambia dos inputs, invierte el diff"

2911

2903 -#: diff.c:5479

2912 +#: diff.c:5482

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

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

2915

2907 -#: diff.c:5481

2916 +#: diff.c:5484

2917 msgid "disable all output of the program"

2918 msgstr "deshabilita todo el output del programa"

2919

2911 -#: diff.c:5483

2920 +#: diff.c:5486

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

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

2923

2915 -#: diff.c:5485

2924 +#: diff.c:5488

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

2926 msgstr ""

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

2928

2920 -#: diff.c:5487

2929 +#: diff.c:5490

2930 msgid "<when>"

2931 msgstr "<cuando>"

2932

2924 -#: diff.c:5488

2933 +#: diff.c:5491

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

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

2936

2928 -#: diff.c:5491

2937 +#: diff.c:5494

2938 msgid "<format>"

2939 msgstr "<formato>"

2940

2932 -#: diff.c:5492

2941 +#: diff.c:5495

2942 msgid "specify how differences in submodules are shown"

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

2944

2936 -#: diff.c:5496

2945 +#: diff.c:5499

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

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

2948

2940 -#: diff.c:5499

2949 +#: diff.c:5502

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

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

2952

2944 -#: diff.c:5501

2953 +#: diff.c:5504

2954 msgid "<string>"

2955 msgstr "<string>"

2956

2948 -#: diff.c:5502

2957 +#: diff.c:5505

2958 msgid ""

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

2960 "string"

@@ -2953,7 +2962,7 @@ msgstr ""

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

2963 "especificado"

2964

2956 -#: diff.c:5505

2965 +#: diff.c:5508

2966 msgid ""

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

2968 "regex"

@@ -2961,23 +2970,23 @@ msgstr ""

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

2971 "especificado"

2972

2964 -#: diff.c:5508

2973 +#: diff.c:5511

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

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

2976

2968 -#: diff.c:5511

2977 +#: diff.c:5514

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

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

2980

2972 -#: diff.c:5514

2981 +#: diff.c:5517

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

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

2984

2976 -#: diff.c:5515

2985 +#: diff.c:5518

2986 msgid "<object-id>"

2987 msgstr "<id-objeto>"

2988

2980 -#: diff.c:5516

2989 +#: diff.c:5519

2990 msgid ""

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

2992 "object"

@@ -2985,33 +2994,33 @@ msgstr ""

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

2995 "especificado"

2996

2988 -#: diff.c:5518

2997 +#: diff.c:5521

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

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

3000

2992 -#: diff.c:5519

3001 +#: diff.c:5522

3002 msgid "select files by diff type"

3003 msgstr "selecciona archivos por tipo de diff"

3004

2996 -#: diff.c:5521

3005 +#: diff.c:5524

3006 msgid "<file>"

3007 msgstr "<archivo>"

3008

3000 -#: diff.c:5522

3009 +#: diff.c:5525

3010 msgid "Output to a specific file"

3011 msgstr "Output a un archivo específico"

3012

3004 -#: diff.c:6177

3013 +#: diff.c:6180

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

3015 msgstr ""

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

3017

3009 -#: diff.c:6180

3018 +#: diff.c:6183

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

3020 msgstr ""

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

3022

3014 -#: diff.c:6183

3023 +#: diff.c:6186

3024 #, c-format

3025 msgid ""

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

@@ -3019,41 +3028,41 @@ msgstr ""

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

3029 "intentar el comando."

3030

3022 -#: dir.c:537

3031 +#: dir.c:549

3032 #, c-format

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

3034 msgstr ""

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

3036

3028 -#: dir.c:926

3037 +#: dir.c:938

3038 #, c-format

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

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

3041

3033 -#: dir.c:1843

3042 +#: dir.c:1877

3043 #, c-format

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

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

3046

3038 -#: dir.c:2085

3047 +#: dir.c:2128

3048 msgid "failed to get kernel name and information"

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

3050

3042 -#: dir.c:2209

3051 +#: dir.c:2252

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

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

3054

3046 -#: dir.c:3013

3055 +#: dir.c:3056

3056 #, c-format

3057 msgid "index file corrupt in repo %s"

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

3059

3051 -#: dir.c:3058 dir.c:3063

3060 +#: dir.c:3101 dir.c:3106

3061 #, c-format

3062 msgid "could not create directories for %s"

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

3064

3056 -#: dir.c:3092

3065 +#: dir.c:3135

3066 #, c-format

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

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

@@ -3072,12 +3081,12 @@ msgstr "Filtrando contenido"

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

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

3083

3075 -#: environment.c:150

3084 +#: environment.c:148

3085 #, c-format

3086 msgid "bad git namespace path \"%s\""

3087 msgstr "ruta de namespace de git mala \"%s\""

3088

3080 -#: environment.c:332

3089 +#: environment.c:330

3090 #, c-format

3091 msgid "could not set GIT_DIR to '%s'"

3092 msgstr "no se pudo configurar GIT_DIR a '%s'"

@@ -3087,159 +3096,155 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"

3096 msgid "too many args to run %s"

3097 msgstr "demasiados argumentos para correr %s"

3098

3090 -#: fetch-object.c:17

3091 -msgid "Remote with no URL"

3092 -msgstr "Remoto sin URL"

3093 -

3094 -#: fetch-pack.c:151

3099 +#: fetch-pack.c:150

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

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

3102

3098 -#: fetch-pack.c:154

3103 +#: fetch-pack.c:153

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

3105 msgstr ""

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

3107

3103 -#: fetch-pack.c:165

3108 +#: fetch-pack.c:164

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

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

3111

3107 -#: fetch-pack.c:185

3112 +#: fetch-pack.c:184

3113 #, c-format

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

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

3116

3112 -#: fetch-pack.c:196

3117 +#: fetch-pack.c:195

3118 msgid "unable to write to remote"

3119 msgstr "no se puede escribir al remoto"

3120

3116 -#: fetch-pack.c:258

3121 +#: fetch-pack.c:257

3122 msgid "--stateless-rpc requires multi_ack_detailed"

3123 msgstr "--stateless-rpc requiere multi_ack_detailed"

3124

3120 -#: fetch-pack.c:360 fetch-pack.c:1284

3125 +#: fetch-pack.c:356 fetch-pack.c:1280

3126 #, c-format

3127 msgid "invalid shallow line: %s"

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

3129

3125 -#: fetch-pack.c:366 fetch-pack.c:1290

3130 +#: fetch-pack.c:362 fetch-pack.c:1286

3131 #, c-format

3132 msgid "invalid unshallow line: %s"

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

3134

3130 -#: fetch-pack.c:368 fetch-pack.c:1292

3135 +#: fetch-pack.c:364 fetch-pack.c:1288

3136 #, c-format

3137 msgid "object not found: %s"

3138 msgstr "objeto no encontrado: %s"

3139

3135 -#: fetch-pack.c:371 fetch-pack.c:1295

3140 +#: fetch-pack.c:367 fetch-pack.c:1291

3141 #, c-format

3142 msgid "error in object: %s"

3143 msgstr "error en objeto: %s"

3144

3140 -#: fetch-pack.c:373 fetch-pack.c:1297

3145 +#: fetch-pack.c:369 fetch-pack.c:1293

3146 #, c-format

3147 msgid "no shallow found: %s"

3148 msgstr "superficie no encontrada: %s"

3149

3145 -#: fetch-pack.c:376 fetch-pack.c:1301

3150 +#: fetch-pack.c:372 fetch-pack.c:1297

3151 #, c-format

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

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

3154

3150 -#: fetch-pack.c:417

3155 +#: fetch-pack.c:414

3156 #, c-format

3157 msgid "got %s %d %s"

3158 msgstr "se obtuvo %s %d %s"

3159

3155 -#: fetch-pack.c:434

3160 +#: fetch-pack.c:431

3161 #, c-format

3162 msgid "invalid commit %s"

3163 msgstr "commit inválido %s"

3164

3160 -#: fetch-pack.c:465

3165 +#: fetch-pack.c:462

3166 msgid "giving up"

3167 msgstr "rindiéndose"

3168

3164 -#: fetch-pack.c:477 progress.c:277

3169 +#: fetch-pack.c:475 progress.c:312

3170 msgid "done"

3171 msgstr "listo"

3172

3168 -#: fetch-pack.c:489

3173 +#: fetch-pack.c:487

3174 #, c-format

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

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

3177

3173 -#: fetch-pack.c:535

3178 +#: fetch-pack.c:533

3179 #, c-format

3180 msgid "Marking %s as complete"

3181 msgstr "Marcando %s como completa"

3182

3178 -#: fetch-pack.c:744

3183 +#: fetch-pack.c:742

3184 #, c-format

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

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

3187

3183 -#: fetch-pack.c:783

3188 +#: fetch-pack.c:781

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

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

3191

3187 -#: fetch-pack.c:791

3192 +#: fetch-pack.c:789

3193 msgid "protocol error: bad pack header"

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

3195

3191 -#: fetch-pack.c:859

3196 +#: fetch-pack.c:857

3197 #, c-format

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

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

3200

3196 -#: fetch-pack.c:875

3201 +#: fetch-pack.c:873

3202 #, c-format

3203 msgid "%s failed"

3204 msgstr "%s falló"

3205

3201 -#: fetch-pack.c:877

3206 +#: fetch-pack.c:875

3207 msgid "error in sideband demultiplexer"

3208 msgstr "error en demultiplexor de banda lateral"

3209

3205 -#: fetch-pack.c:908

3210 +#: fetch-pack.c:907

3211 #, c-format

3212 msgid "Server version is %.*s"

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

3214

3210 -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3211 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3212 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3213 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3215 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3216 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3217 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3218 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3219 #, c-format

3220 msgid "Server supports %s"

3221 msgstr "El servidor soporta %s"

3222

3218 -#: fetch-pack.c:915

3223 +#: fetch-pack.c:914

3224 msgid "Server does not support shallow clients"

3225 msgstr "El servidor no soporta clientes superficiales"

3226

3222 -#: fetch-pack.c:975

3227 +#: fetch-pack.c:974

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

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

3230

3226 -#: fetch-pack.c:980

3231 +#: fetch-pack.c:979

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

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

3234

3230 -#: fetch-pack.c:984

3235 +#: fetch-pack.c:983

3236 msgid "Server does not support --deepen"

3237 msgstr "El servidor no soporta --deepen"

3238

3234 -#: fetch-pack.c:1001

3239 +#: fetch-pack.c:1000

3240 msgid "no common commits"

3241 msgstr "no hay commits comunes"

3242

3238 -#: fetch-pack.c:1013 fetch-pack.c:1462

3243 +#: fetch-pack.c:1012 fetch-pack.c:1468

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

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

3246

3242 -#: fetch-pack.c:1151

3247 +#: fetch-pack.c:1150

3248 msgid "Server does not support shallow requests"

3249 msgstr "El servidor no soporta peticiones superficiales"

3250

@@ -3247,72 +3252,72 @@ msgstr "El servidor no soporta peticiones superficiales"

3252 msgid "Server supports filter"

3253 msgstr "El servidor soporta filtro"

3254

3250 -#: fetch-pack.c:1184

3255 +#: fetch-pack.c:1180

3256 msgid "unable to write request to remote"

3257 msgstr "no se puede escribir request al remoto"

3258

3254 -#: fetch-pack.c:1202

3259 +#: fetch-pack.c:1198

3260 #, c-format

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

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

3263

3259 -#: fetch-pack.c:1208

3264 +#: fetch-pack.c:1204

3265 #, c-format

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

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

3268

3264 -#: fetch-pack.c:1247

3269 +#: fetch-pack.c:1243

3270 #, c-format

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

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

3273

3269 -#: fetch-pack.c:1252

3274 +#: fetch-pack.c:1248

3275 #, c-format

3276 msgid "error processing acks: %d"

3277 msgstr "error procesando acks: %d"

3278

3274 -#: fetch-pack.c:1262

3279 +#: fetch-pack.c:1258

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

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

3282

3278 -#: fetch-pack.c:1264

3283 +#: fetch-pack.c:1260

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

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

3286

3282 -#: fetch-pack.c:1306

3287 +#: fetch-pack.c:1302

3288 #, c-format

3289 msgid "error processing shallow info: %d"

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

3291

3287 -#: fetch-pack.c:1353

3292 +#: fetch-pack.c:1349

3293 #, c-format

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

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

3296

3292 -#: fetch-pack.c:1358

3297 +#: fetch-pack.c:1354

3298 #, c-format

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

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

3301

3297 -#: fetch-pack.c:1363

3302 +#: fetch-pack.c:1359

3303 #, c-format

3304 msgid "error processing wanted refs: %d"

3305 msgstr "error procesando refs deseadas: %d"

3306

3302 -#: fetch-pack.c:1689

3307 +#: fetch-pack.c:1693

3308 msgid "no matching remote head"

3309 msgstr "no concuerda el head remoto"

3310

3306 -#: fetch-pack.c:1712 builtin/clone.c:686

3311 +#: fetch-pack.c:1716 builtin/clone.c:685

3312 msgid "remote did not send all necessary objects"

3313 msgstr "remoto no mando todos los objetos necesarios"

3314

3310 -#: fetch-pack.c:1739

3315 +#: fetch-pack.c:1743

3316 #, c-format

3317 msgid "no such remote ref %s"

3318 msgstr "no existe ref remota %s"

3319

3315 -#: fetch-pack.c:1742

3320 +#: fetch-pack.c:1746

3321 #, c-format

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

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

@@ -3335,18 +3340,26 @@ msgstr "falló al escribir la firma separada para '%s'"

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

3341 msgstr "ignora color inválido '%.*s' en log.graphColors"

3342

3338 -#: grep.c:2117

3343 +#: grep.c:668

3344 +msgid ""

3345 +"given pattern contains NULL byte (via -f <file>). This is only supported "

3346 +"with -P under PCRE v2"

3347 +msgstr ""

3348 +"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es "

3349 +"soportado con -P bajo PCRE v2"

3350 +

3351 +#: grep.c:2124

3352 #, c-format

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

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

3355

3343 -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3356 +#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3357 #: builtin/rm.c:135

3358 #, c-format

3359 msgid "failed to stat '%s'"

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

3361

3349 -#: grep.c:2145

3362 +#: grep.c:2152

3363 #, c-format

3364 msgid "'%s': short read"

3365 msgstr "'%s': lectura corta"

@@ -3444,7 +3457,7 @@ msgid ""

3457 "able to execute it. Maybe git-%s is broken?"

3458 msgstr ""

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

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

3460 +"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"

3461

3462 #: help.c:655

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

@@ -3488,12 +3501,12 @@ msgstr[1] ""

3501 msgid "git version [<options>]"

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

3503

3491 -#: help.c:782

3504 +#: help.c:783

3505 #, c-format

3506 msgid "%s: %s - %s"

3507 msgstr "%s: %s - %s"

3508

3496 -#: help.c:786

3509 +#: help.c:787

3510 msgid ""

3511 "\n"

3512 "Did you mean this?"

@@ -3566,41 +3579,56 @@ msgstr "el nombre consiste solo de caracteres no permitidos: %s"

3579 msgid "invalid date format: %s"

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

3581

3569 -#: list-objects.c:129

3582 +#: list-objects.c:127

3583 #, c-format

3584 msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3585 msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"

3586

3574 -#: list-objects.c:142

3587 +#: list-objects.c:140

3588 #, c-format

3589 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3590 msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"

3591

3579 -#: list-objects.c:378

3592 +#: list-objects.c:375

3593 #, c-format

3594 msgid "unable to load root tree for commit %s"

3595 msgstr "no se puede cargar árbol raíz para commit %s"

3596

3584 -#: list-objects-filter-options.c:36

3585 -msgid "multiple filter-specs cannot be combined"

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

3597 +#: list-objects-filter.c:492

3598 +#, c-format

3599 +msgid "unable to access sparse blob in '%s'"

3600 +msgstr "no es posible acceder al blob en '%s'"

3601 +

3602 +#: list-objects-filter.c:495

3603 +#, c-format

3604 +msgid "unable to parse sparse filter data in %s"

3605 +msgstr "incapaz de analizar filtro de data en %s"

3606

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

3608 msgid "expected 'tree:<depth>'"

3609 msgstr "se esperaba 'tree:<depth>'"

3610

3592 -#: list-objects-filter-options.c:84

3611 +#: list-objects-filter-options.c:73

3612 msgid "sparse:path filters support has been dropped"

3613 msgstr "soporte para filtros sparse:path ha sido discontinuado"

3614

3596 -#: list-objects-filter-options.c:94

3615 +#: list-objects-filter-options.c:86

3616 #, c-format

3617 msgid "invalid filter-spec '%s'"

3618 msgstr "filtro -spec inválido '%s'"

3619

3601 -#: list-objects-filter-options.c:158

3602 -msgid "cannot change partial clone promisor remote"

3603 -msgstr "no se puede cambiar un clon parcial remoto promisor"

3620 +#: list-objects-filter-options.c:102

3621 +#, c-format

3622 +msgid "must escape char in sub-filter-spec: '%c'"

3623 +msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"

3624 +

3625 +#: list-objects-filter-options.c:144

3626 +msgid "expected something after combine:"

3627 +msgstr "se espera algo luego de combine:"

3628 +

3629 +#: list-objects-filter-options.c:226

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

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

3632

3633 #: lockfile.c:151

3634 #, c-format

@@ -3631,115 +3659,111 @@ msgstr "No se pudo crear '%s.lock': %s"

3659 msgid "failed to read the cache"

3660 msgstr "falló al leer la cache"

3661

3634 -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3635 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3662 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3663 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

3664 #: builtin/stash.c:264

3665 msgid "unable to write new index file"

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

3667

3640 -#: merge-recursive.c:322

3668 +#: merge-recursive.c:367

3669 msgid "(bad commit)\n"

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

3671

3644 -#: merge-recursive.c:345

3672 +#: merge-recursive.c:390

3673 #, c-format

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

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

3676

3649 -#: merge-recursive.c:354

3677 +#: merge-recursive.c:399

3678 #, c-format

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

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

3681

3654 -#: merge-recursive.c:437

3655 -msgid "error building trees"

3656 -msgstr "error construyendo árboles"

3657 -

3658 -#: merge-recursive.c:863

3682 +#: merge-recursive.c:885

3683 #, c-format

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

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

3686

3663 -#: merge-recursive.c:874

3687 +#: merge-recursive.c:896

3688 #, c-format

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

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

3691

3668 -#: merge-recursive.c:888 merge-recursive.c:907

3692 +#: merge-recursive.c:910 merge-recursive.c:929

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

3670 -msgstr ": tal vez un conflicto D/F?"

3694 +msgstr ": ¿tal vez un conflicto D/F?"

3695

3672 -#: merge-recursive.c:897

3696 +#: merge-recursive.c:919

3697 #, c-format

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

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

3700

3677 -#: merge-recursive.c:938 builtin/cat-file.c:40

3701 +#: merge-recursive.c:960 builtin/cat-file.c:41

3702 #, c-format

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

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

3705

3682 -#: merge-recursive.c:941

3706 +#: merge-recursive.c:965

3707 #, c-format

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

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

3710

3687 -#: merge-recursive.c:965

3711 +#: merge-recursive.c:990

3712 #, c-format

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

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

3715

3692 -#: merge-recursive.c:976

3716 +#: merge-recursive.c:1001

3717 #, c-format

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

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

3720

3697 -#: merge-recursive.c:981

3721 +#: merge-recursive.c:1006

3722 #, c-format

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

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

3725

3702 -#: merge-recursive.c:1177

3726 +#: merge-recursive.c:1199

3727 #, c-format

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

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

3730

3707 -#: merge-recursive.c:1184

3731 +#: merge-recursive.c:1206

3732 #, c-format

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

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

3735

3712 -#: merge-recursive.c:1191

3736 +#: merge-recursive.c:1213

3737 #, c-format

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

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

3740

3717 -#: merge-recursive.c:1199 merge-recursive.c:1211

3741 +#: merge-recursive.c:1221 merge-recursive.c:1233

3742 #, c-format

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

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

3745

3722 -#: merge-recursive.c:1202 merge-recursive.c:1214

3746 +#: merge-recursive.c:1224 merge-recursive.c:1236

3747 #, c-format

3748 msgid "Fast-forwarding submodule %s"

3749 msgstr "Avance rápido en submódulo %s"

3750

3727 -#: merge-recursive.c:1237

3751 +#: merge-recursive.c:1259

3752 #, c-format

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

3754 msgstr ""

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

3756

3733 -#: merge-recursive.c:1241

3757 +#: merge-recursive.c:1263

3758 #, c-format

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

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

3761

3738 -#: merge-recursive.c:1242

3762 +#: merge-recursive.c:1264

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

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

3765

3742 -#: merge-recursive.c:1245

3766 +#: merge-recursive.c:1267

3767 #, c-format

3768 msgid ""

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

@@ -3756,33 +3780,33 @@ msgstr ""

3780 "\n"

3781 "el cual aceptará esta sugerencia.\n"

3782

3759 -#: merge-recursive.c:1254

3783 +#: merge-recursive.c:1276

3784 #, c-format

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

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

3787

3764 -#: merge-recursive.c:1327

3788 +#: merge-recursive.c:1349

3789 msgid "Failed to execute internal merge"

3790 msgstr "Falló al ejecutar la fusión interna"

3791

3768 -#: merge-recursive.c:1332

3792 +#: merge-recursive.c:1354

3793 #, c-format

3794 msgid "Unable to add %s to database"

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

3796

3773 -#: merge-recursive.c:1364

3797 +#: merge-recursive.c:1386

3798 #, c-format

3799 msgid "Auto-merging %s"

3800 msgstr "Auto-fusionando %s"

3801

3778 -#: merge-recursive.c:1387

3802 +#: merge-recursive.c:1410

3803 #, c-format

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

3805 msgstr ""

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

3807 "cambio."

3808

3785 -#: merge-recursive.c:1459

3809 +#: merge-recursive.c:1482

3810 #, c-format

3811 msgid ""

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

@@ -3791,7 +3815,7 @@ msgstr ""

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

3816 "en el árbol."

3817

3794 -#: merge-recursive.c:1464

3818 +#: merge-recursive.c:1487

3819 #, c-format

3820 msgid ""

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

@@ -3800,7 +3824,7 @@ msgstr ""

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

3825 "permanece en el árbol."

3826

3803 -#: merge-recursive.c:1471

3827 +#: merge-recursive.c:1494

3828 #, c-format

3829 msgid ""

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

@@ -3809,7 +3833,7 @@ msgstr ""

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

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

3835

3812 -#: merge-recursive.c:1476

3836 +#: merge-recursive.c:1499

3837 #, c-format

3838 msgid ""

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

@@ -3818,44 +3842,44 @@ msgstr ""

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

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

3844

3821 -#: merge-recursive.c:1511

3845 +#: merge-recursive.c:1534

3846 msgid "rename"

3847 msgstr "renombrar"

3848

3825 -#: merge-recursive.c:1511

3849 +#: merge-recursive.c:1534

3850 msgid "renamed"

3851 msgstr "renombrado"

3852

3829 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3853 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

3854 #, c-format

3855 msgid "Refusing to lose dirty file at %s"

3856 msgstr "Rehusando perder el archivo sucio en %s"

3857

3834 -#: merge-recursive.c:1601

3858 +#: merge-recursive.c:1624

3859 #, c-format

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

3861 msgstr ""

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

3863 "interponiendo."

3864

3841 -#: merge-recursive.c:1659

3865 +#: merge-recursive.c:1682

3866 #, c-format

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

3868 msgstr ""

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

3870

3847 -#: merge-recursive.c:1690

3871 +#: merge-recursive.c:1713

3872 #, c-format

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

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

3875

3852 -#: merge-recursive.c:1695

3876 +#: merge-recursive.c:1718

3877 #, c-format

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

3879 msgstr ""

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

3881

3858 -#: merge-recursive.c:1714

3882 +#: merge-recursive.c:1737

3883 #, c-format

3884 msgid ""

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

@@ -3864,18 +3888,18 @@ msgstr ""

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

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

3890

3867 -#: merge-recursive.c:1719

3891 +#: merge-recursive.c:1742

3892 msgid " (left unresolved)"

3893 msgstr " (dejado sin resolver)"

3894

3871 -#: merge-recursive.c:1828

3895 +#: merge-recursive.c:1851

3896 #, c-format

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

3898 msgstr ""

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

3900 "%s"

3901

3878 -#: merge-recursive.c:2035

3902 +#: merge-recursive.c:2056

3903 #, c-format

3904 msgid ""

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

@@ -3886,7 +3910,7 @@ msgstr ""

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

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

3912

3889 -#: merge-recursive.c:2067

3913 +#: merge-recursive.c:2088

3914 #, c-format

3915 msgid ""

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

@@ -3896,7 +3920,7 @@ msgstr ""

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

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

3922

3899 -#: merge-recursive.c:2077

3923 +#: merge-recursive.c:2098

3924 #, c-format

3925 msgid ""

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

@@ -3905,7 +3929,7 @@ msgstr ""

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

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

3931

3908 -#: merge-recursive.c:2169

3932 +#: merge-recursive.c:2190

3933 #, c-format

3934 msgid ""

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

@@ -3914,7 +3938,7 @@ msgstr ""

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

3939 "Renombrar directorio %s->%s en %s"

3940

3917 -#: merge-recursive.c:2413

3941 +#: merge-recursive.c:2435

3942 #, c-format

3943 msgid ""

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

@@ -3923,52 +3947,52 @@ msgstr ""

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

3948 "renombrado."

3949

3926 -#: merge-recursive.c:2938

3950 +#: merge-recursive.c:2961

3951 #, c-format

3952 msgid "cannot read object %s"

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

3954

3931 -#: merge-recursive.c:2941

3955 +#: merge-recursive.c:2964

3956 #, c-format

3957 msgid "object %s is not a blob"

3958 msgstr "objeto %s no es un blob"

3959

3936 -#: merge-recursive.c:3005

3960 +#: merge-recursive.c:3028

3961 msgid "modify"

3962 msgstr "modificar"

3963

3940 -#: merge-recursive.c:3005

3964 +#: merge-recursive.c:3028

3965 msgid "modified"

3966 msgstr "modificado"

3967

3944 -#: merge-recursive.c:3017

3968 +#: merge-recursive.c:3040

3969 msgid "content"

3970 msgstr "contenido"

3971

3948 -#: merge-recursive.c:3021

3972 +#: merge-recursive.c:3044

3973 msgid "add/add"

3974 msgstr "agregar/agregar"

3975

3952 -#: merge-recursive.c:3044

3976 +#: merge-recursive.c:3067

3977 #, c-format

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

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

3980

3957 -#: merge-recursive.c:3066 git-submodule.sh:937

3981 +#: merge-recursive.c:3089 git-submodule.sh:937

3982 msgid "submodule"

3983 msgstr "submódulo"

3984

3961 -#: merge-recursive.c:3067

3985 +#: merge-recursive.c:3090

3986 #, c-format

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

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

3989

3966 -#: merge-recursive.c:3097

3990 +#: merge-recursive.c:3120

3991 #, c-format

3992 msgid "Adding as %s instead"

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

3994

3971 -#: merge-recursive.c:3179

3995 +#: merge-recursive.c:3203

3996 #, c-format

3997 msgid ""

3998 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3977,7 +4001,7 @@ msgstr ""

4001 "Path actualizado: %s agregado en %s dentro de un directorio que fue "

4002 "renombrado en %s; moviéndolo a %s."

4003

3980 -#: merge-recursive.c:3182

4004 +#: merge-recursive.c:3206

4005 #, c-format

4006 msgid ""

4007 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3986,7 +4010,7 @@ msgstr ""

4010 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

4011 "que fue renombrado en %s, sugerimos que debería ser movido a %s."

4012

3989 -#: merge-recursive.c:3186

4013 +#: merge-recursive.c:3210

4014 #, c-format

4015 msgid ""

4016 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -3995,7 +4019,7 @@ msgstr ""

4019 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

4020 "renombrado en %s; moviéndolo a %s."

4021

3998 -#: merge-recursive.c:3189

4022 +#: merge-recursive.c:3213

4023 #, c-format

4024 msgid ""

4025 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4005,230 +4029,230 @@ msgstr ""

4029 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

4030 "movido a %s."

4031

4008 -#: merge-recursive.c:3303

4032 +#: merge-recursive.c:3327

4033 #, c-format

4034 msgid "Removing %s"

4035 msgstr "Eliminando %s"

4036

4013 -#: merge-recursive.c:3326

4037 +#: merge-recursive.c:3350

4038 msgid "file/directory"

4039 msgstr "archivo/directorio"

4040

4017 -#: merge-recursive.c:3331

4041 +#: merge-recursive.c:3355

4042 msgid "directory/file"

4043 msgstr "directorio/archivo"

4044

4021 -#: merge-recursive.c:3338

4045 +#: merge-recursive.c:3362

4046 #, c-format

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

4048 msgstr ""

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

4050 "%s"

4051

4028 -#: merge-recursive.c:3347

4052 +#: merge-recursive.c:3371

4053 #, c-format

4054 msgid "Adding %s"

4055 msgstr "Agregando %s"

4056

4033 -#: merge-recursive.c:3356

4057 +#: merge-recursive.c:3380

4058 #, c-format

4059 msgid "CONFLICT (add/add): Merge conflict in %s"

4060 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

4061

4038 -#: merge-recursive.c:3394

4039 -#, c-format

4040 -msgid ""

4041 -"Your local changes to the following files would be overwritten by merge:\n"

4042 -" %s"

4043 -msgstr ""

4044 -"Los cambios locales de los siguientes archivos serán sobreescritos por "

4045 -"merge:\n"

4046 -" %s"

4047 -

4048 -#: merge-recursive.c:3405

4062 +#: merge-recursive.c:3424

4063 msgid "Already up to date!"

4064 msgstr "¡Ya está actualizado!"

4065

4052 -#: merge-recursive.c:3414

4066 +#: merge-recursive.c:3433

4067 #, c-format

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

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

4070

4057 -#: merge-recursive.c:3513

4071 +#: merge-recursive.c:3537

4072 msgid "Merging:"

4073 msgstr "Fusionando:"

4074

4061 -#: merge-recursive.c:3526

4075 +#: merge-recursive.c:3550

4076 #, c-format

4077 msgid "found %u common ancestor:"

4078 msgid_plural "found %u common ancestors:"

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

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

4081

4068 -#: merge-recursive.c:3565

4082 +#: merge-recursive.c:3600

4083 msgid "merge returned no commit"

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

4085

4072 -#: merge-recursive.c:3631

4086 +#: merge-recursive.c:3659

4087 +#, c-format

4088 +msgid ""

4089 +"Your local changes to the following files would be overwritten by merge:\n"

4090 +" %s"

4091 +msgstr ""

4092 +"Los cambios locales de los siguientes archivos serán sobreescritos por "

4093 +"merge:\n"

4094 +" %s"

4095 +

4096 +#: merge-recursive.c:3756

4097 #, c-format

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

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

4100

4077 -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4101 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4102 msgid "Unable to write index."

4103 msgstr "Incapaz de escribir el índice."

4104

4081 -#: midx.c:69

4105 +#: midx.c:68

4106 #, c-format

4107 msgid "multi-pack-index file %s is too small"

4108 msgstr "archivo multi-pack-index %s es muy pequeño"

4109

4086 -#: midx.c:85

4110 +#: midx.c:84

4111 #, c-format

4112 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4113 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"

4114

4091 -#: midx.c:90

4115 +#: midx.c:89

4116 #, c-format

4117 msgid "multi-pack-index version %d not recognized"

4118 msgstr "versión %d de multi-pack-index no reconocida"

4119

4096 -#: midx.c:95

4120 +#: midx.c:94

4121 #, c-format

4122 msgid "hash version %u does not match"

4123 msgstr "versión de hash %u no concuerda"

4124

4101 -#: midx.c:109

4125 +#: midx.c:108

4126 msgid "invalid chunk offset (too large)"

4127 msgstr "offset inválido del conjunto (muy grande)"

4128

4105 -#: midx.c:133

4129 +#: midx.c:132

4130 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4131 msgstr ""

4132 "terminando multi-pack-index porque el id del conjunto aparece antes de lo "

4133 "esperado"

4134

4111 -#: midx.c:146

4135 +#: midx.c:145

4136 msgid "multi-pack-index missing required pack-name chunk"

4137 msgstr "multi-pack-index le falta el conjunto pack-name requerido"

4138

4115 -#: midx.c:148

4139 +#: midx.c:147

4140 msgid "multi-pack-index missing required OID fanout chunk"

4141 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4142

4119 -#: midx.c:150

4143 +#: midx.c:149

4144 msgid "multi-pack-index missing required OID lookup chunk"

4145 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4146

4123 -#: midx.c:152

4147 +#: midx.c:151

4148 msgid "multi-pack-index missing required object offsets chunk"

4149 msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

4150

4127 -#: midx.c:166

4151 +#: midx.c:165

4152 #, c-format

4153 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4154 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

4155

4132 -#: midx.c:211

4156 +#: midx.c:210

4157 #, c-format

4158 msgid "bad pack-int-id: %u (%u total packs)"

4159 msgstr "mal pack-int-id: %u (%u paquetes totales)"

4160

4137 -#: midx.c:261

4161 +#: midx.c:260

4162 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4163 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4164

4141 -#: midx.c:289

4165 +#: midx.c:288

4166 msgid "error preparing packfile from multi-pack-index"

4167 msgstr "error preparando packfile de multi-pack-index"

4168

4145 -#: midx.c:470

4169 +#: midx.c:469

4170 #, c-format

4171 msgid "failed to add packfile '%s'"

4172 msgstr "falló al agregar packfile '%s'"

4173

4150 -#: midx.c:476

4174 +#: midx.c:475

4175 #, c-format

4176 msgid "failed to open pack-index '%s'"

4177 msgstr "falló al abrir pack-index '%s'"

4178

4155 -#: midx.c:536

4179 +#: midx.c:535

4180 #, c-format

4181 msgid "failed to locate object %d in packfile"

4182 msgstr "falló al ubicar objeto %d en packfile"

4183

4160 -#: midx.c:865

4184 +#: midx.c:864

4185 #, c-format

4186 msgid "did not see pack-file %s to drop"

4187 msgstr "no se vió pack-file %s caer"

4188

4165 -#: midx.c:1036

4189 +#: midx.c:1035

4190 #, c-format

4191 msgid "failed to clear multi-pack-index at %s"

4192 msgstr "falló al limpiar multi-pack-index en %s"

4193

4170 -#: midx.c:1091

4194 +#: midx.c:1090

4195 msgid "Looking for referenced packfiles"

4196 msgstr "Buscando por packfiles referidos"

4197

4174 -#: midx.c:1106

4198 +#: midx.c:1105

4199 #, c-format

4200 msgid ""

4201 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4202 msgstr ""

4203 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4204

4181 -#: midx.c:1110

4205 +#: midx.c:1109

4206 msgid "Verifying OID order in MIDX"

4207 msgstr "Verificando orden de OID en MIDX"

4208

4185 -#: midx.c:1119

4209 +#: midx.c:1118

4210 #, c-format

4211 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4212 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4213

4190 -#: midx.c:1138

4214 +#: midx.c:1137

4215 msgid "Sorting objects by packfile"

4216 msgstr "Ordenando objetos por packfile"

4217

4194 -#: midx.c:1144

4218 +#: midx.c:1143

4219 msgid "Verifying object offsets"

4220 msgstr "Verificando offsets de objetos"

4221

4198 -#: midx.c:1160

4222 +#: midx.c:1159

4223 #, c-format

4224 msgid "failed to load pack entry for oid[%d] = %s"

4225 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4226

4203 -#: midx.c:1166

4227 +#: midx.c:1165

4228 #, c-format

4229 msgid "failed to load pack-index for packfile %s"

4230 msgstr "falló al cargar el pack-index para packfile %s"

4231

4208 -#: midx.c:1175

4232 +#: midx.c:1174

4233 #, c-format

4234 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4235 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4236

4213 -#: midx.c:1350

4237 +#: midx.c:1349

4238 msgid "could not start pack-objects"

4239 msgstr "no se pudo empezar los pack-objetcts"

4240

4217 -#: midx.c:1369

4241 +#: midx.c:1368

4242 msgid "could not finish pack-objects"

4243 msgstr "no se pudo finalizar pack-objetcts"

4244

4221 -#: name-hash.c:532

4245 +#: name-hash.c:537

4246 #, c-format

4247 msgid "unable to create lazy_dir thread: %s"

4248 msgstr "no es posible crear hilo lazy_dir: %s"

4249

4226 -#: name-hash.c:554

4250 +#: name-hash.c:559

4251 #, c-format

4252 msgid "unable to create lazy_name thread: %s"

4253 msgstr "no es posible crear hilo lazy_name: %s"

4254

4231 -#: name-hash.c:560

4255 +#: name-hash.c:565

4256 #, c-format

4257 msgid "unable to join lazy_name thread: %s"

4258 msgstr "no es posible unir hilo lazy_name: %s"

@@ -4275,46 +4299,46 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

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

4300 msgstr "Valor erróneo para %s: '%s'"

4301

4278 -#: object.c:54

4302 +#: object.c:53

4303 #, c-format

4304 msgid "invalid object type \"%s\""

4305 msgstr "tipo de objeto \"%s\" inválido"

4306

4283 -#: object.c:174

4307 +#: object.c:173

4308 #, c-format

4309 msgid "object %s is a %s, not a %s"

4310 msgstr "objeto %s es un %s, no un %s"

4311

4288 -#: object.c:234

4312 +#: object.c:233

4313 #, c-format

4314 msgid "object %s has unknown type id %d"

4315 msgstr "el objeto %s tiene un id de tipo desconocido %d"

4316

4293 -#: object.c:247

4317 +#: object.c:246

4318 #, c-format

4319 msgid "unable to parse object: %s"

4320 msgstr "incapaz de analizar objeto: %s"

4321

4298 -#: object.c:267 object.c:278

4322 +#: object.c:266 object.c:277

4323 #, c-format

4324 msgid "hash mismatch %s"

4325 msgstr "hash no concuerda %s"

4326

4303 -#: packfile.c:648

4327 +#: packfile.c:641

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

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

4330

4307 -#: packfile.c:1899

4331 +#: packfile.c:1887

4332 #, c-format

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

4334 msgstr ""

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

4335 +"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"

4336

4313 -#: packfile.c:1903

4337 +#: packfile.c:1891

4338 #, c-format

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

4340 msgstr ""

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

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

4342

4343 #: parse-options.c:38

4344 #, c-format

@@ -4356,26 +4380,26 @@ msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

4380 msgid "did you mean `--%s` (with two dashes ?)"

4381 msgstr "¿quisiste decir `--%s` (con dos guiones)?"

4382

4359 -#: parse-options.c:859

4383 +#: parse-options.c:860

4384 #, c-format

4385 msgid "unknown option `%s'"

4386 msgstr "opción `%s' desconocida"

4387

4364 -#: parse-options.c:861

4388 +#: parse-options.c:862

4389 #, c-format

4390 msgid "unknown switch `%c'"

4391 msgstr "switch desconocido `%c'"

4392

4369 -#: parse-options.c:863

4393 +#: parse-options.c:864

4394 #, c-format

4395 msgid "unknown non-ascii option in string: `%s'"

4396 msgstr "opción desconocida en string no ascii: `%s'"

4397

4374 -#: parse-options.c:887

4398 +#: parse-options.c:888

4399 msgid "..."

4400 msgstr "..."

4401

4378 -#: parse-options.c:906

4402 +#: parse-options.c:907

4403 #, c-format

4404 msgid "usage: %s"

4405 msgstr "uso: %s"

@@ -4383,21 +4407,21 @@ msgstr "uso: %s"

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

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

4409 #.

4386 -#: parse-options.c:912

4410 +#: parse-options.c:913

4411 #, c-format

4412 msgid " or: %s"

4413 msgstr " o: %s"

4414

4391 -#: parse-options.c:915

4415 +#: parse-options.c:916

4416 #, c-format

4417 msgid " %s"

4418 msgstr " %s"

4419

4396 -#: parse-options.c:954

4420 +#: parse-options.c:955

4421 msgid "-NUM"

4422 msgstr "-NUM"

4423

4400 -#: parse-options.c:968

4424 +#: parse-options.c:969

4425 #, c-format

4426 msgid "alias of --%s"

4427 msgstr "alias de --%s"

@@ -4566,29 +4590,38 @@ msgstr "no es posible crear lstat hilado: %s"

4590 msgid "unable to parse --pretty format"

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

4592

4569 -#: range-diff.c:70

4593 +#: promisor-remote.c:25

4594 +msgid "Remote with no URL"

4595 +msgstr "Remoto sin URL"

4596 +

4597 +#: promisor-remote.c:61

4598 +#, c-format

4599 +msgid "promisor remote name cannot begin with '/': %s"

4600 +msgstr "nombre remoto promisor no puede comenzar con '/': %s"

4601 +

4602 +#: range-diff.c:71

4603 msgid "could not start `log`"

4604 msgstr "no se pudo comenzar `log`"

4605

4573 -#: range-diff.c:72

4606 +#: range-diff.c:73

4607 msgid "could not read `log` output"

4608 msgstr "no se pudo leer output de `log`"

4609

4577 -#: range-diff.c:91 sequencer.c:5021

4610 +#: range-diff.c:92 sequencer.c:4985

4611 #, c-format

4612 msgid "could not parse commit '%s'"

4613 msgstr "no se pudo analizar commit '%s'"

4614

4582 -#: range-diff.c:117

4615 +#: range-diff.c:118

4616 #, c-format

4617 msgid "could not parse git header '%.*s'"

4618 msgstr "no se puede analizar git header '%.*s'"

4619

4587 -#: range-diff.c:274

4620 +#: range-diff.c:275

4621 msgid "failed to generate diff"

4622 msgstr "falló al generar diff"

4623

4591 -#: range-diff.c:506 range-diff.c:508

4624 +#: range-diff.c:507 range-diff.c:509

4625 #, c-format

4626 msgid "could not parse log for '%s'"

4627 msgstr "no se pudo leer el log para '%s'"

@@ -4633,11 +4666,11 @@ msgstr "incapaz de correr stat en '%s'"

4666 msgid "'%s' appears as both a file and as a directory"

4667 msgstr "'%s' parece ser un directorio y un archivo a la vez"

4668

4636 -#: read-cache.c:1499

4669 +#: read-cache.c:1520

4670 msgid "Refresh index"

4671 msgstr "Refrescar index"

4672

4640 -#: read-cache.c:1613

4673 +#: read-cache.c:1635

4674 #, c-format

4675 msgid ""

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

@@ -4646,7 +4679,7 @@ msgstr ""

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

4680 "Usando versión %i"

4681

4649 -#: read-cache.c:1623

4682 +#: read-cache.c:1645

4683 #, c-format

4684 msgid ""

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

@@ -4655,138 +4688,138 @@ msgstr ""

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

4689 "Usando versión %i"

4690

4658 -#: read-cache.c:1679

4691 +#: read-cache.c:1701

4692 #, c-format

4693 msgid "bad signature 0x%08x"

4694 msgstr "mala firma 0x%08x"

4695

4663 -#: read-cache.c:1682

4696 +#: read-cache.c:1704

4697 #, c-format

4698 msgid "bad index version %d"

4699 msgstr "mala versión del índice %d"

4700

4668 -#: read-cache.c:1691

4701 +#: read-cache.c:1713

4702 msgid "bad index file sha1 signature"

4703 msgstr "mala firma sha1 del archivo index"

4704

4672 -#: read-cache.c:1721

4705 +#: read-cache.c:1743

4706 #, c-format

4707 msgid "index uses %.4s extension, which we do not understand"

4708 msgstr "index usa %.4s extensiones, cosa que no entendemos"

4709

4677 -#: read-cache.c:1723

4710 +#: read-cache.c:1745

4711 #, c-format

4712 msgid "ignoring %.4s extension"

4713 msgstr "ignorando extensión %.4s"

4714

4682 -#: read-cache.c:1760

4715 +#: read-cache.c:1782

4716 #, c-format

4717 msgid "unknown index entry format 0x%08x"

4718 msgstr "formato de index desconocido 0x%08x"

4719

4687 -#: read-cache.c:1776

4720 +#: read-cache.c:1798

4721 #, c-format

4722 msgid "malformed name field in the index, near path '%s'"

4723 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

4724

4692 -#: read-cache.c:1833

4725 +#: read-cache.c:1855

4726 msgid "unordered stage entries in index"

4727 msgstr "entradas en stage desordenadas en index"

4728

4696 -#: read-cache.c:1836

4729 +#: read-cache.c:1858

4730 #, c-format

4731 msgid "multiple stage entries for merged file '%s'"

4732 msgstr "múltiples entradas extrañas para archivo fusionado '%s'"

4733

4701 -#: read-cache.c:1839

4734 +#: read-cache.c:1861

4735 #, c-format

4736 msgid "unordered stage entries for '%s'"

4737 msgstr "entradas de stage desordenadas para '%s'"

4738

4706 -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4707 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4708 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4739 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4740 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4741 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

4742 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4743 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4744 msgid "index file corrupt"

4745 msgstr "archivo índice corrompido"

4746

4714 -#: read-cache.c:2087

4747 +#: read-cache.c:2108

4748 #, c-format

4749 msgid "unable to create load_cache_entries thread: %s"

4750 msgstr "no es posible crear hilo load_cache_entries: %s"

4751

4719 -#: read-cache.c:2100

4752 +#: read-cache.c:2121

4753 #, c-format

4754 msgid "unable to join load_cache_entries thread: %s"

4755 msgstr "no es posible unir hilo load_cache_entires: %s"

4756

4724 -#: read-cache.c:2133

4757 +#: read-cache.c:2154

4758 #, c-format

4759 msgid "%s: index file open failed"

4760 msgstr "%s: falló al abrir el archivo index"

4761

4729 -#: read-cache.c:2137

4762 +#: read-cache.c:2158

4763 #, c-format

4764 msgid "%s: cannot stat the open index"

4765 msgstr "%s: no se puede hacer stat del index abierto"

4766

4734 -#: read-cache.c:2141

4767 +#: read-cache.c:2162

4768 #, c-format

4769 msgid "%s: index file smaller than expected"

4770 msgstr "%s: archivo index más pequeño de lo esperado"

4771

4739 -#: read-cache.c:2145

4772 +#: read-cache.c:2166

4773 #, c-format

4774 msgid "%s: unable to map index file"

4775 msgstr "%s: no se pudo mapear el archivo index"

4776

4744 -#: read-cache.c:2187

4777 +#: read-cache.c:2208

4778 #, c-format

4779 msgid "unable to create load_index_extensions thread: %s"

4780 msgstr "no es posible crear hilo load_index_extensions: %s"

4781

4749 -#: read-cache.c:2214

4782 +#: read-cache.c:2235

4783 #, c-format

4784 msgid "unable to join load_index_extensions thread: %s"

4785 msgstr "no es posible unir hilo load_index_extensions: %s"

4786

4754 -#: read-cache.c:2246

4787 +#: read-cache.c:2267

4788 #, c-format

4789 msgid "could not freshen shared index '%s'"

4790 msgstr "no se pudo refrescar el index compartido '%s'"

4791

4759 -#: read-cache.c:2293

4792 +#: read-cache.c:2314

4793 #, c-format

4794 msgid "broken index, expect %s in %s, got %s"

4795 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

4796

4764 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4797 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

4798 #, c-format

4799 msgid "could not close '%s'"

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

4801

4769 -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4802 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

4803 #, c-format

4804 msgid "could not stat '%s'"

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

4806

4774 -#: read-cache.c:3105

4807 +#: read-cache.c:3126

4808 #, c-format

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

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

4811

4779 -#: read-cache.c:3117

4812 +#: read-cache.c:3138

4813 #, c-format

4814 msgid "unable to unlink: %s"

4815 msgstr "no es posible eliminar el vinculo: %s"

4816

4784 -#: read-cache.c:3142

4817 +#: read-cache.c:3163

4818 #, c-format

4819 msgid "cannot fix permission bits on '%s'"

4820 msgstr "no se pudo arreglar bits de permisos en '%s'"

4821

4789 -#: read-cache.c:3291

4822 +#: read-cache.c:3312

4823 #, c-format

4824 msgid "%s: cannot drop to stage #0"

4825 msgstr "%s: no se puede eliminar a stage #0"

@@ -4861,7 +4894,7 @@ msgid ""

4894 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

4895 msgstr ""

4896 "\n"

4864 -"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"

4897 +"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"

4898

4899 #: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

4900 msgid ""

@@ -4891,8 +4924,8 @@ msgstr ""

4924 msgid "Note that empty commits are commented out"

4925 msgstr "Tenga en cuenta que los commits vacíos están comentados"

4926

4894 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4895 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4927 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4928 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

4929 #, c-format

4930 msgid "could not write '%s'"

4931 msgstr "no se pudo escribir '%s'"

@@ -4932,14 +4965,14 @@ msgstr ""

4965 #: refs.c:262

4966 #, c-format

4967 msgid "%s does not point to a valid object!"

4935 -msgstr "%s no apunta a ningún objeto válido!"

4968 +msgstr "¡%s no apunta a ningún objeto válido!"

4969

4970 #: refs.c:667

4971 #, c-format

4972 msgid "ignoring dangling symref %s"

4973 msgstr "ignorando referencia rota %s"

4974

4942 -#: refs.c:669 ref-filter.c:2092

4975 +#: refs.c:669 ref-filter.c:2098

4976 #, c-format

4977 msgid "ignoring broken ref %s"

4978 msgstr "ignorando referencia rota %s"

@@ -4964,14 +4997,14 @@ msgstr "ref '%s' ya existe"

4997 msgid "unexpected object ID when writing '%s'"

4998 msgstr "ID de objecto inesperado cuando se escribía '%s'"

4999

4967 -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4968 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

5000 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

5001 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

5002 #, c-format

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

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

5005

4973 -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4974 -#: builtin/rebase.c:1003

5006 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5007 +#: builtin/rebase.c:1004

5008 #, c-format

5009 msgid "could not open '%s' for writing"

5010 msgstr "no se pudo abrir '%s' para escritura"

@@ -5006,21 +5039,21 @@ msgstr "rehusando actualizar ref con mal nombre '%s'"

5039 msgid "update_ref failed for ref '%s': %s"

5040 msgstr "update_ref falló para ref '%s': %s"

5041

5009 -#: refs.c:2012

5042 +#: refs.c:2023

5043 #, c-format

5044 msgid "multiple updates for ref '%s' not allowed"

5045 msgstr "múltiples actualizaciones para ref '%s' no permitidas"

5046

5014 -#: refs.c:2044

5047 +#: refs.c:2055

5048 msgid "ref updates forbidden inside quarantine environment"

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

5050

5018 -#: refs.c:2140 refs.c:2170

5051 +#: refs.c:2151 refs.c:2181

5052 #, c-format

5053 msgid "'%s' exists; cannot create '%s'"

5054 msgstr "'%s' existe; no se puede crear '%s'"

5055

5023 -#: refs.c:2146 refs.c:2181

5056 +#: refs.c:2157 refs.c:2192

5057 #, c-format

5058 msgid "cannot process '%s' and '%s' at the same time"

5059 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

@@ -5030,13 +5063,13 @@ msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

5063 msgid "could not remove reference %s"

5064 msgstr "no se pudo eliminar la referencia %s"

5065

5033 -#: refs/files-backend.c:1248 refs/packed-backend.c:1532

5034 -#: refs/packed-backend.c:1542

5066 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5067 +#: refs/packed-backend.c:1551

5068 #, c-format

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

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

5071

5039 -#: refs/files-backend.c:1251 refs/packed-backend.c:1545

5072 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5073 #, c-format

5074 msgid "could not delete references: %s"

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

@@ -5046,7 +5079,7 @@ msgstr "no se pudo eliminar la referencia: %s"

5079 msgid "invalid refspec '%s'"

5080 msgstr "refspec inválido: '%s'"

5081

5049 -#: ref-filter.c:42 wt-status.c:1934

5082 +#: ref-filter.c:42 wt-status.c:1938

5083 msgid "gone"

5084 msgstr "desaparecido"

5085

@@ -5065,281 +5098,281 @@ msgstr "detrás %d"

5098 msgid "ahead %d, behind %d"

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

5100

5068 -#: ref-filter.c:162

5101 +#: ref-filter.c:165

5102 #, c-format

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

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

5105

5073 -#: ref-filter.c:164

5106 +#: ref-filter.c:167

5107 #, c-format

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

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

5110

5078 -#: ref-filter.c:186

5111 +#: ref-filter.c:189

5112 #, c-format

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

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

5115

5083 -#: ref-filter.c:190

5116 +#: ref-filter.c:193

5117 #, c-format

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

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

5120

5088 -#: ref-filter.c:192

5121 +#: ref-filter.c:195

5122 #, c-format

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

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

5125

5093 -#: ref-filter.c:247

5126 +#: ref-filter.c:250

5127 #, c-format

5128 msgid "%%(objecttype) does not take arguments"

5129 msgstr "%%(objecttype) no toma ningún argumento"

5130

5098 -#: ref-filter.c:269

5131 +#: ref-filter.c:272

5132 #, c-format

5133 msgid "unrecognized %%(objectsize) argument: %s"

5134 msgstr "%%(objectsize) no reconocido argumento: %s"

5135

5103 -#: ref-filter.c:277

5136 +#: ref-filter.c:280

5137 #, c-format

5138 msgid "%%(deltabase) does not take arguments"

5139 msgstr "%%(deltabase) no toma argumentos"

5140

5108 -#: ref-filter.c:289

5141 +#: ref-filter.c:292

5142 #, c-format

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

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

5145

5113 -#: ref-filter.c:298

5146 +#: ref-filter.c:301

5147 #, c-format

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

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

5150

5118 -#: ref-filter.c:320

5151 +#: ref-filter.c:323

5152 #, c-format

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

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

5155

5123 -#: ref-filter.c:349

5156 +#: ref-filter.c:352

5157 #, c-format

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

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

5160

5128 -#: ref-filter.c:351

5161 +#: ref-filter.c:354

5162 #, c-format

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

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

5165

5133 -#: ref-filter.c:366

5166 +#: ref-filter.c:369

5167 #, c-format

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

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

5170

5138 -#: ref-filter.c:370

5171 +#: ref-filter.c:373

5172 #, c-format

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

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

5175

5143 -#: ref-filter.c:400

5176 +#: ref-filter.c:403

5177 #, c-format

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

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

5180

5148 -#: ref-filter.c:412

5181 +#: ref-filter.c:415

5182 #, c-format

5183 msgid "unrecognized position:%s"

5184 msgstr "posición desconocida: %s"

5185

5153 -#: ref-filter.c:419

5186 +#: ref-filter.c:422

5187 #, c-format

5188 msgid "unrecognized width:%s"

5189 msgstr "ancho desconocido: %s"

5190

5158 -#: ref-filter.c:428

5191 +#: ref-filter.c:431

5192 #, c-format

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

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

5195

5163 -#: ref-filter.c:436

5196 +#: ref-filter.c:439

5197 #, c-format

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

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

5200

5168 -#: ref-filter.c:454

5201 +#: ref-filter.c:457

5202 #, c-format

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

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

5205

5173 -#: ref-filter.c:556

5206 +#: ref-filter.c:559

5207 #, c-format

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

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

5210

5178 -#: ref-filter.c:583

5211 +#: ref-filter.c:586

5212 #, c-format

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

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

5215

5183 -#: ref-filter.c:587

5216 +#: ref-filter.c:590

5217 #, c-format

5218 msgid ""

5219 "not a git repository, but the field '%.*s' requires access to object data"

5220 msgstr ""

5221 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"

5222

5190 -#: ref-filter.c:711

5223 +#: ref-filter.c:714

5224 #, c-format

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

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

5227

5195 -#: ref-filter.c:774

5228 +#: ref-filter.c:777

5229 #, c-format

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

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

5232

5200 -#: ref-filter.c:776

5233 +#: ref-filter.c:779

5234 #, c-format

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

5236 msgstr "formato: átomo %%(then) usado más de una vez"

5237

5205 -#: ref-filter.c:778

5238 +#: ref-filter.c:781

5239 #, c-format

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

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

5242

5210 -#: ref-filter.c:806

5243 +#: ref-filter.c:809

5244 #, c-format

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

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

5247

5215 -#: ref-filter.c:808

5248 +#: ref-filter.c:811

5249 #, c-format

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

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

5252

5220 -#: ref-filter.c:810

5253 +#: ref-filter.c:813

5254 #, c-format

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

5256 msgstr "formato: átomo %%(else) usado más de una vez"

5257

5225 -#: ref-filter.c:825

5258 +#: ref-filter.c:828

5259 #, c-format

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

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

5262

5230 -#: ref-filter.c:882

5263 +#: ref-filter.c:885

5264 #, c-format

5265 msgid "malformed format string %s"

5266 msgstr "formato de cadena mal formado %s"

5267

5235 -#: ref-filter.c:1485

5268 +#: ref-filter.c:1488

5269 #, c-format

5270 msgid "no branch, rebasing %s"

5271 msgstr "no hay rama, rebasando %s"

5272

5240 -#: ref-filter.c:1488

5273 +#: ref-filter.c:1491

5274 #, c-format

5275 msgid "no branch, rebasing detached HEAD %s"

5276 msgstr "(o hay rama, rebasando con HEAD desacoplado %s"

5277

5245 -#: ref-filter.c:1491

5278 +#: ref-filter.c:1494

5279 #, c-format

5280 msgid "no branch, bisect started on %s"

5281 msgstr "no hay rama, comenzando biseccón en %s"

5282

5250 -#: ref-filter.c:1501

5283 +#: ref-filter.c:1504

5284 msgid "no branch"

5285 msgstr "sin rama"

5286

5254 -#: ref-filter.c:1537 ref-filter.c:1743

5287 +#: ref-filter.c:1540 ref-filter.c:1749

5288 #, c-format

5289 msgid "missing object %s for %s"

5290 msgstr "falta objeto %s para %s"

5291

5259 -#: ref-filter.c:1547

5292 +#: ref-filter.c:1550

5293 #, c-format

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

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

5296

5264 -#: ref-filter.c:1998

5297 +#: ref-filter.c:2004

5298 #, c-format

5299 msgid "malformed object at '%s'"

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

5301

5269 -#: ref-filter.c:2087

5302 +#: ref-filter.c:2093

5303 #, c-format

5304 msgid "ignoring ref with broken name %s"

5305 msgstr "ignorando referencia con nombre roto %s"

5306

5274 -#: ref-filter.c:2382

5307 +#: ref-filter.c:2389

5308 #, c-format

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

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

5311

5279 -#: ref-filter.c:2482

5312 +#: ref-filter.c:2489

5313 #, c-format

5314 msgid "option `%s' is incompatible with --merged"

5315 msgstr "opción `%s' es incompatible con --merged"

5316

5284 -#: ref-filter.c:2485

5317 +#: ref-filter.c:2492

5318 #, c-format

5319 msgid "option `%s' is incompatible with --no-merged"

5320 msgstr "opción `%s' es incompatible con --no-merged"

5321

5289 -#: ref-filter.c:2495

5322 +#: ref-filter.c:2502

5323 #, c-format

5324 msgid "malformed object name %s"

5325 msgstr "nombre de objeto mal formado %s"

5326

5294 -#: ref-filter.c:2500

5327 +#: ref-filter.c:2507

5328 #, c-format

5329 msgid "option `%s' must point to a commit"

5330 msgstr "opción '%s' debe apuntar a un commit"

5331

5299 -#: remote.c:363

5332 +#: remote.c:366

5333 #, c-format

5334 msgid "config remote shorthand cannot begin with '/': %s"

5335 msgstr "config remote shorthand no puede comenzar con '/': %s"

5336

5304 -#: remote.c:410

5337 +#: remote.c:413

5338 msgid "more than one receivepack given, using the first"

5339 msgstr "más de un receivepack dado, usando el primero"

5340

5308 -#: remote.c:418

5341 +#: remote.c:421

5342 msgid "more than one uploadpack given, using the first"

5343 msgstr "más de un uploadpack dado, usando el primero"

5344

5312 -#: remote.c:608

5345 +#: remote.c:611

5346 #, c-format

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

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

5349

5317 -#: remote.c:612

5350 +#: remote.c:615

5351 #, c-format

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

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

5354

5322 -#: remote.c:616

5355 +#: remote.c:619

5356 #, c-format

5357 msgid "%s tracks both %s and %s"

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

5359

5327 -#: remote.c:684

5360 +#: remote.c:687

5361 #, c-format

5362 msgid "key '%s' of pattern had no '*'"

5363 msgstr "llave '%s' de patrón no tuvo '*'"

5364

5332 -#: remote.c:694

5365 +#: remote.c:697

5366 #, c-format

5367 msgid "value '%s' of pattern has no '*'"

5368 msgstr "valor '%s' del patrón no tiene '*'"

5369

5337 -#: remote.c:1000

5370 +#: remote.c:1003

5371 #, c-format

5372 msgid "src refspec %s does not match any"

5373 msgstr "src refsoec %s: no concuerda con ninguno"

5374

5342 -#: remote.c:1005

5375 +#: remote.c:1008

5376 #, c-format

5377 msgid "src refspec %s matches more than one"

5378 msgstr "src refspec %s concuerda con más de uno"

@@ -5348,7 +5381,7 @@ msgstr "src refspec %s concuerda con más de uno"

5381 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5382 #. the <src>.

5383 #.

5351 -#: remote.c:1020

5384 +#: remote.c:1023

5385 #, c-format

5386 msgid ""

5387 "The destination you provided is not a full refname (i.e.,\n"

@@ -5372,7 +5405,7 @@ msgstr ""

5405 "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "

5406 "full ref."

5407

5375 -#: remote.c:1040

5408 +#: remote.c:1043

5409 #, c-format

5410 msgid ""

5411 "The <src> part of the refspec is a commit object.\n"

@@ -5383,7 +5416,7 @@ msgstr ""

5416 "¿Quisiste crear un branch nuevo mediante un push a\n"

5417 "'%s:refs/heads/%s'?"

5418

5386 -#: remote.c:1045

5419 +#: remote.c:1048

5420 #, c-format

5421 msgid ""

5422 "The <src> part of the refspec is a tag object.\n"

@@ -5394,7 +5427,7 @@ msgstr ""

5427 "Did you mean to create a new tag by pushing to\n"

5428 "'%s:refs/tags/%s'?"

5429

5397 -#: remote.c:1050

5430 +#: remote.c:1053

5431 #, c-format

5432 msgid ""

5433 "The <src> part of the refspec is a tree object.\n"

@@ -5405,7 +5438,7 @@ msgstr ""

5438 "¿Quisiste crear un tag nuevo mediante un push a\n"

5439 "'%s:refs/heads/%s'?"

5440

5408 -#: remote.c:1055

5441 +#: remote.c:1058

5442 #, c-format

5443 msgid ""

5444 "The <src> part of the refspec is a blob object.\n"

@@ -5416,115 +5449,115 @@ msgstr ""

5449 "¿Quisiste crear un tag nuevo mediante un push a\n"

5450 "'%s:refs/heads/%s'?"

5451

5419 -#: remote.c:1091

5452 +#: remote.c:1094

5453 #, c-format

5454 msgid "%s cannot be resolved to branch"

5455 msgstr "%s no puede ser resolver a un branch"

5456

5424 -#: remote.c:1102

5457 +#: remote.c:1105

5458 #, c-format

5459 msgid "unable to delete '%s': remote ref does not exist"

5460 msgstr "no es posible borrar '%s': ref remoto no existe"

5461

5429 -#: remote.c:1114

5462 +#: remote.c:1117

5463 #, c-format

5464 msgid "dst refspec %s matches more than one"

5465 msgstr "dst refspec %s concuerda con más de uno"

5466

5434 -#: remote.c:1121

5467 +#: remote.c:1124

5468 #, c-format

5469 msgid "dst ref %s receives from more than one src"

5470 msgstr "dst ref %s recibe de más de un src"

5471

5439 -#: remote.c:1624 remote.c:1725

5472 +#: remote.c:1627 remote.c:1728

5473 msgid "HEAD does not point to a branch"

5474 msgstr "HEAD no apunta a ninguna rama"

5475

5443 -#: remote.c:1633

5476 +#: remote.c:1636

5477 #, c-format

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

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

5480

5448 -#: remote.c:1636

5481 +#: remote.c:1639

5482 #, c-format

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

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

5485

5453 -#: remote.c:1642

5486 +#: remote.c:1645

5487 #, c-format

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

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

5490

5458 -#: remote.c:1657

5491 +#: remote.c:1660

5492 #, c-format

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

5494 msgstr ""

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

5496

5464 -#: remote.c:1669

5497 +#: remote.c:1672

5498 #, c-format

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

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

5501

5469 -#: remote.c:1679

5502 +#: remote.c:1682

5503 #, c-format

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

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

5506

5474 -#: remote.c:1692

5507 +#: remote.c:1695

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

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

5510

5478 -#: remote.c:1714

5511 +#: remote.c:1717

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

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

5514

5482 -#: remote.c:1840

5515 +#: remote.c:1843

5516 #, c-format

5517 msgid "couldn't find remote ref %s"

5518 msgstr "no se puedo encontrar ref remota %s"

5519

5487 -#: remote.c:1853

5520 +#: remote.c:1856

5521 #, c-format

5522 msgid "* Ignoring funny ref '%s' locally"

5523 msgstr "* Ignorando ref graciosa '%s' localmente"

5524

5492 -#: remote.c:2016

5525 +#: remote.c:2019

5526 #, c-format

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

5528 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"

5529

5497 -#: remote.c:2020

5530 +#: remote.c:2023

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

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

5533

5501 -#: remote.c:2023

5534 +#: remote.c:2026

5535 #, c-format

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

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

5538

5506 -#: remote.c:2027

5539 +#: remote.c:2030

5540 #, c-format

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

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

5543

5511 -#: remote.c:2030

5544 +#: remote.c:2033

5545 #, c-format

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

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

5548

5516 -#: remote.c:2034

5549 +#: remote.c:2037

5550 #, c-format

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

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

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

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

5555

5523 -#: remote.c:2040

5556 +#: remote.c:2043

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

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

5559

5527 -#: remote.c:2043

5560 +#: remote.c:2046

5561 #, c-format

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

5563 msgid_plural ""

@@ -5534,11 +5567,11 @@ msgstr[0] ""

5567 msgstr[1] ""

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

5569

5537 -#: remote.c:2051

5570 +#: remote.c:2054

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

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

5573

5541 -#: remote.c:2054

5574 +#: remote.c:2057

5575 #, c-format

5576 msgid ""

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

@@ -5553,11 +5586,11 @@ msgstr[1] ""

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

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

5588

5556 -#: remote.c:2064

5589 +#: remote.c:2067

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

5591 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

5592

5560 -#: remote.c:2247

5593 +#: remote.c:2250

5594 #, c-format

5595 msgid "cannot parse expected object name '%s'"

5596 msgstr "no se puede leer el nombre de objeto '%s'"

@@ -5635,7 +5668,7 @@ msgstr "no se puede desvincular stray '%s'"

5668 msgid "Recorded preimage for '%s'"

5669 msgstr "Resolución precargada para '%s'"

5670

5638 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5671 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5672 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5673 #, c-format

5674 msgid "could not create directory '%s'"

@@ -5670,20 +5703,20 @@ msgstr "Se olvidó resolución para '%s'\n"

5703 msgid "unable to open rr-cache directory"

5704 msgstr "no es posible abrir directorio rr-cache"

5705

5673 -#: revision.c:2507

5706 +#: revision.c:2509

5707 msgid "your current branch appears to be broken"

5708 msgstr "tu rama actual parece estar rota"

5709

5677 -#: revision.c:2510

5710 +#: revision.c:2512

5711 #, c-format

5712 msgid "your current branch '%s' does not have any commits yet"

5713 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

5714

5682 -#: revision.c:2710

5715 +#: revision.c:2720

5716 msgid "--first-parent is incompatible with --bisect"

5717 msgstr "--first-parent es incompatible con --bisect"

5718

5686 -#: revision.c:2714

5719 +#: revision.c:2724

5720 msgid "-L does not yet support diff formats besides -p and -s"

5721 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

5722

@@ -5706,30 +5739,30 @@ msgstr ""

5739 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "

5740 "false`."

5741

5709 -#: send-pack.c:141

5742 +#: send-pack.c:142

5743 msgid "unexpected flush packet while reading remote unpack status"

5744 msgstr ""

5745 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"

5746

5714 -#: send-pack.c:143

5747 +#: send-pack.c:144

5748 #, c-format

5749 msgid "unable to parse remote unpack status: %s"

5750 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"

5751

5719 -#: send-pack.c:145

5752 +#: send-pack.c:146

5753 #, c-format

5754 msgid "remote unpack failed: %s"

5755 msgstr "desempaquetado remoto falló: %s"

5756

5724 -#: send-pack.c:306

5757 +#: send-pack.c:307

5758 msgid "failed to sign the push certificate"

5759 msgstr "falló al firmar el certificado de push"

5760

5728 -#: send-pack.c:420

5761 +#: send-pack.c:421

5762 msgid "the receiving end does not support --signed push"

5763 msgstr "el final receptor no soporta --signed push"

5764

5732 -#: send-pack.c:422

5765 +#: send-pack.c:423

5766 msgid ""

5767 "not sending a push certificate since the receiving end does not support --"

5768 "signed push"

@@ -5737,11 +5770,11 @@ msgstr ""

5770 "no se manda un certificado de push ya que el destino no soporta push firmado "

5771 "(--signed )"

5772

5740 -#: send-pack.c:434

5773 +#: send-pack.c:435

5774 msgid "the receiving end does not support --atomic push"

5775 msgstr "el destino no soporta push atómicos (--atomic)"

5776

5744 -#: send-pack.c:439

5777 +#: send-pack.c:440

5778 msgid "the receiving end does not support push options"

5779 msgstr "el destino no soporta opciones de push"

5780

@@ -5755,7 +5788,7 @@ msgstr "mensaje de commit inválido, modo cleanup '%s'"

5788 msgid "could not delete '%s'"

5789 msgstr "no se pudo borrar '%s'"

5790

5758 -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5791 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

5792 #, c-format

5793 msgid "could not remove '%s'"

5794 msgstr "no se pudo eliminar'%s'"

@@ -5795,7 +5828,7 @@ msgstr ""

5828 "con 'git add <rutas>' o 'git rm <rutas>'\n"

5829 "y haz un commit del resultado con 'git commit'"

5830

5798 -#: sequencer.c:401 sequencer.c:2909

5831 +#: sequencer.c:401 sequencer.c:2847

5832 #, c-format

5833 msgid "could not lock '%s'"

5834 msgstr "no se pudo bloquear '%s'"

@@ -5805,15 +5838,15 @@ msgstr "no se pudo bloquear '%s'"

5838 msgid "could not write eol to '%s'"

5839 msgstr "no se pudo escribir EOL en '%s'"

5840

5808 -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5809 -#: sequencer.c:3192

5841 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5842 +#: sequencer.c:3130

5843 #, c-format

5844 msgid "failed to finalize '%s'"

5845 msgstr "falló al finalizar '%s'"

5846

5814 -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5815 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5816 -#: builtin/merge.c:1112 builtin/rebase.c:567

5847 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5848 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5849 +#: builtin/rebase.c:568

5850 #, c-format

5851 msgid "could not read '%s'"

5852 msgstr "no se pudo leer '%s'"

@@ -5840,70 +5873,65 @@ msgstr "Modo cleanup inválido %s"

5873 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

5874 #. "rebase -i".

5875 #.

5843 -#: sequencer.c:632

5876 +#: sequencer.c:631

5877 #, c-format

5878 msgid "%s: Unable to write new index file"

5879 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

5880

5848 -#: sequencer.c:649

5881 +#: sequencer.c:648

5882 msgid "unable to update cache tree"

5883 msgstr "no es posible actualizar el árbol de la caché"

5884

5852 -#: sequencer.c:663

5885 +#: sequencer.c:662

5886 msgid "could not resolve HEAD commit"

5887 msgstr "no se pudo resolver el commit de HEAD"

5888

5856 -#: sequencer.c:743

5889 +#: sequencer.c:742

5890 #, c-format

5891 msgid "no key present in '%.*s'"

5892 msgstr "no hay llave presente en '%.*s'"

5893

5861 -#: sequencer.c:754

5894 +#: sequencer.c:753

5895 #, c-format

5896 msgid "unable to dequote value of '%s'"

5897 msgstr "no es posible dequote para '%s'"

5898

5866 -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5867 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5899 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5900 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

5901 #, c-format

5902 msgid "could not open '%s' for reading"

5903 msgstr "no se pudo abrir '%s' para lectura"

5904

5872 -#: sequencer.c:801

5905 +#: sequencer.c:800

5906 msgid "'GIT_AUTHOR_NAME' already given"

5907 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

5908

5876 -#: sequencer.c:806

5909 +#: sequencer.c:805

5910 msgid "'GIT_AUTHOR_EMAIL' already given"

5911 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

5912

5880 -#: sequencer.c:811

5913 +#: sequencer.c:810

5914 msgid "'GIT_AUTHOR_DATE' already given"

5915 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

5916

5884 -#: sequencer.c:815

5917 +#: sequencer.c:814

5918 #, c-format

5919 msgid "unknown variable '%s'"

5920 msgstr "variable desconocida '%s'"

5921

5889 -#: sequencer.c:820

5922 +#: sequencer.c:819

5923 msgid "missing 'GIT_AUTHOR_NAME'"

5924 msgstr "falta 'GIT_AUTHOR_NAME'"

5925

5893 -#: sequencer.c:822

5926 +#: sequencer.c:821

5927 msgid "missing 'GIT_AUTHOR_EMAIL'"

5928 msgstr "falta 'GIT_AUTHOR_EMAIL'"

5929

5897 -#: sequencer.c:824

5930 +#: sequencer.c:823

5931 msgid "missing 'GIT_AUTHOR_DATE'"

5932 msgstr "falta 'GIT_AUTHOR_DATE'"

5933

5901 -#: sequencer.c:884

5902 -#, c-format

5903 -msgid "invalid date format '%s' in '%s'"

5904 -msgstr "formato de fecha inválido '%s' en '%s'"

5905 -

5906 -#: sequencer.c:901

5934 +#: sequencer.c:872

5935 #, c-format

5936 msgid ""

5937 "you have staged changes in your working tree\n"

@@ -5933,15 +5961,11 @@ msgstr ""

5961 "\n"

5962 " git rebase --continue\n"

5963

5936 -#: sequencer.c:995

5937 -msgid "writing root commit"

5938 -msgstr "escribiendo commit raíz"

5939 -

5940 -#: sequencer.c:1216

5964 +#: sequencer.c:1146

5965 msgid "'prepare-commit-msg' hook failed"

5966 msgstr "hook 'prepare-commit-msg' falló"

5967

5944 -#: sequencer.c:1223

5968 +#: sequencer.c:1153

5969 msgid ""

5970 "Your name and email address were configured automatically based\n"

5971 "on your username and hostname. Please check that they are accurate.\n"

@@ -5968,7 +5992,7 @@ msgstr ""

5992 "\n"

5993 " git commit --amend --reset-author\n"

5994

5971 -#: sequencer.c:1236

5995 +#: sequencer.c:1166

5996 msgid ""

5997 "Your name and email address were configured automatically based\n"

5998 "on your username and hostname. Please check that they are accurate.\n"

@@ -5992,325 +6016,325 @@ msgstr ""

6016 "\n"

6017 " git commit --amend --reset-author\n"

6018

5995 -#: sequencer.c:1278

6019 +#: sequencer.c:1208

6020 msgid "couldn't look up newly created commit"

6021 msgstr "no se pudo revisar el commit recién creado"

6022

5999 -#: sequencer.c:1280

6023 +#: sequencer.c:1210

6024 msgid "could not parse newly created commit"

6025 msgstr "no se pudo analizar el commit recién creado"

6026

6003 -#: sequencer.c:1326

6027 +#: sequencer.c:1256

6028 msgid "unable to resolve HEAD after creating commit"

6029 msgstr "no se pudo resolver HEAD tras crear el commit"

6030

6007 -#: sequencer.c:1328

6031 +#: sequencer.c:1258

6032 msgid "detached HEAD"

6033 msgstr "HEAD desacoplado"

6034

6011 -#: sequencer.c:1332

6035 +#: sequencer.c:1262

6036 msgid " (root-commit)"

6037 msgstr " (commit-raíz)"

6038

6015 -#: sequencer.c:1353

6039 +#: sequencer.c:1283

6040 msgid "could not parse HEAD"

6041 msgstr "no se pudo analizar HEAD"

6042

6019 -#: sequencer.c:1355

6043 +#: sequencer.c:1285

6044 #, c-format

6045 msgid "HEAD %s is not a commit!"

6022 -msgstr "HEAD %s no es un commit!"

6046 +msgstr "¡HEAD %s no es un commit!"

6047

6024 -#: sequencer.c:1359 builtin/commit.c:1571

6048 +#: sequencer.c:1289 builtin/commit.c:1571

6049 msgid "could not parse HEAD commit"

6050 msgstr "no se pudo analizar el commit de HEAD"

6051

6028 -#: sequencer.c:1411 sequencer.c:2004

6052 +#: sequencer.c:1341 sequencer.c:1933

6053 msgid "unable to parse commit author"

6054 msgstr "no es posible analizar el autor del commit"

6055

6032 -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6056 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6057 msgid "git write-tree failed to write a tree"

6058 msgstr "git write-tree falló al escribir el árbol"

6059

6036 -#: sequencer.c:1438 sequencer.c:1499

6060 +#: sequencer.c:1369 sequencer.c:1429

6061 #, c-format

6062 msgid "unable to read commit message from '%s'"

6063 msgstr "no se puede leer el mensaje del commit de '%s'"

6064

6041 -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6042 -#: builtin/merge.c:903

6065 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6066 +#: builtin/merge.c:908

6067 msgid "failed to write commit object"

6068 msgstr "falló al escribir el objeto commit"

6069

6046 -#: sequencer.c:1526

6070 +#: sequencer.c:1456

6071 #, c-format

6072 msgid "could not parse commit %s"

6073 msgstr "no se pudo analizar commit %s"

6074

6051 -#: sequencer.c:1531

6075 +#: sequencer.c:1461

6076 #, c-format

6077 msgid "could not parse parent commit %s"

6078 msgstr "no se pudo analizar el commit padre %s"

6079

6056 -#: sequencer.c:1605 sequencer.c:1715

6080 +#: sequencer.c:1535 sequencer.c:1645

6081 #, c-format

6082 msgid "unknown command: %d"

6083 msgstr "comando desconocido: %d"

6084

6061 -#: sequencer.c:1662 sequencer.c:1687

6085 +#: sequencer.c:1592 sequencer.c:1617

6086 #, c-format

6087 msgid "This is a combination of %d commits."

6088 msgstr "Esta es una combinación de %d commits."

6089

6066 -#: sequencer.c:1672

6090 +#: sequencer.c:1602

6091 msgid "need a HEAD to fixup"

6092 msgstr "se necesita un HEAD para arreglar"

6093

6070 -#: sequencer.c:1674 sequencer.c:3219

6094 +#: sequencer.c:1604 sequencer.c:3157

6095 msgid "could not read HEAD"

6096 msgstr "no se pudo leer HEAD"

6097

6074 -#: sequencer.c:1676

6098 +#: sequencer.c:1606

6099 msgid "could not read HEAD's commit message"

6100 msgstr "no se pudo leer el mensaje de commit de HEAD"

6101

6078 -#: sequencer.c:1682

6102 +#: sequencer.c:1612

6103 #, c-format

6104 msgid "cannot write '%s'"

6105 msgstr "no se puede escribir '%s'"

6106

6083 -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6107 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6108 msgid "This is the 1st commit message:"

6109 msgstr "Este es el mensaje del 1er commit:"

6110

6087 -#: sequencer.c:1697

6111 +#: sequencer.c:1627

6112 #, c-format

6113 msgid "could not read commit message of %s"

6114 msgstr "no se puede leer el mensaje del commit de %s"

6115

6092 -#: sequencer.c:1704

6116 +#: sequencer.c:1634

6117 #, c-format

6118 msgid "This is the commit message #%d:"

6119 msgstr "Este es el mensaje del commit #%d:"

6120

6097 -#: sequencer.c:1710

6121 +#: sequencer.c:1640

6122 #, c-format

6123 msgid "The commit message #%d will be skipped:"

6124 msgstr "El mensaje del commit #%d será saltado:"

6125

6102 -#: sequencer.c:1798

6126 +#: sequencer.c:1728

6127 msgid "your index file is unmerged."

6128 msgstr "tu archivo índice no está fusionado."

6129

6106 -#: sequencer.c:1805

6130 +#: sequencer.c:1735

6131 msgid "cannot fixup root commit"

6132 msgstr "no se puede arreglar el commit raíz"

6133

6110 -#: sequencer.c:1824

6134 +#: sequencer.c:1754

6135 #, c-format

6136 msgid "commit %s is a merge but no -m option was given."

6137 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."

6138

6115 -#: sequencer.c:1832 sequencer.c:1840

6139 +#: sequencer.c:1762 sequencer.c:1770

6140 #, c-format

6141 msgid "commit %s does not have parent %d"

6142 msgstr "el commit %s no tiene un padre %d"

6143

6120 -#: sequencer.c:1846

6144 +#: sequencer.c:1776

6145 #, c-format

6146 msgid "cannot get commit message for %s"

6147 msgstr "no se puede obtener el mensaje de commit para %s"

6148

6149 #. TRANSLATORS: The first %s will be a "todo" command like

6150 #. "revert" or "pick", the second %s a SHA1.

6127 -#: sequencer.c:1865

6151 +#: sequencer.c:1795

6152 #, c-format

6153 msgid "%s: cannot parse parent commit %s"

6154 msgstr "%s: no se puede analizar el commit padre %s"

6155

6132 -#: sequencer.c:1930

6156 +#: sequencer.c:1860

6157 #, c-format

6158 msgid "could not rename '%s' to '%s'"

6159 msgstr "no se puede renombrar '%s' a '%s'"

6160

6137 -#: sequencer.c:1985

6161 +#: sequencer.c:1915

6162 #, c-format

6163 msgid "could not revert %s... %s"

6164 msgstr "no se pudo revertir %s... %s"

6165

6142 -#: sequencer.c:1986

6166 +#: sequencer.c:1916

6167 #, c-format

6168 msgid "could not apply %s... %s"

6169 msgstr "no se pudo aplicar %s... %s"

6170

6147 -#: sequencer.c:2045

6171 +#: sequencer.c:1983

6172 #, c-format

6173 msgid "git %s: failed to read the index"

6174 msgstr "git %s: falló al leer el índice"

6175

6152 -#: sequencer.c:2052

6176 +#: sequencer.c:1990

6177 #, c-format

6178 msgid "git %s: failed to refresh the index"

6179 msgstr "git %s: falló al refrescar el índice"

6180

6157 -#: sequencer.c:2128

6181 +#: sequencer.c:2066

6182 #, c-format

6183 msgid "%s does not accept arguments: '%s'"

6184 msgstr "%s no acepta los argumentos: '%s'"

6185

6162 -#: sequencer.c:2137

6186 +#: sequencer.c:2075

6187 #, c-format

6188 msgid "missing arguments for %s"

6189 msgstr "faltan argumentos para para %s"

6190

6167 -#: sequencer.c:2174

6191 +#: sequencer.c:2112

6192 #, c-format

6193 msgid "could not parse '%.*s'"

6194 msgstr "no se puede analizar '%.*s'"

6195

6172 -#: sequencer.c:2228

6196 +#: sequencer.c:2166

6197 #, c-format

6198 msgid "invalid line %d: %.*s"

6199 msgstr "línea inválida %d: %.*s"

6200

6177 -#: sequencer.c:2239

6201 +#: sequencer.c:2177

6202 #, c-format

6203 msgid "cannot '%s' without a previous commit"

6204 msgstr "no se puede '%s' sin un commit previo"

6205

6182 -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6206 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6207 #: builtin/rebase.c:204 builtin/rebase.c:229

l10n: es: 2.24.0 round 2