d0b1b61578 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

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

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

10 +"POT-Creation-Date: 2019-05-14 17:09+0800\n"

11 +"PO-Revision-Date: 2019-05-28 11:32-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.2\n"

20

21 -#: advice.c:101

21 +#: advice.c:103

22 #, c-format

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

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

25

26 -#: advice.c:154

26 +#: advice.c:156

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

31 +#: advice.c:158

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

35 +#: advice.c:160

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

39 +#: advice.c:162

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

43 +#: advice.c:164

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

47 +#: advice.c:166

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

52 +#: advice.c:174

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

60 +#: advice.c:182

61 msgid "Exiting because of an unresolved conflict."

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

63

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

64 +#: advice.c:187 builtin/merge.c:1320

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

68 +#: advice.c:189

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

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

71

72 -#: advice.c:188

72 +#: advice.c:190

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:194

76 +#: advice.c:196

77 #, c-format

78 msgid ""

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

@@ -110,99 +110,99 @@ msgstr "cmdline termina en \\"

110 msgid "unclosed quote"

111 msgstr "comillas incompletas"

112

113 -#: apply.c:59

113 +#: apply.c:63

114 #, c-format

115 msgid "unrecognized whitespace option '%s'"

116 msgstr "opción de espacios en blanco no reconocida '%s'"

117

118 -#: apply.c:75

118 +#: apply.c:79

119 #, c-format

120 msgid "unrecognized whitespace ignore option '%s'"

121 msgstr "opción de ignorar espacios en blanco no reconocida '%s'"

122

123 -#: apply.c:125

123 +#: apply.c:129

124 msgid "--reject and --3way cannot be used together."

125 msgstr "--reject y --3way no se pueden utilizar juntas."

126

127 -#: apply.c:127

127 +#: apply.c:131

128 msgid "--cached and --3way cannot be used together."

129 msgstr "--cached y --3way no se pueden utilizar juntas."

130

131 -#: apply.c:130

131 +#: apply.c:134

132 msgid "--3way outside a repository"

133 msgstr "--3way está fuera de un repositorio"

134

135 -#: apply.c:141

135 +#: apply.c:145

136 msgid "--index outside a repository"

137 msgstr "--index está fuera de un repositorio"

138

139 -#: apply.c:144

139 +#: apply.c:148

140 msgid "--cached outside a repository"

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

142

143 -#: apply.c:825

143 +#: apply.c:829

144 #, c-format

145 msgid "Cannot prepare timestamp regexp %s"

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

147

148 -#: apply.c:834

148 +#: apply.c:838

149 #, c-format

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

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

152

153 -#: apply.c:908

153 +#: apply.c:912

154 #, c-format

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

156 msgstr ""

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

158

159 -#: apply.c:946

159 +#: apply.c:950

160 #, c-format

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

162 msgstr ""

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

164 "lalínea %d"

165

166 -#: apply.c:952

166 +#: apply.c:956

167 #, c-format

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

169 msgstr ""

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

171 "lalínea %d"

172

173 -#: apply.c:953

173 +#: apply.c:957

174 #, c-format

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

176 msgstr ""

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

178 "lalínea %d"

179

180 -#: apply.c:958

180 +#: apply.c:962

181 #, c-format

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

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

184

185 -#: apply.c:987

185 +#: apply.c:991

186 #, c-format

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

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

189

190 -#: apply.c:1306

190 +#: apply.c:1310

191 #, c-format

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

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

194

195 -#: apply.c:1478

195 +#: apply.c:1482

196 #, c-format

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

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

199

200 -#: apply.c:1547

200 +#: apply.c:1551

201 #, c-format

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

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

204

205 -#: apply.c:1567

205 +#: apply.c:1571

206 #, c-format

207 msgid ""

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

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

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

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

219

220 -#: apply.c:1580

220 +#: apply.c:1584

221 #, c-format

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

223 msgstr ""

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

225

226 -#: apply.c:1768

226 +#: apply.c:1772

227 msgid "new file depends on old contents"

228 msgstr "el nuevo archivo depende de contenidos viejos"

229

230 -#: apply.c:1770

230 +#: apply.c:1774

231 msgid "deleted file still has contents"

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

233

234 -#: apply.c:1804

234 +#: apply.c:1808

235 #, c-format

236 msgid "corrupt patch at line %d"

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

238

239 -#: apply.c:1841

239 +#: apply.c:1845

240 #, c-format

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

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

243

244 -#: apply.c:1843

244 +#: apply.c:1847

245 #, c-format

246 msgid "deleted file %s still has contents"

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

248

249 -#: apply.c:1846

249 +#: apply.c:1850

250 #, c-format

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

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

253

254 -#: apply.c:1993

254 +#: apply.c:1997

255 #, c-format

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

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

258

259 -#: apply.c:2030

259 +#: apply.c:2034

260 #, c-format

261 msgid "unrecognized binary patch at line %d"

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

263

264 -#: apply.c:2192

264 +#: apply.c:2196

265 #, c-format

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

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

268

269 -#: apply.c:2278

269 +#: apply.c:2282

270 #, c-format

271 msgid "unable to read symlink %s"

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

273

274 -#: apply.c:2282

274 +#: apply.c:2286

275 #, c-format

276 msgid "unable to open or read %s"

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

278

279 -#: apply.c:2941

279 +#: apply.c:2945

280 #, c-format

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

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

283

284 -#: apply.c:3062

284 +#: apply.c:3066

285 #, c-format

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

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

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

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

290

291 -#: apply.c:3074

291 +#: apply.c:3078

292 #, c-format

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

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

295

296 -#: apply.c:3080

296 +#: apply.c:3084

297 #, c-format

298 msgid ""

299 "while searching for:\n"

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

302 "mientras se busca:\n"

303 "%.*s"

304

305 -#: apply.c:3102

305 +#: apply.c:3106

306 #, c-format

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

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

309

310 -#: apply.c:3110

310 +#: apply.c:3114

311 #, c-format

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

313 msgstr ""

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

315

316 -#: apply.c:3157

316 +#: apply.c:3161

317 #, c-format

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

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

320

321 -#: apply.c:3167

321 +#: apply.c:3171

322 #, c-format

323 msgid ""

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

@@ -326,289 +326,289 @@ msgstr ""

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

327 "actuales."

328

329 -#: apply.c:3175

329 +#: apply.c:3179

330 #, c-format

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

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

333

334 -#: apply.c:3193

334 +#: apply.c:3197

335 #, c-format

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

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

338

339 -#: apply.c:3206

339 +#: apply.c:3210

340 #, c-format

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

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

343

344 -#: apply.c:3212

344 +#: apply.c:3216

345 #, c-format

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

347 msgstr ""

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

349 "obtuvo %s)"

350

351 -#: apply.c:3233

351 +#: apply.c:3237

352 #, c-format

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

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

355

356 -#: apply.c:3356

356 +#: apply.c:3360

357 #, c-format

358 msgid "cannot checkout %s"

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

360

361 -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

361 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279

362 #, c-format

363 msgid "failed to read %s"

364 msgstr "no se pudo leer %s"

365

366 -#: apply.c:3416

366 +#: apply.c:3420

367 #, c-format

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

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

370

371 -#: apply.c:3445 apply.c:3688

371 +#: apply.c:3449 apply.c:3692

372 #, c-format

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

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

375

376 -#: apply.c:3531 apply.c:3703

376 +#: apply.c:3535 apply.c:3707

377 #, c-format

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

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

380

381 -#: apply.c:3540 apply.c:3711

381 +#: apply.c:3544 apply.c:3715

382 #, c-format

383 msgid "%s: does not match index"

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

385

386 -#: apply.c:3575

386 +#: apply.c:3579

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

388 msgstr ""

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

390 "vías."

391

392 -#: apply.c:3578

392 +#: apply.c:3582

393 #, c-format

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

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

396

397 -#: apply.c:3594 apply.c:3598

397 +#: apply.c:3598 apply.c:3602

398 #, c-format

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

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

401

402 -#: apply.c:3610

402 +#: apply.c:3614

403 #, c-format

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

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

406

407 -#: apply.c:3624

407 +#: apply.c:3628

408 #, c-format

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

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

411

412 -#: apply.c:3629

412 +#: apply.c:3633

413 #, c-format

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

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

416

417 -#: apply.c:3655

417 +#: apply.c:3659

418 msgid "removal patch leaves file contents"

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

420

421 -#: apply.c:3728

421 +#: apply.c:3732

422 #, c-format

423 msgid "%s: wrong type"

424 msgstr "%s: tipo incorrecto"

425

426 -#: apply.c:3730

426 +#: apply.c:3734

427 #, c-format

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

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

430

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

432 -#: read-cache.c:1299

431 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856

432 +#: read-cache.c:1309

433 #, c-format

434 msgid "invalid path '%s'"

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

436

437 -#: apply.c:3939

437 +#: apply.c:3943

438 #, c-format

439 msgid "%s: already exists in index"

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

441

442 -#: apply.c:3942

442 +#: apply.c:3946

443 #, c-format

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

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

446

447 -#: apply.c:3962

447 +#: apply.c:3966

448 #, c-format

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

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

451

452 -#: apply.c:3967

452 +#: apply.c:3971

453 #, c-format

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

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

456

457 -#: apply.c:3987

457 +#: apply.c:3991

458 #, c-format

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

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

461

462 -#: apply.c:3991

462 +#: apply.c:3995

463 #, c-format

464 msgid "%s: patch does not apply"

465 msgstr "%s: el parche no aplica"

466

467 -#: apply.c:4006

467 +#: apply.c:4010

468 #, c-format

469 msgid "Checking patch %s..."

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

471

472 -#: apply.c:4098

472 +#: apply.c:4102

473 #, c-format

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

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

476

477 -#: apply.c:4105

477 +#: apply.c:4109

478 #, c-format

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

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

481

482 -#: apply.c:4108

482 +#: apply.c:4112

483 #, c-format

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

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

486

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

487 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143

488 #, c-format

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

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

491

492 -#: apply.c:4117

492 +#: apply.c:4121

493 #, c-format

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

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

496

497 -#: apply.c:4127

497 +#: apply.c:4131

498 #, c-format

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

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

501

502 -#: apply.c:4265

502 +#: apply.c:4269

503 #, c-format

504 msgid "unable to remove %s from index"

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

506

507 -#: apply.c:4299

507 +#: apply.c:4303

508 #, c-format

509 msgid "corrupt patch for submodule %s"

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

511

512 -#: apply.c:4305

512 +#: apply.c:4309

513 #, c-format

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

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

516

517 -#: apply.c:4313

517 +#: apply.c:4317

518 #, c-format

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

520 msgstr ""

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

522

523 -#: apply.c:4319 apply.c:4464

523 +#: apply.c:4323 apply.c:4468

524 #, c-format

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

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

527

528 -#: apply.c:4362

528 +#: apply.c:4366

529 #, c-format

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

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

532

533 -#: apply.c:4366

533 +#: apply.c:4370

534 #, c-format

535 msgid "closing file '%s'"

536 msgstr "cerrando archivo '%s'"

537

538 -#: apply.c:4436

538 +#: apply.c:4440

539 #, c-format

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

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

542

543 -#: apply.c:4534

543 +#: apply.c:4538

544 #, c-format

545 msgid "Applied patch %s cleanly."

546 msgstr "Parche %s aplicado limpiamente."

547

548 -#: apply.c:4542

548 +#: apply.c:4546

549 msgid "internal error"

550 msgstr "error interno"

551

552 -#: apply.c:4545

552 +#: apply.c:4549

553 #, c-format

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

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

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

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

558

559 -#: apply.c:4556

559 +#: apply.c:4560

560 #, c-format

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

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

563

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

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

565 #, c-format

566 msgid "cannot open %s"

567 msgstr "no se puede abrir %s"

568

569 -#: apply.c:4578

569 +#: apply.c:4582

570 #, c-format

571 msgid "Hunk #%d applied cleanly."

572 msgstr "Hunk #%d aplicado limpiamente."

573

574 -#: apply.c:4582

574 +#: apply.c:4586

575 #, c-format

576 msgid "Rejected hunk #%d."

577 msgstr "Hunk #%d rechazado."

578

579 -#: apply.c:4692

579 +#: apply.c:4696

580 #, c-format

581 msgid "Skipped patch '%s'."

582 msgstr "Parche '%s' saltado."

583

584 -#: apply.c:4700

584 +#: apply.c:4704

585 msgid "unrecognized input"

586 msgstr "input no reconocido"

587

588 -#: apply.c:4720

588 +#: apply.c:4724

589 msgid "unable to read index file"

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

591

592 -#: apply.c:4875

592 +#: apply.c:4879

593 #, c-format

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

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

596

597 -#: apply.c:4902

597 +#: apply.c:4906

598 #, c-format

599 msgid "squelched %d whitespace error"

600 msgid_plural "squelched %d whitespace errors"

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

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

603

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

604 +#: apply.c:4912 apply.c:4927

605 #, c-format

606 msgid "%d line adds whitespace errors."

607 msgid_plural "%d lines add whitespace errors."

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

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

610

611 -#: apply.c:4916

611 +#: apply.c:4920

612 #, c-format

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

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

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

617 msgstr[1] ""

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

619

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

620 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

621 msgid "Unable to write new index file"

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

623

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

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

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

624 +#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

625 +#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271

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

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

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

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

628 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

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

630 msgid "path"

631 msgstr "ruta"

632

633 -#: apply.c:4960

633 +#: apply.c:4964

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

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

636

637 -#: apply.c:4963

637 +#: apply.c:4967

638 msgid "apply changes matching the given path"

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

640

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

641 +#: apply.c:4969 builtin/am.c:2219

642 msgid "num"

643 msgstr "num"

644

645 -#: apply.c:4966

645 +#: apply.c:4970

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

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

648

649 -#: apply.c:4969

649 +#: apply.c:4973

650 msgid "ignore additions made by the patch"

651 msgstr "ignorar adiciones hechas por el parche"

652

653 -#: apply.c:4971

653 +#: apply.c:4975

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

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

656

657 -#: apply.c:4975

657 +#: apply.c:4979

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

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

660

661 -#: apply.c:4977

661 +#: apply.c:4981

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

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

664

665 -#: apply.c:4979

665 +#: apply.c:4983

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

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

668

669 -#: apply.c:4981

669 +#: apply.c:4985

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

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

672

673 -#: apply.c:4983

673 +#: apply.c:4987

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

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

676

677 -#: apply.c:4985

677 +#: apply.c:4989

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

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

680

681 -#: apply.c:4987

681 +#: apply.c:4991

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

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

684

685 -#: apply.c:4990

685 +#: apply.c:4994

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

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

688

689 -#: apply.c:4992

689 +#: apply.c:4996

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

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

692

693 -#: apply.c:4994

693 +#: apply.c:4998

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

695 msgstr ""

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

697

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

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

699 msgid "paths are separated with NUL character"

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

701

702 -#: apply.c:4999

702 +#: apply.c:5003

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

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

705

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

706 +#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97

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

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

708 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415

709 msgid "action"

710 msgstr "acción"

711

712 -#: apply.c:5001

712 +#: apply.c:5005

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

714 msgstr ""

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

716 "blanco"

717

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

718 +#: apply.c:5008 apply.c:5011

719 msgid "ignore changes in whitespace when finding context"

720 msgstr ""

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

722

723 -#: apply.c:5010

723 +#: apply.c:5014

724 msgid "apply the patch in reverse"

725 msgstr "aplicar el parche en reversa"

726

727 -#: apply.c:5012

727 +#: apply.c:5016

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

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

730

731 -#: apply.c:5014

731 +#: apply.c:5018

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

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

734

735 -#: apply.c:5016

735 +#: apply.c:5020

736 msgid "allow overlapping hunks"

737 msgstr "permitir solapamiento de hunks"

738

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

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

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

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

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

740 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786

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

742 msgid "be verbose"

743 msgstr "ser verboso"

744

746 -#: apply.c:5019

745 +#: apply.c:5023

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

747 msgstr ""

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

749 "archivo"

750

752 -#: apply.c:5022

751 +#: apply.c:5026

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

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

754

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

755 +#: apply.c:5028 builtin/am.c:2207

756 msgid "root"

757 msgstr "raíz"

758

760 -#: apply.c:5025

759 +#: apply.c:5029

760 msgid "prepend <root> to all filenames"

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

762

@@ -780,7 +779,7 @@ msgstr ""

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

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

781

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

782 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

783 #, c-format

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

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

@@ -812,7 +811,7 @@ msgstr "fmt"

811 msgid "archive format"

812 msgstr "formato del archivo"

813

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

814 +#: archive.c:456 builtin/log.c:1557

815 msgid "prefix"

816 msgstr "prefijo"

817

@@ -820,11 +819,11 @@ msgstr "prefijo"

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

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

821

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

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

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

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

827 -#: parse-options.h:162

822 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822

823 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

824 +#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

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

826 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176

827 msgid "file"

828 msgstr "carpeta"

829

@@ -856,8 +855,8 @@ msgstr "comprimir mejor"

855 msgid "list supported archive formats"

856 msgstr "listar los formatos de carpeta soportados"

857

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

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

858 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

859 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

860 msgid "repo"

861 msgstr "repo"

862

@@ -865,7 +864,7 @@ msgstr "repo"

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

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

866

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

867 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713

868 #: builtin/notes.c:498

869 msgid "command"

870 msgstr "comando"

@@ -911,16 +910,16 @@ msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"

910 msgid "cannot read %s"

911 msgstr "no se puede leer %s"

912

914 -#: archive-tar.c:458

913 +#: archive-tar.c:459

914 #, c-format

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

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

917

919 -#: archive-tar.c:461

918 +#: archive-tar.c:462

919 msgid "unable to redirect descriptor"

920 msgstr "incapaz de redirigir descriptor"

921

923 -#: archive-tar.c:468

922 +#: archive-tar.c:469

923 #, c-format

924 msgid "'%s' filter reported error"

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

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

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

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

936

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

937 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229

938 #, c-format

939 msgid "deflate error (%d)"

940 msgstr "error al desinflar (%d)"

@@ -1037,26 +1036,26 @@ msgstr "Biseccionando: una base de fisión debe ser probada\n"

1036 msgid "a %s revision is needed"

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

1038

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

1039 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248

1040 #, c-format

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

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

1043

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

1044 +#: bisect.c:928 builtin/merge.c:146

1045 #, c-format

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

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

1048

1050 -#: bisect.c:967

1049 +#: bisect.c:958

1050 msgid "reading bisect refs failed"

1051 msgstr "falló leer las refs de bisect"

1052

1054 -#: bisect.c:986

1053 +#: bisect.c:977

1054 #, c-format

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

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

1057

1059 -#: bisect.c:994

1058 +#: bisect.c:985

1059 #, c-format

1060 msgid ""

1061 "No testable commit found.\n"

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

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

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

1066

1068 -#: bisect.c:1013

1067 +#: bisect.c:1004

1068 #, c-format

1069 msgid "(roughly %d step)"

1070 msgid_plural "(roughly %d steps)"

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

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

1075 #. steps)" translation.

1076 #.

1078 -#: bisect.c:1019

1077 +#: bisect.c:1010

1078 #, c-format

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

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

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

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

1083

1085 -#: blame.c:1792

1084 +#: blame.c:1794

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

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

1087

1089 -#: blame.c:1806

1088 +#: blame.c:1808

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

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

1091

1093 -#: blame.c:1827

1092 +#: blame.c:1829

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

1094 msgstr ""

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

1096

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

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

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

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

1097 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030

1098 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940

1099 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415

1100 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155

1101 #: builtin/shortlog.c:192

1102 msgid "revision walk setup failed"

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

1104

1106 -#: blame.c:1854

1105 +#: blame.c:1856

1106 msgid ""

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

1108 msgstr ""

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

1110 "del primer padre"

1111

1113 -#: blame.c:1865

1112 +#: blame.c:1867

1113 #, c-format

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

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

1116

1118 -#: blame.c:1876

1117 +#: blame.c:1878

1118 #, c-format

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

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

1121

1123 -#: branch.c:52

1122 +#: branch.c:53

1123 #, c-format

1124 msgid ""

1125 "\n"

@@ -1133,97 +1132,97 @@ msgstr ""

1132 "la infamación del rastreo remoto invocando\n"

1133 "\"git branch --set-upstream-to=%s%s%s\"."

1134

1136 -#: branch.c:66

1135 +#: branch.c:67

1136 #, c-format

1137 msgid "Not setting branch %s as its own upstream."

1138 msgstr "La rama %s no se configura como su propio upstream."

1139

1141 -#: branch.c:92

1140 +#: branch.c:93

1141 #, c-format

1142 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1143 msgstr ""

1144 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "

1145 "por rebase."

1146

1148 -#: branch.c:93

1147 +#: branch.c:94

1148 #, c-format

1149 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1150 msgstr ""

1151 "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."

1152

1154 -#: branch.c:97

1153 +#: branch.c:98

1154 #, c-format

1155 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1156 msgstr ""

1157 "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."

1158

1160 -#: branch.c:98

1159 +#: branch.c:99

1160 #, c-format

1161 msgid "Branch '%s' set up to track local branch '%s'."

1162 msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."

1163

1165 -#: branch.c:103

1164 +#: branch.c:104

1165 #, c-format

1166 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1167 msgstr ""

1168 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "

1169 "rebase."

1170

1172 -#: branch.c:104

1171 +#: branch.c:105

1172 #, c-format

1173 msgid "Branch '%s' set up to track remote ref '%s'."

1174 msgstr ""

1175 "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."

1176

1178 -#: branch.c:108

1177 +#: branch.c:109

1178 #, c-format

1179 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1180 msgstr ""

1181 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "

1182 "rebase."

1183

1185 -#: branch.c:109

1184 +#: branch.c:110

1185 #, c-format

1186 msgid "Branch '%s' set up to track local ref '%s'."

1187 msgstr ""

1188 "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."

1189

1191 -#: branch.c:118

1190 +#: branch.c:119

1191 msgid "Unable to write upstream branch configuration"

1192 msgstr "No es posible escribir la configuración de la rama upstream"

1193

1195 -#: branch.c:155

1194 +#: branch.c:156

1195 #, c-format

1196 msgid "Not tracking: ambiguous information for ref %s"

1197 msgstr "No rastreando: información ambigua para la referencia %s"

1198

1200 -#: branch.c:188

1199 +#: branch.c:189

1200 #, c-format

1201 msgid "'%s' is not a valid branch name."

1202 msgstr "'%s' no es un nombre valido de rama."

1203

1205 -#: branch.c:207

1204 +#: branch.c:208

1205 #, c-format

1206 msgid "A branch named '%s' already exists."

1207 msgstr "Una rama llamada '%s' ya existe."

1208

1210 -#: branch.c:212

1209 +#: branch.c:213

1210 msgid "Cannot force update the current branch."

1211 msgstr "No se puede forzar la actualización de la rama actual."

1212

1214 -#: branch.c:232

1213 +#: branch.c:233

1214 #, c-format

1215 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1216 msgstr ""

1217 "No se puede configurar el rastreo de información; el punto de partida '%s' "

1218 "no es una rama."

1219

1221 -#: branch.c:234

1220 +#: branch.c:235

1221 #, c-format

1222 msgid "the requested upstream branch '%s' does not exist"

1223 msgstr "la rama de upstream solicitada '%s' no existe"

1224

1226 -#: branch.c:236

1225 +#: branch.c:237

1226 msgid ""

1227 "\n"

1228 "If you are planning on basing your work on an upstream\n"

@@ -1244,17 +1243,17 @@ msgstr ""

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

1244 "el push."

1245

1247 -#: branch.c:280

1246 +#: branch.c:281

1247 #, c-format

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

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

1250

1252 -#: branch.c:300

1251 +#: branch.c:301

1252 #, c-format

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

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

1255

1257 -#: branch.c:305

1256 +#: branch.c:306

1257 #, c-format

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

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

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

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

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

1280

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

1283 -#: builtin/commit.c:776

1281 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916

1282 +#: builtin/commit.c:788

1283 #, c-format

1284 msgid "could not open '%s'"

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

@@ -1328,7 +1327,7 @@ msgstr "rev-list murió"

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

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

1329

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

1330 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306

1331 #, c-format

1332 msgid "unrecognized argument: %s"

1333 msgstr "argumento no reconocido: %s"

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

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

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

1352

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

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

1356 -#: builtin/replace.c:448

1353 +#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399

1354 +#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455

1355 #, c-format

1356 msgid "could not parse %s"

1357 msgstr "no se puede analizar %s"

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

1381 "Apapa este mensaje ejecutando\n"

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

1383

1386 -#: commit.c:1122

1384 +#: commit.c:1128

1385 #, c-format

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

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

1388

1391 -#: commit.c:1125

1389 +#: commit.c:1131

1390 #, c-format

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

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

1393

1396 -#: commit.c:1128

1394 +#: commit.c:1134

1395 #, c-format

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

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

1398

1401 -#: commit.c:1131

1399 +#: commit.c:1137

1400 #, c-format

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

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

1403

1406 -#: commit.c:1385

1404 +#: commit.c:1391

1405 msgid ""

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

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

@@ -1414,133 +1412,201 @@ msgstr ""

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

1413 "su proyecto.\n"

1414

1417 -#: commit-graph.c:101

1418 -#, c-format

1419 -msgid "graph file %s is too small"

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

1415 +#: commit-graph.c:105

1416 +msgid "commit-graph file is too small"

1417 +msgstr "archivo commit-graph es muy pequeño"

1418

1422 -#: commit-graph.c:136

1419 +#: commit-graph.c:170

1420 #, c-format

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

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

1421 +msgid "commit-graph signature %X does not match signature %X"

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

1423

1427 -#: commit-graph.c:143

1424 +#: commit-graph.c:177

1425 #, c-format

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

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

1426 +msgid "commit-graph version %X does not match version %X"

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

1428

1432 -#: commit-graph.c:150

1429 +#: commit-graph.c:184

1430 #, c-format

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

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

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

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

1433

1437 -#: commit-graph.c:173

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

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

1434 +#: commit-graph.c:207

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

1436 +msgstr ""

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

1438 +"incompleto"

1439

1441 -#: commit-graph.c:184

1440 +#: commit-graph.c:218

1441 #, c-format

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

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

1442 +msgid "commit-graph improper chunk offset %08x%08x"

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

1444

1446 -#: commit-graph.c:221

1445 +#: commit-graph.c:255

1446 #, c-format

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

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

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

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

1449

1451 -#: commit-graph.c:334

1450 +#: commit-graph.c:388

1451 #, c-format

1452 msgid "could not find commit %s"

1453 msgstr "no se pudo encontrar commit %s"

1454

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

1455 +#: commit-graph.c:730 builtin/pack-objects.c:2649

1456 #, c-format

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

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

1459

1461 -#: commit-graph.c:704

1460 +#: commit-graph.c:763

1461 msgid "Loading known commits in commit graph"

1462 msgstr "Cargando commits conocidos en commit graph"

1463

1465 -#: commit-graph.c:720

1464 +#: commit-graph.c:779

1465 msgid "Expanding reachable commits in commit graph"

1466 msgstr "Expandiendo commits alcanzables en commit graph"

1467

1469 -#: commit-graph.c:732

1468 +#: commit-graph.c:791

1469 msgid "Clearing commit marks in commit graph"

1470 msgstr "Limpiando marcas de commits en commit graph"

1471

1473 -#: commit-graph.c:752

1472 +#: commit-graph.c:811

1473 msgid "Computing commit graph generation numbers"

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

1475

1477 -#: commit-graph.c:869

1476 +#: commit-graph.c:928

1477 #, c-format

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

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

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

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

1482

1484 -#: commit-graph.c:882

1483 +#: commit-graph.c:941

1484 #, c-format

1485 msgid "error adding pack %s"

1486 msgstr "error agregando pack %s"

1487

1489 -#: commit-graph.c:884

1488 +#: commit-graph.c:943

1489 #, c-format

1490 msgid "error opening index for %s"

1491 msgstr "error abriendo index para %s"

1492

1494 -#: commit-graph.c:898

1493 +#: commit-graph.c:957

1494 #, c-format

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

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

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

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

1499

1501 -#: commit-graph.c:930

1500 +#: commit-graph.c:989

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

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

1503

1505 -#: commit-graph.c:943

1504 +#: commit-graph.c:1002

1505 msgid "Counting distinct commits in commit graph"

1506 msgstr "Contando commits distintos en commit graph"

1507

1509 -#: commit-graph.c:956

1508 +#: commit-graph.c:1015

1509 #, c-format

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

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

1512

1514 -#: commit-graph.c:965

1513 +#: commit-graph.c:1024

1514 msgid "Finding extra edges in commit graph"

1515 msgstr "Encontrando esquinas extra en commit graph"

1516

1518 -#: commit-graph.c:989

1517 +#: commit-graph.c:1048

1518 msgid "too many commits to write graph"

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

1520

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

1521 +#: commit-graph.c:1055 midx.c:805

1522 #, c-format

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

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

1525

1527 -#: commit-graph.c:1036

1526 +#: commit-graph.c:1095

1527 #, c-format

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

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

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

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

1532

1534 -#: commit-graph.c:1109

1533 +#: commit-graph.c:1160

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

1535 msgstr ""

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

1537 "corrupto"

1538

1540 -#: commit-graph.c:1153

1539 +#: commit-graph.c:1170

1540 +#, c-format

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

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

1543 +

1544 +#: commit-graph.c:1180 commit-graph.c:1195

1545 +#, c-format

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

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

1548 +

1549 +#: commit-graph.c:1187

1550 +#, c-format

1551 +msgid "failed to parse commit %s from commit-graph"

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

1553 +

1554 +#: commit-graph.c:1204

1555 msgid "Verifying commits in commit graph"

1556 msgstr "Verificando commits en commit graph"

1557

1558 +#: commit-graph.c:1217

1559 +#, c-format

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

1561 +msgstr ""

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

1563 +"graph"

1564 +

1565 +#: commit-graph.c:1224

1566 +#, c-format

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

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

1569 +

1570 +#: commit-graph.c:1234

1571 +#, c-format

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

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

1574 +

1575 +#: commit-graph.c:1240

1576 +#, c-format

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

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

1579 +

1580 +#: commit-graph.c:1253

1581 +#, c-format

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

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

1584 +

1585 +#: commit-graph.c:1258

1586 +#, c-format

1587 +msgid ""

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

1589 +msgstr ""

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

1591 +

1592 +#: commit-graph.c:1262

1593 +#, c-format

1594 +msgid ""

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

1596 +msgstr ""

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

1598 +

1599 +#: commit-graph.c:1277

1600 +#, c-format

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

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

1603 +

1604 +#: commit-graph.c:1283

1605 +#, c-format

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

1607 +msgstr ""

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

1609 +

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

1611 msgid "memory exhausted"

1612 msgstr "memoria agotada"

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

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

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

1652

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

1653 +#: config.c:378 sequencer.c:2459

1654 #, c-format

1655 msgid "invalid key: %s"

1656 msgstr "llave inválida: %s"

@@ -1722,138 +1788,138 @@ msgstr "valor malformado para %s: %s"

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

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

1790

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

1791 +#: config.c:1483 builtin/pack-objects.c:3397

1792 #, c-format

1793 msgid "bad pack compression level %d"

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

1795

1730 -#: config.c:1602

1796 +#: config.c:1604

1797 #, c-format

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

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

1800

1735 -#: config.c:1605

1801 +#: config.c:1607

1802 #, c-format

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

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

1805

1740 -#: config.c:1622

1806 +#: config.c:1624

1807 #, c-format

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

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

1810

1745 -#: config.c:1652

1811 +#: config.c:1654

1812 #, c-format

1813 msgid "failed to parse %s"

1814 msgstr "no se pudo analizar %s"

1815

1750 -#: config.c:1705

1816 +#: config.c:1710

1817 msgid "unable to parse command-line config"

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

1819

1754 -#: config.c:2037

1820 +#: config.c:2059

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

1822 msgstr ""

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

1824

1759 -#: config.c:2207

1825 +#: config.c:2229

1826 #, c-format

1827 msgid "Invalid %s: '%s'"

1828 msgstr "Invalido %s: '%s'"

1829

1764 -#: config.c:2250

1830 +#: config.c:2272

1831 #, c-format

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

1833 msgstr ""

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

1835 "defecto"

1836

1771 -#: config.c:2276

1837 +#: config.c:2298

1838 #, c-format

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

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

1841

1776 -#: config.c:2322

1842 +#: config.c:2344

1843 #, c-format

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

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

1846

1781 -#: config.c:2324

1847 +#: config.c:2346

1848 #, c-format

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

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

1851

1786 -#: config.c:2405

1852 +#: config.c:2427

1853 #, c-format

1854 msgid "invalid section name '%s'"

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

1856

1791 -#: config.c:2437

1857 +#: config.c:2459

1858 #, c-format

1859 msgid "%s has multiple values"

1860 msgstr "%s tiene múltiples valores"

1861

1796 -#: config.c:2466

1862 +#: config.c:2488

1863 #, c-format

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

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

1866

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

1867 +#: config.c:2740 config.c:3064

1868 #, c-format

1869 msgid "could not lock config file %s"

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

1871

1806 -#: config.c:2727

1872 +#: config.c:2751

1873 #, c-format

1874 msgid "opening %s"

1875 msgstr "abriendo %s"

1876

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

1877 +#: config.c:2786 builtin/config.c:328

1878 #, c-format

1879 msgid "invalid pattern: %s"

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

1881

1816 -#: config.c:2787

1882 +#: config.c:2811

1883 #, c-format

1884 msgid "invalid config file %s"

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

1886

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

1887 +#: config.c:2824 config.c:3077

1888 #, c-format

1889 msgid "fstat on %s failed"

1890 msgstr "fstat en %s falló"

1891

1826 -#: config.c:2811

1892 +#: config.c:2835

1893 #, c-format

1894 msgid "unable to mmap '%s'"

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

1896

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

1897 +#: config.c:2844 config.c:3082

1898 #, c-format

1899 msgid "chmod on %s failed"

1900 msgstr "chmod en %s falló"

1901

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

1902 +#: config.c:2929 config.c:3179

1903 #, c-format

1904 msgid "could not write config file %s"

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

1906

1841 -#: config.c:2939

1907 +#: config.c:2963

1908 #, c-format

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

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

1911

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

1912 +#: config.c:2965 builtin/remote.c:782

1913 #, c-format

1914 msgid "could not unset '%s'"

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

1916

1851 -#: config.c:3031

1917 +#: config.c:3055

1918 #, c-format

1919 msgid "invalid section name: %s"

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

1921

1856 -#: config.c:3198

1922 +#: config.c:3222

1923 #, c-format

1924 msgid "missing value for '%s'"

1925 msgstr "valor faltante para '%s'"

@@ -2009,28 +2075,28 @@ msgstr "variante 'simple' de ssh no soporta -6"

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

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

2077

2012 -#: connect.c:1259

2078 +#: connect.c:1260

2079 #, c-format

2080 msgid "strange pathname '%s' blocked"

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

2082

2017 -#: connect.c:1304

2083 +#: connect.c:1307

2084 msgid "unable to fork"

2085 msgstr "no es posible hacer fork"

2086

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

2087 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43

2088 msgid "Checking connectivity"

2089 msgstr "Verificando conectividad"

2090

2025 -#: connected.c:80

2091 +#: connected.c:97

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

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

2094

2029 -#: connected.c:100

2095 +#: connected.c:117

2096 msgid "failed write to rev-list"

2097 msgstr "falló escribir a rev-list"

2098

2033 -#: connected.c:107

2099 +#: connected.c:124

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

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

2102

@@ -2262,22 +2328,29 @@ msgstr "falló al leer orden de archivos '%s'"

2328 msgid "Performing inexact rename detection"

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

2330

2265 -#: diff.c:108

2266 -#, c-format

2267 -msgid "option '%s' requires a value"

2268 -msgstr "opción '%s' requiere un valor"

2331 +#: diff-no-index.c:238

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

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

2334 +

2335 +#: diff-no-index.c:263

2336 +msgid ""

2337 +"Not a git repository. Use --no-index to compare two paths outside a working "

2338 +"tree"

2339 +msgstr ""

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

2341 +"árbol de trabajo"

2342

2270 -#: diff.c:158

2343 +#: diff.c:155

2344 #, c-format

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

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

2347

2275 -#: diff.c:163

2348 +#: diff.c:160

2349 #, c-format

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

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

2352

2280 -#: diff.c:291

2353 +#: diff.c:296

2354 msgid ""

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

2356 "'dimmed-zebra', 'plain'"

@@ -2285,7 +2358,7 @@ msgstr ""

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

2359 "'dimmed_zebra', 'plain'"

2360

2288 -#: diff.c:319

2361 +#: diff.c:324

2362 #, c-format

2363 msgid ""

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

@@ -2295,7 +2368,7 @@ msgstr ""

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

2369 "change'"

2370

2298 -#: diff.c:327

2371 +#: diff.c:332

2372 msgid ""

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

2374 "whitespace modes"

@@ -2303,13 +2376,13 @@ msgstr ""

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

2377 "modos de espacios en blanco"

2378

2306 -#: diff.c:400

2379 +#: diff.c:405

2380 #, c-format

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

2382 msgstr ""

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

2384

2312 -#: diff.c:460

2385 +#: diff.c:465

2386 #, c-format

2387 msgid ""

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

@@ -2318,24 +2391,35 @@ msgstr ""

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

2392 "%s"

2393

2321 -#: diff.c:4211

2394 +#: diff.c:4210

2395 #, c-format

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

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

2398

2326 -#: diff.c:4553

2399 +#: diff.c:4555

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

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

2402

2330 -#: diff.c:4556

2403 +#: diff.c:4558

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

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

2406

2334 -#: diff.c:4634

2407 +#: diff.c:4636

2408 msgid "--follow requires exactly one pathspec"

2409 msgstr "--follow requiere exactamente un pathspec"

2410

2338 -#: diff.c:4800

2411 +#: diff.c:4684

2412 +#, c-format

2413 +msgid "invalid --stat value: %s"

2414 +msgstr "valor --stat inválido: %s"

2415 +

2416 +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216

2417 +#: parse-options.c:200

2418 +#, c-format

2419 +msgid "%s expects a numerical value"

2420 +msgstr "%s espera un valor numérico"

2421 +

2422 +#: diff.c:4721

2423 #, c-format

2424 msgid ""

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

@@ -2344,22 +2428,517 @@ msgstr ""

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

2429 "%s"

2430

2347 -#: diff.c:4814

2431 +#: diff.c:4806

2432 +#, c-format

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

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

2435 +

2436 +#: diff.c:4830

2437 +#, c-format

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

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

2440 +

2441 +#: diff.c:4844

2442 +#, c-format

2443 +msgid "unable to resolve '%s'"

2444 +msgstr "no se puede resolver '%s'"

2445 +

2446 +#: diff.c:4894 diff.c:4900

2447 +#, c-format

2448 +msgid "%s expects <n>/<m> form"

2449 +msgstr "%s espera forma <n>/<m>"

2450 +

2451 +#: diff.c:4912

2452 +#, c-format

2453 +msgid "%s expects a character, got '%s'"

2454 +msgstr "%s esperaba un char, se obtuvo '%s'"

2455 +

2456 +#: diff.c:4933

2457 +#, c-format

2458 +msgid "bad --color-moved argument: %s"

2459 +msgstr "mal argumento --color-moved: %s"

2460 +

2461 +#: diff.c:4952

2462 +#, c-format

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

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

2465 +

2466 +#: diff.c:4992

2467 +msgid ""

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

2469 +"\"histogram\""

2470 +msgstr ""

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

2472 +"\"histogram\""

2473 +

2474 +#: diff.c:5028 diff.c:5048

2475 +#, c-format

2476 +msgid "invalid argument to %s"

2477 +msgstr "argumento inválido para %s"

2478 +

2479 +#: diff.c:5186

2480 +#, c-format

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

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

2483 +

2484 +#: diff.c:5240

2485 #, c-format

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

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

2486 +msgid "bad --word-diff argument: %s"

2487 +msgstr "mal argumento --word-diff: %s"

2488 +

2489 +#: diff.c:5263

2490 +msgid "Diff output format options"

2491 +msgstr "Opciones de formato de salida para diff"

2492 +

2493 +#: diff.c:5265 diff.c:5271

2494 +msgid "generate patch"

2495 +msgstr "generar parche"

2496 +

2497 +#: diff.c:5268 builtin/log.c:167

2498 +msgid "suppress diff output"

2499 +msgstr "suprimir salida de diff"

2500 +

2501 +#: diff.c:5273 diff.c:5387 diff.c:5394

2502 +msgid "<n>"

2503 +msgstr "<n>"

2504 +

2505 +#: diff.c:5274 diff.c:5277

2506 +msgid "generate diffs with <n> lines context"

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

2508 +

2509 +#: diff.c:5279

2510 +msgid "generate the diff in raw format"

2511 +msgstr "genera el diff en formato raw"

2512 +

2513 +#: diff.c:5282

2514 +msgid "synonym for '-p --raw'"

2515 +msgstr "sinónimo para '-p --stat'"

2516

2352 -#: diff.c:5900

2517 +#: diff.c:5286

2518 +msgid "synonym for '-p --stat'"

2519 +msgstr "sinónimo para '-p --stat'"

2520 +

2521 +#: diff.c:5290

2522 +msgid "machine friendly --stat"

2523 +msgstr "--stat amigable para máquina"

2524 +

2525 +#: diff.c:5293

2526 +msgid "output only the last line of --stat"

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

2528 +

2529 +#: diff.c:5295 diff.c:5303

2530 +msgid "<param1,param2>..."

2531 +msgstr "<param1,param2>..."

2532 +

2533 +#: diff.c:5296

2534 +msgid ""

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

2536 +msgstr ""

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

2538 +"subdirectorio"

2539 +

2540 +#: diff.c:5300

2541 +msgid "synonym for --dirstat=cumulative"

2542 +msgstr "sinónimo para --dirstat=cumulative"

2543 +

2544 +#: diff.c:5304

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

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

2547 +

2548 +#: diff.c:5308

2549 +msgid "warn if changes introduce conflict markers or whitespace errors"

2550 +msgstr ""

2551 +"advierte si cambios introducen conflictos de markers o errores de espacios "

2552 +"en blanco"

2553 +

2554 +#: diff.c:5311

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

2556 +msgstr ""

2557 +"resumen condensado de creaciones, cambios de nombres y cambios de modos"

2558 +

2559 +#: diff.c:5314

2560 +msgid "show only names of changed files"

2561 +msgstr "mostrar solo nombres de archivos cambiados"

2562 +

2563 +#: diff.c:5317

2564 +msgid "show only names and status of changed files"

2565 +msgstr "mostrar solo nombres y estados de archivos cambiados"

2566 +

2567 +#: diff.c:5319

2568 +msgid "<width>[,<name-width>[,<count>]]"

2569 +msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"

2570 +

2571 +#: diff.c:5320

2572 +msgid "generate diffstat"

2573 +msgstr "generar diffstat"

2574 +

2575 +#: diff.c:5322 diff.c:5325 diff.c:5328

2576 +msgid "<width>"

2577 +msgstr "<ancho>"

2578 +

2579 +#: diff.c:5323

2580 +msgid "generate diffstat with a given width"

2581 +msgstr "genera diffstat con un ancho dado"

2582 +

2583 +#: diff.c:5326

2584 +msgid "generate diffstat with a given name width"

2585 +msgstr "genera diffstat con un nombre de ancho dado"

2586 +

2587 +#: diff.c:5329

2588 +msgid "generate diffstat with a given graph width"

2589 +msgstr "genera diffstat con un ancho de graph dado"

2590 +

2591 +#: diff.c:5331

2592 +msgid "<count>"

2593 +msgstr "<cantidad>"

2594 +

2595 +#: diff.c:5332

2596 +msgid "generate diffstat with limited lines"

2597 +msgstr "genera diffstat con líneas limitadas"

2598 +

2599 +#: diff.c:5335

2600 +msgid "generate compact summary in diffstat"

2601 +msgstr "genera un resumen compacto de diffstat"

2602 +

2603 +#: diff.c:5338

2604 +msgid "output a binary diff that can be applied"

2605 +msgstr "muestra un diff binario que puede ser aplicado"

2606 +

2607 +#: diff.c:5341

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

2609 +msgstr ""

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

2611 +"\""

2612 +

2613 +#: diff.c:5343

2614 +msgid "show colored diff"

2615 +msgstr "mostrar diff colorido"

2616 +

2617 +#: diff.c:5344

2618 +msgid "<kind>"

2619 +msgstr "<tipo>"

2620 +

2621 +#: diff.c:5345

2622 +msgid ""

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

2624 +"diff"

2625 +msgstr ""

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

2627 +"'new' del diff"

2628 +

2629 +#: diff.c:5348

2630 +msgid ""

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

2632 +"--numstat"

2633 +msgstr ""

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

2635 +"o --numstat"

2636 +

2637 +#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463

2638 +msgid "<prefix>"

2639 +msgstr "<prefijo>"

2640 +

2641 +#: diff.c:5352

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

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

2644 +

2645 +#: diff.c:5355

2646 +msgid "show the given source prefix instead of \"b/\""

2647 +msgstr "mostrar el prefijo de fuente dado en lugar de \"b/\""

2648 +

2649 +#: diff.c:5358

2650 +msgid "prepend an additional prefix to every line of output"

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

2652 +

2653 +#: diff.c:5361

2654 +msgid "do not show any source or destination prefix"

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

2656 +

2657 +#: diff.c:5364

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

2659 +msgstr ""

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

2661 +"líneas"

2662 +

2663 +#: diff.c:5368 diff.c:5373 diff.c:5378

2664 +msgid "<char>"

2665 +msgstr "<char>"

2666 +

2667 +#: diff.c:5369

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

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

2670 +

2671 +#: diff.c:5374

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

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

2674 +

2675 +#: diff.c:5379

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

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

2678 +

2679 +#: diff.c:5382

2680 +msgid "Diff rename options"

2681 +msgstr "Opciones de diff rename"

2682 +

2683 +#: diff.c:5383

2684 +msgid "<n>[/<m>]"

2685 +msgstr "<n>[/<m>]"

2686 +

2687 +#: diff.c:5384

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

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

2690 +

2691 +#: diff.c:5388

2692 +msgid "detect renames"

2693 +msgstr "detectar renombrados"

2694 +

2695 +#: diff.c:5392

2696 +msgid "omit the preimage for deletes"

2697 +msgstr "omite la preimage para borrados"

2698 +

2699 +#: diff.c:5395

2700 +msgid "detect copies"

2701 +msgstr "detectar copias"

2702 +

2703 +#: diff.c:5399

2704 +msgid "use unmodified files as source to find copies"

2705 +msgstr "usa archivos no modificados como fuente para encontrar copias"

2706 +

2707 +#: diff.c:5401

2708 +msgid "disable rename detection"

2709 +msgstr "deshabilita detección de renombres"

2710 +

2711 +#: diff.c:5404

2712 +msgid "use empty blobs as rename source"

2713 +msgstr "usa blobs vacíos como fuente de renombre"

2714 +

2715 +#: diff.c:5406

2716 +msgid "continue listing the history of a file beyond renames"

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

2718 +

2719 +#: diff.c:5409

2720 +msgid ""

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

2722 +"given limit"

2723 +msgstr ""

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

2725 +"renombres/copias excede el límite dado"

2726 +

2727 +#: diff.c:5411

2728 +msgid "Diff algorithm options"

2729 +msgstr "Opciones de algoritmos de diff"

2730 +

2731 +#: diff.c:5413

2732 +msgid "produce the smallest possible diff"

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

2734 +

2735 +#: diff.c:5416

2736 +msgid "ignore whitespace when comparing lines"

2737 +msgstr "ignorar espacios en blanco cuando comparando líneas"

2738 +

2739 +#: diff.c:5419

2740 +msgid "ignore changes in amount of whitespace"

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

2742 +

2743 +#: diff.c:5422

2744 +msgid "ignore changes in whitespace at EOL"

2745 +msgstr "ignorar cambios en espacios en blanco en EOL"

2746 +

2747 +#: diff.c:5425

2748 +msgid "ignore carrier-return at the end of line"

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

2750 +

2751 +#: diff.c:5428

2752 +msgid "ignore changes whose lines are all blank"

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

2754 +

2755 +#: diff.c:5431

2756 +msgid "heuristic to shift diff hunk boundaries for easy reading"

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

2758 +

2759 +#: diff.c:5434

2760 +msgid "generate diff using the \"patience diff\" algorithm"

2761 +msgstr "genera un diff usando algoritmo \"patience diff\""

2762 +

2763 +#: diff.c:5438

2764 +msgid "generate diff using the \"histogram diff\" algorithm"

2765 +msgstr "genera un diff usando algoritmo \"histogram diff\""

2766 +

2767 +#: diff.c:5440

2768 +msgid "<algorithm>"

2769 +msgstr "<algoritmo>"

2770 +

2771 +#: diff.c:5441

2772 +msgid "choose a diff algorithm"

2773 +msgstr "escoge un algoritmo para diff"

2774 +

2775 +#: diff.c:5443

2776 +msgid "<text>"

2777 +msgstr "<texto>"

2778 +

2779 +#: diff.c:5444

2780 +msgid "generate diff using the \"anchored diff\" algorithm"

2781 +msgstr "genera un diff usando algoritmo \"anchored diff\""

2782 +

2783 +#: diff.c:5446 diff.c:5455 diff.c:5458

2784 +msgid "<mode>"

2785 +msgstr "<modo>"

2786 +

2787 +#: diff.c:5447

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

2789 +msgstr ""

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

2791 +

2792 +#: diff.c:5449 diff.c:5452 diff.c:5497

2793 +msgid "<regex>"

2794 +msgstr "<regex>"

2795 +

2796 +#: diff.c:5450

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

2798 +msgstr "usa <regex> para decidir que palabra es"

2799 +

2800 +#: diff.c:5453

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

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

2803 +

2804 +#: diff.c:5456

2805 +msgid "move lines of code are colored differently"

2806 +msgstr "líneas movidas de código son coloreadas diferente"

2807 +

2808 +#: diff.c:5459

2809 +msgid "how white spaces are ignored in --color-moved"

2810 +msgstr "como espacios en blanco son ignorados en --color-moved"

2811 +

2812 +#: diff.c:5462

2813 +msgid "Diff other options"

2814 +msgstr "Otras opciones de diff"

2815 +

2816 +#: diff.c:5464

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

2818 +msgstr ""

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

2820 +"paths relativos"

2821 +

2822 +#: diff.c:5468

2823 +msgid "treat all files as text"

2824 +msgstr "tratar todos los archivos como texto"

2825 +

2826 +#: diff.c:5470

2827 +msgid "swap two inputs, reverse the diff"

2828 +msgstr "cambia dos inputs, invierte el diff"

2829 +

2830 +#: diff.c:5472

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

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

2833 +

2834 +#: diff.c:5474

2835 +msgid "disable all output of the program"

2836 +msgstr "deshabilita todo el output del programa"

2837 +

2838 +#: diff.c:5476

2839 +msgid "allow an external diff helper to be executed"

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

2841 +

2842 +#: diff.c:5478

2843 +msgid "run external text conversion filters when comparing binary files"

2844 +msgstr ""

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

2846 +

2847 +#: diff.c:5480

2848 +msgid "<when>"

2849 +msgstr "<cuando>"

2850 +

2851 +#: diff.c:5481

2852 +msgid "ignore changes to submodules in the diff generation"

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

2854 +

2855 +#: diff.c:5484

2856 +msgid "<format>"

2857 +msgstr "<formato>"

2858 +

2859 +#: diff.c:5485

2860 +msgid "specify how differences in submodules are shown"

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

2862 +

2863 +#: diff.c:5489

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

2865 +msgstr "ocultar entradas 'git add -N' del index"

2866 +

2867 +#: diff.c:5492

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

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

2870 +

2871 +#: diff.c:5494

2872 +msgid "<string>"

2873 +msgstr "<string>"

2874 +

2875 +#: diff.c:5495

2876 +msgid ""

2877 +"look for differences that change the number of occurrences of the specified "

2878 +"string"

2879 +msgstr ""

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

2881 +"especificado"

2882 +

2883 +#: diff.c:5498

2884 +msgid ""

2885 +"look for differences that change the number of occurrences of the specified "

2886 +"regex"

2887 +msgstr ""

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

2889 +"especificado"

2890 +

2891 +#: diff.c:5501

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

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

2894 +

2895 +#: diff.c:5504

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

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

2898 +

2899 +#: diff.c:5507

2900 +msgid "control the order in which files appear in the output"

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

2902 +

2903 +#: diff.c:5508

2904 +msgid "<object-id>"

2905 +msgstr "<id-objeto>"

2906 +

2907 +#: diff.c:5509

2908 +msgid ""

2909 +"look for differences that change the number of occurrences of the specified "

2910 +"object"

2911 +msgstr ""

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

2913 +"especificado"

2914 +

2915 +#: diff.c:5511

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

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

2918 +

2919 +#: diff.c:5512

2920 +msgid "select files by diff type"

2921 +msgstr "selecciona archivos por tipo de diff"

2922 +

2923 +#: diff.c:5514

2924 +msgid "<file>"

2925 +msgstr "<archivo>"

2926 +

2927 +#: diff.c:5515

2928 +msgid "Output to a specific file"

2929 +msgstr "Output a un archivo específico"

2930 +

2931 +#: diff.c:6148

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

2933 msgstr ""

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

2935

2357 -#: diff.c:5903

2936 +#: diff.c:6151

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

2938 msgstr ""

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

2940

2362 -#: diff.c:5906

2941 +#: diff.c:6154

2942 #, c-format

2943 msgid ""

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

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

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

2947 "intentar el comando."

2948

2370 -#: dir.c:538

2949 +#: dir.c:537

2950 #, c-format

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

2952 msgstr ""

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

2954

2376 -#: dir.c:927

2955 +#: dir.c:926

2956 #, c-format

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

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

2959

2381 -#: dir.c:1842

2960 +#: dir.c:1843

2961 #, c-format

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

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

2964

2386 -#: dir.c:2084

2965 +#: dir.c:2085

2966 msgid "failed to get kernel name and information"

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

2968

2390 -#: dir.c:2208

2969 +#: dir.c:2209

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

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

2972

2394 -#: dir.c:3009

2973 +#: dir.c:3013

2974 #, c-format

2975 msgid "index file corrupt in repo %s"

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

2977

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

2978 +#: dir.c:3058 dir.c:3063

2979 #, c-format

2980 msgid "could not create directories for %s"

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

2982

2404 -#: dir.c:3088

2983 +#: dir.c:3092

2984 #, c-format

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

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

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

2994 msgid "Filtering content"

2995 msgstr "Filtrando contenido"

2996

2418 -#: entry.c:465

2997 +#: entry.c:476

2998 #, c-format

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

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

@@ -2430,7 +3009,7 @@ msgstr "ruta de namespace de git mala \"%s\""

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

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

3011

2433 -#: exec-cmd.c:361

3012 +#: exec-cmd.c:363

3013 #, c-format

3014 msgid "too many args to run %s"

3015 msgstr "demasiados argumentos para correr %s"

@@ -2457,226 +3036,234 @@ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"

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

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

3038

2460 -#: fetch-pack.c:256

3039 +#: fetch-pack.c:196

3040 +msgid "unable to write to remote"

3041 +msgstr "no se puede escribir al remoto"

3042 +

3043 +#: fetch-pack.c:258

3044 msgid "--stateless-rpc requires multi_ack_detailed"

3045 msgstr "--stateless-rpc requiere multi_ack_detailed"

3046

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

3047 +#: fetch-pack.c:360 fetch-pack.c:1271

3048 #, c-format

3049 msgid "invalid shallow line: %s"

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

3051

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

3052 +#: fetch-pack.c:366 fetch-pack.c:1277

3053 #, c-format

3054 msgid "invalid unshallow line: %s"

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

3056

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

3057 +#: fetch-pack.c:368 fetch-pack.c:1279

3058 #, c-format

3059 msgid "object not found: %s"

3060 msgstr "objeto no encontrado: %s"

3061

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

3062 +#: fetch-pack.c:371 fetch-pack.c:1282

3063 #, c-format

3064 msgid "error in object: %s"

3065 msgstr "error en objeto: %s"

3066

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

3067 +#: fetch-pack.c:373 fetch-pack.c:1284

3068 #, c-format

3069 msgid "no shallow found: %s"

3070 msgstr "superficie no encontrada: %s"

3071

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

3072 +#: fetch-pack.c:376 fetch-pack.c:1288

3073 #, c-format

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

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

3076

2494 -#: fetch-pack.c:415

3077 +#: fetch-pack.c:417

3078 #, c-format

3079 msgid "got %s %d %s"

3080 msgstr "se obtuvo %s %d %s"

3081

2499 -#: fetch-pack.c:432

3082 +#: fetch-pack.c:434

3083 #, c-format

3084 msgid "invalid commit %s"

3085 msgstr "commit inválido %s"

3086

2504 -#: fetch-pack.c:463

3087 +#: fetch-pack.c:465

3088 msgid "giving up"

3089 msgstr "rindiéndose"

3090

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

3091 +#: fetch-pack.c:477 progress.c:284

3092 msgid "done"

3093 msgstr "listo"

3094

2512 -#: fetch-pack.c:487

3095 +#: fetch-pack.c:489

3096 #, c-format

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

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

3099

2517 -#: fetch-pack.c:533

3100 +#: fetch-pack.c:535

3101 #, c-format

3102 msgid "Marking %s as complete"

3103 msgstr "Marcando %s como completa"

3104

2522 -#: fetch-pack.c:740

3105 +#: fetch-pack.c:744

3106 #, c-format

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

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

3109

2527 -#: fetch-pack.c:779

3110 +#: fetch-pack.c:783

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

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

3113

2531 -#: fetch-pack.c:787

3114 +#: fetch-pack.c:791

3115 msgid "protocol error: bad pack header"

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

3117

2535 -#: fetch-pack.c:855

3118 +#: fetch-pack.c:859

3119 #, c-format

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

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

3122

2540 -#: fetch-pack.c:871

3123 +#: fetch-pack.c:875

3124 #, c-format

3125 msgid "%s failed"

3126 msgstr "%s falló"

3127

2545 -#: fetch-pack.c:873

3128 +#: fetch-pack.c:877

3129 msgid "error in sideband demultiplexer"

3130 msgstr "error en demultiplexor de banda lateral"

3131

2549 -#: fetch-pack.c:902

3132 +#: fetch-pack.c:906

3133 msgid "Server does not support shallow clients"

3134 msgstr "El servidor no soporta clientes superficiales"

3135

2553 -#: fetch-pack.c:906

3136 +#: fetch-pack.c:910

3137 msgid "Server supports multi_ack_detailed"

3138 msgstr "El servidor soporta ulti_ack_detailed"

3139

2557 -#: fetch-pack.c:909

3140 +#: fetch-pack.c:913

3141 msgid "Server supports no-done"

3142 msgstr "El servidor soporta no-done"

3143

2561 -#: fetch-pack.c:915

3144 +#: fetch-pack.c:919

3145 msgid "Server supports multi_ack"

3146 msgstr "El servidor soporta multi_ack"

3147

2565 -#: fetch-pack.c:919

3148 +#: fetch-pack.c:923

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

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

3151

2569 -#: fetch-pack.c:923

3152 +#: fetch-pack.c:927

3153 msgid "Server supports side-band"

3154 msgstr "El servidor soporta side-band"

3155

2573 -#: fetch-pack.c:927

3156 +#: fetch-pack.c:931

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

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

3159

2577 -#: fetch-pack.c:931

3160 +#: fetch-pack.c:935

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

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

3163

2581 -#: fetch-pack.c:941

3164 +#: fetch-pack.c:945

3165 msgid "Server supports ofs-delta"

3166 msgstr "El servidor soporta ofs-delta"

3167

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

3168 +#: fetch-pack.c:951 fetch-pack.c:1144

3169 msgid "Server supports filter"

3170 msgstr "El servidor soporta filtro"

3171

2589 -#: fetch-pack.c:955

3172 +#: fetch-pack.c:959

3173 #, c-format

3174 msgid "Server version is %.*s"

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

3176

2594 -#: fetch-pack.c:961

3177 +#: fetch-pack.c:965

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

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

3180

2598 -#: fetch-pack.c:965

3181 +#: fetch-pack.c:969

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

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

3184

2602 -#: fetch-pack.c:967

3185 +#: fetch-pack.c:971

3186 msgid "Server does not support --deepen"

3187 msgstr "El servidor no soporta --deepen"

3188

2606 -#: fetch-pack.c:984

3189 +#: fetch-pack.c:988

3190 msgid "no common commits"

3191 msgstr "no hay commits comunes"

3192

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

3193 +#: fetch-pack.c:1000 fetch-pack.c:1449

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

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

3196

2614 -#: fetch-pack.c:1134

3197 +#: fetch-pack.c:1138

3198 msgid "Server does not support shallow requests"

3199 msgstr "El servidor no soporta peticiones superficiales"

3200

2618 -#: fetch-pack.c:1184

3201 +#: fetch-pack.c:1171

3202 +msgid "unable to write request to remote"

3203 +msgstr "no se puede escribir request al remoto"

3204 +

3205 +#: fetch-pack.c:1189

3206 #, c-format

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

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

3209

2623 -#: fetch-pack.c:1190

3210 +#: fetch-pack.c:1195

3211 #, c-format

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

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

3214

2628 -#: fetch-pack.c:1229

3215 +#: fetch-pack.c:1234

3216 #, c-format

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

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

3219

2633 -#: fetch-pack.c:1234

3220 +#: fetch-pack.c:1239

3221 #, c-format

3222 msgid "error processing acks: %d"

3223 msgstr "error procesando acks: %d"

3224

2638 -#: fetch-pack.c:1244

3225 +#: fetch-pack.c:1249

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

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

3228

2642 -#: fetch-pack.c:1246

3229 +#: fetch-pack.c:1251

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

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

3232

2646 -#: fetch-pack.c:1287

3233 +#: fetch-pack.c:1293

3234 #, c-format

3235 msgid "error processing shallow info: %d"

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

3237

2651 -#: fetch-pack.c:1308

3238 +#: fetch-pack.c:1340

3239 #, c-format

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

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

3242

2656 -#: fetch-pack.c:1318

3243 +#: fetch-pack.c:1345

3244 #, c-format

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

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

3247

2661 -#: fetch-pack.c:1322

3248 +#: fetch-pack.c:1350

3249 #, c-format

3250 msgid "error processing wanted refs: %d"

3251 msgstr "error procesando refs deseadas: %d"

3252

2666 -#: fetch-pack.c:1646

3253 +#: fetch-pack.c:1676

3254 msgid "no matching remote head"

3255 msgstr "no concuerda el head remoto"

3256

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

3257 +#: fetch-pack.c:1699 builtin/clone.c:676

3258 msgid "remote did not send all necessary objects"

3259 msgstr "remoto no mando todos los objetos necesarios"

3260

2674 -#: fetch-pack.c:1690

3261 +#: fetch-pack.c:1726

3262 #, c-format

3263 msgid "no such remote ref %s"

3264 msgstr "no existe ref remota %s"

3265

2679 -#: fetch-pack.c:1693

3266 +#: fetch-pack.c:1729

3267 #, c-format

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

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

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

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

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

3293

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

3294 +#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82

3295 #: builtin/rm.c:135

3296 #, c-format

3297 msgid "failed to stat '%s'"

@@ -2780,28 +3367,28 @@ msgstr "comandos disponibles de git desde otro lugar en tu $PATH"

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

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

3369

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

3370 +#: help.c:363 git.c:97

3371 #, c-format

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

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

3374

2788 -#: help.c:410

3375 +#: help.c:403

3376 msgid "The common Git guides are:"

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

3378

2792 -#: help.c:519

3379 +#: help.c:512

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

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

3382

2796 -#: help.c:524

3383 +#: help.c:517

3384 msgid "External commands"

3385 msgstr "Comandos externos"

3386

2800 -#: help.c:539

3387 +#: help.c:532

3388 msgid "Command aliases"

3389 msgstr "Aliases de comando"

3390

2804 -#: help.c:603

3391 +#: help.c:596

3392 #, c-format

3393 msgid ""

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

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

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

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

3399

2813 -#: help.c:662

3400 +#: help.c:655

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

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

3403

2817 -#: help.c:684

3404 +#: help.c:677

3405 #, c-format

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

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

3408

2822 -#: help.c:689

3409 +#: help.c:682

3410 #, c-format

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

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

3413

2827 -#: help.c:694

3414 +#: help.c:687

3415 #, c-format

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

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

3418

2832 -#: help.c:702

3419 +#: help.c:695

3420 #, c-format

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

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

3423

2837 -#: help.c:706

3424 +#: help.c:699

3425 msgid ""

3426 "\n"

3427 "The most similar command is"

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

3435 "\n"

3436 "Los comandos mas similares son"

3437

2851 -#: help.c:721

3438 +#: help.c:714

3439 msgid "git version [<options>]"

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

3441

2855 -#: help.c:789

3442 +#: help.c:782

3443 #, c-format

3444 msgid "%s: %s - %s"

3445 msgstr "%s: %s - %s"

3446

2860 -#: help.c:793

3447 +#: help.c:786

3448 msgid ""

3449 "\n"

3450 "Did you mean this?"

@@ -2871,7 +3458,7 @@ msgstr[1] ""

3458 "\n"

3459 "¿Quisiste decir alguno de estos?"

3460

2874 -#: ident.c:345

3461 +#: ident.c:349

3462 msgid ""

3463 "\n"

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

@@ -2897,39 +3484,54 @@ msgstr ""

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

3485 "\n"

3486

2900 -#: ident.c:369

3487 +#: ident.c:379

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

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

3490

2904 -#: ident.c:374

3491 +#: ident.c:384

3492 #, c-format

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

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

3495

2909 -#: ident.c:384

3496 +#: ident.c:401

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

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

3499

2913 -#: ident.c:390

3500 +#: ident.c:407

3501 #, c-format

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

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

3504

2918 -#: ident.c:398

3505 +#: ident.c:415

3506 #, c-format

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

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

3509

2923 -#: ident.c:404

3510 +#: ident.c:421

3511 #, c-format

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

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

3514

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

3515 +#: ident.c:436 builtin/commit.c:608

3516 #, c-format

3517 msgid "invalid date format: %s"

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

3519

3520 +#: list-objects.c:129

3521 +#, c-format

3522 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3523 +msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"

3524 +

3525 +#: list-objects.c:142

3526 +#, c-format

3527 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3528 +msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"

3529 +

3530 +#: list-objects.c:378

3531 +#, c-format

3532 +msgid "unable to load root tree for commit %s"

3533 +msgstr "no se puede cargar árbol raíz para commit %s"

3534 +

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

3536 msgid "multiple filter-specs cannot be combined"

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

@@ -2938,7 +3540,7 @@ msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"

3540 msgid "expected 'tree:<depth>'"

3541 msgstr "se esperaba 'tree:<depth>'"

3542

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

3543 +#: list-objects-filter-options.c:156

3544 msgid "cannot change partial clone promisor remote"

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

3546

@@ -2971,114 +3573,115 @@ msgstr "No se pudo crear '%s.lock': %s"

3573 msgid "failed to read the cache"

3574 msgstr "falló al leer la cache"

3575

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

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

3576 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3577 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776

3578 +#: builtin/stash.c:264

3579 msgid "unable to write new index file"

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

3581

2979 -#: merge-recursive.c:332

3582 +#: merge-recursive.c:322

3583 msgid "(bad commit)\n"

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

3585

2983 -#: merge-recursive.c:355

3586 +#: merge-recursive.c:345

3587 #, c-format

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

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

3590

2988 -#: merge-recursive.c:364

3591 +#: merge-recursive.c:354

3592 #, c-format

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

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

3595

2993 -#: merge-recursive.c:447

3596 +#: merge-recursive.c:437

3597 msgid "error building trees"

3598 msgstr "error construyendo árboles"

3599

2997 -#: merge-recursive.c:902

3600 +#: merge-recursive.c:861

3601 #, c-format

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

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

3604

3002 -#: merge-recursive.c:913

3605 +#: merge-recursive.c:872

3606 #, c-format

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

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

3609

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

3610 +#: merge-recursive.c:886 merge-recursive.c:905

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

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

3613

3011 -#: merge-recursive.c:936

3614 +#: merge-recursive.c:895

3615 #, c-format

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

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

3618

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

3619 +#: merge-recursive.c:936 builtin/cat-file.c:40

3620 #, c-format

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

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

3623

3021 -#: merge-recursive.c:980

3624 +#: merge-recursive.c:939

3625 #, c-format

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

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

3628

3026 -#: merge-recursive.c:1004

3629 +#: merge-recursive.c:963

3630 #, c-format

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

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

3633

3031 -#: merge-recursive.c:1015

3634 +#: merge-recursive.c:974

3635 #, c-format

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

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

3638

3036 -#: merge-recursive.c:1020

3639 +#: merge-recursive.c:979

3640 #, c-format

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

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

3643

3041 -#: merge-recursive.c:1211

3644 +#: merge-recursive.c:1175

3645 #, c-format

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

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

3648

3046 -#: merge-recursive.c:1218

3649 +#: merge-recursive.c:1182

3650 #, c-format

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

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

3653

3051 -#: merge-recursive.c:1225

3654 +#: merge-recursive.c:1189

3655 #, c-format

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

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

3658

3056 -#: merge-recursive.c:1233 merge-recursive.c:1245

3659 +#: merge-recursive.c:1197 merge-recursive.c:1209

3660 #, c-format

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

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

3663

3061 -#: merge-recursive.c:1236 merge-recursive.c:1248

3664 +#: merge-recursive.c:1200 merge-recursive.c:1212

3665 #, c-format

3666 msgid "Fast-forwarding submodule %s"

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

3668

3066 -#: merge-recursive.c:1271

3669 +#: merge-recursive.c:1235

3670 #, c-format

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

3672 msgstr ""

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

3674

3072 -#: merge-recursive.c:1275

3675 +#: merge-recursive.c:1239

3676 #, c-format

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

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

3679

3077 -#: merge-recursive.c:1276

3680 +#: merge-recursive.c:1240

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

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

3683

3081 -#: merge-recursive.c:1279

3684 +#: merge-recursive.c:1243

3685 #, c-format

3686 msgid ""

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

@@ -3095,33 +3698,33 @@ msgstr ""

3698 "\n"

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

3700

3098 -#: merge-recursive.c:1288

3701 +#: merge-recursive.c:1252

3702 #, c-format

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

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

3705

3103 -#: merge-recursive.c:1361

3706 +#: merge-recursive.c:1325

3707 msgid "Failed to execute internal merge"

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

3709

3107 -#: merge-recursive.c:1366

3710 +#: merge-recursive.c:1330

3711 #, c-format

3712 msgid "Unable to add %s to database"

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

3714

3112 -#: merge-recursive.c:1398

3715 +#: merge-recursive.c:1362

3716 #, c-format

3717 msgid "Auto-merging %s"

3718 msgstr "Auto-fusionando %s"

3719

3117 -#: merge-recursive.c:1419

3720 +#: merge-recursive.c:1385

3721 #, c-format

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

3723 msgstr ""

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

3725 "cambio."

3726

3124 -#: merge-recursive.c:1486

3727 +#: merge-recursive.c:1457

3728 #, c-format

3729 msgid ""

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

@@ -3130,7 +3733,7 @@ msgstr ""

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

3734 "en el árbol."

3735

3133 -#: merge-recursive.c:1491

3736 +#: merge-recursive.c:1462

3737 #, c-format

3738 msgid ""

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

@@ -3139,7 +3742,7 @@ msgstr ""

3742 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

3743 "permanece en el árbol."

3744

3142 -#: merge-recursive.c:1498

3745 +#: merge-recursive.c:1469

3746 #, c-format

3747 msgid ""

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

@@ -3148,7 +3751,7 @@ msgstr ""

3751 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "

3752 "dejada en el árbol, en %s."

3753

3151 -#: merge-recursive.c:1503

3754 +#: merge-recursive.c:1474

3755 #, c-format

3756 msgid ""

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

@@ -3157,44 +3760,44 @@ msgstr ""

3760 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

3761 "permanece en el árbol en %s."

3762

3160 -#: merge-recursive.c:1537

3763 +#: merge-recursive.c:1509

3764 msgid "rename"

3765 msgstr "renombrar"

3766

3164 -#: merge-recursive.c:1537

3767 +#: merge-recursive.c:1509

3768 msgid "renamed"

3769 msgstr "renombrado"

3770

3168 -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3771 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3772 #, c-format

3773 msgid "Refusing to lose dirty file at %s"

3774 msgstr "Rehusando perder el archivo sucio en %s"

3775

3173 -#: merge-recursive.c:1643

3776 +#: merge-recursive.c:1599

3777 #, c-format

3778 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3779 msgstr ""

3780 "Rehusando perder el archivo no rastreado en %s, incluso aunque se está "

3781 "interponiendo."

3782

3180 -#: merge-recursive.c:1706

3783 +#: merge-recursive.c:1657

3784 #, c-format

3785 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

3786 msgstr ""

3787 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"

3788

3186 -#: merge-recursive.c:1734

3789 +#: merge-recursive.c:1687

3790 #, c-format

3791 msgid "%s is a directory in %s adding as %s instead"

3792 msgstr "%s es un directorio en %s agregando como %s más bien"

3793

3191 -#: merge-recursive.c:1739

3794 +#: merge-recursive.c:1692

3795 #, c-format

3796 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3797 msgstr ""

3798 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"

3799

3197 -#: merge-recursive.c:1759

3800 +#: merge-recursive.c:1711

3801 #, c-format

3802 msgid ""

3803 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -3203,18 +3806,18 @@ msgstr ""

3806 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "

3807 "renombrar \"%s\"->\"%s\" en \"%s\"%s"

3808

3206 -#: merge-recursive.c:1764

3809 +#: merge-recursive.c:1716

3810 msgid " (left unresolved)"

3811 msgstr " (dejado sin resolver)"

3812

3210 -#: merge-recursive.c:1868

3813 +#: merge-recursive.c:1825

3814 #, c-format

3815 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

3816 msgstr ""

3817 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

3818 "%s"

3819

3217 -#: merge-recursive.c:2064

3820 +#: merge-recursive.c:2030

3821 #, c-format

3822 msgid ""

3823 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3225,7 +3828,7 @@ msgstr ""

3828 "colocar %s porque el directorio %s fue renombrado a otros múltiples "

3829 "directorios, sin ningún que contenga la mayoría de archivos."

3830

3228 -#: merge-recursive.c:2096

3831 +#: merge-recursive.c:2062

3832 #, c-format

3833 msgid ""

3834 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3235,7 +3838,7 @@ msgstr ""

3838 "existente en %s se interpone con el cambio de nombres implícito, poniendo "

3839 "la(s) siguiente(s) ruta(s) aquí: %s."

3840

3238 -#: merge-recursive.c:2106

3841 +#: merge-recursive.c:2072

3842 #, c-format

3843 msgid ""

3844 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3244,7 +3847,7 @@ msgstr ""

3847 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

3848 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"

3849

3247 -#: merge-recursive.c:2198

3850 +#: merge-recursive.c:2164

3851 #, c-format

3852 msgid ""

3853 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3253,7 +3856,7 @@ msgstr ""

3856 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

3857 "Renombrar directorio %s->%s en %s"

3858

3256 -#: merge-recursive.c:2443

3859 +#: merge-recursive.c:2408

3860 #, c-format

3861 msgid ""

3862 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3262,82 +3865,119 @@ msgstr ""

3865 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

3866 "renombrado."

3867

3265 -#: merge-recursive.c:3022

3868 +#: merge-recursive.c:2929

3869 #, c-format

3870 msgid "cannot read object %s"

3871 msgstr "no se pudo leer el objeto %s"

3872

3270 -#: merge-recursive.c:3025

3873 +#: merge-recursive.c:2932

3874 #, c-format

3875 msgid "object %s is not a blob"

3876 msgstr "objeto %s no es un blob"

3877

3275 -#: merge-recursive.c:3094

3878 +#: merge-recursive.c:2996

3879 msgid "modify"

3880 msgstr "modificar"

3881

3279 -#: merge-recursive.c:3094

3882 +#: merge-recursive.c:2996

3883 msgid "modified"

3884 msgstr "modificado"

3885

3283 -#: merge-recursive.c:3105

3886 +#: merge-recursive.c:3008

3887 msgid "content"

3888 msgstr "contenido"

3889

3287 -#: merge-recursive.c:3112

3890 +#: merge-recursive.c:3012

3891 msgid "add/add"

3892 msgstr "agregar/agregar"

3893

3291 -#: merge-recursive.c:3160

3894 +#: merge-recursive.c:3035

3895 #, c-format

3896 msgid "Skipped %s (merged same as existing)"

3897 msgstr "Saltado %s (fusionado como existente)"

3898

3296 -#: merge-recursive.c:3182 git-submodule.sh:861

3899 +#: merge-recursive.c:3057 git-submodule.sh:937

3900 msgid "submodule"

3901 msgstr "submódulo"

3902

3300 -#: merge-recursive.c:3183

3903 +#: merge-recursive.c:3058

3904 #, c-format

3905 msgid "CONFLICT (%s): Merge conflict in %s"

3906 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

3907

3305 -#: merge-recursive.c:3216

3908 +#: merge-recursive.c:3088

3909 #, c-format

3910 msgid "Adding as %s instead"

3911 msgstr "Agregando más bien como %s"

3912

3310 -#: merge-recursive.c:3319

3913 +#: merge-recursive.c:3170

3914 +#, c-format

3915 +msgid ""

3916 +"Path updated: %s added in %s inside a directory that was renamed in %s; "

3917 +"moving it to %s."

3918 +msgstr ""

3919 +"Path actualizado: %s agregado en %s dentro de un directorio que fue "

3920 +"renombrado en %s; moviéndolo a %s."

3921 +

3922 +#: merge-recursive.c:3173

3923 +#, c-format

3924 +msgid ""

3925 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "

3926 +"in %s, suggesting it should perhaps be moved to %s."

3927 +msgstr ""

3928 +"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

3929 +"que fue renombrado en %s, sugerimos que debería ser movido a %s."

3930 +

3931 +#: merge-recursive.c:3177

3932 +#, c-format

3933 +msgid ""

3934 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

3935 +"%s; moving it to %s."

3936 +msgstr ""

3937 +"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

3938 +"renombrado en %s; moviéndolo a %s."

3939 +

3940 +#: merge-recursive.c:3180

3941 +#, c-format

3942 +msgid ""

3943 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

3944 +"was renamed in %s, suggesting it should perhaps be moved to %s."

3945 +msgstr ""

3946 +"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "

3947 +"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

3948 +"movido a %s."

3949 +

3950 +#: merge-recursive.c:3294

3951 #, c-format

3952 msgid "Removing %s"

3953 msgstr "Eliminando %s"

3954

3315 -#: merge-recursive.c:3345

3955 +#: merge-recursive.c:3317

3956 msgid "file/directory"

3957 msgstr "archivo/directorio"

3958

3319 -#: merge-recursive.c:3351

3959 +#: merge-recursive.c:3322

3960 msgid "directory/file"

3961 msgstr "directorio/archivo"

3962

3323 -#: merge-recursive.c:3358

3963 +#: merge-recursive.c:3329

3964 #, c-format

3965 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

3966 msgstr ""

3967 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "

3968 "%s"

3969

3330 -#: merge-recursive.c:3367

3970 +#: merge-recursive.c:3338

3971 #, c-format

3972 msgid "Adding %s"

3973 msgstr "Agregando %s"

3974

3335 -#: merge-recursive.c:3376

3975 +#: merge-recursive.c:3347

3976 #, c-format

3977 msgid "CONFLICT (add/add): Merge conflict in %s"

3978 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

3979

3340 -#: merge-recursive.c:3417

3980 +#: merge-recursive.c:3385

3981 #, c-format

3982 msgid ""

3983 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3347,150 +3987,162 @@ msgstr ""

3987 "merge:\n"

3988 " %s"

3989

3350 -#: merge-recursive.c:3428

3990 +#: merge-recursive.c:3396

3991 msgid "Already up to date!"

3992 msgstr "¡Ya está actualizado!"

3993

3354 -#: merge-recursive.c:3437

3994 +#: merge-recursive.c:3405

3995 #, c-format

3996 msgid "merging of trees %s and %s failed"

3997 msgstr "falló la fusión de los árboles %s y %s"

3998

3359 -#: merge-recursive.c:3536

3999 +#: merge-recursive.c:3504

4000 msgid "Merging:"

4001 msgstr "Fusionando:"

4002

3363 -#: merge-recursive.c:3549

4003 +#: merge-recursive.c:3517

4004 #, c-format

4005 msgid "found %u common ancestor:"

4006 msgid_plural "found %u common ancestors:"

4007 msgstr[0] "se encontró %u ancestro común:"

4008 msgstr[1] "se encontraron %u ancestros comunes:"

4009

3370 -#: merge-recursive.c:3588

4010 +#: merge-recursive.c:3556

4011 msgid "merge returned no commit"

4012 msgstr "la fusión no devolvió ningún commit"

4013

3374 -#: merge-recursive.c:3654

4014 +#: merge-recursive.c:3622

4015 #, c-format

4016 msgid "Could not parse object '%s'"

4017 msgstr "No se pudo analizar el objeto '%s'"

4018

3379 -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

4019 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4020 msgid "Unable to write index."

4021 msgstr "Incapaz de escribir el índice."

4022

3383 -#: midx.c:65

4023 +#: midx.c:66

4024 #, c-format

4025 msgid "multi-pack-index file %s is too small"

4026 msgstr "archivo multi-pack-index %s es muy pequeño"

4027

3388 -#: midx.c:81

4028 +#: midx.c:82

4029 #, c-format

4030 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4031 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"

4032

3393 -#: midx.c:86

4033 +#: midx.c:87

4034 #, c-format

4035 msgid "multi-pack-index version %d not recognized"

4036 msgstr "versión %d de multi-pack-index no reconocida"

4037

3398 -#: midx.c:91

4038 +#: midx.c:92

4039 #, c-format

4040 msgid "hash version %u does not match"

4041 msgstr "versión de hash %u no concuerda"

4042

3403 -#: midx.c:105

4043 +#: midx.c:106

4044 msgid "invalid chunk offset (too large)"

4045 msgstr "offset inválido del conjunto (muy grande)"

4046

3407 -#: midx.c:129

4047 +#: midx.c:130

4048 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4049 msgstr ""

4050 "terminando multi-pack-index porque el id del conjunto aparece antes de lo "

4051 "esperado"

4052

3413 -#: midx.c:142

4053 +#: midx.c:143

4054 msgid "multi-pack-index missing required pack-name chunk"

4055 msgstr "multi-pack-index le falta el conjunto pack-name requerido"

4056

3417 -#: midx.c:144

4057 +#: midx.c:145

4058 msgid "multi-pack-index missing required OID fanout chunk"

4059 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4060

3421 -#: midx.c:146

4061 +#: midx.c:147

4062 msgid "multi-pack-index missing required OID lookup chunk"

4063 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4064

3425 -#: midx.c:148

4065 +#: midx.c:149

4066 msgid "multi-pack-index missing required object offsets chunk"

4067 msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

4068

3429 -#: midx.c:162

4069 +#: midx.c:163

4070 #, c-format

4071 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4072 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

4073

3434 -#: midx.c:205

4074 +#: midx.c:209

4075 #, c-format

4076 msgid "bad pack-int-id: %u (%u total packs)"

4077 msgstr "mal pack-int-id: %u (%u paquetes totales)"

4078

3439 -#: midx.c:246

4079 +#: midx.c:250

4080 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4081 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4082

3443 -#: midx.c:271

4083 +#: midx.c:275

4084 msgid "error preparing packfile from multi-pack-index"

4085 msgstr "error preparando packfile de multi-pack-index"

4086

3447 -#: midx.c:407

4087 +#: midx.c:443

4088 #, c-format

4089 msgid "failed to add packfile '%s'"

4090 msgstr "falló al agregar packfile '%s'"

4091

3452 -#: midx.c:413

4092 +#: midx.c:449

4093 #, c-format

4094 msgid "failed to open pack-index '%s'"

4095 msgstr "falló al abrir pack-index '%s'"

4096

3457 -#: midx.c:507

4097 +#: midx.c:543

4098 #, c-format

4099 msgid "failed to locate object %d in packfile"

4100 msgstr "falló al ubicar objeto %d en packfile"

4101

3462 -#: midx.c:943

4102 +#: midx.c:979

4103 #, c-format

4104 msgid "failed to clear multi-pack-index at %s"

4105 msgstr "falló al limpiar multi-pack-index en %s"

4106

3467 -#: midx.c:981

4107 +#: midx.c:1034

4108 +msgid "Looking for referenced packfiles"

4109 +msgstr "Buscando por packfiles referidos"

4110 +

4111 +#: midx.c:1049

4112 #, c-format

4113 msgid ""

4114 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4115 msgstr ""

4116 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4117

3474 -#: midx.c:992

4118 +#: midx.c:1053

4119 +msgid "Verifying OID order in MIDX"

4120 +msgstr "Verificando orden de OID en MIDX"

4121 +

4122 +#: midx.c:1062

4123 #, c-format

4124 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4125 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4126

3479 -#: midx.c:996

4127 +#: midx.c:1081

4128 +msgid "Sorting objects by packfile"

4129 +msgstr "Ordenando objetos por packfile"

4130 +

4131 +#: midx.c:1087

4132 msgid "Verifying object offsets"

4133 msgstr "Verificando offsets de objetos"

4134

3483 -#: midx.c:1004

4135 +#: midx.c:1103

4136 #, c-format

4137 msgid "failed to load pack entry for oid[%d] = %s"

4138 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4139

3488 -#: midx.c:1010

4140 +#: midx.c:1109

4141 #, c-format

4142 msgid "failed to load pack-index for packfile %s"

4143 msgstr "falló al cargar el pack-index para packfile %s"

4144

3493 -#: midx.c:1019

4145 +#: midx.c:1118

4146 #, c-format

4147 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4148 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

@@ -3577,87 +4229,82 @@ msgstr "incapaz de analizar objeto: %s"

4229 msgid "hash mismatch %s"

4230 msgstr "hash no concuerda %s"

4231

3580 -#: packfile.c:607

4232 +#: packfile.c:617

4233 msgid "offset before end of packfile (broken .idx?)"

4234 msgstr "offset antes del final del paquete (broken .idx?)"

4235

3584 -#: packfile.c:1870

4236 +#: packfile.c:1880

4237 #, c-format

4238 msgid "offset before start of pack index for %s (corrupt index?)"

4239 msgstr ""

4240 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"

4241

3590 -#: packfile.c:1874

4242 +#: packfile.c:1884

4243 #, c-format

4244 msgid "offset beyond end of pack index for %s (truncated index?)"

4245 msgstr ""

4246 "offset más allá del índice de fin de paquete para %s (índice truncado?)"

4247

3596 -#: parse-options.c:35

4248 +#: parse-options.c:38

4249 #, c-format

4250 msgid "%s requires a value"

4251 msgstr "%s requiere un valor"

4252

3601 -#: parse-options.c:69

4253 +#: parse-options.c:73

4254 #, c-format

4255 msgid "%s is incompatible with %s"

4256 msgstr "%s es incompatible con %s"

4257

3606 -#: parse-options.c:74

4258 +#: parse-options.c:78

4259 #, c-format

4260 msgid "%s : incompatible with something else"

4261 msgstr "%s : incompatible con otra cosa"

4262

3611 -#: parse-options.c:88 parse-options.c:92 parse-options.c:260

4263 +#: parse-options.c:92 parse-options.c:96 parse-options.c:287

4264 #, c-format

4265 msgid "%s takes no value"

4266 msgstr "%s no toma valores"

4267

3616 -#: parse-options.c:90

4268 +#: parse-options.c:94

4269 #, c-format

4270 msgid "%s isn't available"

4271 msgstr "%s no está disponible"

4272

3621 -#: parse-options.c:178

3622 -#, c-format

3623 -msgid "%s expects a numerical value"

3624 -msgstr "%s espera un valor numérico"

3625 -

3626 -#: parse-options.c:194

4273 +#: parse-options.c:216

4274 #, c-format

4275 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

4276 msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"

4277

3631 -#: parse-options.c:322

4278 +#: parse-options.c:356

4279 #, c-format

4280 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

4281 msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

4282

3636 -#: parse-options.c:356 parse-options.c:364

4283 +#: parse-options.c:390 parse-options.c:398

4284 #, c-format

4285 msgid "did you mean `--%s` (with two dashes ?)"

4286 msgstr "¿quisiste decir `--%s` (con dos guiones)?"

4287

3641 -#: parse-options.c:649

4288 +#: parse-options.c:733

4289 #, c-format

4290 msgid "unknown option `%s'"

4291 msgstr "opción `%s' desconocida"

4292

3646 -#: parse-options.c:651

4293 +#: parse-options.c:735

4294 #, c-format

4295 msgid "unknown switch `%c'"

4296 msgstr "switch desconocido `%c'"

4297

3651 -#: parse-options.c:653

4298 +#: parse-options.c:737

4299 #, c-format

4300 msgid "unknown non-ascii option in string: `%s'"

4301 msgstr "opcion desconocida en string no ascii: `%s'"

4302

3656 -#: parse-options.c:675

4303 +#: parse-options.c:759

4304 msgid "..."

4305 msgstr "..."

4306

3660 -#: parse-options.c:694

4307 +#: parse-options.c:778

4308 #, c-format

4309 msgid "usage: %s"

4310 msgstr "uso: %s"

@@ -3665,17 +4312,17 @@ msgstr "uso: %s"

4312 #. TRANSLATORS: the colon here should align with the

4313 #. one in "usage: %s" translation.

4314 #.

3668 -#: parse-options.c:700

4315 +#: parse-options.c:784

4316 #, c-format

4317 msgid " or: %s"

4318 msgstr " o: %s"

4319

3673 -#: parse-options.c:703

4320 +#: parse-options.c:787

4321 #, c-format

4322 msgid " %s"

4323 msgstr " %s"

4324

3678 -#: parse-options.c:742

4325 +#: parse-options.c:826

4326 msgid "-NUM"

4327 msgstr "-NUM"

4328

@@ -3694,12 +4341,12 @@ msgstr "fecha de expiración mal formada: '%s'"

4341 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4342 msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

4343

3697 -#: parse-options-cb.c:110

4344 +#: parse-options-cb.c:127 parse-options-cb.c:144

4345 #, c-format

4346 msgid "malformed object name '%s'"

4347 msgstr "nombre de objeto mal formado '%s'"

4348

3702 -#: path.c:894

4349 +#: path.c:897

4350 #, c-format

4351 msgid "Could not make %s writable by group"

4352 msgstr "No se pudo hacer que %s fuera escribible por el grupo"

@@ -3779,45 +4426,53 @@ msgstr "%s: magic pathspec no soportado por este comando: %s"

4426 msgid "pathspec '%s' is beyond a symbolic link"

4427 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

4428

3782 -#: pkt-line.c:104

4429 +#: pkt-line.c:92

4430 +msgid "unable to write flush packet"

4431 +msgstr "no es posible escribir flush packet"

4432 +

4433 +#: pkt-line.c:99

4434 +msgid "unable to write delim packet"

4435 +msgstr "no es posible escribir delim packet"

4436 +

4437 +#: pkt-line.c:106

4438 msgid "flush packet write failed"

4439 msgstr "limpieza de escritura de paquetes falló"

4440

3786 -#: pkt-line.c:144 pkt-line.c:230

4441 +#: pkt-line.c:146 pkt-line.c:232

4442 msgid "protocol error: impossibly long line"

4443 msgstr "error de protocolo: línea imposiblemente larga"

4444

3790 -#: pkt-line.c:160 pkt-line.c:162

4445 +#: pkt-line.c:162 pkt-line.c:164

4446 msgid "packet write with format failed"

4447 msgstr "escritura de paquetes con formato falló"

4448

3794 -#: pkt-line.c:194

4449 +#: pkt-line.c:196

4450 msgid "packet write failed - data exceeds max packet size"

4451 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"

4452

3798 -#: pkt-line.c:201 pkt-line.c:208

4453 +#: pkt-line.c:203 pkt-line.c:210

4454 msgid "packet write failed"

4455 msgstr "escritura de paquetes falló"

4456

3802 -#: pkt-line.c:293

4457 +#: pkt-line.c:295

4458 msgid "read error"

4459 msgstr "error de lectura"

4460

3806 -#: pkt-line.c:301

4461 +#: pkt-line.c:303

4462 msgid "the remote end hung up unexpectedly"

4463 msgstr "el remoto se colgó de manera inesperada"

4464

3810 -#: pkt-line.c:329

4465 +#: pkt-line.c:331

4466 #, c-format

4467 msgid "protocol error: bad line length character: %.4s"

4468 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"

4469

3815 -#: pkt-line.c:339 pkt-line.c:344

4470 +#: pkt-line.c:341 pkt-line.c:346

4471 #, c-format

4472 msgid "protocol error: bad line length %d"

4473 msgstr "error de protocolo: mal largo de línea %d"

4474

3820 -#: pkt-line.c:353

4475 +#: pkt-line.c:362

4476 #, c-format

4477 msgid "remote error: %s"

4478 msgstr "error remoto: %s"

@@ -3831,7 +4486,7 @@ msgstr "Refrescando index"

4486 msgid "unable to create threaded lstat: %s"

4487 msgstr "no es posible crear lstat hilado: %s"

4488

3834 -#: pretty.c:963

4489 +#: pretty.c:966

4490 msgid "unable to parse --pretty format"

4491 msgstr "incapaz de analizar el formato --pretty"

4492

@@ -3843,7 +4498,7 @@ msgstr "no se pudo comenzar `log`"

4498 msgid "could not read `log` output"

4499 msgstr "no se pudo leer output de `log`"

4500

3846 -#: range-diff.c:74 sequencer.c:4828

4501 +#: range-diff.c:74 sequencer.c:4897

4502 #, c-format

4503 msgid "could not parse commit '%s'"

4504 msgstr "no se pudo analizar commit '%s'"

@@ -3857,46 +4512,51 @@ msgstr "falló al generar diff"

4512 msgid "could not parse log for '%s'"

4513 msgstr "no se pudo leer el log para '%s'"

4514

3860 -#: read-cache.c:673

4515 +#: read-cache.c:680

4516 #, c-format

4517 msgid "will not add file alias '%s' ('%s' already exists in index)"

4518 msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)"

4519

3865 -#: read-cache.c:689

4520 +#: read-cache.c:696

4521 msgid "cannot create an empty blob in the object database"

4522 msgstr "no se puede crear un blob vacío en la base de datos de objetos"

4523

3869 -#: read-cache.c:710

4524 +#: read-cache.c:718

4525 #, c-format

4526 msgid "%s: can only add regular files, symbolic links or git-directories"

4527 msgstr ""

4528 "%s: solo puede agregar archivos regulares, symbolic links o git-directories"

4529

3875 -#: read-cache.c:765

4530 +#: read-cache.c:723

4531 +#, c-format

4532 +msgid "'%s' does not have a commit checked out"

4533 +msgstr "'%s' no tiene un commit checked out"

4534 +

4535 +#: read-cache.c:775

4536 #, c-format

4537 msgid "unable to index file '%s'"

4538 msgstr "no es posible indexar archivo '%s'"

4539

3880 -#: read-cache.c:784

4540 +#: read-cache.c:794

4541 #, c-format

4542 msgid "unable to add '%s' to index"

3883 -msgstr "No es posible agregar '%s' al index"

4543 +msgstr "no es posible agregar '%s' al index"

4544

3885 -#: read-cache.c:795

4545 +#: read-cache.c:805

4546 #, c-format

4547 msgid "unable to stat '%s'"

4548 msgstr "incapaz de correr stat en '%s'"

4549

3890 -#: read-cache.c:1304

4550 +#: read-cache.c:1314

4551 #, c-format

4552 msgid "'%s' appears as both a file and as a directory"

4553 msgstr "'%s' parece ser un directorio y un archivo a la vez"

4554

3895 -#: read-cache.c:1489

4555 +#: read-cache.c:1499

4556 msgid "Refresh index"

4557 msgstr "Refrescar index"

4558

3899 -#: read-cache.c:1603

4559 +#: read-cache.c:1613

4560 #, c-format

4561 msgid ""

4562 "index.version set, but the value is invalid.\n"

@@ -3905,7 +4565,7 @@ msgstr ""

4565 "index.version configurado, pero el valor no es válido.\n"

4566 "Usando versión %i"

4567

3908 -#: read-cache.c:1613

4568 +#: read-cache.c:1623

4569 #, c-format

4570 msgid ""

4571 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -3914,144 +4574,151 @@ msgstr ""

4574 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"

4575 "Usando versión %i"

4576

3917 -#: read-cache.c:1684

4577 +#: read-cache.c:1679

4578 #, c-format

4579 msgid "bad signature 0x%08x"

4580 msgstr "mala firma 0x%08x"

4581

3922 -#: read-cache.c:1687

4582 +#: read-cache.c:1682

4583 #, c-format

4584 msgid "bad index version %d"

4585 msgstr "mala versión del índice %d"

4586

3927 -#: read-cache.c:1696

4587 +#: read-cache.c:1691

4588 msgid "bad index file sha1 signature"

4589 msgstr "mala firma sha1 del archivo index"

4590

3931 -#: read-cache.c:1726

4591 +#: read-cache.c:1721

4592 #, c-format

4593 msgid "index uses %.4s extension, which we do not understand"

4594 msgstr "index usa %.4s extensiones, cosa que no entendemos"

4595

3936 -#: read-cache.c:1728

4596 +#: read-cache.c:1723

4597 #, c-format

4598 msgid "ignoring %.4s extension"

4599 msgstr "ignorando extensión %.4s"

4600

3941 -#: read-cache.c:1765

4601 +#: read-cache.c:1760

4602 #, c-format

4603 msgid "unknown index entry format 0x%08x"

3944 -msgstr "Formato de index desconocido 0x%08x"

4604 +msgstr "formato de index desconocido 0x%08x"

4605

3946 -#: read-cache.c:1781

4606 +#: read-cache.c:1776

4607 #, c-format

4608 msgid "malformed name field in the index, near path '%s'"

4609 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

4610

3951 -#: read-cache.c:1836

4611 +#: read-cache.c:1833

4612 msgid "unordered stage entries in index"

4613 msgstr "entradas en stage desordenadas en index"

4614

3955 -#: read-cache.c:1839

4615 +#: read-cache.c:1836

4616 #, c-format

4617 msgid "multiple stage entries for merged file '%s'"

4618 msgstr "múltiples entradas extrañas para archivo fusionado '%s'"

4619

3960 -#: read-cache.c:1842

4620 +#: read-cache.c:1839

4621 #, c-format

4622 msgid "unordered stage entries for '%s'"

4623 msgstr "entradas de stage desordenadas para '%s'"

4624

3965 -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3966 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3967 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3968 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

4625 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4626 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4627 +#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4628 +#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4629 #: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4630 #: builtin/submodule--helper.c:330

4631 msgid "index file corrupt"

4632 msgstr "archivo índice corrompido"

4633

3974 -#: read-cache.c:2090

4634 +#: read-cache.c:2087

4635 #, c-format

4636 msgid "unable to create load_cache_entries thread: %s"

4637 msgstr "no es posible crear hilo load_cache_entries: %s"

4638

3979 -#: read-cache.c:2103

4639 +#: read-cache.c:2100

4640 #, c-format

4641 msgid "unable to join load_cache_entries thread: %s"

4642 msgstr "no es posible unir hilo load_cache_entires: %s"

4643

3984 -#: read-cache.c:2136

4644 +#: read-cache.c:2133

4645 #, c-format

4646 msgid "%s: index file open failed"

4647 msgstr "%s: falló al abrir el archivo index"

4648

3989 -#: read-cache.c:2140

4649 +#: read-cache.c:2137

4650 #, c-format

4651 msgid "%s: cannot stat the open index"

4652 msgstr "%s: no se puede hacer stat del index abierto"

4653

3994 -#: read-cache.c:2144

4654 +#: read-cache.c:2141

4655 #, c-format

4656 msgid "%s: index file smaller than expected"

4657 msgstr "%s: archivo index más pequeño de lo esperado"

4658

3999 -#: read-cache.c:2148

4659 +#: read-cache.c:2145

4660 #, c-format

4661 msgid "%s: unable to map index file"

4662 msgstr "%s: no se pudo mapear el archivo index"

4663

4004 -#: read-cache.c:2190

4664 +#: read-cache.c:2187

4665 #, c-format

4666 msgid "unable to create load_index_extensions thread: %s"

4667 msgstr "no es posible crear hilo load_index_extensions: %s"

4668

4009 -#: read-cache.c:2217

4669 +#: read-cache.c:2214

4670 #, c-format

4671 msgid "unable to join load_index_extensions thread: %s"

4672 msgstr "no es posible unir hilo load_index_extensions: %s"

4673

4014 -#: read-cache.c:2239

4674 +#: read-cache.c:2246

4675 #, c-format

4676 msgid "could not freshen shared index '%s'"

4677 msgstr "no se pudo refrescar el index compartido '%s'"

4678

4019 -#: read-cache.c:2274

4679 +#: read-cache.c:2293

4680 #, c-format

4681 msgid "broken index, expect %s in %s, got %s"

4682 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

4683

4024 -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4684 +#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117

4685 #, c-format

4686 msgid "could not close '%s'"

4687 msgstr "no se pudo cerrar '%s'"

4688

4029 -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4689 +#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807

4690 #, c-format

4691 msgid "could not stat '%s'"

4692 msgstr "no se pudo definir '%s'"

4693

4034 -#: read-cache.c:3057

4694 +#: read-cache.c:3104

4695 #, c-format

4696 msgid "unable to open git dir: %s"

4697 msgstr "no es posible abrir el directorio de git: %s"

4698

4039 -#: read-cache.c:3069

4699 +#: read-cache.c:3116

4700 #, c-format

4701 msgid "unable to unlink: %s"

4702 msgstr "no es posible eliminar el vinculo: %s"

4703

4044 -#: read-cache.c:3088

4704 +#: read-cache.c:3141

4705 #, c-format

4706 msgid "cannot fix permission bits on '%s'"

4707 msgstr "no se pudo arreglar bits de permisos en '%s'"

4708

4049 -#: read-cache.c:3237

4709 +#: read-cache.c:3290

4710 #, c-format

4711 msgid "%s: cannot drop to stage #0"

4712 msgstr "%s: no se puede eliminar a stage #0"

4713

4054 -#: rebase-interactive.c:10

4714 +#: rebase-interactive.c:26

4715 +#, c-format

4716 +msgid ""

4717 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4718 +msgstr ""

4719 +"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

4720 +

4721 +#: rebase-interactive.c:35

4722 msgid ""

4723 "\n"

4724 "Commands:\n"

@@ -4093,7 +4760,14 @@ msgstr ""

4760 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "

4761 "abajo.\n"

4762

4096 -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

4763 +#: rebase-interactive.c:56

4764 +#, c-format

4765 +msgid "Rebase %s onto %s (%d command)"

4766 +msgid_plural "Rebase %s onto %s (%d commands)"

4767 +msgstr[0] "Rebase %s en %s (%d comando)"

4768 +msgstr[1] "Rebase %s en %s (%d comandos)"

4769 +

4770 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4771 msgid ""

4772 "\n"

4773 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4101,7 +4775,7 @@ msgstr ""

4775 "\n"

4776 "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"

4777

4104 -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

4778 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4779 msgid ""

4780 "\n"

4781 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4109,7 +4783,7 @@ msgstr ""

4783 "\n"

4784 "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"

4785

4112 -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

4786 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

4787 msgid ""

4788 "\n"

4789 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4123,7 +4797,7 @@ msgstr ""

4797 " git rebase --continue\n"

4798 "\n"

4799

4126 -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

4800 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

4801 msgid ""

4802 "\n"

4803 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4133,125 +4807,155 @@ msgstr ""

4807 "Como sea, si quieres borrar todo, el rebase será abortado.\n"

4808 "\n"

4809

4136 -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

4810 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

4811 msgid "Note that empty commits are commented out"

4812 msgstr "Tenga en cuenta que los commits vacíos están comentados"

4813

4140 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4141 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4814 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4815 +#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4816 #, c-format

4143 -msgid "could not read '%s'."

4144 -msgstr "no se puede leer '%s'."

4817 +msgid "could not write '%s'"

4818 +msgstr "no se pudo escribir '%s'"

4819 +

4820 +#: rebase-interactive.c:108

4821 +#, c-format

4822 +msgid "could not copy '%s' to '%s'."

4823 +msgstr "no se pudo copiar '%s' a '%s'."

4824 +

4825 +#: rebase-interactive.c:173

4826 +#, c-format

4827 +msgid ""

4828 +"Warning: some commits may have been dropped accidentally.\n"

4829 +"Dropped commits (newer to older):\n"

4830 +msgstr ""

4831 +"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

4832 +"Commits botados (empezando con el mas nuevo):\n"

4833 +

4834 +#: rebase-interactive.c:180

4835 +#, c-format

4836 +msgid ""

4837 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

4838 +"\n"

4839 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

4840 +"warnings.\n"

4841 +"The possible behaviours are: ignore, warn, error.\n"

4842 +"\n"

4843 +msgstr ""

4844 +"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "

4845 +"commit.\n"

4846 +"\n"

4847 +"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "

4848 +"advertencias.\n"

4849 +"Los posibles comportamientos son: ignore,warn,error.\n"

4850 +"\n"

4851

4852 #: refs.c:192

4853 #, c-format

4854 msgid "%s does not point to a valid object!"

4855 msgstr "%s no apunta a ningún objeto válido!"

4856

4151 -#: refs.c:583

4857 +#: refs.c:597

4858 #, c-format

4859 msgid "ignoring dangling symref %s"

4860 msgstr "ignorando referencia rota %s"

4861

4156 -#: refs.c:585 ref-filter.c:1976

4862 +#: refs.c:599 ref-filter.c:1982

4863 #, c-format

4864 msgid "ignoring broken ref %s"

4865 msgstr "ignorando referencia rota %s"

4866

4161 -#: refs.c:711

4867 +#: refs.c:734

4868 #, c-format

4869 msgid "could not open '%s' for writing: %s"

4870 msgstr "no se pudo abrir '%s' para escritura: %s"

4871

4166 -#: refs.c:721 refs.c:772

4872 +#: refs.c:744 refs.c:795

4873 #, c-format

4874 msgid "could not read ref '%s'"

4875 msgstr "no se pudo leer la referencia '%s'"

4876

4171 -#: refs.c:727

4877 +#: refs.c:750

4878 #, c-format

4879 msgid "ref '%s' already exists"

4880 msgstr "ref '%s' ya existe"

4881

4176 -#: refs.c:732

4882 +#: refs.c:755

4883 #, c-format

4884 msgid "unexpected object ID when writing '%s'"

4885 msgstr "ID de objecto inesperado cuando se escribía '%s'"

4886

4181 -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4182 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4183 -#: wrapper.c:656

4887 +#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4888 +#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4889 #, c-format

4890 msgid "could not write to '%s'"

4891 msgstr "no se pudo escribir en '%s'"

4892

4188 -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4189 -#: builtin/am.c:713 builtin/rebase.c:575

4893 +#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4894 #, c-format

4895 msgid "could not open '%s' for writing"

4896 msgstr "no se pudo abrir '%s' para escritura"

4897

4194 -#: refs.c:774

4898 +#: refs.c:797

4899 #, c-format

4900 msgid "unexpected object ID when deleting '%s'"

4901 msgstr "ID de objecto inesperado cuando se borraba '%s'"

4902

4199 -#: refs.c:905

4903 +#: refs.c:928

4904 #, c-format

4905 msgid "log for ref %s has gap after %s"

4906 msgstr "log de ref %s tiene un vacío tras %s"

4907

4204 -#: refs.c:911

4908 +#: refs.c:934

4909 #, c-format

4910 msgid "log for ref %s unexpectedly ended on %s"

4911 msgstr "log de ref %s finalizado inesperadamente en %s"

4912

4209 -#: refs.c:969

4913 +#: refs.c:993

4914 #, c-format

4915 msgid "log for %s is empty"

4916 msgstr "log de %s está vacío"

4917

4214 -#: refs.c:1061

4918 +#: refs.c:1085

4919 #, c-format

4920 msgid "refusing to update ref with bad name '%s'"

4921 msgstr "rehusando actualizar ref con mal nombre '%s'"

4922

4219 -#: refs.c:1137

4923 +#: refs.c:1161

4924 #, c-format

4925 msgid "update_ref failed for ref '%s': %s"

4926 msgstr "update_ref falló para ref '%s': %s"

4927

4224 -#: refs.c:1911

4928 +#: refs.c:1942

4929 #, c-format

4930 msgid "multiple updates for ref '%s' not allowed"

4931 msgstr "múltiples actualizaciones para ref '%s' no permitidas"

4932

4229 -#: refs.c:1943

4933 +#: refs.c:1974

4934 msgid "ref updates forbidden inside quarantine environment"

4935 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

4936

4233 -#: refs.c:2039 refs.c:2069

4937 +#: refs.c:2070 refs.c:2100

4938 #, c-format

4939 msgid "'%s' exists; cannot create '%s'"

4940 msgstr "'%s' existe; no se puede crear '%s'"

4941

4238 -#: refs.c:2045 refs.c:2080

4942 +#: refs.c:2076 refs.c:2111

4943 #, c-format

4944 msgid "cannot process '%s' and '%s' at the same time"

4945 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

4946

4243 -#: refs/files-backend.c:1228

4947 +#: refs/files-backend.c:1234

4948 #, c-format

4949 msgid "could not remove reference %s"

4950 msgstr "no se pudo eliminar la referencia %s"

4951

4248 -#: refs/files-backend.c:1242 refs/packed-backend.c:1532

4952 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532

4953 #: refs/packed-backend.c:1542

4954 #, c-format

4955 msgid "could not delete reference %s: %s"

4956 msgstr "no se pudo eliminar la referencia %s: %s"

4957

4254 -#: refs/files-backend.c:1245 refs/packed-backend.c:1545

4958 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545

4959 #, c-format

4960 msgid "could not delete references: %s"

4961 msgstr "no se pudo eliminar la referencia: %s"

@@ -4261,7 +4965,7 @@ msgstr "no se pudo eliminar la referencia: %s"

4965 msgid "invalid refspec '%s'"

4966 msgstr "refspec inválido: '%s'"

4967

4264 -#: ref-filter.c:39 wt-status.c:1861

4968 +#: ref-filter.c:39 wt-status.c:1907

4969 msgid "gone"

4970 msgstr "desaparecido"

4971

@@ -4385,79 +5089,79 @@ msgstr "se esperaba un ancho positivo con el átomo %%(align)"

5089 msgid "unrecognized %%(if) argument: %s"

5090 msgstr "argumento: %s no reconocido %%(if)"

5091

4388 -#: ref-filter.c:527

5092 +#: ref-filter.c:531

5093 #, c-format

5094 msgid "malformed field name: %.*s"

5095 msgstr "nombre mal formado de campo: %.*s"

5096

4393 -#: ref-filter.c:554

5097 +#: ref-filter.c:558

5098 #, c-format

5099 msgid "unknown field name: %.*s"

5100 msgstr "nombre de campo desconocido: %.*s"

5101

4398 -#: ref-filter.c:558

5102 +#: ref-filter.c:562

5103 #, c-format

5104 msgid ""

5105 "not a git repository, but the field '%.*s' requires access to object data"

5106 msgstr ""

5107 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"

5108

4405 -#: ref-filter.c:682

5109 +#: ref-filter.c:686

5110 #, c-format

5111 msgid "format: %%(if) atom used without a %%(then) atom"

5112 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"

5113

4410 -#: ref-filter.c:745

5114 +#: ref-filter.c:749

5115 #, c-format

5116 msgid "format: %%(then) atom used without an %%(if) atom"

5117 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"

5118

4415 -#: ref-filter.c:747

5119 +#: ref-filter.c:751

5120 #, c-format

5121 msgid "format: %%(then) atom used more than once"

5122 msgstr "formato: átomo %%(then) usado mas de una vez"

5123

4420 -#: ref-filter.c:749

5124 +#: ref-filter.c:753

5125 #, c-format

5126 msgid "format: %%(then) atom used after %%(else)"

5127 msgstr "formato: átomo %%(then) usado después de %%(else)"

5128

4425 -#: ref-filter.c:777

5129 +#: ref-filter.c:781

5130 #, c-format

5131 msgid "format: %%(else) atom used without an %%(if) atom"

5132 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

5133

4430 -#: ref-filter.c:779

5134 +#: ref-filter.c:783

5135 #, c-format

5136 msgid "format: %%(else) atom used without a %%(then) atom"

5137 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"

5138

4435 -#: ref-filter.c:781

5139 +#: ref-filter.c:785

5140 #, c-format

5141 msgid "format: %%(else) atom used more than once"

5142 msgstr "formato: átomo %%(else) usado mas de una vez"

5143

4440 -#: ref-filter.c:796

5144 +#: ref-filter.c:800

5145 #, c-format

5146 msgid "format: %%(end) atom used without corresponding atom"

5147 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

5148

4445 -#: ref-filter.c:853

5149 +#: ref-filter.c:857

5150 #, c-format

5151 msgid "malformed format string %s"

5152 msgstr "formato de cadena mal formado %s"

5153

4450 -#: ref-filter.c:1447

5154 +#: ref-filter.c:1453

5155 #, c-format

5156 msgid "(no branch, rebasing %s)"

5157 msgstr "(no hay rama, rebasando %s)"

5158

4455 -#: ref-filter.c:1450

5159 +#: ref-filter.c:1456

5160 #, c-format

5161 msgid "(no branch, rebasing detached HEAD %s)"

5162 msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"

5163

4460 -#: ref-filter.c:1453

5164 +#: ref-filter.c:1459

5165 #, c-format

5166 msgid "(no branch, bisect started on %s)"

5167 msgstr "(no hay rama, comenzando biseccón en %s)"

@@ -4465,7 +5169,7 @@ msgstr "(no hay rama, comenzando biseccón en %s)"

5169 #. TRANSLATORS: make sure this matches "HEAD

5170 #. detached at " in wt-status.c

5171 #.

4468 -#: ref-filter.c:1461

5172 +#: ref-filter.c:1467

5173 #, c-format

5174 msgid "(HEAD detached at %s)"

5175 msgstr "(HEAD desacoplado en %s)"

@@ -4473,56 +5177,56 @@ msgstr "(HEAD desacoplado en %s)"

5177 #. TRANSLATORS: make sure this matches "HEAD

5178 #. detached from " in wt-status.c

5179 #.

4476 -#: ref-filter.c:1468

5180 +#: ref-filter.c:1474

5181 #, c-format

5182 msgid "(HEAD detached from %s)"

5183 msgstr "(HEAD desacoplado de %s)"

5184

4481 -#: ref-filter.c:1472

5185 +#: ref-filter.c:1478

5186 msgid "(no branch)"

5187 msgstr "(sin rama)"

5188

4485 -#: ref-filter.c:1506 ref-filter.c:1663

5189 +#: ref-filter.c:1512 ref-filter.c:1669

5190 #, c-format

5191 msgid "missing object %s for %s"

5192 msgstr "falta objeto %s para %s"

5193

4490 -#: ref-filter.c:1516

5194 +#: ref-filter.c:1522

5195 #, c-format

5196 msgid "parse_object_buffer failed on %s for %s"

5197 msgstr "parse_object_buffer falló en %s para %s"

5198

4495 -#: ref-filter.c:1882

5199 +#: ref-filter.c:1888

5200 #, c-format

5201 msgid "malformed object at '%s'"

5202 msgstr "objeto mal formado en '%s'"

5203

4500 -#: ref-filter.c:1971

5204 +#: ref-filter.c:1977

5205 #, c-format

5206 msgid "ignoring ref with broken name %s"

5207 msgstr "ignorando referencia con nombre roto %s"

5208

4505 -#: ref-filter.c:2257

5209 +#: ref-filter.c:2263

5210 #, c-format

5211 msgid "format: %%(end) atom missing"

5212 msgstr "formato: falta átomo %%(end)"

5213

4510 -#: ref-filter.c:2352

5214 +#: ref-filter.c:2363

5215 #, c-format

5216 msgid "option `%s' is incompatible with --merged"

5217 msgstr "opción `%s' es incompatible con --merged"

5218

4515 -#: ref-filter.c:2355

5219 +#: ref-filter.c:2366

5220 #, c-format

5221 msgid "option `%s' is incompatible with --no-merged"

5222 msgstr "opción `%s' es incompatible con --no-merged"

5223

4520 -#: ref-filter.c:2365

5224 +#: ref-filter.c:2376

5225 #, c-format

5226 msgid "malformed object name %s"

5227 msgstr "nombre de objeto mal formado %s"

5228

4525 -#: ref-filter.c:2370

5229 +#: ref-filter.c:2381

5230 #, c-format

5231 msgid "option `%s' must point to a commit"

5232 msgstr "opción '%s' debe apuntar a un commit"

@@ -4713,49 +5417,49 @@ msgstr "no se puede resolver push 'simple' para un destino único"

5417 #: remote.c:1840

5418 #, c-format

5419 msgid "couldn't find remote ref %s"

4716 -msgstr "No se puedo encontrar ref remota %s"

5420 +msgstr "no se puedo encontrar ref remota %s"

5421

5422 #: remote.c:1853

5423 #, c-format

5424 msgid "* Ignoring funny ref '%s' locally"

5425 msgstr "* Ignorando ref graciosa '%s' localmente"

5426

4723 -#: remote.c:1990

5427 +#: remote.c:2016

5428 #, c-format

5429 msgid "Your branch is based on '%s', but the upstream is gone.\n"

5430 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"

5431

4728 -#: remote.c:1994

5432 +#: remote.c:2020

5433 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

5434 msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"

5435

4732 -#: remote.c:1997

5436 +#: remote.c:2023

5437 #, c-format

5438 msgid "Your branch is up to date with '%s'.\n"

5439 msgstr "Tu rama está actualizada con '%s'.\n"

5440

4737 -#: remote.c:2001

5441 +#: remote.c:2027

5442 #, c-format

5443 msgid "Your branch and '%s' refer to different commits.\n"

5444 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"

5445

4742 -#: remote.c:2004

5446 +#: remote.c:2030

5447 #, c-format

5448 msgid " (use \"%s\" for details)\n"

5449 msgstr " (usa \"%s\" para detalles)\n"

5450

4747 -#: remote.c:2008

5451 +#: remote.c:2034

5452 #, c-format

5453 msgid "Your branch is ahead of '%s' by %d commit.\n"

5454 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

5455 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"

5456 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"

5457

4754 -#: remote.c:2014

5458 +#: remote.c:2040

5459 msgid " (use \"git push\" to publish your local commits)\n"

5460 msgstr " (usa \"git push\" para publicar tus commits locales)\n"

5461

4758 -#: remote.c:2017

5462 +#: remote.c:2043

5463 #, c-format

5464 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

5465 msgid_plural ""

@@ -4765,11 +5469,11 @@ msgstr[0] ""

5469 msgstr[1] ""

5470 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"

5471

4768 -#: remote.c:2025

5472 +#: remote.c:2051

5473 msgid " (use \"git pull\" to update your local branch)\n"

5474 msgstr " (usa \"git pull\" para actualizar tu rama local)\n"

5475

4772 -#: remote.c:2028

5476 +#: remote.c:2054

5477 #, c-format

5478 msgid ""

5479 "Your branch and '%s' have diverged,\n"

@@ -4784,11 +5488,11 @@ msgstr[1] ""

5488 "Tu rama y '%s' han divergido,\n"

5489 "y tienen %d y %d commits diferentes cada una respectivamente.\n"

5490

4787 -#: remote.c:2038

5491 +#: remote.c:2064

5492 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

5493 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

5494

4791 -#: remote.c:2221

5495 +#: remote.c:2247

5496 #, c-format

5497 msgid "cannot parse expected object name '%s'"

5498 msgstr "no se puede leer el nombre de objeto '%s'"

@@ -4816,12 +5520,6 @@ msgstr "MERGE_RR corrupto"

5520 msgid "unable to write rerere record"

5521 msgstr "incapaz de escribir entrada rerere"

5522

4819 -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4820 -#: builtin/fsck.c:314

4821 -#, c-format

4822 -msgid "could not write '%s'"

4823 -msgstr "no se pudo escribir '%s'"

4824 -

5523 #: rerere.c:495

5524 #, c-format

5525 msgid "there were errors while writing '%s' (%s)"

@@ -4872,8 +5570,8 @@ msgstr "no se puede desvincular stray '%s'"

5570 msgid "Recorded preimage for '%s'"

5571 msgstr "Resolución precargada para '%s'"

5572

4875 -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4876 -#: builtin/submodule--helper.c:1427

5573 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5574 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5575 #, c-format

5576 msgid "could not create directory '%s'"

5577 msgstr "no se pudo crear el directorio '%s'"

@@ -4907,29 +5605,33 @@ msgstr "Se olvidó resolución para '%s'\n"

5605 msgid "unable to open rr-cache directory"

5606 msgstr "no es posible abrir directorio rr-cache"

5607

4910 -#: revision.c:2484

5608 +#: revision.c:2476

5609 msgid "your current branch appears to be broken"

5610 msgstr "tu rama actual parece estar rota"

5611

4914 -#: revision.c:2487

5612 +#: revision.c:2479

5613 #, c-format

5614 msgid "your current branch '%s' does not have any commits yet"

5615 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

5616

4919 -#: revision.c:2684

5617 +#: revision.c:2679

5618 msgid "--first-parent is incompatible with --bisect"

5619 msgstr "--first-parent es incompatible con --bisect"

5620

4923 -#: run-command.c:742

5621 +#: revision.c:2683

5622 +msgid "-L does not yet support diff formats besides -p and -s"

5623 +msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

5624 +

5625 +#: run-command.c:763

5626 msgid "open /dev/null failed"

5627 msgstr "falló al abrir /dev/null"

5628

4927 -#: run-command.c:1231

5629 +#: run-command.c:1269

5630 #, c-format

5631 msgid "cannot create async thread: %s"

5632 msgstr "no es posible crear hilo async: %s"

5633

4932 -#: run-command.c:1295

5634 +#: run-command.c:1333

5635 #, c-format

5636 msgid ""

5637 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -4978,34 +5680,34 @@ msgstr "el destino no soporta push atómicos (--atomic)"

5680 msgid "the receiving end does not support push options"

5681 msgstr "el destino no soporta opciones de push"

5682

4981 -#: sequencer.c:184

5683 +#: sequencer.c:187

5684 #, c-format

5685 msgid "invalid commit message cleanup mode '%s'"

5686 msgstr "mensaje de commit inválido, modo cleanup '%s'"

5687

4986 -#: sequencer.c:288

5688 +#: sequencer.c:292

5689 #, c-format

5690 msgid "could not delete '%s'"

5691 msgstr "no se pudo borrar '%s'"

5692

4991 -#: sequencer.c:314

5693 +#: sequencer.c:318

5694 msgid "revert"

5695 msgstr "revertir"

5696

4995 -#: sequencer.c:316

5697 +#: sequencer.c:320

5698 msgid "cherry-pick"

5699 msgstr "cherry-pick"

5700

4999 -#: sequencer.c:318

5701 +#: sequencer.c:322

5702 msgid "rebase -i"

5703 msgstr "rebase -i"

5704

5003 -#: sequencer.c:320

5705 +#: sequencer.c:324

5706 #, c-format

5707 msgid "unknown action: %d"

5708 msgstr "acción desconocida: %d"

5709

5008 -#: sequencer.c:378

5710 +#: sequencer.c:382

5711 msgid ""

5712 "after resolving the conflicts, mark the corrected paths\n"

5713 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5013,7 +5715,7 @@ msgstr ""

5715 "después de resolver los conflictos, marca las rutas corregidas\n"

5716 "con 'git add <rutas>' o 'git rm <rutas>'"

5717

5016 -#: sequencer.c:381

5718 +#: sequencer.c:385

5719 msgid ""

5720 "after resolving the conflicts, mark the corrected paths\n"

5721 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5023,110 +5725,115 @@ msgstr ""

5725 "con 'git add <rutas>' o 'git rm <rutas>'\n"

5726 "y haz un commit del resultado con 'git commit'"

5727

5026 -#: sequencer.c:394 sequencer.c:2671

5728 +#: sequencer.c:398 sequencer.c:2801

5729 #, c-format

5730 msgid "could not lock '%s'"

5731 msgstr "no se pudo bloquear '%s'"

5732

5031 -#: sequencer.c:401

5733 +#: sequencer.c:405

5734 #, c-format

5735 msgid "could not write eol to '%s'"

5736 msgstr "no se pudo escribir EOL en '%s'"

5737

5036 -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5037 -#: sequencer.c:2931

5738 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5739 +#: sequencer.c:3084

5740 #, c-format

5741 msgid "failed to finalize '%s'"

5742 msgstr "falló al finalizar '%s'"

5743

5042 -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5043 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5044 -#: builtin/merge.c:1085 builtin/rebase.c:154

5744 +#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5745 +#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5746 +#: builtin/merge.c:1115 builtin/rebase.c:567

5747 #, c-format

5748 msgid "could not read '%s'"

5749 msgstr "no se pudo leer '%s'"

5750

5049 -#: sequencer.c:455

5751 +#: sequencer.c:459

5752 #, c-format

5753 msgid "your local changes would be overwritten by %s."

5754 msgstr "tus cambios locales serán sobreescritos por %s."

5755

5054 -#: sequencer.c:459

5756 +#: sequencer.c:463

5757 msgid "commit your changes or stash them to proceed."

5758 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

5759

5058 -#: sequencer.c:491

5760 +#: sequencer.c:495

5761 #, c-format

5762 msgid "%s: fast-forward"

5763 msgstr "%s: avance rápido"

5764

5765 +#: sequencer.c:534 builtin/tag.c:555

5766 +#, c-format

5767 +msgid "Invalid cleanup mode %s"

5768 +msgstr "Modo cleanup inválido %s"

5769 +

5770 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

5771 #. "rebase -i".

5772 #.

5066 -#: sequencer.c:582

5773 +#: sequencer.c:629

5774 #, c-format

5775 msgid "%s: Unable to write new index file"

5776 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

5777

5071 -#: sequencer.c:598

5778 +#: sequencer.c:646

5779 msgid "unable to update cache tree"

5780 msgstr "no es posible actualizar el árbol de la caché"

5781

5075 -#: sequencer.c:612

5782 +#: sequencer.c:660

5783 msgid "could not resolve HEAD commit"

5784 msgstr "no se pudo resolver el commit de HEAD"

5785

5079 -#: sequencer.c:692

5786 +#: sequencer.c:740

5787 #, c-format

5788 msgid "no key present in '%.*s'"

5789 msgstr "no hay llave presente en '%.*s'"

5790

5084 -#: sequencer.c:703

5791 +#: sequencer.c:751

5792 #, c-format

5793 msgid "unable to dequote value of '%s'"

5794 msgstr "no es posible dequote para '%s'"

5795

5089 -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5090 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5796 +#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5797 +#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5798 #, c-format

5799 msgid "could not open '%s' for reading"

5800 msgstr "no se pudo abrir '%s' para lectura"

5801

5095 -#: sequencer.c:750

5802 +#: sequencer.c:798

5803 msgid "'GIT_AUTHOR_NAME' already given"

5804 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

5805

5099 -#: sequencer.c:755

5806 +#: sequencer.c:803

5807 msgid "'GIT_AUTHOR_EMAIL' already given"

5808 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

5809

5103 -#: sequencer.c:760

5810 +#: sequencer.c:808

5811 msgid "'GIT_AUTHOR_DATE' already given"

5812 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

5813

5107 -#: sequencer.c:764

5814 +#: sequencer.c:812

5815 #, c-format

5816 msgid "unknown variable '%s'"

5817 msgstr "variable desconocida '%s'"

5818

5112 -#: sequencer.c:769

5819 +#: sequencer.c:817

5820 msgid "missing 'GIT_AUTHOR_NAME'"

5821 msgstr "falta 'GIT_AUTHOR_NAME'"

5822

5116 -#: sequencer.c:771

5823 +#: sequencer.c:819

5824 msgid "missing 'GIT_AUTHOR_EMAIL'"

5825 msgstr "falta 'GIT_AUTHOR_EMAIL'"

5826

5120 -#: sequencer.c:773

5827 +#: sequencer.c:821

5828 msgid "missing 'GIT_AUTHOR_DATE'"

5829 msgstr "falta 'GIT_AUTHOR_DATE'"

5830

5124 -#: sequencer.c:833

5831 +#: sequencer.c:881

5832 #, c-format

5833 msgid "invalid date format '%s' in '%s'"

5834 msgstr "formato de fecha inválido '%s' en '%s'"

5835

5129 -#: sequencer.c:850

5836 +#: sequencer.c:898

5837 #, c-format

5838 msgid ""

5839 "you have staged changes in your working tree\n"

@@ -5156,15 +5863,15 @@ msgstr ""

5863 "\n"

5864 " git rebase --continue\n"

5865

5159 -#: sequencer.c:945

5866 +#: sequencer.c:992

5867 msgid "writing root commit"

5868 msgstr "escribiendo commit raíz"

5869

5163 -#: sequencer.c:1155

5870 +#: sequencer.c:1213

5871 msgid "'prepare-commit-msg' hook failed"

5872 msgstr "hook 'prepare-commit-msg' falló"

5873

5167 -#: sequencer.c:1162

5874 +#: sequencer.c:1220

5875 msgid ""

5876 "Your name and email address were configured automatically based\n"

5877 "on your username and hostname. Please check that they are accurate.\n"

@@ -5191,7 +5898,7 @@ msgstr ""

5898 "\n"

5899 " git commit --amend --reset-author\n"

5900

5194 -#: sequencer.c:1175

5901 +#: sequencer.c:1233

5902 msgid ""

5903 "Your name and email address were configured automatically based\n"

5904 "on your username and hostname. Please check that they are accurate.\n"

@@ -5215,294 +5922,305 @@ msgstr ""

5922 "\n"

5923 " git commit --amend --reset-author\n"

5924

5218 -#: sequencer.c:1217

5925 +#: sequencer.c:1275

5926 msgid "couldn't look up newly created commit"

5927 msgstr "no se pudo revisar el commit recién creado"

5928

5222 -#: sequencer.c:1219

5929 +#: sequencer.c:1277

5930 msgid "could not parse newly created commit"

5931 msgstr "no se pudo analizar el commit recién creado"

5932

5226 -#: sequencer.c:1265

5933 +#: sequencer.c:1323

5934 msgid "unable to resolve HEAD after creating commit"

5935 msgstr "no se pudo resolver HEAD tras crear el commit"

5936

5230 -#: sequencer.c:1267

5937 +#: sequencer.c:1325

5938 msgid "detached HEAD"

5939 msgstr "HEAD desacoplado"

5940

5234 -#: sequencer.c:1271

5941 +#: sequencer.c:1329

5942 msgid " (root-commit)"

5943 msgstr " (commit-raíz)"

5944

5238 -#: sequencer.c:1292

5945 +#: sequencer.c:1350

5946 msgid "could not parse HEAD"

5947 msgstr "no se pudo analizar HEAD"

5948

5242 -#: sequencer.c:1294

5949 +#: sequencer.c:1352

5950 #, c-format

5951 msgid "HEAD %s is not a commit!"

5952 msgstr "HEAD %s no es un commit!"

5953

5247 -#: sequencer.c:1298 builtin/commit.c:1546

5954 +#: sequencer.c:1356 builtin/commit.c:1551

5955 msgid "could not parse HEAD commit"

5956 msgstr "no se pudo analizar el commit de HEAD"

5957

5251 -#: sequencer.c:1350 sequencer.c:1964

5958 +#: sequencer.c:1408 sequencer.c:2001

5959 msgid "unable to parse commit author"

5960 msgstr "no es posible analizar el autor del commit"

5961

5255 -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5962 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

5963 msgid "git write-tree failed to write a tree"

5964 msgstr "git write-tree falló al escribir el árbol"

5965

5259 -#: sequencer.c:1377 sequencer.c:1433

5966 +#: sequencer.c:1435 sequencer.c:1496

5967 #, c-format

5968 msgid "unable to read commit message from '%s'"

5969 msgstr "no se puede leer el mensaje del commit de '%s'"

5970

5264 -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5265 -#: builtin/merge.c:884

5971 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5972 +#: builtin/merge.c:906

5973 msgid "failed to write commit object"

5974 msgstr "falló al escribir el objeto commit"

5975

5269 -#: sequencer.c:1460

5976 +#: sequencer.c:1523

5977 #, c-format

5978 msgid "could not parse commit %s"

5979 msgstr "no se pudo analizar commit %s"

5980

5274 -#: sequencer.c:1465

5981 +#: sequencer.c:1528

5982 #, c-format

5983 msgid "could not parse parent commit %s"

5984 msgstr "no se pudo analizar el commit padre %s"

5985

5279 -#: sequencer.c:1565 sequencer.c:1675

5986 +#: sequencer.c:1602 sequencer.c:1712

5987 #, c-format

5988 msgid "unknown command: %d"

5989 msgstr "comando desconocido: %d"

5990

5284 -#: sequencer.c:1622 sequencer.c:1647

5991 +#: sequencer.c:1659 sequencer.c:1684

5992 #, c-format

5993 msgid "This is a combination of %d commits."

5994 msgstr "Esta es una combinación de %d commits."

5995

5289 -#: sequencer.c:1632 sequencer.c:4808

5996 +#: sequencer.c:1669

5997 msgid "need a HEAD to fixup"

5998 msgstr "se necesita un HEAD para arreglar"

5999

5293 -#: sequencer.c:1634 sequencer.c:2958

6000 +#: sequencer.c:1671 sequencer.c:3111

6001 msgid "could not read HEAD"

6002 msgstr "no se pudo leer HEAD"

6003

5297 -#: sequencer.c:1636

6004 +#: sequencer.c:1673

6005 msgid "could not read HEAD's commit message"

6006 msgstr "no se pudo leer el mensaje de commit de HEAD"

6007

5301 -#: sequencer.c:1642

6008 +#: sequencer.c:1679

6009 #, c-format

6010 msgid "cannot write '%s'"

6011 msgstr "no se puede escribir '%s'"

6012

5306 -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

6013 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

6014 msgid "This is the 1st commit message:"

6015 msgstr "Este es el mensaje del 1er commit:"

6016

5310 -#: sequencer.c:1657

6017 +#: sequencer.c:1694

6018 #, c-format

6019 msgid "could not read commit message of %s"

6020 msgstr "no se puede leer el mensaje del commit de %s"

6021

5315 -#: sequencer.c:1664

6022 +#: sequencer.c:1701

6023 #, c-format

6024 msgid "This is the commit message #%d:"

6025 msgstr "Este es el mensaje del commit #%d:"

6026

5320 -#: sequencer.c:1670

6027 +#: sequencer.c:1707

6028 #, c-format

6029 msgid "The commit message #%d will be skipped:"

6030 msgstr "El mensaje del commit #%d será saltado:"

6031

5325 -#: sequencer.c:1758

6032 +#: sequencer.c:1795

6033 msgid "your index file is unmerged."

6034 msgstr "tu archivo índice no está fusionado."

6035

5329 -#: sequencer.c:1765

6036 +#: sequencer.c:1802

6037 msgid "cannot fixup root commit"

6038 msgstr "no se puede arreglar el commit raíz"

6039

5333 -#: sequencer.c:1784

6040 +#: sequencer.c:1821

6041 #, c-format

6042 msgid "commit %s is a merge but no -m option was given."

6043 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."

6044

5338 -#: sequencer.c:1792 sequencer.c:1800

6045 +#: sequencer.c:1829 sequencer.c:1837

6046 #, c-format

6047 msgid "commit %s does not have parent %d"

6048 msgstr "el commit %s no tiene un padre %d"

6049

5343 -#: sequencer.c:1806

6050 +#: sequencer.c:1843

6051 #, c-format

6052 msgid "cannot get commit message for %s"

6053 msgstr "no se puede obtener el mensaje de commit para %s"

6054

6055 #. TRANSLATORS: The first %s will be a "todo" command like

6056 #. "revert" or "pick", the second %s a SHA1.

5350 -#: sequencer.c:1825

6057 +#: sequencer.c:1862

6058 #, c-format

6059 msgid "%s: cannot parse parent commit %s"

6060 msgstr "%s: no se puede analizar el commit padre %s"

6061

5355 -#: sequencer.c:1890

6062 +#: sequencer.c:1927

6063 #, c-format

6064 msgid "could not rename '%s' to '%s'"

6065 msgstr "no se puede renombrar '%s' a '%s'"

6066

5360 -#: sequencer.c:1945

6067 +#: sequencer.c:1982

6068 #, c-format

6069 msgid "could not revert %s... %s"

6070 msgstr "no se pudo revertir %s... %s"

6071

5365 -#: sequencer.c:1946

6072 +#: sequencer.c:1983

6073 #, c-format

6074 msgid "could not apply %s... %s"

6075 msgstr "no se pudo aplicar %s... %s"

6076

5370 -#: sequencer.c:2005

6077 +#: sequencer.c:2042

6078 #, c-format

6079 msgid "git %s: failed to read the index"

6080 msgstr "git %s: falló al leer el índice"

6081

5375 -#: sequencer.c:2012

6082 +#: sequencer.c:2049

6083 #, c-format

6084 msgid "git %s: failed to refresh the index"

6085 msgstr "git %s: falló al refrescar el índice"

6086

5380 -#: sequencer.c:2094

6087 +#: sequencer.c:2118

6088 #, c-format

6089 msgid "%s does not accept arguments: '%s'"

6090 msgstr "%s no acepta los argumentos: '%s'"

6091

5385 -#: sequencer.c:2103

6092 +#: sequencer.c:2127

l10n: es: 2.22.0 round 1