0960a4beff · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

8 "Project-Id-Version: Git\n"

9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

10 -"POT-Creation-Date: 2018-09-04 08:50+0800\n"

11 -"PO-Revision-Date: 2018-09-06 04:25-0500\n"

10 +"POT-Creation-Date: 2018-12-01 16:14+0800\n"

11 +"PO-Revision-Date: 2018-12-01 13:33-0500\n"

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

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

14 "Language: es\n"

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

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

19 "X-Generator: Poedit 2.1.1\n"

20

21 -#: advice.c:97

21 +#: advice.c:99

22 #, c-format

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

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

25

26 -#: advice.c:150

26 +#: advice.c:152

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

28 msgstr ""

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

30

31 -#: advice.c:152

31 +#: advice.c:154

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

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

34

35 -#: advice.c:154

35 +#: advice.c:156

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

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

38

39 -#: advice.c:156

39 +#: advice.c:158

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

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

42

43 -#: advice.c:158

43 +#: advice.c:160

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

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

46

47 -#: advice.c:160

47 +#: advice.c:162

48 #, c-format

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

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

51

52 -#: advice.c:168

52 +#: advice.c:170

53 msgid ""

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

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

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

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

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

59

60 -#: advice.c:176

60 +#: advice.c:178

61 msgid "Exiting because of an unresolved conflict."

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

63

64 -#: advice.c:181 builtin/merge.c:1286

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

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

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

67

68 -#: advice.c:183

68 +#: advice.c:185

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

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

71

72 -#: advice.c:184

72 +#: advice.c:186

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:190

76 +#: advice.c:192

77 #, c-format

78 msgid ""

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

@@ -179,22 +179,22 @@ msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d"

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

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

181

182 -#: apply.c:1306

182 +#: apply.c:1307

183 #, c-format

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

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

186

187 -#: apply.c:1478

187 +#: apply.c:1479

188 #, c-format

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

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

191

192 -#: apply.c:1547

192 +#: apply.c:1548

193 #, c-format

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

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

196

197 -#: apply.c:1567

197 +#: apply.c:1568

198 #, c-format

199 msgid ""

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

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

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

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

211

212 -#: apply.c:1580

212 +#: apply.c:1581

213 #, c-format

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

215 msgstr ""

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

217

218 -#: apply.c:1768

218 +#: apply.c:1769

219 msgid "new file depends on old contents"

220 msgstr "el nuevo archivo depende de contenidos viejos"

221

222 -#: apply.c:1770

222 +#: apply.c:1771

223 msgid "deleted file still has contents"

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

225

226 -#: apply.c:1804

226 +#: apply.c:1805

227 #, c-format

228 msgid "corrupt patch at line %d"

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

230

231 -#: apply.c:1841

231 +#: apply.c:1842

232 #, c-format

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

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

235

236 -#: apply.c:1843

236 +#: apply.c:1844

237 #, c-format

238 msgid "deleted file %s still has contents"

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

240

241 -#: apply.c:1846

241 +#: apply.c:1847

242 #, c-format

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

244 msgstr "** peligro: el archivo %s esta vacío pero no es borrado"

245

246 -#: apply.c:1993

246 +#: apply.c:1994

247 #, c-format

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

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

250

251 -#: apply.c:2030

251 +#: apply.c:2031

252 #, c-format

253 msgid "unrecognized binary patch at line %d"

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

255

256 -#: apply.c:2190

256 +#: apply.c:2193

257 #, c-format

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

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

260

261 -#: apply.c:2276

261 +#: apply.c:2279

262 #, c-format

263 msgid "unable to read symlink %s"

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

265

266 -#: apply.c:2280

266 +#: apply.c:2283

267 #, c-format

268 msgid "unable to open or read %s"

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

270

271 -#: apply.c:2939

271 +#: apply.c:2942

272 #, c-format

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

274 msgstr "comienzo invalido de línea: '%c'"

275

276 -#: apply.c:3060

276 +#: apply.c:3063

277 #, c-format

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

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

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

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

282

283 -#: apply.c:3072

283 +#: apply.c:3075

284 #, c-format

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

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

287

288 -#: apply.c:3078

288 +#: apply.c:3081

289 #, c-format

290 msgid ""

291 "while searching for:\n"

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

294 "mientras se busca:\n"

295 "%.*s"

296

297 -#: apply.c:3100

297 +#: apply.c:3103

298 #, c-format

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

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

301

302 -#: apply.c:3108

302 +#: apply.c:3111

303 #, c-format

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

305 msgstr ""

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

307

308 -#: apply.c:3154

308 +#: apply.c:3158

309 #, c-format

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

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

312

313 -#: apply.c:3164

313 +#: apply.c:3168

314 #, c-format

315 msgid ""

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

@@ -318,288 +318,288 @@ msgstr ""

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

319 "actuales."

320

321 -#: apply.c:3172

321 +#: apply.c:3176

322 #, c-format

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

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

325

326 -#: apply.c:3190

326 +#: apply.c:3194

327 #, c-format

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

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

330

331 -#: apply.c:3203

331 +#: apply.c:3207

332 #, c-format

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

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

335

336 -#: apply.c:3209

336 +#: apply.c:3213

337 #, c-format

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

339 msgstr ""

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

341 "obtuvo %s)"

342

343 -#: apply.c:3230

343 +#: apply.c:3234

344 #, c-format

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

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

347

348 -#: apply.c:3352

348 +#: apply.c:3356

349 #, c-format

350 msgid "cannot checkout %s"

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

352

353 -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

353 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

354 #, c-format

355 msgid "failed to read %s"

356 msgstr "no se pudo leer %s"

357

358 -#: apply.c:3412

358 +#: apply.c:3416

359 #, c-format

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

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

362

363 -#: apply.c:3441 apply.c:3681

363 +#: apply.c:3445 apply.c:3688

364 #, c-format

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

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

367

368 -#: apply.c:3524 apply.c:3696

368 +#: apply.c:3531 apply.c:3703

369 #, c-format

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

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

372

373 -#: apply.c:3533 apply.c:3704

373 +#: apply.c:3540 apply.c:3711

374 #, c-format

375 msgid "%s: does not match index"

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

377

378 -#: apply.c:3568

378 +#: apply.c:3575

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

380 msgstr ""

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

382 "vías."

383

384 -#: apply.c:3571

384 +#: apply.c:3578

385 #, c-format

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

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

388

389 -#: apply.c:3587 apply.c:3591

389 +#: apply.c:3594 apply.c:3598

390 #, c-format

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

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

393

394 -#: apply.c:3603

394 +#: apply.c:3610

395 #, c-format

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

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

398

399 -#: apply.c:3617

399 +#: apply.c:3624

400 #, c-format

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

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

403

404 -#: apply.c:3622

404 +#: apply.c:3629

405 #, c-format

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

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

408

409 -#: apply.c:3648

409 +#: apply.c:3655

410 msgid "removal patch leaves file contents"

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

412

413 -#: apply.c:3721

413 +#: apply.c:3728

414 #, c-format

415 msgid "%s: wrong type"

416 msgstr "%s: tipo incorrecto"

417

418 -#: apply.c:3723

418 +#: apply.c:3730

419 #, c-format

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

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

422

423 -#: apply.c:3874 apply.c:3876

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

424 #, c-format

425 msgid "invalid path '%s'"

426 msgstr "ruta invalida '%s'"

427

428 -#: apply.c:3932

428 +#: apply.c:3939

429 #, c-format

430 msgid "%s: already exists in index"

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

432

433 -#: apply.c:3935

433 +#: apply.c:3942

434 #, c-format

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

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

437

438 -#: apply.c:3955

438 +#: apply.c:3962

439 #, c-format

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

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

442

443 -#: apply.c:3960

443 +#: apply.c:3967

444 #, c-format

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

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

447

448 -#: apply.c:3980

448 +#: apply.c:3987

449 #, c-format

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

451 msgstr "archivo afectado '%s' esta tras un enlace simbólico"

452

453 -#: apply.c:3984

453 +#: apply.c:3991

454 #, c-format

455 msgid "%s: patch does not apply"

456 msgstr "%s: el parche no aplica"

457

458 -#: apply.c:3999

458 +#: apply.c:4006

459 #, c-format

460 msgid "Checking patch %s..."

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

462

463 -#: apply.c:4091

463 +#: apply.c:4098

464 #, c-format

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

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

467

468 -#: apply.c:4098

468 +#: apply.c:4105

469 #, c-format

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

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

472

473 -#: apply.c:4101

473 +#: apply.c:4108

474 #, c-format

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

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

477

478 -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

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

479 #, c-format

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

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

482

483 -#: apply.c:4110

483 +#: apply.c:4117

484 #, c-format

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

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

487

488 -#: apply.c:4120

488 +#: apply.c:4127

489 #, c-format

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

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

492

493 -#: apply.c:4258

493 +#: apply.c:4265

494 #, c-format

495 msgid "unable to remove %s from index"

496 msgstr "no se puede remover %s del índice"

497

498 -#: apply.c:4292

498 +#: apply.c:4299

499 #, c-format

500 msgid "corrupt patch for submodule %s"

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

502

503 -#: apply.c:4298

503 +#: apply.c:4305

504 #, c-format

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

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

507

508 -#: apply.c:4306

508 +#: apply.c:4313

509 #, c-format

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

511 msgstr ""

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

513

514 -#: apply.c:4312 apply.c:4457

514 +#: apply.c:4319 apply.c:4464

515 #, c-format

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

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

518

519 -#: apply.c:4355

519 +#: apply.c:4362

520 #, c-format

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

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

523

524 -#: apply.c:4359

524 +#: apply.c:4366

525 #, c-format

526 msgid "closing file '%s'"

527 msgstr "cerrando archivo '%s'"

528

529 -#: apply.c:4429

529 +#: apply.c:4436

530 #, c-format

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

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

533

534 -#: apply.c:4527

534 +#: apply.c:4534

535 #, c-format

536 msgid "Applied patch %s cleanly."

537 msgstr "Parche %s aplicado limpiamente."

538

539 -#: apply.c:4535

539 +#: apply.c:4542

540 msgid "internal error"

541 msgstr "error interno"

542

543 -#: apply.c:4538

543 +#: apply.c:4545

544 #, c-format

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

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

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

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

549

550 -#: apply.c:4549

550 +#: apply.c:4556

551 #, c-format

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

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

554

555 -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

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

556 #, c-format

557 msgid "cannot open %s"

558 msgstr "no se puede abrir %s"

559

560 -#: apply.c:4571

560 +#: apply.c:4578

561 #, c-format

562 msgid "Hunk #%d applied cleanly."

563 msgstr "Hunk #%d aplicado limpiamente."

564

565 -#: apply.c:4575

565 +#: apply.c:4582

566 #, c-format

567 msgid "Rejected hunk #%d."

568 msgstr "Hunk #%d rechazado."

569

570 -#: apply.c:4685

570 +#: apply.c:4692

571 #, c-format

572 msgid "Skipped patch '%s'."

573 msgstr "Parche '%s' saltado."

574

575 -#: apply.c:4693

575 +#: apply.c:4700

576 msgid "unrecognized input"

577 msgstr "input no reconocido"

578

579 -#: apply.c:4712

579 +#: apply.c:4719

580 msgid "unable to read index file"

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

582

583 -#: apply.c:4849

583 +#: apply.c:4874

584 #, c-format

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

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

587

588 -#: apply.c:4876

588 +#: apply.c:4901

589 #, c-format

590 msgid "squelched %d whitespace error"

591 msgid_plural "squelched %d whitespace errors"

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

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

594

595 -#: apply.c:4882 apply.c:4897

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

596 #, c-format

597 msgid "%d line adds whitespace errors."

598 msgid_plural "%d lines add whitespace errors."

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

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

601

602 -#: apply.c:4890

602 +#: apply.c:4915

603 #, c-format

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

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

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

608 msgstr[1] ""

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

610

611 -#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

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

612 msgid "Unable to write new index file"

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

614

615 -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

616 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

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

618 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

619 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

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

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

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

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

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

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

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

621 msgid "path"

622 msgstr "ruta"

623

624 -#: apply.c:4934

624 +#: apply.c:4959

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

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

627

628 -#: apply.c:4937

628 +#: apply.c:4962

629 msgid "apply changes matching the given path"

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

631

632 -#: apply.c:4939 builtin/am.c:2263

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

633 msgid "num"

634 msgstr "num"

635

636 -#: apply.c:4940

636 +#: apply.c:4965

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

638 msgstr "remover <num> slashes iniciales de las rutas diff tradicionales"

639

640 -#: apply.c:4943

640 +#: apply.c:4968

641 msgid "ignore additions made by the patch"

642 msgstr "ignorar adiciones hechas por el parche"

643

644 -#: apply.c:4945

644 +#: apply.c:4970

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

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

647

648 -#: apply.c:4949

648 +#: apply.c:4974

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

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

651

652 -#: apply.c:4951

652 +#: apply.c:4976

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

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

655

656 -#: apply.c:4953

656 +#: apply.c:4978

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

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

659

660 -#: apply.c:4955

660 +#: apply.c:4980

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

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

663

664 -#: apply.c:4957

664 +#: apply.c:4982

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

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

667

668 -#: apply.c:4959

668 +#: apply.c:4984

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

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

671

672 -#: apply.c:4961

672 +#: apply.c:4986

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

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

675

676 -#: apply.c:4964

676 +#: apply.c:4989

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

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

679

680 -#: apply.c:4966

680 +#: apply.c:4991

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

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

683

684 -#: apply.c:4968

684 +#: apply.c:4993

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

686 msgstr ""

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

688

689 -#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

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

690 msgid "paths are separated with NUL character"

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

692

693 -#: apply.c:4973

693 +#: apply.c:4998

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

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

696

697 -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

698 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

699 -#: builtin/pack-objects.c:3202

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

698 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

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

700 msgid "action"

701 msgstr "acción"

702

703 -#: apply.c:4975

703 +#: apply.c:5000

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

705 msgstr ""

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

707 "blanco"

708

709 -#: apply.c:4978 apply.c:4981

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

710 msgid "ignore changes in whitespace when finding context"

711 msgstr ""

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

713

714 -#: apply.c:4984

714 +#: apply.c:5009

715 msgid "apply the patch in reverse"

716 msgstr "aplicar el parche en reversa"

717

718 -#: apply.c:4986

718 +#: apply.c:5011

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

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

721

722 -#: apply.c:4988

722 +#: apply.c:5013

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

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

725

726 -#: apply.c:4990

726 +#: apply.c:5015

727 msgid "allow overlapping hunks"

728 msgstr "permitir solapamiento de hunks"

729

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

731 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

732 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

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

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

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

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

734 msgid "be verbose"

735 msgstr "ser verboso"

736

736 -#: apply.c:4993

737 +#: apply.c:5018

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

739 msgstr ""

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

741 "archivo"

742

742 -#: apply.c:4996

743 +#: apply.c:5021

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

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

746

746 -#: apply.c:4998 builtin/am.c:2251

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

748 msgid "root"

749 msgstr "raíz"

750

750 -#: apply.c:4999

751 +#: apply.c:5024

752 msgid "prepend <root> to all filenames"

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

754

@@ -770,114 +771,114 @@ msgstr ""

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

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

773

773 -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

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

775 #, c-format

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

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

778

778 -#: archive.c:446

779 +#: archive.c:453

780 msgid "fmt"

781 msgstr "fmt"

782

782 -#: archive.c:446

783 +#: archive.c:453

784 msgid "archive format"

785 msgstr "formato del archivo"

786

786 -#: archive.c:447 builtin/log.c:1473

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

788 msgid "prefix"

789 msgstr "prefijo"

790

790 -#: archive.c:448

791 +#: archive.c:455

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

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

794

794 -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

795 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

796 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

797 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

798 -#: parse-options.h:165

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

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

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

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

799 +#: parse-options.h:162

800 msgid "file"

801 msgstr "carpeta"

802

802 -#: archive.c:450 builtin/archive.c:89

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

804 msgid "write the archive to this file"

805 msgstr "escribe el archivo en esta carpeta"

806

806 -#: archive.c:452

807 +#: archive.c:459

808 msgid "read .gitattributes in working directory"

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

810

810 -#: archive.c:453

811 +#: archive.c:460

812 msgid "report archived files on stderr"

813 msgstr "reportar archivos archivados por stderr"

814

814 -#: archive.c:454

815 +#: archive.c:461

816 msgid "store only"

817 msgstr "solo guardar"

818

818 -#: archive.c:455

819 +#: archive.c:462

820 msgid "compress faster"

821 msgstr "comprimir mas rápido"

822

822 -#: archive.c:463

823 +#: archive.c:470

824 msgid "compress better"

825 msgstr "comprimir mejor"

826

826 -#: archive.c:466

827 +#: archive.c:473

828 msgid "list supported archive formats"

829 msgstr "listar los formatos de carpeta soportados"

830

830 -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

831 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

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

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

833 msgid "repo"

834 msgstr "repo"

835

835 -#: archive.c:469 builtin/archive.c:91

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

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

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

839

839 -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

840 -#: builtin/notes.c:491

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

841 +#: builtin/notes.c:496

842 msgid "command"

843 msgstr "comando"

844

844 -#: archive.c:471 builtin/archive.c:93

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

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

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

848

848 -#: archive.c:478

849 +#: archive.c:485

850 msgid "Unexpected option --remote"

851 msgstr "Opción inesperada --remote"

852

852 -#: archive.c:480

853 +#: archive.c:487

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

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

856

856 -#: archive.c:482

857 +#: archive.c:489

858 msgid "Unexpected option --output"

859 msgstr "Opción inesperada --output"

860

860 -#: archive.c:504

861 +#: archive.c:511

862 #, c-format

863 msgid "Unknown archive format '%s'"

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

865

865 -#: archive.c:511

866 +#: archive.c:518

867 #, c-format

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

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

870

870 -#: archive-tar.c:125 archive-zip.c:344

871 +#: archive-tar.c:125 archive-zip.c:345

872 #, c-format

873 msgid "cannot stream blob %s"

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

875

875 -#: archive-tar.c:260 archive-zip.c:361

876 +#: archive-tar.c:260 archive-zip.c:363

877 #, c-format

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

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

880

880 -#: archive-tar.c:287 archive-zip.c:352

881 +#: archive-tar.c:287 archive-zip.c:353

882 #, c-format

883 msgid "cannot read %s"

884 msgstr "no se puede leer %s"

@@ -896,32 +897,32 @@ msgstr "incapaz de redirigir descriptor"

897 msgid "'%s' filter reported error"

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

899

899 -#: archive-zip.c:313

900 +#: archive-zip.c:314

901 #, c-format

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

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

904

904 -#: archive-zip.c:317

905 +#: archive-zip.c:318

906 #, c-format

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

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

909

909 -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

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

911 #, c-format

912 msgid "deflate error (%d)"

913 msgstr "error al desinflar (%d)"

914

914 -#: archive-zip.c:605

915 +#: archive-zip.c:609

916 #, c-format

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

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

919

919 -#: attr.c:218

920 +#: attr.c:212

921 #, c-format

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

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

924

924 -#: attr.c:415

925 +#: attr.c:409

926 msgid ""

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

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

@@ -929,22 +930,22 @@ msgstr ""

930 "Los patrones negativos son ignorados en los atributos de git\n"

931 "Usa '\\!' para comenzar literalmente con exclamación."

932

932 -#: bisect.c:467

933 +#: bisect.c:468

934 #, c-format

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

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

937

937 -#: bisect.c:675

938 +#: bisect.c:676

939 #, c-format

940 msgid "We cannot bisect more!\n"

941 msgstr "No podemos bisecar mas!\n"

942

942 -#: bisect.c:729

943 +#: bisect.c:730

944 #, c-format

945 msgid "Not a valid commit name %s"

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

947

947 -#: bisect.c:753

948 +#: bisect.c:754

949 #, c-format

950 msgid ""

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

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

954 "La base de fisión %s esta mal.\n"

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

956

956 -#: bisect.c:758

957 +#: bisect.c:759

958 #, c-format

959 msgid ""

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

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

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

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

965

965 -#: bisect.c:763

966 +#: bisect.c:764

967 #, c-format

968 msgid ""

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

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

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

973 "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"

974

974 -#: bisect.c:771

975 +#: bisect.c:772

976 #, c-format

977 msgid ""

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

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

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

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

985

985 -#: bisect.c:784

986 +#: bisect.c:785

987 #, c-format

988 msgid ""

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

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

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

995 "Vamos a continuar de todas maneras."

996

996 -#: bisect.c:817

997 +#: bisect.c:818

998 #, c-format

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

1000 msgstr "Bisectando: una base de fisión debe ser probada\n"

1001

1001 -#: bisect.c:857

1002 +#: bisect.c:858

1003 #, c-format

1004 msgid "a %s revision is needed"

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

1006

1006 -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

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

1008 #, c-format

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

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

1011

1011 -#: bisect.c:927 builtin/merge.c:137

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

1013 #, c-format

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

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

1016

1016 -#: bisect.c:957

1017 +#: bisect.c:958

1018 msgid "reading bisect refs failed"

1019 msgstr "falló leer las refs de bisect"

1020

1020 -#: bisect.c:976

1021 +#: bisect.c:977

1022 #, c-format

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

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

1025

1025 -#: bisect.c:984

1026 +#: bisect.c:985

1027 #, c-format

1028 msgid ""

1029 "No testable commit found.\n"

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

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

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

1034

1034 -#: bisect.c:1003

1035 +#: bisect.c:1004

1036 #, c-format

1037 msgid "(roughly %d step)"

1038 msgid_plural "(roughly %d steps)"

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

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

1043 #. steps)" translation.

1044 #.

1044 -#: bisect.c:1009

1045 +#: bisect.c:1010

1046 #, c-format

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

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

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

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

1051

1051 -#: blame.c:1784

1052 +#: blame.c:1787

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

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

1055

1055 -#: blame.c:1798

1056 +#: blame.c:1801

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

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

1059

1059 -#: blame.c:1819

1060 +#: blame.c:1822

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

1062 msgstr ""

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

1064

1064 -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1065 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1066 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1067 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

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

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

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

1068 +#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1069 #: builtin/shortlog.c:192

1070 msgid "revision walk setup failed"

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

1072

1072 -#: blame.c:1846

1073 +#: blame.c:1849

1074 msgid ""

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

1076 msgstr ""

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

1078 "del primer padre"

1079

1079 -#: blame.c:1857

1080 +#: blame.c:1860

1081 #, c-format

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

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

1084

1084 -#: blame.c:1868

1085 +#: blame.c:1871

1086 #, c-format

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

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

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

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

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

1248

1248 -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

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

1250 +#: builtin/commit.c:774

1251 #, c-format

1252 msgid "could not open '%s'"

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

@@ -1272,38 +1274,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1276

1275 -#: bundle.c:260

1277 +#: bundle.c:267

1278 +msgid "unable to dup bundle descriptor"

1279 +msgstr "incapaz de duplicar bundle descriptor"

1280 +

1281 +#: bundle.c:274

1282 msgid "Could not spawn pack-objects"

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

1284

1279 -#: bundle.c:271

1285 +#: bundle.c:285

1286 msgid "pack-objects died"

1287 msgstr "pack-objects murió"

1288

1283 -#: bundle.c:313

1289 +#: bundle.c:327

1290 msgid "rev-list died"

1291 msgstr "rev-list murió"

1292

1287 -#: bundle.c:362

1293 +#: bundle.c:376

1294 #, c-format

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

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

1297

1292 -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

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

1299 #, c-format

1300 msgid "unrecognized argument: %s"

1301 msgstr "argumento no reconocido: %s"

1302

1297 -#: bundle.c:461

1303 +#: bundle.c:464

1304 msgid "Refusing to create empty bundle."

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

1306

1301 -#: bundle.c:473

1307 +#: bundle.c:474

1308 #, c-format

1309 msgid "cannot create '%s'"

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

1311

1306 -#: bundle.c:501

1312 +#: bundle.c:498

1313 msgid "index-pack died"

1314 msgstr "index-pack murió"

1315

@@ -1312,19 +1318,19 @@ msgstr "index-pack murió"

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

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

1320

1315 -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1316 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

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

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

1323 #: builtin/replace.c:448

1324 #, c-format

1325 msgid "could not parse %s"

1326 msgstr "no se puede analizar %s"

1327

1322 -#: commit.c:50

1328 +#: commit.c:52

1329 #, c-format

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

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

1332

1327 -#: commit.c:191

1333 +#: commit.c:193

1334 msgid ""

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

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

@@ -1344,7 +1350,27 @@ msgstr ""

1350 "Apapa este mensaje ejecutando\n"

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

1352

1347 -#: commit.c:1629

1353 +#: commit.c:1115

1354 +#, c-format

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

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

1357 +

1358 +#: commit.c:1118

1359 +#, c-format

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

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

1362 +

1363 +#: commit.c:1121

1364 +#, c-format

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

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

1367 +

1368 +#: commit.c:1124

1369 +#, c-format

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

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

1372 +

1373 +#: commit.c:1378

1374 msgid ""

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

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

@@ -1355,76 +1381,92 @@ msgstr ""

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

1382 "su proyecto.\n"

1383

1358 -#: commit-graph.c:83

1384 +#: commit-graph.c:108

1385 #, c-format

1386 msgid "graph file %s is too small"

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

1388

1363 -#: commit-graph.c:90

1389 +#: commit-graph.c:115

1390 #, c-format

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

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

1393

1368 -#: commit-graph.c:97

1394 +#: commit-graph.c:122

1395 #, c-format

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

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

1398

1373 -#: commit-graph.c:104

1399 +#: commit-graph.c:129

1400 #, c-format

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

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

1403

1378 -#: commit-graph.c:128

1404 +#: commit-graph.c:153

1405 #, c-format

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

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

1408

1383 -#: commit-graph.c:164

1409 +#: commit-graph.c:189

1410 #, c-format

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

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

1413

1388 -#: commit-graph.c:261

1414 +#: commit-graph.c:308

1415 #, c-format

1416 msgid "could not find commit %s"

1417 msgstr "no se pudo encontrar commit %s"

1418

1393 -#: commit-graph.c:565 builtin/pack-objects.c:2568

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

1420 #, c-format

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

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

1423

1398 -#: commit-graph.c:730

1424 +#: commit-graph.c:651

1425 +msgid "Annotating commits in commit graph"

1426 +msgstr "Anotando commits en commit graph"

1427 +

1428 +#: commit-graph.c:691

1429 +msgid "Computing commit graph generation numbers"

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

1431 +

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

1433 +msgid "Finding commits for commit graph"

1434 +msgstr "Encontrando commits para commit graph"

1435 +

1436 +#: commit-graph.c:812

1437 #, c-format

1438 msgid "error adding pack %s"

1439 msgstr "error agregando pack %s"

1440

1403 -#: commit-graph.c:732

1441 +#: commit-graph.c:814

1442 #, c-format

1443 msgid "error opening index for %s"

1444 msgstr "error abriendo index para %s"

1445

1408 -#: commit-graph.c:773

1446 +#: commit-graph.c:868

1447 #, c-format

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

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

1450

1413 -#: commit-graph.c:800

1451 +#: commit-graph.c:895

1452 msgid "too many commits to write graph"

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

1454

1417 -#: commit-graph.c:806

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

1456 #, c-format

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

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

1459

1422 -#: commit-graph.c:904

1460 +#: commit-graph.c:1002

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

1462 msgstr ""

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

1464 "corrupto"

1465

1466 +#: commit-graph.c:1046

1467 +msgid "Verifying commits in commit graph"

1468 +msgstr "Verificando commits en commit graph"

1469 +

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

1471 msgid "memory exhausted"

1472 msgstr "memoria agotada"

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

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

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

1512

1471 -#: config.c:378 sequencer.c:2206

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

1514 #, c-format

1515 msgid "invalid key: %s"

1516 msgstr "llave invalida: %s"

@@ -1592,152 +1634,152 @@ msgstr "core.commentChar debería tener solo un caracter"

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

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

1636

1595 -#: config.c:1403

1637 +#: config.c:1395

1638 #, c-format

1639 msgid "malformed value for %s"

1640 msgstr "valor malformado para %s"

1641

1600 -#: config.c:1429

1642 +#: config.c:1421

1643 #, c-format

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

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

1646

1605 -#: config.c:1430

1647 +#: config.c:1422

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

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

1650

1609 -#: config.c:1489 builtin/pack-objects.c:3279

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

1652 #, c-format

1653 msgid "bad pack compression level %d"

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

1655

1614 -#: config.c:1610

1656 +#: config.c:1602

1657 #, c-format

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

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

1660

1619 -#: config.c:1613

1661 +#: config.c:1605

1662 #, c-format

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

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

1665

1624 -#: config.c:1630

1666 +#: config.c:1622

1667 #, c-format

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

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

1670

1629 -#: config.c:1660

1671 +#: config.c:1652

1672 #, c-format

1673 msgid "failed to parse %s"

1674 msgstr "no se pudo analizar %s"

1675

1634 -#: config.c:1700

1676 +#: config.c:1705

1677 msgid "unable to parse command-line config"

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

1679

1638 -#: config.c:2032

1680 +#: config.c:2037

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

1682 msgstr ""

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

1684

1643 -#: config.c:2202

1685 +#: config.c:2207

1686 #, c-format

1687 msgid "Invalid %s: '%s'"

1688 msgstr "Invalido %s: '%s'"

1689

1648 -#: config.c:2245

1690 +#: config.c:2250

1691 #, c-format

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

1693 msgstr ""

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

1695 "defecto"

1696

1655 -#: config.c:2271

1697 +#: config.c:2276

1698 #, c-format

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

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

1701

1660 -#: config.c:2296

1702 +#: config.c:2322

1703 #, c-format

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

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

1706

1665 -#: config.c:2298

1707 +#: config.c:2324

1708 #, c-format

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

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

1711

1670 -#: config.c:2379

1712 +#: config.c:2405

1713 #, c-format

1714 msgid "invalid section name '%s'"

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

1716

1675 -#: config.c:2411

1717 +#: config.c:2437

1718 #, c-format

1719 msgid "%s has multiple values"

1720 msgstr "%s tiene múltiples valores"

1721

1680 -#: config.c:2440

1722 +#: config.c:2466

1723 #, c-format

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

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

1726

1685 -#: config.c:2691 config.c:3015

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

1728 #, c-format

1729 msgid "could not lock config file %s"

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

1731

1690 -#: config.c:2702

1732 +#: config.c:2728

1733 #, c-format

1734 msgid "opening %s"

1735 msgstr "abriendo %s"

1736

1695 -#: config.c:2737 builtin/config.c:324

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

1738 #, c-format

1739 msgid "invalid pattern: %s"

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

1741

1700 -#: config.c:2762

1742 +#: config.c:2788

1743 #, c-format

1744 msgid "invalid config file %s"

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

1746

1705 -#: config.c:2775 config.c:3028

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

1748 #, c-format

1749 msgid "fstat on %s failed"

1750 msgstr "fstat en %s falló"

1751

1710 -#: config.c:2786

1752 +#: config.c:2812

1753 #, c-format

1754 msgid "unable to mmap '%s'"

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

1756

1715 -#: config.c:2795 config.c:3033

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

1758 #, c-format

1759 msgid "chmod on %s failed"

1760 msgstr "chmod en %s falló"

1761

1720 -#: config.c:2880 config.c:3130

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

1763 #, c-format

1764 msgid "could not write config file %s"

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

1766

1725 -#: config.c:2914

1767 +#: config.c:2940

1768 #, c-format

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

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

1771

1730 -#: config.c:2916 builtin/remote.c:781

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

1773 #, c-format

1774 msgid "could not unset '%s'"

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

1776

1735 -#: config.c:3006

1777 +#: config.c:3032

1778 #, c-format

1779 msgid "invalid section name: %s"

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

1781

1740 -#: config.c:3173

1782 +#: config.c:3199

1783 #, c-format

1784 msgid "missing value for '%s'"

1785 msgstr "valor faltante para '%s'"

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

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

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

1834

1793 -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

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

1836 #, c-format

1837 msgid "remote error: %s"

1838 msgstr "error remoto: %s"

@@ -1907,7 +1949,7 @@ msgstr "ruta extraña '%s' bloqueada"

1949 msgid "unable to fork"

1950 msgstr "no es posible hacer fork"

1951

1910 -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

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

1953 msgid "Checking connectivity"

1954 msgstr "Verificando conectividad"

1955

@@ -1940,8 +1982,7 @@ msgid ""

1982 "The file will have its original line endings in your working directory"

1983 msgstr ""

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

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

1944 -"trabajo."

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

1986

1987 #: convert.c:217

1988 #, c-format

@@ -1955,8 +1996,7 @@ msgid ""

1996 "The file will have its original line endings in your working directory"

1997 msgstr ""

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

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

1959 -"trabajo."

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

2000

2001 #: convert.c:280

2002 #, c-format

@@ -1999,7 +2039,7 @@ msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"

2039 #: convert.c:674

2040 #, c-format

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

2002 -msgstr "No se puede hacer fork para ejecutar filtros externos '%s'"

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

2043

2044 #: convert.c:694

2045 #, c-format

@@ -2042,12 +2082,12 @@ msgstr ""

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

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

2084

2045 -#: convert.c:1402 convert.c:1436

2085 +#: convert.c:1398 convert.c:1432

2086 #, c-format

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

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

2089

2050 -#: convert.c:1480

2090 +#: convert.c:1476

2091 #, c-format

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

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

@@ -2120,12 +2160,36 @@ msgid_plural "%<PRIuMAX> years ago"

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

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

2162

2163 +#: delta-islands.c:268

2164 +msgid "Propagating island marks"

2165 +msgstr "Propagando marcas isla"

2166 +

2167 +#: delta-islands.c:286

2168 +#, c-format

2169 +msgid "bad tree object %s"

2170 +msgstr "mal objeto árbol %s"

2171 +

2172 +#: delta-islands.c:330

2173 +#, c-format

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

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

2176 +

2177 +#: delta-islands.c:386

2178 +#, c-format

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

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

2181 +

2182 +#: delta-islands.c:462

2183 +#, c-format

2184 +msgid "Marked %d islands, done.\n"

2185 +msgstr "%d islas marcadas, listo.\n"

2186 +

2187 #: diffcore-order.c:24

2188 #, c-format

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

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

2191

2128 -#: diffcore-rename.c:536

2192 +#: diffcore-rename.c:544

2193 msgid "Performing inexact rename detection"

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

2195

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

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

2245 "%s"

2246

2183 -#: diff.c:4096

2247 +#: diff.c:4140

2248 #, c-format

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

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

2251

2188 -#: diff.c:4427

2252 +#: diff.c:4482

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

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

2255

2192 -#: diff.c:4430

2256 +#: diff.c:4485

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

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

2259

2196 -#: diff.c:4508

2260 +#: diff.c:4563

2261 msgid "--follow requires exactly one pathspec"

2262 msgstr "--follow requiere exactamente un pathspec"

2263

2200 -#: diff.c:4674

2264 +#: diff.c:4729

2265 #, c-format

2266 msgid ""

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

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

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

2271 "%s"

2272

2209 -#: diff.c:4688

2273 +#: diff.c:4743

2274 #, c-format

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

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

2277

2214 -#: diff.c:5766

2278 +#: diff.c:5823

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

2280 msgstr ""

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

2282

2219 -#: diff.c:5769

2283 +#: diff.c:5826

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

2285 msgstr ""

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

2287

2224 -#: diff.c:5772

2288 +#: diff.c:5829

2289 #, c-format

2290 msgid ""

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

@@ -2229,46 +2293,46 @@ msgstr ""

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

2294 "intentar el comando."

2295

2232 -#: dir.c:569

2296 +#: dir.c:576

2297 #, c-format

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

2299 msgstr ""

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

2301

2238 -#: dir.c:958

2302 +#: dir.c:965

2303 #, c-format

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

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

2306

2243 -#: dir.c:1873

2307 +#: dir.c:1880

2308 #, c-format

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

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

2311

2248 -#: dir.c:2115

2312 +#: dir.c:2122

2313 msgid "failed to get kernel name and information"

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

2315

2252 -#: dir.c:2239

2316 +#: dir.c:2246

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

2254 -msgstr "untracked cache esta desactivado en este sistema o ubicación."

2318 +msgstr "untracked cache esta desactivado en este sistema o ubicación"

2319

2256 -#: dir.c:3037

2320 +#: dir.c:3047

2321 #, c-format

2322 msgid "index file corrupt in repo %s"

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

2324

2261 -#: dir.c:3082 dir.c:3087

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

2326 #, c-format

2327 msgid "could not create directories for %s"

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

2329

2266 -#: dir.c:3116

2330 +#: dir.c:3126

2331 #, c-format

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

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

2334

2271 -#: editor.c:61

2335 +#: editor.c:73

2336 #, c-format

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

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

@@ -2277,7 +2341,7 @@ msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"

2341 msgid "Filtering content"

2342 msgstr "Filtrando contenido"

2343

2280 -#: entry.c:437

2344 +#: entry.c:465

2345 #, c-format

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

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

@@ -2301,77 +2365,77 @@ msgstr "demasiados argumentos para correr %s"

2365 msgid "Remote with no URL"

2366 msgstr "Remoto sin URL"

2367

2304 -#: fetch-pack.c:152

2368 +#: fetch-pack.c:151

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

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

2371

2308 -#: fetch-pack.c:164

2372 +#: fetch-pack.c:163

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

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

2375

2312 -#: fetch-pack.c:184

2376 +#: fetch-pack.c:183

2377 #, c-format

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

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

2380

2317 -#: fetch-pack.c:254

2381 +#: fetch-pack.c:253

2382 msgid "--stateless-rpc requires multi_ack_detailed"

2383 msgstr "--stateless-rpc requiere multi_ack_detailed"

2384

2321 -#: fetch-pack.c:342 fetch-pack.c:1257

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

2386 #, c-format

2387 msgid "invalid shallow line: %s"

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

2389

2326 -#: fetch-pack.c:348 fetch-pack.c:1263

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

2391 #, c-format

2392 msgid "invalid unshallow line: %s"

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

2394

2331 -#: fetch-pack.c:350 fetch-pack.c:1265

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

2396 #, c-format

2397 msgid "object not found: %s"

2398 msgstr "objeto no encontrado: %s"

2399

2336 -#: fetch-pack.c:353 fetch-pack.c:1268

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

2401 #, c-format

2402 msgid "error in object: %s"

2403 msgstr "error en objeto: %s"

2404

2341 -#: fetch-pack.c:355 fetch-pack.c:1270

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

2406 #, c-format

2407 msgid "no shallow found: %s"

2408 msgstr "superficie no encontrada: %s"

2409

2346 -#: fetch-pack.c:358 fetch-pack.c:1273

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

2411 #, c-format

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

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

2414

2351 -#: fetch-pack.c:399

2415 +#: fetch-pack.c:404

2416 #, c-format

2417 msgid "got %s %d %s"

2418 msgstr "se obtuvo %s %d %s"

2419

2356 -#: fetch-pack.c:416

2420 +#: fetch-pack.c:421

2421 #, c-format

2422 msgid "invalid commit %s"

2423 msgstr "commit inválido %s"

2424

2361 -#: fetch-pack.c:447

2425 +#: fetch-pack.c:452

2426 msgid "giving up"

2427 msgstr "rindiéndose"

2428

2365 -#: fetch-pack.c:459 progress.c:229

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

2430 msgid "done"

2431 msgstr "listo"

2432

2369 -#: fetch-pack.c:471

2433 +#: fetch-pack.c:476

2434 #, c-format

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

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

2437

2374 -#: fetch-pack.c:517

2438 +#: fetch-pack.c:522

2439 #, c-format

2440 msgid "Marking %s as complete"

2441 msgstr "Marcando %s como completa"

@@ -2439,7 +2503,7 @@ msgstr "Servidor soporta allow-reachable-sha1-in-want"

2503 msgid "Server supports ofs-delta"

2504 msgstr "Servidor soporta ofs-delta"

2505

2442 -#: fetch-pack.c:971 fetch-pack.c:1150

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

2507 msgid "Server supports filter"

2508 msgstr "Servidor soporta filtro"

2509

@@ -2460,85 +2524,93 @@ msgstr "Servidor no soporta --shalow-exclude"

2524 msgid "Server does not support --deepen"

2525 msgstr "Servidor no soporta --deepen"

2526

2463 -#: fetch-pack.c:1004

2527 +#: fetch-pack.c:1008

2528 msgid "no common commits"

2529 msgstr "no hay commits comunes"

2530

2467 -#: fetch-pack.c:1016 fetch-pack.c:1393

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

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

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

2534

2471 -#: fetch-pack.c:1145

2535 +#: fetch-pack.c:1153

2536 msgid "Server does not support shallow requests"

2537 msgstr "Servidor no soporta peticiones superficiales"

2538

2475 -#: fetch-pack.c:1191

2539 +#: fetch-pack.c:1199

2540 #, c-format

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

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

2543

2480 -#: fetch-pack.c:1197

2544 +#: fetch-pack.c:1205

2545 #, c-format

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

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

2548

2485 -#: fetch-pack.c:1236

2549 +#: fetch-pack.c:1244

2550 #, c-format

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

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

2553

2490 -#: fetch-pack.c:1241

2554 +#: fetch-pack.c:1249

2555 #, c-format

2556 msgid "error processing acks: %d"

2557 msgstr "error procesando acks: %d"

2558

2495 -#: fetch-pack.c:1278

2559 +#: fetch-pack.c:1259

2560 +msgid "expected packfile to be sent after 'ready'"

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

2562 +

2563 +#: fetch-pack.c:1261

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

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

2566 +

2567 +#: fetch-pack.c:1298

2568 #, c-format

2569 msgid "error processing shallow info: %d"

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

2571

2500 -#: fetch-pack.c:1294

2572 +#: fetch-pack.c:1314

2573 #, c-format

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

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

2576

2505 -#: fetch-pack.c:1304

2577 +#: fetch-pack.c:1324

2578 #, c-format

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

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

2581

2510 -#: fetch-pack.c:1308

2582 +#: fetch-pack.c:1328

2583 #, c-format

2584 msgid "error processing wanted refs: %d"

2585 msgstr "error procesando refs deseadas: %d"

2586

2515 -#: fetch-pack.c:1603

2587 +#: fetch-pack.c:1642

2588 msgid "no matching remote head"

2589 msgstr "no concuerda el head remoto"

2590

2519 -#: fetch-pack.c:1621 builtin/clone.c:664

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

2592 msgid "remote did not send all necessary objects"

2593 msgstr "remoto no mando todos los objetos necesarios"

2594

2523 -#: fetch-pack.c:1647

2595 +#: fetch-pack.c:1686

2596 #, c-format

2597 msgid "no such remote ref %s"

2598 msgstr "no existe ref remota %s"

2599

2528 -#: fetch-pack.c:1650

2600 +#: fetch-pack.c:1689

2601 #, c-format

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

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

2604

2533 -#: gpg-interface.c:253

2605 +#: gpg-interface.c:318

2606 msgid "gpg failed to sign the data"

2607 msgstr "gpg falló al firmar la data"

2608

2537 -#: gpg-interface.c:279

2609 +#: gpg-interface.c:344

2610 msgid "could not create temporary file"

2611 msgstr "no se pudo crear archivo temporal"

2612

2541 -#: gpg-interface.c:282

2613 +#: gpg-interface.c:347

2614 #, c-format

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

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

@@ -2548,18 +2620,18 @@ msgstr "falló al escribir la firma separada para '%s'"

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

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

2622

2551 -#: grep.c:2115

2623 +#: grep.c:2113

2624 #, c-format

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

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

2627

2556 -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

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

2629 #: builtin/rm.c:134

2630 #, c-format

2631 msgid "failed to stat '%s'"

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

2633

2562 -#: grep.c:2143

2634 +#: grep.c:2141

2635 #, c-format

2636 msgid "'%s': short read"

2637 msgstr "'%s': lectura corta"

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

2688 msgid "Low-level Commands / Internal Helpers"

2689 msgstr "Comandos de bajo nivel / Auxiliares internos"

2690

2619 -#: help.c:293

2691 +#: help.c:296

2692 #, c-format

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

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

2695

2624 -#: help.c:300

2696 +#: help.c:303

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

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

2699

2628 -#: help.c:309

2700 +#: help.c:312

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

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

2703

2632 -#: help.c:358 git.c:90

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

2705 #, c-format

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

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

2708

2637 -#: help.c:405

2709 +#: help.c:408

2710 msgid "The common Git guides are:"

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

2712

2641 -#: help.c:552

2713 +#: help.c:517

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

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

2716 +

2717 +#: help.c:522

2718 +msgid "External commands"

2719 +msgstr "Comandos externos"

2720 +

2721 +#: help.c:530

2722 +msgid "Command aliases"

2723 +msgstr "Aliases de comando"

2724 +

2725 +#: help.c:594

2726 #, c-format

2727 msgid ""

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

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

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

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

2733

2650 -#: help.c:611

2734 +#: help.c:653

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

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

2737

2654 -#: help.c:633

2738 +#: help.c:675

2739 #, c-format

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

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

2742

2659 -#: help.c:638

2743 +#: help.c:680

2744 #, c-format

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

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

2747

2664 -#: help.c:643

2748 +#: help.c:685

2749 #, c-format

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

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

2752

2669 -#: help.c:651

2753 +#: help.c:693

2754 #, c-format

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

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

2757

2674 -#: help.c:655

2758 +#: help.c:697

2759 msgid ""

2760 "\n"

2761 "The most similar command is"

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

2769 "\n"

2770 "Los comandos mas similares son"

2771

2688 -#: help.c:670

2772 +#: help.c:712

2773 msgid "git version [<options>]"

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

2775

2692 -#: help.c:738

2776 +#: help.c:780

2777 #, c-format

2778 msgid "%s: %s - %s"

2779 msgstr "%s: %s - %s"

2780

2697 -#: help.c:742

2781 +#: help.c:784

2782 msgid ""

2783 "\n"

2784 "Did you mean this?"

@@ -2708,7 +2792,7 @@ msgstr[1] ""

2792 "\n"

2793 "Quisiste decir alguno de estos?"

2794

2711 -#: ident.c:342

2795 +#: ident.c:345

2796 msgid ""

2797 "\n"

2798 "*** Please tell me who you are.\n"

@@ -2734,44 +2818,48 @@ msgstr ""

2818 "Omite --global para configurar tu identidad solo en este repositorio.\n"

2819 "\n"

2820

2737 -#: ident.c:366

2821 +#: ident.c:369

2822 msgid "no email was given and auto-detection is disabled"

2823 msgstr "no se entrego ningún email y la detección automática esta desactivada"

2824

2741 -#: ident.c:371

2825 +#: ident.c:374

2826 #, c-format

2827 msgid "unable to auto-detect email address (got '%s')"

2828 msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"

2829

2746 -#: ident.c:381

2830 +#: ident.c:384

2831 msgid "no name was given and auto-detection is disabled"

2832 msgstr "no se entrego ningún nombre y la detección automática esta desactivada"

2833

2750 -#: ident.c:387

2834 +#: ident.c:390

2835 #, c-format

2836 msgid "unable to auto-detect name (got '%s')"

2837 msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"

2838

2755 -#: ident.c:395

2839 +#: ident.c:398

2840 #, c-format

2841 msgid "empty ident name (for <%s>) not allowed"

2842 msgstr "no se puede tener un nombre vacío (para <%s>)"

2843

2760 -#: ident.c:401

2844 +#: ident.c:404

2845 #, c-format

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

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

2848

2765 -#: ident.c:416 builtin/commit.c:600

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

2850 #, c-format

2851 msgid "invalid date format: %s"

2852 msgstr "formato de fecha invalido: %s"

2853

2770 -#: list-objects-filter-options.c:36

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

2855 msgid "multiple filter-specs cannot be combined"

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

2857

2774 -#: list-objects-filter-options.c:126

2858 +#: list-objects-filter-options.c:58

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

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

2861 +

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

2863 msgid "cannot change partial clone promisor remote"

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

2865

@@ -2800,118 +2888,118 @@ msgstr ""

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

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

2890

2803 -#: merge.c:40

2891 +#: merge.c:41

2892 msgid "failed to read the cache"

2893 msgstr "falló al leer la cache"

2894

2807 -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2808 -#: builtin/checkout.c:608 builtin/clone.c:763

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

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

2897 msgid "unable to write new index file"

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

2899

2812 -#: merge-recursive.c:303

2900 +#: merge-recursive.c:323

2901 msgid "(bad commit)\n"

2902 msgstr "(mal commit)\n"

2903

2816 -#: merge-recursive.c:325

2904 +#: merge-recursive.c:345

2905 #, c-format

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

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

2908

2821 -#: merge-recursive.c:333

2909 +#: merge-recursive.c:353

2910 #, c-format

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

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

2913

2826 -#: merge-recursive.c:415

2914 +#: merge-recursive.c:435

2915 msgid "error building trees"

2916 msgstr "error construyendo árboles"

2917

2830 -#: merge-recursive.c:886

2918 +#: merge-recursive.c:906

2919 #, c-format

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

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

2922

2835 -#: merge-recursive.c:897

2923 +#: merge-recursive.c:917

2924 #, c-format

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

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

2927

2840 -#: merge-recursive.c:911 merge-recursive.c:930

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

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

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

2931

2844 -#: merge-recursive.c:920

2932 +#: merge-recursive.c:940

2933 #, c-format

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

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

2936

2849 -#: merge-recursive.c:962 builtin/cat-file.c:39

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

2938 #, c-format

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

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

2941

2854 -#: merge-recursive.c:964

2942 +#: merge-recursive.c:984

2943 #, c-format

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

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

2946

2859 -#: merge-recursive.c:988

2947 +#: merge-recursive.c:1008

2948 #, c-format

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

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

2951

2864 -#: merge-recursive.c:999

2952 +#: merge-recursive.c:1019

2953 #, c-format

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

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

2956

2869 -#: merge-recursive.c:1004

2957 +#: merge-recursive.c:1024

2958 #, c-format

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

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

2961

2874 -#: merge-recursive.c:1191

2962 +#: merge-recursive.c:1212

2963 #, c-format

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

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

2966

2879 -#: merge-recursive.c:1198

2967 +#: merge-recursive.c:1219

2968 #, c-format

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

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

2971

2884 -#: merge-recursive.c:1205

2972 +#: merge-recursive.c:1226

2973 #, c-format

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

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

2976

2889 -#: merge-recursive.c:1213 merge-recursive.c:1225

2977 +#: merge-recursive.c:1234 merge-recursive.c:1246

2978 #, c-format

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

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

2981

2894 -#: merge-recursive.c:1216 merge-recursive.c:1228

2982 +#: merge-recursive.c:1237 merge-recursive.c:1249

2983 #, c-format

2984 msgid "Fast-forwarding submodule %s"

2985 msgstr "Avance rápido en submódulo %s"

2986

2899 -#: merge-recursive.c:1250

2987 +#: merge-recursive.c:1271

2988 #, c-format

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

2990 msgstr ""

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

2992

2905 -#: merge-recursive.c:1254

2993 +#: merge-recursive.c:1275

2994 #, c-format

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

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

2997

2910 -#: merge-recursive.c:1255

2998 +#: merge-recursive.c:1276

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

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

3001

2914 -#: merge-recursive.c:1258

3002 +#: merge-recursive.c:1279

3003 #, c-format

3004 msgid ""

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

@@ -2928,33 +3016,33 @@ msgstr ""

3016 "\n"

3017 "el cual aceptará esta sugerencia.\n"

3018

2931 -#: merge-recursive.c:1267

3019 +#: merge-recursive.c:1288

3020 #, c-format

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

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

3023

2936 -#: merge-recursive.c:1326

3024 +#: merge-recursive.c:1358

3025 msgid "Failed to execute internal merge"

3026 msgstr "Falló al ejecutar la fusión interna"

3027

2940 -#: merge-recursive.c:1331

3028 +#: merge-recursive.c:1363

3029 #, c-format

3030 msgid "Unable to add %s to database"

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

3032

2945 -#: merge-recursive.c:1363

3033 +#: merge-recursive.c:1395

3034 #, c-format

3035 msgid "Auto-merging %s"

3036 msgstr "Auto-fusionando %s"

3037

2950 -#: merge-recursive.c:1434

3038 +#: merge-recursive.c:1416

3039 #, c-format

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

3041 msgstr ""

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

3043 "cambio."

3044

2957 -#: merge-recursive.c:1501

3045 +#: merge-recursive.c:1483

3046 #, c-format

3047 msgid ""

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

@@ -2963,7 +3051,7 @@ msgstr ""

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

3052 "en el árbol."

3053

2966 -#: merge-recursive.c:1506

3054 +#: merge-recursive.c:1488

3055 #, c-format

3056 msgid ""

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

@@ -2972,7 +3060,7 @@ msgstr ""

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

3061 "permanece en el árbol."

3062

2975 -#: merge-recursive.c:1513

3063 +#: merge-recursive.c:1495

3064 #, c-format

3065 msgid ""

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

@@ -2981,7 +3069,7 @@ msgstr ""

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

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

3071

2984 -#: merge-recursive.c:1518

3072 +#: merge-recursive.c:1500

3073 #, c-format

3074 msgid ""

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

@@ -2990,32 +3078,32 @@ msgstr ""

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

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

3080

2993 -#: merge-recursive.c:1552

3081 +#: merge-recursive.c:1534

3082 msgid "rename"

3083 msgstr "renombrar"

3084

2997 -#: merge-recursive.c:1552

3085 +#: merge-recursive.c:1534

3086 msgid "renamed"

3087 msgstr "renombrado"

3088

3001 -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3002 -#: merge-recursive.c:3129

3089 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3090 +#: merge-recursive.c:3124

3091 #, c-format

3092 msgid "Refusing to lose dirty file at %s"

3093 msgstr "Rehusando perder el archivo sucio en %s"

3094

3007 -#: merge-recursive.c:1620

3095 +#: merge-recursive.c:1602

3096 #, c-format

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

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

3099

3012 -#: merge-recursive.c:1625

3100 +#: merge-recursive.c:1607

3101 #, c-format

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

3103 msgstr ""

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

3105

3018 -#: merge-recursive.c:1651

3106 +#: merge-recursive.c:1633

3107 #, c-format

3108 msgid ""

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

@@ -3024,30 +3112,30 @@ msgstr ""

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

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

3114

3027 -#: merge-recursive.c:1656

3115 +#: merge-recursive.c:1638

3116 msgid " (left unresolved)"

3117 msgstr " (dejado sin resolver)"

3118

3031 -#: merge-recursive.c:1720

3119 +#: merge-recursive.c:1699

3120 #, c-format

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

3122 msgstr ""

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

3124 "%s"

3125

3038 -#: merge-recursive.c:1759

3126 +#: merge-recursive.c:1734

3127 #, c-format

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

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

3130

3043 -#: merge-recursive.c:1771

3131 +#: merge-recursive.c:1746

3132 #, c-format

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

3134 msgstr ""

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

3136 "interponiendo."

3137

3050 -#: merge-recursive.c:1977

3138 +#: merge-recursive.c:1952

3139 #, c-format

3140 msgid ""

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

@@ -3058,7 +3146,7 @@ msgstr ""

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

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

3148

3061 -#: merge-recursive.c:2009

3149 +#: merge-recursive.c:1984

3150 #, c-format

3151 msgid ""

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

@@ -3068,7 +3156,7 @@ msgstr ""

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

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

3158

3071 -#: merge-recursive.c:2019

3159 +#: merge-recursive.c:1994

3160 #, c-format

3161 msgid ""

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

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

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

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

3167

3080 -#: merge-recursive.c:2111

3168 +#: merge-recursive.c:2086

3169 #, c-format

3170 msgid ""

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

@@ -3086,7 +3174,7 @@ msgstr ""

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

3175 "Renombrar directorio %s->%s en %s"

3176

3089 -#: merge-recursive.c:2356

3177 +#: merge-recursive.c:2331

3178 #, c-format

3179 msgid ""

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

@@ -3095,88 +3183,88 @@ msgstr ""

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

3184 "renombrado."

3185

3098 -#: merge-recursive.c:2762

3186 +#: merge-recursive.c:2737

3187 #, c-format

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

3189 msgstr ""

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

3191

3104 -#: merge-recursive.c:2777

3192 +#: merge-recursive.c:2763

3193 #, c-format

3194 msgid "Adding merged %s"

3195 msgstr "Agregar %s fusionado"

3196

3109 -#: merge-recursive.c:2784 merge-recursive.c:3132

3197 +#: merge-recursive.c:2770 merge-recursive.c:3127

3198 #, c-format

3199 msgid "Adding as %s instead"

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

3201

3114 -#: merge-recursive.c:2941

3202 +#: merge-recursive.c:2934

3203 #, c-format

3204 msgid "cannot read object %s"

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

3206

3119 -#: merge-recursive.c:2944

3207 +#: merge-recursive.c:2937

3208 #, c-format

3209 msgid "object %s is not a blob"

3210 msgstr "objeto %s no es un blob"

3211

3124 -#: merge-recursive.c:3013

3212 +#: merge-recursive.c:3006

3213 msgid "modify"

3214 msgstr "modificar"

3215

3128 -#: merge-recursive.c:3013

3216 +#: merge-recursive.c:3006

3217 msgid "modified"

3218 msgstr "modificado"

3219

3132 -#: merge-recursive.c:3024

3220 +#: merge-recursive.c:3017

3221 msgid "content"

3222 msgstr "contenido"

3223

3136 -#: merge-recursive.c:3031

3224 +#: merge-recursive.c:3024

3225 msgid "add/add"

3226 msgstr "agregar/agregar"

3227

3140 -#: merge-recursive.c:3076

3228 +#: merge-recursive.c:3071

3229 #, c-format

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

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

3232

3145 -#: merge-recursive.c:3098 git-submodule.sh:865

3233 +#: merge-recursive.c:3093 git-submodule.sh:858

3234 msgid "submodule"

3235 msgstr "submódulo"

3236

3149 -#: merge-recursive.c:3099

3237 +#: merge-recursive.c:3094

3238 #, c-format

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

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

3241

3154 -#: merge-recursive.c:3221

3242 +#: merge-recursive.c:3216

3243 #, c-format

3244 msgid "Removing %s"

3245 msgstr "Eliminando %s"

3246

3159 -#: merge-recursive.c:3247

3247 +#: merge-recursive.c:3242

3248 msgid "file/directory"

3249 msgstr "archivo/directorio"

3250

3163 -#: merge-recursive.c:3253

3251 +#: merge-recursive.c:3248

3252 msgid "directory/file"

3253 msgstr "directorio/archivo"

3254

3167 -#: merge-recursive.c:3260

3255 +#: merge-recursive.c:3255

3256 #, c-format

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

3258 msgstr ""

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

3260 "%s"

3261

3174 -#: merge-recursive.c:3269

3262 +#: merge-recursive.c:3264

3263 #, c-format

3264 msgid "Adding %s"

3265 msgstr "Agregando %s"

3266

3179 -#: merge-recursive.c:3303

3267 +#: merge-recursive.c:3300

3268 #, c-format

3269 msgid ""

3270 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3186,40 +3274,170 @@ msgstr ""

3274 "merge:\n"

3275 " %s"

3276

3189 -#: merge-recursive.c:3314

3277 +#: merge-recursive.c:3311

3278 msgid "Already up to date!"

3279 msgstr "¡Ya está actualizado!"

3280

3193 -#: merge-recursive.c:3323

3281 +#: merge-recursive.c:3320

3282 #, c-format

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

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

3285

3198 -#: merge-recursive.c:3422

3286 +#: merge-recursive.c:3419

3287 msgid "Merging:"

3288 msgstr "Fusionando:"

3289

3202 -#: merge-recursive.c:3435

3290 +#: merge-recursive.c:3432

3291 #, c-format

3292 msgid "found %u common ancestor:"

3293 msgid_plural "found %u common ancestors:"

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

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

3296

3209 -#: merge-recursive.c:3474

3297 +#: merge-recursive.c:3471

3298 msgid "merge returned no commit"

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

3300

3213 -#: merge-recursive.c:3540

3301 +#: merge-recursive.c:3537

3302 #, c-format

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

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

3305

3218 -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3306 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3307 msgid "Unable to write index."

3308 msgstr "Incapaz de escribir el índice."

3309

3222 -#: notes-merge.c:274

3310 +#: midx.c:65

3311 +#, c-format

3312 +msgid "multi-pack-index file %s is too small"

3313 +msgstr "archivo multi-pack-index %s es muy pequeño"

3314 +

3315 +#: midx.c:81

3316 +#, c-format

3317 +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3318 +msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"

3319 +

3320 +#: midx.c:86

3321 +#, c-format

3322 +msgid "multi-pack-index version %d not recognized"

3323 +msgstr "versión %d de multi-pack-index no reconocida"

3324 +

3325 +#: midx.c:91

3326 +#, c-format

3327 +msgid "hash version %u does not match"

3328 +msgstr "versión de hash %u no concuerda"

3329 +

3330 +#: midx.c:105

3331 +msgid "invalid chunk offset (too large)"

3332 +msgstr "offset inválido del conjunto (muy grande)"

3333 +

3334 +#: midx.c:129

3335 +msgid "terminating multi-pack-index chunk id appears earlier than expected"

3336 +msgstr ""

3337 +"terminando multi-pack-index porque el id del conjunto aparece antes de lo "

3338 +"esperado"

3339 +

3340 +#: midx.c:142

3341 +msgid "multi-pack-index missing required pack-name chunk"

3342 +msgstr "multi-pack-index le falta el conjunto pack-name requerido"

3343 +

3344 +#: midx.c:144

3345 +msgid "multi-pack-index missing required OID fanout chunk"

3346 +msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

3347 +

3348 +#: midx.c:146

3349 +msgid "multi-pack-index missing required OID lookup chunk"

3350 +msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

3351 +

3352 +#: midx.c:148

3353 +msgid "multi-pack-index missing required object offsets chunk"

3354 +msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

3355 +

3356 +#: midx.c:162

3357 +#, c-format

3358 +msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3359 +msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

3360 +

3361 +#: midx.c:205

3362 +#, c-format

3363 +msgid "bad pack-int-id: %u (%u total packs)"

3364 +msgstr "mal pack-int-id: %u (%u paquetes totales)"

3365 +

3366 +#: midx.c:246

3367 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3368 +msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

3369 +

3370 +#: midx.c:271

3371 +msgid "error preparing packfile from multi-pack-index"

3372 +msgstr "error preparando packfile de multi-pack-index"

3373 +

3374 +#: midx.c:407

3375 +#, c-format

3376 +msgid "failed to add packfile '%s'"

3377 +msgstr "falló al agregar packfile '%s'"

3378 +

3379 +#: midx.c:413

3380 +#, c-format

3381 +msgid "failed to open pack-index '%s'"

3382 +msgstr "falló al abrir pack-index '%s'"

3383 +

3384 +#: midx.c:507

3385 +#, c-format

3386 +msgid "failed to locate object %d in packfile"

3387 +msgstr "falló al ubicar objeto %d en packfile"

3388 +

3389 +#: midx.c:943

3390 +#, c-format

3391 +msgid "failed to clear multi-pack-index at %s"

3392 +msgstr "falló al limpiar multi-pack-index en %s"

3393 +

3394 +#: midx.c:981

3395 +#, c-format

3396 +msgid ""

3397 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3398 +msgstr ""

3399 +"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3400 +

3401 +#: midx.c:992

3402 +#, c-format

3403 +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3404 +msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

3405 +

3406 +#: midx.c:996

3407 +msgid "Verifying object offsets"

3408 +msgstr "Verificando offsets de objetos"

3409 +

3410 +#: midx.c:1004

3411 +#, c-format

3412 +msgid "failed to load pack entry for oid[%d] = %s"

3413 +msgstr "fallo al cargar entrada pack para oid[%d] = %s"

3414 +

3415 +#: midx.c:1010

3416 +#, c-format

3417 +msgid "failed to load pack-index for packfile %s"

3418 +msgstr "falló al cargar el pack-index para packfile %s"

3419 +

3420 +#: midx.c:1019

3421 +#, c-format

3422 +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3423 +msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3424 +

3425 +#: name-hash.c:532

3426 +#, c-format

3427 +msgid "unable to create lazy_dir thread: %s"

3428 +msgstr "no es posible crear hilo lazy_dir: %s"

3429 +

3430 +#: name-hash.c:554

3431 +#, c-format

3432 +msgid "unable to create lazy_name thread: %s"

3433 +msgstr "no es posible crear hilo lazy_name: %s"

3434 +

3435 +#: name-hash.c:560

3436 +#, c-format

3437 +msgid "unable to join lazy_name thread: %s"

3438 +msgstr "no es posible unir hilo lazy_name: %s"

3439 +

3440 +#: notes-merge.c:275

3441 #, c-format

3442 msgid ""

3443 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3231,7 +3449,7 @@ msgstr ""

3449 "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "

3450 "nota de fusión."

3451

3234 -#: notes-merge.c:281

3452 +#: notes-merge.c:282

3453 #, c-format

3454 msgid "You have not concluded your notes merge (%s exists)."

3455 msgstr "No has terminado tus notas de fusión (%s existe)."

@@ -3274,7 +3492,7 @@ msgstr "objeto %s es un %s, no un %s"

3492 #: object.c:233

3493 #, c-format

3494 msgid "object %s has unknown type id %d"

3277 -msgstr "El objeto %s tiene un id de tipo desconocido %d"

3495 +msgstr "el objeto %s tiene un id de tipo desconocido %d"

3496

3497 #: object.c:246

3498 #, c-format

@@ -3286,17 +3504,17 @@ msgstr "incapaz de analizar objeto: %s"

3504 msgid "sha1 mismatch %s"

3505 msgstr "sha1 no concuerda %s"

3506

3289 -#: packfile.c:563

3507 +#: packfile.c:607

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

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

3510

3293 -#: packfile.c:1745

3511 +#: packfile.c:1864

3512 #, c-format

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

3514 msgstr ""

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

3516

3299 -#: packfile.c:1749

3517 +#: packfile.c:1868

3518 #, c-format

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

3520 msgstr ""

@@ -3328,17 +3546,17 @@ msgstr " %s"

3546 msgid "-NUM"

3547 msgstr "-NUM"

3548

3331 -#: parse-options-cb.c:44

3549 +#: parse-options-cb.c:37

3550 #, c-format

3551 msgid "malformed expiration date '%s'"

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

3553

3336 -#: parse-options-cb.c:112

3554 +#: parse-options-cb.c:109

3555 #, c-format

3556 msgid "malformed object name '%s'"

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

3558

3341 -#: path.c:892

3559 +#: path.c:894

3560 #, c-format

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

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

@@ -3444,7 +3662,7 @@ msgstr "error de lectura"

3662

3663 #: pkt-line.c:299

3664 msgid "the remote end hung up unexpectedly"

3447 -msgstr "El remoto se colgó de manera inesperada"

3665 +msgstr "el remoto se colgó de manera inesperada"

3666

3667 #: pkt-line.c:327

3668 #, c-format

@@ -3456,33 +3674,46 @@ msgstr "error de protocolo: mal caracter de largo de línea: %.4s"

3674 msgid "protocol error: bad line length %d"

3675 msgstr "error de protocolo: mal largo de línea %d"

3676

3677 +#: preload-index.c:118

3678 +msgid "Refreshing index"

3679 +msgstr "Refrescando index"

3680 +

3681 +#: preload-index.c:137

3682 +#, c-format

3683 +msgid "unable to create threaded lstat: %s"

3684 +msgstr "no es posible crear lstat hilado: %s"

3685 +

3686 #: pretty.c:962

3687 msgid "unable to parse --pretty format"

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

3689

3463 -#: range-diff.c:48

3690 +#: range-diff.c:56

3691 msgid "could not start `log`"

3692 msgstr "no se pudo comenzar `log`"

3693

3467 -#: range-diff.c:51

3694 +#: range-diff.c:59

3695 msgid "could not read `log` output"

3696 msgstr "no se pudo leer output de `log`"

3697

3471 -#: range-diff.c:66 sequencer.c:4540

3698 +#: range-diff.c:74 sequencer.c:4764

3699 #, c-format

3700 msgid "could not parse commit '%s'"

3701 msgstr "no se pudo analizar commit '%s'"

3702

3476 -#: range-diff.c:196

3703 +#: range-diff.c:224

3704 msgid "failed to generate diff"

3705 msgstr "falló al generar diff"

3706

3480 -#: range-diff.c:421 range-diff.c:423

3707 +#: range-diff.c:455 range-diff.c:457

3708 #, c-format

3709 msgid "could not parse log for '%s'"

3710 msgstr "no se pudo leer el log para '%s'"

3711

3485 -#: read-cache.c:1579

3712 +#: read-cache.c:1490

3713 +msgid "Refresh index"

3714 +msgstr "Refrescar index"

3715 +

3716 +#: read-cache.c:1604

3717 #, c-format

3718 msgid ""

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

@@ -3491,7 +3722,7 @@ msgstr ""

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

3723 "Usando versión %i"

3724

3494 -#: read-cache.c:1589

3725 +#: read-cache.c:1614

3726 #, c-format

3727 msgid ""

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

@@ -3500,135 +3731,260 @@ msgstr ""

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

3732 "Usando versión %i"

3733

3503 -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3734 +#: read-cache.c:1792

3735 +#, c-format

3736 +msgid "malformed name field in the index, near path '%s'"

3737 +msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

3738 +

3739 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3740 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3741 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3742 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3743 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3744 +msgid "index file corrupt"

3745 +msgstr "archivo índice corrompido"

3746 +

3747 +#: read-cache.c:2101

3748 +#, c-format

3749 +msgid "unable to create load_cache_entries thread: %s"

3750 +msgstr "no es posible crear hilo load_cache_entries: %s"

3751 +

3752 +#: read-cache.c:2114

3753 +#, c-format

3754 +msgid "unable to join load_cache_entries thread: %s"

3755 +msgstr "no es posible unir hilo load_cache_entires: %s"

3756 +

3757 +#: read-cache.c:2201

3758 +#, c-format

3759 +msgid "unable to create load_index_extensions thread: %s"

3760 +msgstr "no es posible crear hilo load_index_extensions: %s"

3761 +

3762 +#: read-cache.c:2228

3763 +#, c-format

3764 +msgid "unable to join load_index_extensions thread: %s"

3765 +msgstr "no es posible unir hilo load_index_extensions: %s"

3766 +

3767 +#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3768 #, c-format

3769 msgid "could not close '%s'"

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

3771

3508 -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3772 +#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

3773 #, c-format

3774 msgid "could not stat '%s'"

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

3776

3513 -#: read-cache.c:2666

3777 +#: read-cache.c:3068

3778 #, c-format

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

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

3781

3518 -#: read-cache.c:2678

3782 +#: read-cache.c:3080

3783 #, c-format

3784 msgid "unable to unlink: %s"

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

3786

3787 +#: rebase-interactive.c:10

3788 +msgid ""

3789 +"\n"

3790 +"Commands:\n"

3791 +"p, pick <commit> = use commit\n"

3792 +"r, reword <commit> = use commit, but edit the commit message\n"

3793 +"e, edit <commit> = use commit, but stop for amending\n"

3794 +"s, squash <commit> = use commit, but meld into previous commit\n"

3795 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

3796 +"x, exec <command> = run command (the rest of the line) using shell\n"

3797 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

3798 +"d, drop <commit> = remove commit\n"

3799 +"l, label <label> = label current HEAD with a name\n"

3800 +"t, reset <label> = reset HEAD to a label\n"

3801 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3802 +". create a merge commit using the original merge commit's\n"

3803 +". message (or the oneline, if no original merge commit was\n"

3804 +". specified). Use -c <commit> to reword the commit message.\n"

3805 +"\n"

3806 +"These lines can be re-ordered; they are executed from top to bottom.\n"

3807 +msgstr ""

3808 +"\n"

3809 +"Comandos:\n"

3810 +"p, pick <commit> = usar commit\n"

3811 +"r, reword <commit> = usar commit, pero editar el mensaje de commit\n"

3812 +"e, edit <commit> = usar commit, pero parar para un amend\n"

3813 +"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"

3814 +"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "

3815 +"este commit\n"

3816 +"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n"

3817 +"b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n"

3818 +"d, drop <commit> = remover commit\n"

3819 +"l, label <label> = poner label al HEAD actual con un nombre\n"

3820 +"t, reset <label> = reiniciar HEAD a el label\n"

3821 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3822 +". crea un commit de fusión usando el mensaje original de\n"

3823 +". fusión (o la línea de oneline, si no se especifica un mensaje\n"

3824 +". de commit). Use -c <commit> para reescribir el mensaje del commit.\n"

3825 +"\n"

3826 +"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "

3827 +"abajo.\n"

3828 +

3829 +#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

3830 +msgid ""

3831 +"\n"

3832 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

3833 +msgstr ""

3834 +"\n"

3835 +"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"

3836 +

3837 +#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

3838 +msgid ""

3839 +"\n"

3840 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

3841 +msgstr ""

3842 +"\n"

3843 +"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"

3844 +

3845 +#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

3846 +msgid ""

3847 +"\n"

3848 +"You are editing the todo file of an ongoing interactive rebase.\n"

3849 +"To continue rebase after editing, run:\n"

3850 +" git rebase --continue\n"

3851 +"\n"

3852 +msgstr ""

3853 +"\n"

3854 +"Esta editando el archivo TODO de un rebase interactivo.\n"

3855 +"Para continuar el rebase después de editar, ejecute:\n"

3856 +" git rebase --continue\n"

3857 +"\n"

3858 +

3859 +#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

3860 +msgid ""

3861 +"\n"

3862 +"However, if you remove everything, the rebase will be aborted.\n"

3863 +"\n"

3864 +msgstr ""

3865 +"\n"

3866 +"Como sea, si quieres borrar todo, el rebase será abortado.\n"

3867 +"\n"

3868 +

3869 +#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

3870 +msgid "Note that empty commits are commented out"

3871 +msgstr "Tenga en cuenta que los commits vacíos están comentados"

3872 +

3873 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3874 +#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3875 +#, c-format

3876 +msgid "could not read '%s'."

3877 +msgstr "no se puede leer '%s'."

3878 +

3879 #: refs.c:192

3880 #, c-format

3881 msgid "%s does not point to a valid object!"

3882 msgstr "%s no apunta a ningún objeto válido!"

3883

3528 -#: refs.c:579

3884 +#: refs.c:583

3885 #, c-format

3886 msgid "ignoring dangling symref %s"

3887 msgstr "ignorando referencia rota %s"

3888

3533 -#: refs.c:581 ref-filter.c:2067

3889 +#: refs.c:585 ref-filter.c:1951

3890 #, c-format

3891 msgid "ignoring broken ref %s"

3892 msgstr "ignorando referencia rota %s"

3893

3538 -#: refs.c:685

3894 +#: refs.c:711

3895 #, c-format

3896 msgid "could not open '%s' for writing: %s"

3897 msgstr "no se pudo abrir '%s' para escritura: %s"

3898

3543 -#: refs.c:695 refs.c:746

3899 +#: refs.c:721 refs.c:772

3900 #, c-format

3901 msgid "could not read ref '%s'"

3546 -msgstr "No se pudo leer la referencia '%s'"

3902 +msgstr "no se pudo leer la referencia '%s'"

3903

3548 -#: refs.c:701

3904 +#: refs.c:727

3905 #, c-format

3906 msgid "ref '%s' already exists"

3907 msgstr "ref '%s' ya existe"

3908

3553 -#: refs.c:706

3909 +#: refs.c:732

3910 #, c-format

3911 msgid "unexpected object ID when writing '%s'"

3912 msgstr "ID de objecto inesperado cuando se escribía '%s'"

3913

3558 -#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3559 -#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3914 +#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3915 +#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

3916 #: wrapper.c:656

3917 #, c-format

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

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

3920

3565 -#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3566 -#: builtin/am.c:780

3921 +#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3922 +#: builtin/am.c:728

3923 #, c-format

3924 msgid "could not open '%s' for writing"

3925 msgstr "no se pudo abrir '%s' para escritura"

3926

3571 -#: refs.c:748

3927 +#: refs.c:774

3928 #, c-format

3929 msgid "unexpected object ID when deleting '%s'"

3930 msgstr "ID de objecto inesperado cuando se borraba '%s'"

3931

3576 -#: refs.c:879

3932 +#: refs.c:905

3933 #, c-format

3934 msgid "log for ref %s has gap after %s"

3935 msgstr "log de ref %s tiene un vacío tras %s"

3936

3581 -#: refs.c:885

3937 +#: refs.c:911

3938 #, c-format

3939 msgid "log for ref %s unexpectedly ended on %s"

3940 msgstr "log de ref %s finalizado inesperadamente en %s"

3941

3586 -#: refs.c:943

3942 +#: refs.c:969

3943 #, c-format

3944 msgid "log for %s is empty"

3945 msgstr "log de %s está vacío"

3946

3591 -#: refs.c:1035

3947 +#: refs.c:1061

3948 #, c-format

3949 msgid "refusing to update ref with bad name '%s'"

3950 msgstr "rehusando actualizar ref con mal nombre '%s'"

3951

3596 -#: refs.c:1111

3952 +#: refs.c:1137

3953 #, c-format

3954 msgid "update_ref failed for ref '%s': %s"

3955 msgstr "update_ref falló para ref '%s': %s"

3956

3601 -#: refs.c:1853

3957 +#: refs.c:1911

3958 #, c-format

3959 msgid "multiple updates for ref '%s' not allowed"

3960 msgstr "múltiples actualizaciones para ref '%s' no permitidas"

3961

3606 -#: refs.c:1885

3962 +#: refs.c:1943

3963 msgid "ref updates forbidden inside quarantine environment"

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

3965

3610 -#: refs.c:1981 refs.c:2011

3966 +#: refs.c:2039 refs.c:2069

3967 #, c-format

3968 msgid "'%s' exists; cannot create '%s'"

3969 msgstr "'%s' existe; no se puede crear '%s'"

3970

3615 -#: refs.c:1987 refs.c:2022

3971 +#: refs.c:2045 refs.c:2080

3972 #, c-format

3973 msgid "cannot process '%s' and '%s' at the same time"

3618 -msgstr "No se puede procesar '%s' y '%s' al mismo tiempo"

3974 +msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

3975

3620 -#: refs/files-backend.c:1191

3976 +#: refs/files-backend.c:1228

3977 #, c-format

3978 msgid "could not remove reference %s"

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

3980

3625 -#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3981 +#: refs/files-backend.c:1242 refs/packed-backend.c:1532

3982 #: refs/packed-backend.c:1542

3983 #, c-format

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

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

3986

3631 -#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3987 +#: refs/files-backend.c:1245 refs/packed-backend.c:1545

3988 #, c-format

3989 msgid "could not delete references: %s"

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

@@ -3638,191 +3994,198 @@ msgstr "no se pudo eliminar la referencia: %s"

3994 msgid "invalid refspec '%s'"

3995 msgstr "refspec inválido: '%s'"

3996

3641 -#: ref-filter.c:38 wt-status.c:1850

3997 +#: ref-filter.c:39 wt-status.c:1855

3998 msgid "gone"

3999 msgstr "desaparecido"

4000

3645 -#: ref-filter.c:39

4001 +#: ref-filter.c:40

4002 #, c-format

4003 msgid "ahead %d"

4004 msgstr "adelante %d"

4005

3650 -#: ref-filter.c:40

4006 +#: ref-filter.c:41

4007 #, c-format

4008 msgid "behind %d"

4009 msgstr "detrás %d"

4010

3655 -#: ref-filter.c:41

4011 +#: ref-filter.c:42

4012 #, c-format

4013 msgid "ahead %d, behind %d"

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

4015

3660 -#: ref-filter.c:137

4016 +#: ref-filter.c:138

4017 #, c-format

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

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

4020

3665 -#: ref-filter.c:139

4021 +#: ref-filter.c:140

4022 #, c-format

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

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

4025

3670 -#: ref-filter.c:161

4026 +#: ref-filter.c:162

4027 #, c-format

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

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

4030

3675 -#: ref-filter.c:165

4031 +#: ref-filter.c:166

4032 #, c-format

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

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

4035

3680 -#: ref-filter.c:167

4036 +#: ref-filter.c:168

4037 #, c-format

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

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

4040

3685 -#: ref-filter.c:222

4041 +#: ref-filter.c:223

4042 #, c-format

4043 msgid "%%(objecttype) does not take arguments"

4044 msgstr "%%(objecttype) no toma ningún argumento"

4045

3690 -#: ref-filter.c:234

4046 +#: ref-filter.c:235

4047 #, c-format

4048 msgid "%%(objectsize) does not take arguments"

4049 msgstr "%%(objectsize) no toma argumentos"

4050

3695 -#: ref-filter.c:246

4051 +#: ref-filter.c:247

4052 #, c-format

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

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

4055

3700 -#: ref-filter.c:255

4056 +#: ref-filter.c:256

4057 #, c-format

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

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

4060

3705 -#: ref-filter.c:275

4061 +#: ref-filter.c:278

4062 #, c-format

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

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

4065

3710 -#: ref-filter.c:304

4066 +#: ref-filter.c:307

4067 #, c-format

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

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

4070

3715 -#: ref-filter.c:306

4071 +#: ref-filter.c:309

4072 #, c-format

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

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

4075

3720 -#: ref-filter.c:321

4076 +#: ref-filter.c:324

4077 #, c-format

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

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

4080

3725 -#: ref-filter.c:325

4081 +#: ref-filter.c:328

4082 #, c-format

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

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

4085

3730 -#: ref-filter.c:355

4086 +#: ref-filter.c:358

4087 #, c-format

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

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

4090

3735 -#: ref-filter.c:367

4091 +#: ref-filter.c:370

4092 #, c-format

4093 msgid "unrecognized position:%s"

4094 msgstr "posición desconocida: %s"

4095

3740 -#: ref-filter.c:374

4096 +#: ref-filter.c:377

4097 #, c-format

4098 msgid "unrecognized width:%s"

4099 msgstr "ancho desconocido: %s"

4100

3745 -#: ref-filter.c:383

4101 +#: ref-filter.c:386

4102 #, c-format

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

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

4105

3750 -#: ref-filter.c:391

4106 +#: ref-filter.c:394

4107 #, c-format

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

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

4110

3755 -#: ref-filter.c:409

4111 +#: ref-filter.c:412

4112 #, c-format

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

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

4115

3760 -#: ref-filter.c:505

4116 +#: ref-filter.c:508

4117 #, c-format

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

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

4120

3765 -#: ref-filter.c:532

4121 +#: ref-filter.c:535

4122 #, c-format

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

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

4125

3770 -#: ref-filter.c:656

4126 +#: ref-filter.c:539

4127 +#, c-format

4128 +msgid ""

4129 +"not a git repository, but the field '%.*s' requires access to object data"

4130 +msgstr ""

4131 +"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"

4132 +

4133 +#: ref-filter.c:663

4134 #, c-format

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

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

4137

3775 -#: ref-filter.c:719

4138 +#: ref-filter.c:726

4139 #, c-format

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

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

4142

3780 -#: ref-filter.c:721

4143 +#: ref-filter.c:728

4144 #, c-format

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

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

4147

3785 -#: ref-filter.c:723

4148 +#: ref-filter.c:730

4149 #, c-format

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

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

4152

3790 -#: ref-filter.c:751

4153 +#: ref-filter.c:758

4154 #, c-format

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

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

4157

3795 -#: ref-filter.c:753

4158 +#: ref-filter.c:760

4159 #, c-format

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

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

4162

3800 -#: ref-filter.c:755

4163 +#: ref-filter.c:762

4164 #, c-format

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

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

4167

3805 -#: ref-filter.c:770

4168 +#: ref-filter.c:777

4169 #, c-format

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

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

4172

3810 -#: ref-filter.c:827

4173 +#: ref-filter.c:834

4174 #, c-format

4175 msgid "malformed format string %s"

4176 msgstr "formato de cadena mal formado %s"

4177

3815 -#: ref-filter.c:1416

4178 +#: ref-filter.c:1424

4179 #, c-format

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

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

4182

3820 -#: ref-filter.c:1419

4183 +#: ref-filter.c:1427

4184 #, c-format

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

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

4187

3825 -#: ref-filter.c:1422

4188 +#: ref-filter.c:1430

4189 #, c-format

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

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

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

4193 #. TRANSLATORS: make sure this matches "HEAD

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

4195 #.

3833 -#: ref-filter.c:1430

4196 +#: ref-filter.c:1438

4197 #, c-format

4198 msgid "(HEAD detached at %s)"

4199 msgstr "(HEAD desacoplado en %s)"

@@ -3838,143 +4201,143 @@ msgstr "(HEAD desacoplado en %s)"

4201 #. TRANSLATORS: make sure this matches "HEAD

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

4203 #.

3841 -#: ref-filter.c:1437

4204 +#: ref-filter.c:1445

4205 #, c-format

4206 msgid "(HEAD detached from %s)"

4207 msgstr "(HEAD desacoplado de %s)"

4208

3846 -#: ref-filter.c:1441

4209 +#: ref-filter.c:1449

4210 msgid "(no branch)"

4211 msgstr "(sin rama)"

4212

3850 -#: ref-filter.c:1475 ref-filter.c:1623

4213 +#: ref-filter.c:1483 ref-filter.c:1638

4214 #, c-format

4215 msgid "missing object %s for %s"

4216 msgstr "falta objeto %s para %s"

4217

3855 -#: ref-filter.c:1483

4218 +#: ref-filter.c:1491

4219 #, c-format

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

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

4222

3860 -#: ref-filter.c:1980

4223 +#: ref-filter.c:1857

4224 #, c-format

4225 msgid "malformed object at '%s'"

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

4227

3865 -#: ref-filter.c:2062

4228 +#: ref-filter.c:1946

4229 #, c-format

4230 msgid "ignoring ref with broken name %s"

4231 msgstr "ignorando referencia con nombre roto %s"

4232

3870 -#: ref-filter.c:2340

4233 +#: ref-filter.c:2232

4234 #, c-format

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

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

4237

3875 -#: ref-filter.c:2444

4238 +#: ref-filter.c:2338

4239 #, c-format

4240 msgid "malformed object name %s"

4241 msgstr "nombre de objeto mal formado %s"

4242

3880 -#: remote.c:606

4243 +#: remote.c:607

4244 #, c-format

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

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

4247

3885 -#: remote.c:610

4248 +#: remote.c:611

4249 #, c-format

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

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

4252

3890 -#: remote.c:614

4253 +#: remote.c:615

4254 #, c-format

4255 msgid "%s tracks both %s and %s"

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

4257

3895 -#: remote.c:622

4258 +#: remote.c:623

4259 msgid "Internal error"

4260 msgstr "Error interno"

4261

3899 -#: remote.c:1536 remote.c:1637

4262 +#: remote.c:1569 remote.c:1670

4263 msgid "HEAD does not point to a branch"

4264 msgstr "HEAD no apunta a ninguna rama"

4265

3903 -#: remote.c:1545

4266 +#: remote.c:1578

4267 #, c-format

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

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

4270

3908 -#: remote.c:1548

4271 +#: remote.c:1581

4272 #, c-format

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

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

4275

3913 -#: remote.c:1554

4276 +#: remote.c:1587

4277 #, c-format

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

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

4280

3918 -#: remote.c:1569

4281 +#: remote.c:1602

4282 #, c-format

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

4284 msgstr ""

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

4286

3924 -#: remote.c:1581

4287 +#: remote.c:1614

4288 #, c-format

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

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

4291

3929 -#: remote.c:1591

4292 +#: remote.c:1624

4293 #, c-format

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

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

4296

3934 -#: remote.c:1604

4297 +#: remote.c:1637

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

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

4300

3938 -#: remote.c:1626

4301 +#: remote.c:1659

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

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

4304

3942 -#: remote.c:1951

4305 +#: remote.c:1935

4306 #, c-format

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

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

4309

3947 -#: remote.c:1955

4310 +#: remote.c:1939

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

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

4313

3951 -#: remote.c:1958

4314 +#: remote.c:1942

4315 #, c-format

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

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

4318

3956 -#: remote.c:1962

4319 +#: remote.c:1946

4320 #, c-format

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

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

4323

3961 -#: remote.c:1965

4324 +#: remote.c:1949

4325 #, c-format

4326 msgid " (use \"%s\" for details)\n"

4327 msgstr " (usa \"%s\" para detalles)\n"

4328

3966 -#: remote.c:1969

4329 +#: remote.c:1953

4330 #, c-format

4331 msgid "Your branch is ahead of '%s' by %d commit.\n"

4332 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

4333 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"

4334 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"

4335

3973 -#: remote.c:1975

4336 +#: remote.c:1959

4337 msgid " (use \"git push\" to publish your local commits)\n"

4338 msgstr " (usa \"git push\" para publicar tus commits locales)\n"

4339

3977 -#: remote.c:1978

4340 +#: remote.c:1962

4341 #, c-format

4342 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

4343 msgid_plural ""

@@ -3984,11 +4347,11 @@ msgstr[0] ""

4347 msgstr[1] ""

4348 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"

4349

3987 -#: remote.c:1986

4350 +#: remote.c:1970

4351 msgid " (use \"git pull\" to update your local branch)\n"

4352 msgstr " (usa \"git pull\" para actualizar tu rama local)\n"

4353

3991 -#: remote.c:1989

4354 +#: remote.c:1973

4355 #, c-format

4356 msgid ""

4357 "Your branch and '%s' have diverged,\n"

@@ -4003,56 +4366,159 @@ msgstr[1] ""

4366 "Tu rama y '%s' han divergido,\n"

4367 "y tienen %d y %d commits diferentes cada una respectivamente.\n"

4368

4006 -#: remote.c:1999

4369 +#: remote.c:1983

4370 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

4371 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

4372

4010 -#: replace-object.c:20

4373 +#: replace-object.c:21

4374 #, c-format

4375 msgid "bad replace ref name: %s"

4376 msgstr "mal nombre de ref de reemplazo: %s"

4377

4015 -#: replace-object.c:29

4378 +#: replace-object.c:30

4379 #, c-format

4380 msgid "duplicate replace ref: %s"

4381 msgstr "duplicar ref de reemplazo: %s"

4382

4020 -#: replace-object.c:72

4383 +#: replace-object.c:73

4384 #, c-format

4385 msgid "replace depth too high for object %s"

4386 msgstr "remplazar profundiad muy elevada para objeto %s"

4387

4025 -#: revision.c:2305

4026 -msgid "your current branch appears to be broken"

4027 -msgstr "tu rama actual parece estar rota"

4388 +#: rerere.c:217 rerere.c:226 rerere.c:229

4389 +msgid "corrupt MERGE_RR"

4390 +msgstr "MERGE_RR corrupto"

4391

4029 -#: revision.c:2308

4392 +#: rerere.c:264 rerere.c:269

4393 +msgid "unable to write rerere record"

4394 +msgstr "incapaz de escribir entrada rerere"

4395 +

4396 +#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4397 #, c-format

4031 -msgid "your current branch '%s' does not have any commits yet"

4032 -msgstr "tu rama actual '%s' no tiene ningún commit todavía"

4398 +msgid "could not write '%s'"

4399 +msgstr "no se pudo escribir '%s'"

4400

4034 -#: revision.c:2505

4035 -msgid "--first-parent is incompatible with --bisect"

4036 -msgstr "--first-parent es incompatible con --bisect"

4401 +#: rerere.c:495

4402 +#, c-format

4403 +msgid "there were errors while writing '%s' (%s)"

4404 +msgstr "hubieron errores mientras se escribía '%s' (%s)"

4405

4038 -#: run-command.c:728

4039 -msgid "open /dev/null failed"

4040 -msgstr "falló al abrir /dev/null"

4406 +#: rerere.c:498

4407 +#, c-format

4408 +msgid "failed to flush '%s'"

4409 +msgstr "falló al hacer flush '%s'"

4410

4042 -#: run-command.c:1271

4411 +#: rerere.c:503 rerere.c:1039

4412 #, c-format

4044 -msgid ""

4045 -"The '%s' hook was ignored because it's not set as executable.\n"

4046 -"You can disable this warning with `git config advice.ignoredHook false`."

4047 -msgstr ""

4048 -"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"

4049 -"Puedes desactivar esta advertencias con `git config advice.ignoredHook "

4050 -"false`."

4413 +msgid "could not parse conflict hunks in '%s'"

4414 +msgstr "no se pudo analizar hunks en conflicto en '%s'"

4415

4052 -#: send-pack.c:142

4053 -msgid "unexpected flush packet while reading remote unpack status"

4054 -msgstr ""

4055 -"flush packet inesperado mientras se leía estatus de desempaquetado remoto"

4416 +#: rerere.c:684

4417 +#, c-format

4418 +msgid "failed utime() on '%s'"

4419 +msgstr "falló utime() en '%s'"

4420 +

4421 +#: rerere.c:694

4422 +#, c-format

4423 +msgid "writing '%s' failed"

4424 +msgstr "escribiendo '%s' falló"

4425 +

4426 +#: rerere.c:714

4427 +#, c-format

4428 +msgid "Staged '%s' using previous resolution."

4429 +msgstr "'%s' puesto en stage usando resolución previa."

4430 +

4431 +#: rerere.c:753

4432 +#, c-format

4433 +msgid "Recorded resolution for '%s'."

4434 +msgstr "Resolución guardada para '%s'."

4435 +

4436 +#: rerere.c:788

4437 +#, c-format

4438 +msgid "Resolved '%s' using previous resolution."

4439 +msgstr "'%s' resuelto usando resolución previa."

4440 +

4441 +#: rerere.c:803

4442 +#, c-format

4443 +msgid "cannot unlink stray '%s'"

4444 +msgstr "no se puede desvincular stray '%s'"

4445 +

4446 +#: rerere.c:807

4447 +#, c-format

4448 +msgid "Recorded preimage for '%s'"

4449 +msgstr "Resolución precargada para '%s'"

4450 +

4451 +#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4452 +#: builtin/submodule--helper.c:1423

4453 +#, c-format

4454 +msgid "could not create directory '%s'"

4455 +msgstr "no se pudo crear el directorio '%s'"

4456 +

4457 +#: rerere.c:1057

4458 +#, c-format

4459 +msgid "failed to update conflicted state in '%s'"

4460 +msgstr "falló al actualizar estado conflictivo en '%s'"

4461 +

4462 +#: rerere.c:1068 rerere.c:1075

4463 +#, c-format

4464 +msgid "no remembered resolution for '%s'"

4465 +msgstr "resolución para '%s' no recordada"

4466 +

4467 +#: rerere.c:1077

4468 +#, c-format

4469 +msgid "cannot unlink '%s'"

4470 +msgstr "no se puede desvincular '%s'"

4471 +

4472 +#: rerere.c:1087

4473 +#, c-format

4474 +msgid "Updated preimage for '%s'"

4475 +msgstr "Actualizada preimagen para '%s'"

4476 +

4477 +#: rerere.c:1096

4478 +#, c-format

4479 +msgid "Forgot resolution for '%s'\n"

4480 +msgstr "Se olvidó resolución para '%s'\n"

4481 +

4482 +#: rerere.c:1199

4483 +msgid "unable to open rr-cache directory"

4484 +msgstr "no es posible abrir directorio rr-cache"

4485 +

4486 +#: revision.c:2324

4487 +msgid "your current branch appears to be broken"

4488 +msgstr "tu rama actual parece estar rota"

4489 +

4490 +#: revision.c:2327

4491 +#, c-format

4492 +msgid "your current branch '%s' does not have any commits yet"

4493 +msgstr "tu rama actual '%s' no tiene ningún commit todavía"

4494 +

4495 +#: revision.c:2523

4496 +msgid "--first-parent is incompatible with --bisect"

4497 +msgstr "--first-parent es incompatible con --bisect"

4498 +

4499 +#: run-command.c:740

4500 +msgid "open /dev/null failed"

4501 +msgstr "falló al abrir /dev/null"

4502 +

4503 +#: run-command.c:1229

4504 +#, c-format

4505 +msgid "cannot create async thread: %s"

4506 +msgstr "no es posible crear hilo async: %s"

4507 +

4508 +#: run-command.c:1293

4509 +#, c-format

4510 +msgid ""

4511 +"The '%s' hook was ignored because it's not set as executable.\n"

4512 +"You can disable this warning with `git config advice.ignoredHook false`."

4513 +msgstr ""

4514 +"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"

4515 +"Puedes desactivar esta advertencias con `git config advice.ignoredHook "

4516 +"false`."

4517 +

4518 +#: send-pack.c:142

4519 +msgid "unexpected flush packet while reading remote unpack status"

4520 +msgstr ""

4521 +"flush packet inesperado mientras se leía estatus de desempaquetado remoto"

4522

4523 #: send-pack.c:144

4524 #, c-format

@@ -4064,15 +4530,15 @@ msgstr "no es posible analizar el estado de desempaquetado remoto: %s"

4530 msgid "remote unpack failed: %s"

4531 msgstr "desempaquetado remoto falló: %s"

4532

4067 -#: send-pack.c:309

4533 +#: send-pack.c:308

4534 msgid "failed to sign the push certificate"

4535 msgstr "falló al firmar el certificado de push"

4536

4071 -#: send-pack.c:422

4537 +#: send-pack.c:421

4538 msgid "the receiving end does not support --signed push"

4539 msgstr "el final receptor no soporta --signed push"

4540

4075 -#: send-pack.c:424

4541 +#: send-pack.c:423

4542 msgid ""

4543 "not sending a push certificate since the receiving end does not support --"

4544 "signed push"

@@ -4080,42 +4546,42 @@ msgstr ""

4546 "no se manda un certificado de push ya que el destino no soporta push firmado "

4547 "(--signed )"

4548

4083 -#: send-pack.c:436

4549 +#: send-pack.c:435

4550 msgid "the receiving end does not support --atomic push"

4551 msgstr "el destino no soporta push atómicos (--atomic)"

4552

4087 -#: send-pack.c:441

4553 +#: send-pack.c:440

4554 msgid "the receiving end does not support push options"

4555 msgstr "el destino no soporta opciones de push"

4556

4091 -#: sequencer.c:177

4557 +#: sequencer.c:183

4558 #, c-format

4559 msgid "invalid commit message cleanup mode '%s'"

4560 msgstr "mensaje de commit inválido, modo cleanup '%s'"

4561

4096 -#: sequencer.c:278

4562 +#: sequencer.c:287

4563 #, c-format

4564 msgid "could not delete '%s'"

4565 msgstr "no se pudo borrar '%s'"

4566

4101 -#: sequencer.c:304

4567 +#: sequencer.c:313

4568 msgid "revert"

4569 msgstr "revertir"

4570

4105 -#: sequencer.c:306

4571 +#: sequencer.c:315

4572 msgid "cherry-pick"

4573 msgstr "cherry-pick"

4574

4109 -#: sequencer.c:308

4575 +#: sequencer.c:317

4576 msgid "rebase -i"

4577 msgstr "rebase -i"

4578

4113 -#: sequencer.c:310

4579 +#: sequencer.c:319

4580 #, c-format

4581 msgid "unknown action: %d"

4582 msgstr "acción desconocida: %d"

4583

4118 -#: sequencer.c:367

4584 +#: sequencer.c:376

4585 msgid ""

4586 "after resolving the conflicts, mark the corrected paths\n"

4587 "with 'git add <paths>' or 'git rm <paths>'"

@@ -4123,7 +4589,7 @@ msgstr ""

4589 "después de resolver los conflictos, marca las rutas corregidas\n"

4590 "con 'git add <rutas>' o 'git rm <rutas>'"

4591

4126 -#: sequencer.c:370

4592 +#: sequencer.c:379

4593 msgid ""

4594 "after resolving the conflicts, mark the corrected paths\n"

4595 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -4133,39 +4599,39 @@ msgstr ""

4599 "con 'git add <rutas>' o 'git rm <rutas>'\n"

4600 "y haz un commit del resultado con 'git commit'"

4601

4136 -#: sequencer.c:383 sequencer.c:2488

4602 +#: sequencer.c:392 sequencer.c:2632

4603 #, c-format

4604 msgid "could not lock '%s'"

4605 msgstr "no se pudo bloquear '%s'"

4606

4141 -#: sequencer.c:390

4607 +#: sequencer.c:399

4608 #, c-format

4609 msgid "could not write eol to '%s'"

4610 msgstr "no se pudo escribir EOL en '%s'"

4611

4146 -#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4147 -#: sequencer.c:2741

4612 +#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4613 +#: sequencer.c:2885

4614 #, c-format

4615 msgid "failed to finalize '%s'"

4616 msgstr "falló al finalizar '%s'"

4617

4152 -#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4153 -#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4154 -#: builtin/merge.c:1081

4618 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4619 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4620 +#: builtin/merge.c:1084 builtin/rebase.c:152

4621 #, c-format

4622 msgid "could not read '%s'"

4623 msgstr "no se pudo leer '%s'"

4624

4159 -#: sequencer.c:444

4625 +#: sequencer.c:453

4626 #, c-format

4627 msgid "your local changes would be overwritten by %s."

4628 msgstr "tus cambios locales serán sobreescritos por %s."

4629

4164 -#: sequencer.c:448

4630 +#: sequencer.c:457

4631 msgid "commit your changes or stash them to proceed."

4632 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

4633

4168 -#: sequencer.c:477

4634 +#: sequencer.c:486

4635 #, c-format

4636 msgid "%s: fast-forward"

4637 msgstr "%s: avance rápido"

@@ -4173,35 +4639,70 @@ msgstr "%s: avance rápido"

4639 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

4640 #. "rebase -i".

4641 #.

4176 -#: sequencer.c:566

4642 +#: sequencer.c:575

4643 #, c-format

4644 msgid "%s: Unable to write new index file"

4645 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

4646

4181 -#: sequencer.c:582

4647 +#: sequencer.c:591

4648 msgid "unable to update cache tree"

4649 msgstr "no es posible actualizar el árbol de la caché"

4650

4185 -#: sequencer.c:595

4651 +#: sequencer.c:604

4652 msgid "could not resolve HEAD commit"

4653 msgstr "no se pudo resolver el commit de HEAD"

4654

4189 -#: sequencer.c:723 sequencer.c:740

4655 +#: sequencer.c:684

4656 +#, c-format

4657 +msgid "no key present in '%.*s'"

4658 +msgstr "no hay llave presente en '%.*s'"

4659 +

4660 +#: sequencer.c:695

4661 #, c-format

4191 -msgid "could not parse '%s' (looking for '%s')"

4192 -msgstr "no se pudo configurar '%s' (buscando '%s')"

4662 +msgid "unable to dequote value of '%s'"

4663 +msgstr "no es posible dequote para '%s'"

4664

4194 -#: sequencer.c:731

4665 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4666 +#: builtin/am.c:811 builtin/merge.c:1081

4667 #, c-format

4196 -msgid "bad quoting on %s value in '%s'"

4197 -msgstr "mal citado en %s valor en '%s'"

4668 +msgid "could not open '%s' for reading"

4669 +msgstr "no se pudo abrir '%s' para lectura"

4670 +

4671 +#: sequencer.c:742

4672 +msgid "'GIT_AUTHOR_NAME' already given"

4673 +msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

4674

4675 #: sequencer.c:747

4676 +msgid "'GIT_AUTHOR_EMAIL' already given"

4677 +msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

4678 +

4679 +#: sequencer.c:752

4680 +msgid "'GIT_AUTHOR_DATE' already given"

4681 +msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

4682 +

4683 +#: sequencer.c:756

4684 +#, c-format

4685 +msgid "unknown variable '%s'"

4686 +msgstr "variable desconocida '%s'"

4687 +

4688 +#: sequencer.c:761

4689 +msgid "missing 'GIT_AUTHOR_NAME'"

4690 +msgstr "falta 'GIT_AUTHOR_NAME'"

4691 +

4692 +#: sequencer.c:763

4693 +msgid "missing 'GIT_AUTHOR_EMAIL'"

4694 +msgstr "falta 'GIT_AUTHOR_EMAIL'"

4695 +

4696 +#: sequencer.c:765

4697 +msgid "missing 'GIT_AUTHOR_DATE'"

4698 +msgstr "falta 'GIT_AUTHOR_DATE'"

4699 +

4700 +#: sequencer.c:825

4701 #, c-format

4702 msgid "invalid date format '%s' in '%s'"

4703 msgstr "formato de fecha inválido '%s' en '%s'"

4704

4204 -#: sequencer.c:761

4705 +#: sequencer.c:842

4706 #, c-format

4707 msgid ""

4708 "you have staged changes in your working tree\n"

@@ -4231,15 +4732,15 @@ msgstr ""

4732 "\n"

4733 " git rebase --continue\n"

4734

4234 -#: sequencer.c:830

4735 +#: sequencer.c:935

4736 msgid "writing root commit"

4737 msgstr "escribiendo commit raíz"

4738

4238 -#: sequencer.c:1055

4739 +#: sequencer.c:1142

4740 msgid "'prepare-commit-msg' hook failed"

4741 msgstr "hook 'prepare-commit-msg' falló"

4742

4242 -#: sequencer.c:1062

4743 +#: sequencer.c:1149

4744 msgid ""

4745 "Your name and email address were configured automatically based\n"

4746 "on your username and hostname. Please check that they are accurate.\n"

@@ -4266,7 +4767,7 @@ msgstr ""

4767 "\n"

4768 " git commit --amend --reset-author\n"

4769

4269 -#: sequencer.c:1075

4770 +#: sequencer.c:1162

4771 msgid ""

4772 "Your name and email address were configured automatically based\n"

4773 "on your username and hostname. Please check that they are accurate.\n"

@@ -4290,304 +4791,299 @@ msgstr ""

4791 "\n"

4792 " git commit --amend --reset-author\n"

4793

4293 -#: sequencer.c:1115

4794 +#: sequencer.c:1202

4795 msgid "couldn't look up newly created commit"

4796 msgstr "no se pudo revisar el commit recién creado"

4797

4297 -#: sequencer.c:1117

4798 +#: sequencer.c:1204

4799 msgid "could not parse newly created commit"

4800 msgstr "no se pudo analizar el commit recién creado"

4801

4301 -#: sequencer.c:1163

4802 +#: sequencer.c:1250

4803 msgid "unable to resolve HEAD after creating commit"

4804 msgstr "no se pudo resolver HEAD tras crear el commit"

4805

4305 -#: sequencer.c:1165

4806 +#: sequencer.c:1252

4807 msgid "detached HEAD"

4808 msgstr "HEAD desacoplado"

4809

4309 -#: sequencer.c:1169

4810 +#: sequencer.c:1256

4811 msgid " (root-commit)"

4812 msgstr " (commit-raíz)"

4813

4313 -#: sequencer.c:1190

4814 +#: sequencer.c:1277

4815 msgid "could not parse HEAD"

4816 msgstr "no se pudo analizar HEAD"

4817

4317 -#: sequencer.c:1192

4818 +#: sequencer.c:1279

4819 #, c-format

4820 msgid "HEAD %s is not a commit!"

4821 msgstr "HEAD %s no es un commit!"

4822

4322 -#: sequencer.c:1196 builtin/commit.c:1528

4823 +#: sequencer.c:1283 builtin/commit.c:1543

4824 msgid "could not parse HEAD commit"

4825 msgstr "no se pudo analizar el commit de HEAD"

4826

4326 -#: sequencer.c:1247 sequencer.c:1845

4827 +#: sequencer.c:1334 sequencer.c:1934

4828 msgid "unable to parse commit author"

4829 msgstr "no es posible analizar el autor del commit"

4830

4330 -#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4831 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4832 msgid "git write-tree failed to write a tree"

4833 msgstr "git write-tree falló al escribir el árbol"

4834

4334 -#: sequencer.c:1274 sequencer.c:1329

4835 +#: sequencer.c:1361 sequencer.c:1416

4836 #, c-format

4837 msgid "unable to read commit message from '%s'"

4838 msgstr "no se puede leer el mensaje del commit de '%s'"

4839

4339 -#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4340 -#: builtin/merge.c:880

4840 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4841 +#: builtin/merge.c:883

4842 msgid "failed to write commit object"

4843 msgstr "falló al escribir el objeto commit"

4844

4344 -#: sequencer.c:1356

4845 +#: sequencer.c:1443

4846 #, c-format

4847 msgid "could not parse commit %s"

4848 msgstr "no se pudo analizar commit %s"

4849

4349 -#: sequencer.c:1361

4850 +#: sequencer.c:1448

4851 #, c-format

4852 msgid "could not parse parent commit %s"

4853 msgstr "no se pudo analizar el commit padre %s"

4854

4354 -#: sequencer.c:1457 sequencer.c:1565

4855 +#: sequencer.c:1546 sequencer.c:1654

4856 #, c-format

4857 msgid "unknown command: %d"

4858 msgstr "comando desconocido: %d"

4859

4359 -#: sequencer.c:1512 sequencer.c:1537

4860 +#: sequencer.c:1601 sequencer.c:1626

4861 #, c-format

4862 msgid "This is a combination of %d commits."

4863 msgstr "Esta es una combinación de %d commits."

4864

4364 -#: sequencer.c:1522 sequencer.c:4520

4865 +#: sequencer.c:1611 sequencer.c:4744

4866 msgid "need a HEAD to fixup"

4867 msgstr "se necesita un HEAD para arreglar"

4868

4368 -#: sequencer.c:1524 sequencer.c:2768

4869 +#: sequencer.c:1613 sequencer.c:2912

4870 msgid "could not read HEAD"

4871 msgstr "no se pudo leer HEAD"

4872

4372 -#: sequencer.c:1526

4873 +#: sequencer.c:1615

4874 msgid "could not read HEAD's commit message"

4875 msgstr "no se pudo leer el mensaje de commit de HEAD"

4876

4376 -#: sequencer.c:1532

4877 +#: sequencer.c:1621

4878 #, c-format

4879 msgid "cannot write '%s'"

4880 msgstr "no se puede escribir '%s'"

4881

4381 -#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4882 +#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4883 msgid "This is the 1st commit message:"

4884 msgstr "Este es el mensaje del 1er commit:"

4885

4385 -#: sequencer.c:1547

4886 +#: sequencer.c:1636

4887 #, c-format

4888 msgid "could not read commit message of %s"

4889 msgstr "no se puede leer el mensaje del commit de %s"

4890

4390 -#: sequencer.c:1554

4891 +#: sequencer.c:1643

4892 #, c-format

4893 msgid "This is the commit message #%d:"

4894 msgstr "Este es el mensaje del commit #%d:"

4895

4395 -#: sequencer.c:1560

4896 +#: sequencer.c:1649

4897 #, c-format

4898 msgid "The commit message #%d will be skipped:"

4899 msgstr "El mensaje del commit #%d será saltado:"

4900

4400 -#: sequencer.c:1643

4901 +#: sequencer.c:1732

4902 msgid "your index file is unmerged."

4903 msgstr "tu archivo índice no esta fusionado."

4904

4404 -#: sequencer.c:1650

4905 +#: sequencer.c:1739

4906 msgid "cannot fixup root commit"

4907 msgstr "no se puede arreglar el commit raíz"

4908

4408 -#: sequencer.c:1669

4909 +#: sequencer.c:1758

4910 #, c-format

4911 msgid "commit %s is a merge but no -m option was given."

4912 msgstr "el commit %s es una fusión pero no se entrego la opción -m."

4913

4413 -#: sequencer.c:1677

4914 +#: sequencer.c:1766

4915 #, c-format

4916 msgid "commit %s does not have parent %d"

4917 msgstr "el commit %s no tiene un padre %d"

4918

4418 -#: sequencer.c:1681

4919 +#: sequencer.c:1770

4920 #, c-format

4921 msgid "mainline was specified but commit %s is not a merge."

4922 msgstr "línea principal especificada pero el commit %s no es una fusión."

4923

4423 -#: sequencer.c:1687

4924 +#: sequencer.c:1776

4925 #, c-format

4926 msgid "cannot get commit message for %s"

4927 msgstr "no se puede obtener el mensaje de commit para %s"

4928

4929 #. TRANSLATORS: The first %s will be a "todo" command like

4930 #. "revert" or "pick", the second %s a SHA1.

4430 -#: sequencer.c:1706

4931 +#: sequencer.c:1795

4932 #, c-format

4933 msgid "%s: cannot parse parent commit %s"

4934 msgstr "%s: no se puede analizar el commit padre %s"

4935

4435 -#: sequencer.c:1771

4936 +#: sequencer.c:1860

4937 #, c-format

4938 msgid "could not rename '%s' to '%s'"

4939 msgstr "no se puede renombrar '%s' a '%s'"

4940

4440 -#: sequencer.c:1826

4941 +#: sequencer.c:1915

4942 #, c-format

4943 msgid "could not revert %s... %s"

4944 msgstr "no se pudo revertir %s... %s"

4945

4445 -#: sequencer.c:1827

4946 +#: sequencer.c:1916

4947 #, c-format

4948 msgid "could not apply %s... %s"

4949 msgstr "no se pudo aplicar %s... %s"

4950

4450 -#: sequencer.c:1885

4951 +#: sequencer.c:1974

4952 #, c-format

4953 msgid "git %s: failed to read the index"

4954 msgstr "git %s: falló al leer el índice"

4955

4455 -#: sequencer.c:1892

4956 +#: sequencer.c:1981

4957 #, c-format

4958 msgid "git %s: failed to refresh the index"

4959 msgstr "git %s: falló al refrescar el índice"

4960

4460 -#: sequencer.c:1972

4961 +#: sequencer.c:2062

4962 #, c-format

4963 msgid "%s does not accept arguments: '%s'"

4964 msgstr "%s no acepta los argumentos: '%s'"

4965

4465 -#: sequencer.c:1981

4966 +#: sequencer.c:2071

4967 #, c-format

4968 msgid "missing arguments for %s"

4969 msgstr "faltan argumentos para para %s"

4970

4470 -#: sequencer.c:2040

4971 +#: sequencer.c:2130

4972 #, c-format

4973 msgid "invalid line %d: %.*s"

4974 msgstr "línea inválida %d: %.*s"

4975

4475 -#: sequencer.c:2048

4976 +#: sequencer.c:2138

4977 #, c-format

4978 msgid "cannot '%s' without a previous commit"

4979 msgstr "no se puede '%s' sin un commit previo"

4980

4480 -#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4481 -#, c-format

4482 -msgid "could not read '%s'."

4483 -msgstr "no se puede leer '%s'."

4484 -

4485 -#: sequencer.c:2119

4981 +#: sequencer.c:2209

4982 msgid "please fix this using 'git rebase --edit-todo'."

4983 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

4984

4489 -#: sequencer.c:2121

4985 +#: sequencer.c:2211

4986 #, c-format

4987 msgid "unusable instruction sheet: '%s'"

4988 msgstr "hoja de instrucciones inutilizable: '%s'"

4989

4494 -#: sequencer.c:2126

4990 +#: sequencer.c:2216

4991 msgid "no commits parsed."

4992 msgstr "ningún commit analizado."

4993

4498 -#: sequencer.c:2137

4994 +#: sequencer.c:2227

4995 msgid "cannot cherry-pick during a revert."

4996 msgstr "no se puede realizar cherry-pick durante un revert."

4997

4502 -#: sequencer.c:2139

4998 +#: sequencer.c:2229

4999 msgid "cannot revert during a cherry-pick."

5000 msgstr "no se puede realizar un revert durante un cherry-pick."

5001

4506 -#: sequencer.c:2209

5002 +#: sequencer.c:2299

5003 #, c-format

5004 msgid "invalid value for %s: %s"

5005 msgstr "valor invalido para %s: %s"

5006

4511 -#: sequencer.c:2285

5007 +#: sequencer.c:2380

5008 msgid "unusable squash-onto"

5009 msgstr "squash-onto inservible"

5010

4515 -#: sequencer.c:2301

5011 +#: sequencer.c:2396

5012 #, c-format

5013 msgid "malformed options sheet: '%s'"

5014 msgstr "hoja de opciones mal formada: '%s'"

5015

4520 -#: sequencer.c:2335 sequencer.c:3775

5016 +#: sequencer.c:2479 sequencer.c:4005

5017 msgid "empty commit set passed"

5018 msgstr "conjunto de commits vacío entregado"

5019

4524 -#: sequencer.c:2343

5020 +#: sequencer.c:2487

5021 msgid "a cherry-pick or revert is already in progress"

5022 msgstr "un cherry-pick o revert ya esta en progreso"

5023

4528 -#: sequencer.c:2344

5024 +#: sequencer.c:2488

5025 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

5026 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""

5027

4532 -#: sequencer.c:2347

5028 +#: sequencer.c:2491

5029 #, c-format

5030 msgid "could not create sequencer directory '%s'"

5031 msgstr "no se pudo crear un directorio secuenciador '%s'"

5032

4537 -#: sequencer.c:2361

5033 +#: sequencer.c:2505

5034 msgid "could not lock HEAD"

5035 msgstr "no se pudo bloquear HEAD"

5036

4541 -#: sequencer.c:2416 sequencer.c:3543

5037 +#: sequencer.c:2560 sequencer.c:3761

5038 msgid "no cherry-pick or revert in progress"

5039 msgstr "ningún cherry-pick o revert en progreso"

5040

4545 -#: sequencer.c:2418

5041 +#: sequencer.c:2562

5042 msgid "cannot resolve HEAD"

5043 msgstr "no se puede resolver HEAD"

5044

4549 -#: sequencer.c:2420 sequencer.c:2455

5045 +#: sequencer.c:2564 sequencer.c:2599

5046 msgid "cannot abort from a branch yet to be born"

5047 msgstr "no se puede abortar de una rama por nacer"

5048

4553 -#: sequencer.c:2441 builtin/grep.c:721

5049 +#: sequencer.c:2585 builtin/grep.c:721

5050 #, c-format

5051 msgid "cannot open '%s'"

5052 msgstr "no se puede abrir '%s'"

5053

4558 -#: sequencer.c:2443

5054 +#: sequencer.c:2587

5055 #, c-format

5056 msgid "cannot read '%s': %s"

5057 msgstr "no se puede leer '%s': %s"

5058

4563 -#: sequencer.c:2444

5059 +#: sequencer.c:2588

5060 msgid "unexpected end of file"

5061 msgstr "final de archivo inesperado"

5062

4567 -#: sequencer.c:2450

5063 +#: sequencer.c:2594

5064 #, c-format

5065 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5066 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"

5067

4572 -#: sequencer.c:2461

5068 +#: sequencer.c:2605

5069 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5070 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

5071

4576 -#: sequencer.c:2565 sequencer.c:3461

5072 +#: sequencer.c:2709 sequencer.c:3679

5073 #, c-format

5074 msgid "could not update %s"

5075 msgstr "no se puede actualizar %s"

5076

4581 -#: sequencer.c:2603 sequencer.c:3441

5077 +#: sequencer.c:2747 sequencer.c:3659

5078 msgid "cannot read HEAD"

5079 msgstr "no se puede leer HEAD"

5080

4585 -#: sequencer.c:2618

5081 +#: sequencer.c:2762

5082 #, c-format

5083 msgid "unable to copy '%s' to '%s'"

5084 msgstr "no se pudo copiar '%s' a '%s'"

5085

4590 -#: sequencer.c:2626

5086 +#: sequencer.c:2770

5087 #, c-format

5088 msgid ""

5089 "You can amend the commit now, with\n"

@@ -4606,26 +5102,27 @@ msgstr ""

5102 "\n"

5103 "\tgit rebase --continue\n"

5104

4609 -#: sequencer.c:2636

5105 +#: sequencer.c:2780

5106 #, c-format

5107 msgid "Could not apply %s... %.*s"

5108 msgstr "No se pudo aplicar %s... %.*s"

5109

4614 -#: sequencer.c:2643

5110 +#: sequencer.c:2787

5111 #, c-format

5112 msgid "Could not merge %.*s"

5113 msgstr "No se pudo fusionar %.*s"

5114

4619 -#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

5115 +#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5116 #, c-format

5117 msgid "could not copy '%s' to '%s'"

5118 msgstr "no se pudo copiar '%s' a '%s'"

5119

4624 -#: sequencer.c:2680 sequencer.c:3095

5120 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1000

5121 +#: builtin/rebase.c:1351 builtin/rebase.c:1405

5122 msgid "could not read index"

5123 msgstr "no se pudo leer índice"

5124

4628 -#: sequencer.c:2685

5125 +#: sequencer.c:2829

5126 #, c-format

5127 msgid ""

5128 "execution failed: %s\n"

@@ -4640,11 +5137,11 @@ msgstr ""

5137 " git rebase --continue\n"

5138 "\n"

5139

4643 -#: sequencer.c:2691

5140 +#: sequencer.c:2835

5141 msgid "and made changes to the index and/or the working tree\n"

5142 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

5143

4647 -#: sequencer.c:2697

5144 +#: sequencer.c:2841

5145 #, c-format

5146 msgid ""

5147 "execution succeeded: %s\n"

@@ -4661,81 +5158,76 @@ msgstr ""

5158 " git rebase --continue\n"

5159 "\n"

5160

4664 -#: sequencer.c:2758

5161 +#: sequencer.c:2902

5162 #, c-format

5163 msgid "illegal label name: '%.*s'"

5164 msgstr "nombre de label ilegal: '%.*s'"

5165

4669 -#: sequencer.c:2810

5166 +#: sequencer.c:2954

5167 msgid "writing fake root commit"

5168 msgstr "escribiendo commit raíz falso"

5169

4673 -#: sequencer.c:2815

5170 +#: sequencer.c:2959

5171 msgid "writing squash-onto"

5172 msgstr "escribiendo squash-onto"

5173

4677 -#: sequencer.c:2850

5174 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5175 #, c-format

5176 msgid "failed to find tree of %s"

5177 msgstr "falló al encontrar árbol de %s"

5178

4682 -#: sequencer.c:2868

5179 +#: sequencer.c:3015 builtin/rebase.c:604

5180 msgid "could not write index"

5181 msgstr "no se pudo escribir índice"

5182

4686 -#: sequencer.c:2895

5183 +#: sequencer.c:3042

5184 #, c-format

5185 msgid "could not resolve '%s'"

5186 msgstr "no se pudo resolver '%s'"

5187

4691 -#: sequencer.c:2921

5188 +#: sequencer.c:3068

5189 msgid "cannot merge without a current revision"

5190 msgstr "no se puede fusionar sin una versión actual"

5191

4695 -#: sequencer.c:2943

5192 +#: sequencer.c:3090

5193 #, c-format

5194 msgid "unable to parse '%.*s'"

5195 msgstr "no se puede analizar '%.*s'"

5196

4700 -#: sequencer.c:2952

5197 +#: sequencer.c:3099

5198 #, c-format

5199 msgid "nothing to merge: '%.*s'"

5200 msgstr "nada para fusionar: '%.*s'"

5201

4705 -#: sequencer.c:2964

5202 +#: sequencer.c:3111

5203 msgid "octopus merge cannot be executed on top of a [new root]"

5204 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"

5205

4709 -#: sequencer.c:2979

5206 +#: sequencer.c:3126

5207 #, c-format

5208 msgid "could not get commit message of '%s'"

5209 msgstr "no se puede leer el mensaje del commit '%s'"

5210

4714 -#: sequencer.c:2989 sequencer.c:3015

4715 -#, c-format

4716 -msgid "could not write '%s'"

4717 -msgstr "no se pudo escribir '%s'"

4718 -

4719 -#: sequencer.c:3127

5211 +#: sequencer.c:3274

5212 #, c-format

5213 msgid "could not even attempt to merge '%.*s'"

5214 msgstr "no se pudo intentar fusionar '%.*s'"

5215

4724 -#: sequencer.c:3143

5216 +#: sequencer.c:3290

5217 msgid "merge: Unable to write new index file"

5218 msgstr "fusión: No se puede escribir el nuevo archivo índice"

5219

4728 -#: sequencer.c:3211

5220 +#: sequencer.c:3358 builtin/rebase.c:268

5221 #, c-format

5222 msgid "Applied autostash.\n"

5223 msgstr "Autostash aplicado.\n"

5224

4733 -#: sequencer.c:3223

5225 +#: sequencer.c:3370

5226 #, c-format

5227 msgid "cannot store %s"

5228 msgstr "no se puede guardar %s"

5229

4738 -#: sequencer.c:3226 git-rebase.sh:188

5230 +#: sequencer.c:3373 builtin/rebase.c:284

5231 #, c-format

5232 msgid ""

5233 "Applying autostash resulted in conflicts.\n"

@@ -4747,7 +5239,31 @@ msgstr ""

5239 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

5240 "momento.\n"

5241

4750 -#: sequencer.c:3257

5242 +#: sequencer.c:3427

5243 +#, c-format

5244 +msgid "could not checkout %s"

5245 +msgstr "no se puede hacer checkout a %s"

5246 +

5247 +#: sequencer.c:3441

5248 +#, c-format

5249 +msgid "%s: not a valid OID"

5250 +msgstr "%s no es OID válido"

5251 +

5252 +#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5253 +msgid "could not detach HEAD"

5254 +msgstr "no se puede desacoplar HEAD"

5255 +

5256 +#: sequencer.c:3461

5257 +#, c-format

5258 +msgid "Stopped at HEAD\n"

5259 +msgstr "Detenido en HEAD\n"

5260 +

5261 +#: sequencer.c:3463

5262 +#, c-format

5263 +msgid "Stopped at %s\n"

5264 +msgstr "Detenido en %s\n"

5265 +

5266 +#: sequencer.c:3471

5267 #, c-format

5268 msgid ""

5269 "Could not execute the todo command\n"

@@ -4768,48 +5284,48 @@ msgstr ""

5284 " git rebase --edit-todo\n"

5285 " git rebase --continue\n"

5286

4771 -#: sequencer.c:3325

5287 +#: sequencer.c:3543

5288 #, c-format

5289 msgid "Stopped at %s... %.*s\n"

5290 msgstr "Detenido en %s... %.*s\n"

5291

4776 -#: sequencer.c:3404

5292 +#: sequencer.c:3622

5293 #, c-format

5294 msgid "unknown command %d"

5295 msgstr "comando desconocido %d"

5296

4781 -#: sequencer.c:3449

5297 +#: sequencer.c:3667

5298 msgid "could not read orig-head"

5299 msgstr "no se puede leer orig-head"

5300

4785 -#: sequencer.c:3454 sequencer.c:4517

5301 +#: sequencer.c:3672 sequencer.c:4741

5302 msgid "could not read 'onto'"

5303 msgstr "no se puede leer 'onto'"

5304

4789 -#: sequencer.c:3468

5305 +#: sequencer.c:3686

5306 #, c-format

5307 msgid "could not update HEAD to %s"

5308 msgstr "no se puede actualizar HEAD a %s"

5309

4794 -#: sequencer.c:3554

5310 +#: sequencer.c:3772

5311 msgid "cannot rebase: You have unstaged changes."

5312 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

5313

4798 -#: sequencer.c:3563

5314 +#: sequencer.c:3781

5315 msgid "cannot amend non-existing commit"

5316 msgstr "no se puede arreglar un commit no existente"

5317

4802 -#: sequencer.c:3565

5318 +#: sequencer.c:3783

5319 #, c-format

5320 msgid "invalid file: '%s'"

5321 msgstr "archivo invalido: '%s'"

5322

4807 -#: sequencer.c:3567

5323 +#: sequencer.c:3785

5324 #, c-format

5325 msgid "invalid contents: '%s'"

5326 msgstr "contenido inválido: '%s'"

5327

4812 -#: sequencer.c:3570

5328 +#: sequencer.c:3788

5329 msgid ""

5330 "\n"

5331 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4820,54 +5336,54 @@ msgstr ""

5336 "un commit con estos\n"

5337 "primero y luego ejecuta 'git rebase --continue' de nuevo."

5338

4823 -#: sequencer.c:3595 sequencer.c:3633

5339 +#: sequencer.c:3824 sequencer.c:3862

5340 #, c-format

5341 msgid "could not write file: '%s'"

5342 msgstr "no se pudo escribir el archivo: '%s'"

5343

4828 -#: sequencer.c:3648

5344 +#: sequencer.c:3877

5345 msgid "could not remove CHERRY_PICK_HEAD"

5346 msgstr "no se puede remover CHERRY_PICK_HEAD"

5347

4832 -#: sequencer.c:3655

5348 +#: sequencer.c:3884

5349 msgid "could not commit staged changes."

5350 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

5351

4836 -#: sequencer.c:3752

5352 +#: sequencer.c:3982

5353 #, c-format

5354 msgid "%s: can't cherry-pick a %s"

5355 msgstr "%s: no se puede aplicar cherry-pick a un %s"

5356

4841 -#: sequencer.c:3756

5357 +#: sequencer.c:3986

5358 #, c-format

5359 msgid "%s: bad revision"

5360 msgstr "%s: mala revision"

5361

4846 -#: sequencer.c:3791

5362 +#: sequencer.c:4021

5363 msgid "can't revert as initial commit"

5364 msgstr "no se puede revertir como commit inicial"

5365

4850 -#: sequencer.c:4238

5366 +#: sequencer.c:4466

5367 msgid "make_script: unhandled options"

5368 msgstr "make_script: opciones desconocidas"

5369

4854 -#: sequencer.c:4241

5370 +#: sequencer.c:4469

5371 msgid "make_script: error preparing revisions"

5372 msgstr "make_script: error preparando revisiones"

5373

4858 -#: sequencer.c:4281 sequencer.c:4337

5374 +#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5375 #, c-format

5376 msgid "unusable todo list: '%s'"

5377 msgstr "lista de pendientes inutilizable: '%s'"

5378

4863 -#: sequencer.c:4396

5379 +#: sequencer.c:4620

5380 #, c-format

5381 msgid ""

5382 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5383 msgstr ""

5384 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

5385

4870 -#: sequencer.c:4466

5386 +#: sequencer.c:4690

5387 #, c-format

5388 msgid ""

5389 "Warning: some commits may have been dropped accidentally.\n"

@@ -4876,7 +5392,7 @@ msgstr ""

5392 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

5393 "Commits botados (empezando con el mas nuevo):\n"

5394

4879 -#: sequencer.c:4473

5395 +#: sequencer.c:4697

5396 #, c-format

5397 msgid ""

5398 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4894,7 +5410,7 @@ msgstr ""

5410 "Los posibles comportamientos son: ignore,warn,error.\n"

5411 "\n"

5412

4897 -#: sequencer.c:4486

5413 +#: sequencer.c:4710

5414 #, c-format

5415 msgid ""

5416 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4905,7 +5421,31 @@ msgstr ""

5421 "rebase --continue'.\n"

5422 "O se puede abortar el rebase con 'git rebase --abort'.\n"

5423

4908 -#: sequencer.c:4660

5424 +#: sequencer.c:4848 sequencer.c:4886

5425 +msgid "nothing to do"

5426 +msgstr "nada que hacer"

5427 +

5428 +#: sequencer.c:4852

5429 +#, c-format

5430 +msgid "Rebase %s onto %s (%d command)"

5431 +msgid_plural "Rebase %s onto %s (%d commands)"

5432 +msgstr[0] "Rebase %s en %s (%d comando)"

5433 +msgstr[1] "Rebase %s en %s (%d comandos)"

5434 +

5435 +#: sequencer.c:4864

5436 +#, c-format

5437 +msgid "could not copy '%s' to '%s'."

5438 +msgstr "no se pudo copiar '%s' a '%s'."

5439 +

5440 +#: sequencer.c:4868 sequencer.c:4897

5441 +msgid "could not transform the todo list"

5442 +msgstr "no se pudo transformar lista de pendientes"

5443 +

5444 +#: sequencer.c:4900

5445 +msgid "could not skip unnecessary pick commands"

5446 +msgstr "no se pudo saltar los comandos pick innecesarios"

5447 +

5448 +#: sequencer.c:4983

5449 msgid "the script was already rearranged."

5450 msgstr "este script ya fue reorganizado."

5451

@@ -4962,85 +5502,85 @@ msgstr ""

5502 msgid "this operation must be run in a work tree"

5503 msgstr "esta operación debe ser realizada en un árbol de trabajo"

5504

4965 -#: setup.c:503

5505 +#: setup.c:527

5506 #, c-format

5507 msgid "Expected git repo version <= %d, found %d"

5508 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

5509

4970 -#: setup.c:511

5510 +#: setup.c:535

5511 msgid "unknown repository extensions found:"

5512 msgstr "se encontró extensión de repositorio desconocida:"

5513

4974 -#: setup.c:530

5514 +#: setup.c:554

5515 #, c-format

5516 msgid "error opening '%s'"

5517 msgstr "error abriendo '%s'"

5518

4979 -#: setup.c:532

5519 +#: setup.c:556

5520 #, c-format

5521 msgid "too large to be a .git file: '%s'"

5522 msgstr "muy grande para ser un archivo .git: '%s'"

5523

4984 -#: setup.c:534

5524 +#: setup.c:558

5525 #, c-format

5526 msgid "error reading %s"

5527 msgstr "error leyendo %s"

5528

4989 -#: setup.c:536

5529 +#: setup.c:560

5530 #, c-format

5531 msgid "invalid gitfile format: %s"

5532 msgstr "formato gitfile inválido: %s"

5533

4994 -#: setup.c:538

5534 +#: setup.c:562

5535 #, c-format

5536 msgid "no path in gitfile: %s"

5537 msgstr "no hay ruta en gitfile: %s"

5538

4999 -#: setup.c:540

5539 +#: setup.c:564

5540 #, c-format

5541 msgid "not a git repository: %s"

5542 msgstr "no es un repositorio git: %s"

5543

5004 -#: setup.c:639

5544 +#: setup.c:663

5545 #, c-format

5546 msgid "'$%s' too big"

5547 msgstr "'$%s' muy grande"

5548

5009 -#: setup.c:653

5549 +#: setup.c:677

5550 #, c-format

5551 msgid "not a git repository: '%s'"

5552 msgstr "no es un repositorio git: '%s'"

5553

5014 -#: setup.c:682 setup.c:684 setup.c:715

5554 +#: setup.c:706 setup.c:708 setup.c:739

5555 #, c-format

5556 msgid "cannot chdir to '%s'"

5557 msgstr "no se puede aplicar chdir a '%s'"

5558

5019 -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

5559 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5560 msgid "cannot come back to cwd"

5561 msgstr "no se puede volver a cwd"

5562

5023 -#: setup.c:813

5563 +#: setup.c:837

5564 #, c-format

5565 msgid "not a git repository (or any of the parent directories): %s"

5566 msgstr ""

5567 "no es un repositorio git (ni ninguno de los directorios superiores): %s"

5568

5029 -#: setup.c:824

5569 +#: setup.c:848

5570 #, c-format

5571 msgid "failed to stat '%*s%s%s'"

5572 msgstr "falló al determinar '%*s%s%s'"

5573

5034 -#: setup.c:1054

5574 +#: setup.c:1078

5575 msgid "Unable to read current working directory"

5576 msgstr "Incapaz de leer el directorio de trabajo actual"

5577

5038 -#: setup.c:1066 setup.c:1072

5578 +#: setup.c:1090 setup.c:1096

5579 #, c-format

5580 msgid "cannot change to '%s'"

5581 msgstr "no se puede cambiar a '%s'"

5582

5043 -#: setup.c:1085

5583 +#: setup.c:1109

5584 #, c-format

5585 msgid ""

5586 "not a git repository (or any parent up to mount point %s)\n"

@@ -5050,7 +5590,7 @@ msgstr ""

5590 "Parando en el límite del sistema de archivos "

5591 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

5592

5053 -#: setup.c:1168

5593 +#: setup.c:1192

5594 #, c-format

5595 msgid ""

5596 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -5059,15 +5599,15 @@ msgstr ""

5599 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

5600 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

5601

5062 -#: setup.c:1211

5602 +#: setup.c:1235

5603 msgid "open /dev/null or dup failed"

5604 msgstr "falló al abrir /dev/null o dup"

5605

5066 -#: setup.c:1226

5606 +#: setup.c:1250

5607 msgid "fork failed"

5608 msgstr "falló fork"

5609

5070 -#: setup.c:1231

5610 +#: setup.c:1255

5611 msgid "setsid failed"

5612 msgstr "falló setsid"

5613

@@ -5144,12 +5684,12 @@ msgstr "mmap falló"

5684 msgid "object file %s is empty"

5685 msgstr "archivo de objeto %s está vacío"

5686

5147 -#: sha1-file.c:1093 sha1-file.c:2206

5687 +#: sha1-file.c:1093 sha1-file.c:2215

5688 #, c-format

5689 msgid "corrupt loose object '%s'"

5690 msgstr "objeto perdido corrupto '%s'"

5691

5152 -#: sha1-file.c:1095 sha1-file.c:2210

5692 +#: sha1-file.c:1095 sha1-file.c:2219

5693 #, c-format

5694 msgid "garbage at end of loose object '%s'"

5695 msgstr "basura al final del objeto perdido '%s'"

@@ -5246,7 +5786,7 @@ msgstr "deflateEnd en objeto %s falló (%d)"

5786 msgid "confused by unstable object source data for %s"

5787 msgstr "confundido por fuente de data de objetos inestable para %s"

5788

5249 -#: sha1-file.c:1685 builtin/pack-objects.c:899

5789 +#: sha1-file.c:1685 builtin/pack-objects.c:918

5790 #, c-format

5791 msgid "failed utime() on %s"

5792 msgstr "falló utime() en %s"

@@ -5264,76 +5804,76 @@ msgstr "commit corrupto"

5804 msgid "corrupt tag"

5805 msgstr "tag corrupto"

5806

5267 -#: sha1-file.c:1906

5807 +#: sha1-file.c:1912

5808 #, c-format

5809 msgid "read error while indexing %s"

5810 msgstr "error leyendo al indexar %s"

5811

5272 -#: sha1-file.c:1909

5812 +#: sha1-file.c:1915

5813 #, c-format

5814 msgid "short read while indexing %s"

5815 msgstr "lectura corta al indexar %s"

5816

5277 -#: sha1-file.c:1980 sha1-file.c:1989

5817 +#: sha1-file.c:1988 sha1-file.c:1997

5818 #, c-format

5819 msgid "%s: failed to insert into database"

5820 msgstr "%s: falló al insertar en la base de datos"

5821

5282 -#: sha1-file.c:1995

5822 +#: sha1-file.c:2003

5823 #, c-format

5824 msgid "%s: unsupported file type"

5825 msgstr "%s: tipo de archivo no soportado"

5826

5287 -#: sha1-file.c:2019

5827 +#: sha1-file.c:2027

5828 #, c-format

5829 msgid "%s is not a valid object"

5830 msgstr "%s no es objeto válido"

5831

5292 -#: sha1-file.c:2021

5832 +#: sha1-file.c:2029

5833 #, c-format

5834 msgid "%s is not a valid '%s' object"

5835 msgstr "%s no es un objeto '%s' válido"

5836

5297 -#: sha1-file.c:2048 builtin/index-pack.c:158

5837 +#: sha1-file.c:2056 builtin/index-pack.c:154

5838 #, c-format

5839 msgid "unable to open %s"

5840 msgstr "no es posible abrir %s"

5841

5302 -#: sha1-file.c:2217 sha1-file.c:2269

5842 +#: sha1-file.c:2226 sha1-file.c:2278

l10n: es.po v2.20.0 round 1