33b727947d · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2018-06-16 22:06+0800\n"

11 -"PO-Revision-Date: 2018-06-16 09:57-0500\n"

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

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

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

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

14 "Language: es\n"

@@ -16,40 +16,40 @@ msgstr ""

16 "Content-Type: text/plain; charset=UTF-8\n"

17 "Content-Transfer-Encoding: 8bit\n"

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

19 -"X-Generator: Poedit 2.0.7\n"

19 +"X-Generator: Poedit 2.1.1\n"

20

21 -#: advice.c:92

21 +#: advice.c:97

22 #, c-format

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

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

25

26 -#: advice.c:137

26 +#: advice.c:150

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

31 +#: advice.c:152

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

35 +#: advice.c:154

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

39 +#: advice.c:156

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

43 +#: advice.c:158

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

47 +#: advice.c:160

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

52 +#: advice.c:168

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

60 +#: advice.c:176

61 msgid "Exiting because of an unresolved conflict."

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

63

64 -#: advice.c:168 builtin/merge.c:1250

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

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

68 +#: advice.c:183

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

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

71

72 -#: advice.c:171

72 +#: advice.c:184

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:177

76 +#: advice.c:190

77 #, c-format

78 msgid ""

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

@@ -102,99 +102,99 @@ msgstr ""

102 " git checkout -b <nombre-de-nueva-rama>\n"

103 "\n"

104

105 -#: apply.c:58

105 +#: apply.c:59

106 #, c-format

107 msgid "unrecognized whitespace option '%s'"

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

109

110 -#: apply.c:74

110 +#: apply.c:75

111 #, c-format

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

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

114

115 -#: apply.c:122

115 +#: apply.c:125

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

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

118

119 -#: apply.c:124

119 +#: apply.c:127

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

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

122

123 -#: apply.c:127

123 +#: apply.c:130

124 msgid "--3way outside a repository"

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

126

127 -#: apply.c:138

127 +#: apply.c:141

128 msgid "--index outside a repository"

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

130

131 -#: apply.c:141

131 +#: apply.c:144

132 msgid "--cached outside a repository"

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

134

135 -#: apply.c:821

135 +#: apply.c:826

136 #, c-format

137 msgid "Cannot prepare timestamp regexp %s"

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

139

140 -#: apply.c:830

140 +#: apply.c:835

141 #, c-format

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

143 msgstr "regexec retornó %d para la entrada: %s"

144

145 -#: apply.c:904

145 +#: apply.c:909

146 #, c-format

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

148 msgstr ""

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

150

151 -#: apply.c:942

151 +#: apply.c:947

152 #, c-format

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

154 msgstr ""

155 "git apply: mal git-diff - se esperaba /dev/null, se encontró %s en la línea "

156 "%d"

157

158 -#: apply.c:948

158 +#: apply.c:953

159 #, c-format

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

161 msgstr ""

162 "git apply: mal git-diff - nuevo nombre de archivo inconsistente en la línea "

163 "%d"

164

165 -#: apply.c:949

165 +#: apply.c:954

166 #, c-format

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

168 msgstr ""

169 "git apply: mal git-diff - viejo nombre de archivo inconsistente en la línea "

170 "%d"

171

172 -#: apply.c:954

172 +#: apply.c:959

173 #, c-format

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

175 msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d"

176

177 -#: apply.c:983

177 +#: apply.c:988

178 #, c-format

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

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

181

182 -#: apply.c:1301

182 +#: apply.c:1306

183 #, c-format

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

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

186

187 -#: apply.c:1473

187 +#: apply.c:1478

188 #, c-format

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

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

191

192 -#: apply.c:1542

192 +#: apply.c:1547

193 #, c-format

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

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

196

197 -#: apply.c:1562

197 +#: apply.c:1567

198 #, c-format

199 msgid ""

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

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

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

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

211

212 -#: apply.c:1575

212 +#: apply.c:1580

213 #, c-format

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

215 msgstr ""

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

217

218 -#: apply.c:1763

218 +#: apply.c:1768

219 msgid "new file depends on old contents"

220 msgstr "el nuevo archivo depende de contenidos viejos"

221

222 -#: apply.c:1765

222 +#: apply.c:1770

223 msgid "deleted file still has contents"

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

225

226 -#: apply.c:1799

226 +#: apply.c:1804

227 #, c-format

228 msgid "corrupt patch at line %d"

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

230

231 -#: apply.c:1836

231 +#: apply.c:1841

232 #, c-format

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

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

235

236 -#: apply.c:1838

236 +#: apply.c:1843

237 #, c-format

238 msgid "deleted file %s still has contents"

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

240

241 -#: apply.c:1841

241 +#: apply.c:1846

242 #, c-format

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

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

245

246 -#: apply.c:1988

246 +#: apply.c:1993

247 #, c-format

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

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

250

251 -#: apply.c:2025

251 +#: apply.c:2030

252 #, c-format

253 msgid "unrecognized binary patch at line %d"

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

255

256 -#: apply.c:2185

256 +#: apply.c:2190

257 #, c-format

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

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

260

261 -#: apply.c:2271

261 +#: apply.c:2276

262 #, c-format

263 msgid "unable to read symlink %s"

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

265

266 -#: apply.c:2275

266 +#: apply.c:2280

267 #, c-format

268 msgid "unable to open or read %s"

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

270

271 -#: apply.c:2934

271 +#: apply.c:2939

272 #, c-format

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

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

275

276 -#: apply.c:3055

276 +#: apply.c:3060

277 #, c-format

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

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

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

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

282

283 -#: apply.c:3067

283 +#: apply.c:3072

284 #, c-format

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

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

287

288 -#: apply.c:3073

288 +#: apply.c:3078

289 #, c-format

290 msgid ""

291 "while searching for:\n"

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

294 "mientras se busca:\n"

295 "%.*s"

296

297 -#: apply.c:3095

297 +#: apply.c:3100

298 #, c-format

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

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

301

302 -#: apply.c:3103

302 +#: apply.c:3108

303 #, c-format

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

305 msgstr ""

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

307

308 -#: apply.c:3149

308 +#: apply.c:3154

309 #, c-format

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

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

312

313 -#: apply.c:3159

313 +#: apply.c:3164

314 #, c-format

315 msgid ""

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

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

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

319 "actuales."

320

321 -#: apply.c:3167

321 +#: apply.c:3172

322 #, c-format

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

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

325

326 -#: apply.c:3185

326 +#: apply.c:3190

327 #, c-format

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

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

330

331 -#: apply.c:3198

331 +#: apply.c:3203

332 #, c-format

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

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

335

336 -#: apply.c:3204

336 +#: apply.c:3209

337 #, c-format

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

339 msgstr ""

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

341 "obtuvo %s)"

342

343 -#: apply.c:3225

343 +#: apply.c:3230

344 #, c-format

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

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

347

348 -#: apply.c:3347

348 +#: apply.c:3352

349 #, c-format

350 msgid "cannot checkout %s"

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

352

353 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

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

354 #, c-format

355 msgid "failed to read %s"

356 msgstr "no se pudo leer %s"

357

358 -#: apply.c:3404

358 +#: apply.c:3412

359 #, c-format

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

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

362

363 -#: apply.c:3433 apply.c:3673

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

364 #, c-format

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

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

367

368 -#: apply.c:3516 apply.c:3687

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

369 #, c-format

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

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

372

373 -#: apply.c:3525 apply.c:3695

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

374 #, c-format

375 msgid "%s: does not match index"

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

377

378 -#: apply.c:3560

378 +#: apply.c:3568

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

380 msgstr ""

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

382 "vías."

383

384 -#: apply.c:3563

384 +#: apply.c:3571

385 #, c-format

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

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

388

389 -#: apply.c:3579 apply.c:3583

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

390 #, c-format

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

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

393

394 -#: apply.c:3595

394 +#: apply.c:3603

395 #, c-format

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

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

398

399 -#: apply.c:3609

399 +#: apply.c:3617

400 #, c-format

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

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

403

404 -#: apply.c:3614

404 +#: apply.c:3622

405 #, c-format

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

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

408

409 -#: apply.c:3640

409 +#: apply.c:3648

410 msgid "removal patch leaves file contents"

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

412

413 -#: apply.c:3712

413 +#: apply.c:3721

414 #, c-format

415 msgid "%s: wrong type"

416 msgstr "%s: tipo incorrecto"

417

418 -#: apply.c:3714

418 +#: apply.c:3723

419 #, c-format

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

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

422

423 -#: apply.c:3864 apply.c:3866

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

424 #, c-format

425 msgid "invalid path '%s'"

426 msgstr "ruta invalida '%s'"

427

428 -#: apply.c:3922

428 +#: apply.c:3932

429 #, c-format

430 msgid "%s: already exists in index"

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

432

433 -#: apply.c:3925

433 +#: apply.c:3935

434 #, c-format

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

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

437

438 -#: apply.c:3945

438 +#: apply.c:3955

439 #, c-format

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

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

442

443 -#: apply.c:3950

443 +#: apply.c:3960

444 #, c-format

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

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

447

448 -#: apply.c:3970

448 +#: apply.c:3980

449 #, c-format

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

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

452

453 -#: apply.c:3974

453 +#: apply.c:3984

454 #, c-format

455 msgid "%s: patch does not apply"

456 msgstr "%s: el parche no aplica"

457

458 -#: apply.c:3989

458 +#: apply.c:3999

459 #, c-format

460 msgid "Checking patch %s..."

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

462

463 -#: apply.c:4080

463 +#: apply.c:4091

464 #, c-format

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

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

467

468 -#: apply.c:4087

468 +#: apply.c:4098

469 #, c-format

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

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

472

473 -#: apply.c:4090

473 +#: apply.c:4101

474 #, c-format

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

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

477

478 -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

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

479 #, c-format

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

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

482

483 -#: apply.c:4099

483 +#: apply.c:4110

484 #, c-format

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

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

487

488 -#: apply.c:4109

488 +#: apply.c:4120

489 #, c-format

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

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

492

493 -#: apply.c:4247

493 +#: apply.c:4258

494 #, c-format

495 msgid "unable to remove %s from index"

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

497

498 -#: apply.c:4282

498 +#: apply.c:4292

499 #, c-format

500 msgid "corrupt patch for submodule %s"

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

502

503 -#: apply.c:4288

503 +#: apply.c:4298

504 #, c-format

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

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

507

508 -#: apply.c:4296

508 +#: apply.c:4306

509 #, c-format

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

511 msgstr ""

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

513

514 -#: apply.c:4302 apply.c:4446

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

515 #, c-format

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

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

518

519 -#: apply.c:4343

519 +#: apply.c:4355

520 #, c-format

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

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

523

524 -#: apply.c:4347

524 +#: apply.c:4359

525 #, c-format

526 msgid "closing file '%s'"

527 msgstr "cerrando archivo '%s'"

528

529 -#: apply.c:4417

529 +#: apply.c:4429

530 #, c-format

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

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

533

534 -#: apply.c:4515

534 +#: apply.c:4527

535 #, c-format

536 msgid "Applied patch %s cleanly."

537 msgstr "Parche %s aplicado limpiamente."

538

539 -#: apply.c:4523

539 +#: apply.c:4535

540 msgid "internal error"

541 msgstr "error interno"

542

543 -#: apply.c:4526

543 +#: apply.c:4538

544 #, c-format

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

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

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

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

549

550 -#: apply.c:4537

550 +#: apply.c:4549

551 #, c-format

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

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

554

555 -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

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

556 #, c-format

557 msgid "cannot open %s"

558 msgstr "no se puede abrir %s"

559

560 -#: apply.c:4559

560 +#: apply.c:4571

561 #, c-format

562 msgid "Hunk #%d applied cleanly."

563 msgstr "Hunk #%d aplicado limpiamente."

564

565 -#: apply.c:4563

565 +#: apply.c:4575

566 #, c-format

567 msgid "Rejected hunk #%d."

568 msgstr "Hunk #%d rechazado."

569

570 -#: apply.c:4673

570 +#: apply.c:4685

571 #, c-format

572 msgid "Skipped patch '%s'."

573 msgstr "Parche '%s' saltado."

574

575 -#: apply.c:4681

575 +#: apply.c:4693

576 msgid "unrecognized input"

577 msgstr "input no reconocido"

578

579 -#: apply.c:4700

579 +#: apply.c:4712

580 msgid "unable to read index file"

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

582

583 -#: apply.c:4837

583 +#: apply.c:4849

584 #, c-format

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

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

587

588 -#: apply.c:4864

588 +#: apply.c:4876

589 #, c-format

590 msgid "squelched %d whitespace error"

591 msgid_plural "squelched %d whitespace errors"

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

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

594

595 -#: apply.c:4870 apply.c:4885

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

596 #, c-format

597 msgid "%d line adds whitespace errors."

598 msgid_plural "%d lines add whitespace errors."

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

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

601

602 -#: apply.c:4878

602 +#: apply.c:4890

603 #, c-format

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

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

@@ -608,260 +608,314 @@ msgstr[0] ""

608 msgstr[1] ""

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

610

611 -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

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

612 msgid "Unable to write new index file"

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

614

615 -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

616 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

617 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

618 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

619 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

620 -#: git-add--interactive.perl:197

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

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

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

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

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

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

621 msgid "path"

622 msgstr "ruta"

623

624 -#: apply.c:4922

624 +#: apply.c:4934

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

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

627

628 -#: apply.c:4925

628 +#: apply.c:4937

629 msgid "apply changes matching the given path"

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

631

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

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

633 msgid "num"

634 msgstr "num"

635

636 -#: apply.c:4928

636 +#: apply.c:4940

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

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

639

640 -#: apply.c:4931

640 +#: apply.c:4943

641 msgid "ignore additions made by the patch"

642 msgstr "ignorar adiciones hechas por el parche"

643

644 -#: apply.c:4933

644 +#: apply.c:4945

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

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

647

648 -#: apply.c:4937

648 +#: apply.c:4949

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

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

651

652 -#: apply.c:4939

652 +#: apply.c:4951

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

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

655

656 -#: apply.c:4941

656 +#: apply.c:4953

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

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

659

660 -#: apply.c:4943

660 +#: apply.c:4955

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

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

663

664 -#: apply.c:4945

664 +#: apply.c:4957

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

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

667 +

668 +#: apply.c:4959

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

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

671

668 -#: apply.c:4947

672 +#: apply.c:4961

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

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

675

672 -#: apply.c:4950

676 +#: apply.c:4964

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

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

679

676 -#: apply.c:4952

680 +#: apply.c:4966

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

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

683

680 -#: apply.c:4954

684 +#: apply.c:4968

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

686 msgstr ""

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

688

685 -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

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

690 msgid "paths are separated with NUL character"

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

692

689 -#: apply.c:4959

693 +#: apply.c:4973

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

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

696

693 -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

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

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

695 -#: builtin/pack-objects.c:3177

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

700 msgid "action"

701 msgstr "acción"

702

699 -#: apply.c:4961

703 +#: apply.c:4975

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

705 msgstr ""

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

707 "blanco"

708

705 -#: apply.c:4964 apply.c:4967

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

710 msgid "ignore changes in whitespace when finding context"

711 msgstr ""

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

713

710 -#: apply.c:4970

714 +#: apply.c:4984

715 msgid "apply the patch in reverse"

716 msgstr "aplicar el parche en reversa"

717

714 -#: apply.c:4972

718 +#: apply.c:4986

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

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

721

718 -#: apply.c:4974

722 +#: apply.c:4988

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

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

725

722 -#: apply.c:4976

726 +#: apply.c:4990

727 msgid "allow overlapping hunks"

728 msgstr "permitir solapamiento de hunks"

729

726 -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

727 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

728 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

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

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

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

733 msgid "be verbose"

734 msgstr "ser verboso"

735

732 -#: apply.c:4979

736 +#: apply.c:4993

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

738 msgstr ""

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

740 "archivo"

741

738 -#: apply.c:4982

742 +#: apply.c:4996

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

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

745

742 -#: apply.c:4984 builtin/am.c:2251

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

747 msgid "root"

748 msgstr "raíz"

749

746 -#: apply.c:4985

750 +#: apply.c:4999

751 msgid "prepend <root> to all filenames"

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

753

750 -#: archive.c:13

754 +#: archive.c:14

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

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

757

754 -#: archive.c:14

758 +#: archive.c:15

759 msgid "git archive --list"

760 msgstr "git archive --list"

761

758 -#: archive.c:15

762 +#: archive.c:16

763 msgid ""

764 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

765 msgstr ""

766 "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"

767 "árbol> [<ruta>...]"

768

765 -#: archive.c:16

769 +#: archive.c:17

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

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

772

769 -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

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

774 #, c-format

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

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

777

774 -#: archive.c:434

778 +#: archive.c:446

779 msgid "fmt"

780 msgstr "fmt"

781

778 -#: archive.c:434

782 +#: archive.c:446

783 msgid "archive format"

784 msgstr "formato del archivo"

785

782 -#: archive.c:435 builtin/log.c:1462

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

787 msgid "prefix"

788 msgstr "prefijo"

789

786 -#: archive.c:436

790 +#: archive.c:448

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

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

793

790 -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

791 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

792 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

793 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

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

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

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

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

798 #: parse-options.h:165

799 msgid "file"

800 msgstr "carpeta"

801

798 -#: archive.c:438 builtin/archive.c:89

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

803 msgid "write the archive to this file"

804 msgstr "escribe el archivo en esta carpeta"

805

802 -#: archive.c:440

806 +#: archive.c:452

807 msgid "read .gitattributes in working directory"

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

809

806 -#: archive.c:441

810 +#: archive.c:453

811 msgid "report archived files on stderr"

812 msgstr "reportar archivos archivados por stderr"

813

810 -#: archive.c:442

814 +#: archive.c:454

815 msgid "store only"

816 msgstr "solo guardar"

817

814 -#: archive.c:443

818 +#: archive.c:455

819 msgid "compress faster"

820 msgstr "comprimir mas rápido"

821

818 -#: archive.c:451

822 +#: archive.c:463

823 msgid "compress better"

824 msgstr "comprimir mejor"

825

822 -#: archive.c:454

826 +#: archive.c:466

827 msgid "list supported archive formats"

828 msgstr "listar los formatos de carpeta soportados"

829

826 -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

827 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

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

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

832 msgid "repo"

833 msgstr "repo"

834

831 -#: archive.c:457 builtin/archive.c:91

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

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

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

838

835 -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

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

840 +#: builtin/notes.c:491

841 msgid "command"

842 msgstr "comando"

843

839 -#: archive.c:459 builtin/archive.c:93

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

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

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

847

843 -#: archive.c:466

848 +#: archive.c:478

849 msgid "Unexpected option --remote"

850 msgstr "Opción inesperada --remote"

851

847 -#: archive.c:468

852 +#: archive.c:480

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

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

855

851 -#: archive.c:470

856 +#: archive.c:482

857 msgid "Unexpected option --output"

858 msgstr "Opción inesperada --output"

859

855 -#: archive.c:492

860 +#: archive.c:504

861 #, c-format

862 msgid "Unknown archive format '%s'"

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

864

860 -#: archive.c:499

865 +#: archive.c:511

866 #, c-format

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

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

869

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

871 +#, c-format

872 +msgid "cannot stream blob %s"

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

874 +

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

876 +#, c-format

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

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

879 +

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

881 +#, c-format

882 +msgid "cannot read %s"

883 +msgstr "no se puede leer %s"

884 +

885 +#: archive-tar.c:458

886 +#, c-format

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

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

889 +

890 +#: archive-tar.c:461

891 +msgid "unable to redirect descriptor"

892 +msgstr "incapaz de redirigir descriptor"

893 +

894 +#: archive-tar.c:468

895 +#, c-format

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

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

898 +

899 +#: archive-zip.c:313

900 +#, c-format

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

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

903 +

904 +#: archive-zip.c:317

905 +#, c-format

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

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

908 +

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

910 +#, c-format

911 +msgid "deflate error (%d)"

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

913 +

914 +#: archive-zip.c:605

915 +#, c-format

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

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

918 +

919 #: attr.c:218

920 #, c-format

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

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

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

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

931

878 -#: bisect.c:461

932 +#: bisect.c:467

933 #, c-format

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

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

936

883 -#: bisect.c:669

937 +#: bisect.c:675

938 #, c-format

939 msgid "We cannot bisect more!\n"

940 msgstr "No podemos bisecar mas!\n"

941

888 -#: bisect.c:723

942 +#: bisect.c:729

943 #, c-format

944 msgid "Not a valid commit name %s"

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

946

893 -#: bisect.c:747

947 +#: bisect.c:753

948 #, c-format

949 msgid ""

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

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

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

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

955

902 -#: bisect.c:752

956 +#: bisect.c:758

957 #, c-format

958 msgid ""

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

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

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

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

964

911 -#: bisect.c:757

965 +#: bisect.c:763

966 #, c-format

967 msgid ""

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

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

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

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

973

920 -#: bisect.c:765

974 +#: bisect.c:771

975 #, c-format

976 msgid ""

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

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

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

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

984

931 -#: bisect.c:778

985 +#: bisect.c:784

986 #, c-format

987 msgid ""

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

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

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

994 "Vamos a continuar de todas maneras."

995

942 -#: bisect.c:811

996 +#: bisect.c:817

997 #, c-format

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

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

1000

947 -#: bisect.c:851

1001 +#: bisect.c:857

1002 #, c-format

1003 msgid "a %s revision is needed"

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

1005

952 -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

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

1007 #, c-format

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

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

1010

957 -#: bisect.c:921

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

1012 #, c-format

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

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

1015

962 -#: bisect.c:951

1016 +#: bisect.c:957

1017 msgid "reading bisect refs failed"

1018 msgstr "falló leer las refs de bisect"

1019

966 -#: bisect.c:970

1020 +#: bisect.c:976

1021 #, c-format

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

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

1024

971 -#: bisect.c:978

1025 +#: bisect.c:984

1026 #, c-format

1027 msgid ""

1028 "No testable commit found.\n"

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

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

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

1033

980 -#: bisect.c:997

1034 +#: bisect.c:1003

1035 #, c-format

1036 msgid "(roughly %d step)"

1037 msgid_plural "(roughly %d steps)"

@@ -987,51 +1041,52 @@ msgstr[1] "(aproximadamente %d pasos)"

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

1042 #. steps)" translation.

1043 #.

990 -#: bisect.c:1003

1044 +#: bisect.c:1009

1045 #, c-format

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

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

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

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

1050

997 -#: blame.c:1756

1051 +#: blame.c:1784

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

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

1054

1001 -#: blame.c:1767

1055 +#: blame.c:1798

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

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

1058

1005 -#: blame.c:1787

1059 +#: blame.c:1819

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

1061 msgstr ""

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

1063

1010 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1011 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1012 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

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

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

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

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

1068 #: builtin/shortlog.c:192

1069 msgid "revision walk setup failed"

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

1071

1017 -#: blame.c:1814

1072 +#: blame.c:1846

1073 msgid ""

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

1075 msgstr ""

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

1077 "del primer padre"

1078

1024 -#: blame.c:1825

1079 +#: blame.c:1857

1080 #, c-format

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

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

1083

1029 -#: blame.c:1836

1084 +#: blame.c:1868

1085 #, c-format

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

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

1088

1034 -#: branch.c:54

1089 +#: branch.c:52

1090 #, c-format

1091 msgid ""

1092 "\n"

@@ -1044,97 +1099,97 @@ msgstr ""

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

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

1101

1047 -#: branch.c:68

1102 +#: branch.c:66

1103 #, c-format

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

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

1106

1052 -#: branch.c:94

1107 +#: branch.c:92

1108 #, c-format

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

1110 msgstr ""

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

1112 "por rebase."

1113

1059 -#: branch.c:95

1114 +#: branch.c:93

1115 #, c-format

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

1117 msgstr ""

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

1119

1065 -#: branch.c:99

1120 +#: branch.c:97

1121 #, c-format

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

1123 msgstr ""

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

1125

1071 -#: branch.c:100

1126 +#: branch.c:98

1127 #, c-format

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

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

1130

1076 -#: branch.c:105

1131 +#: branch.c:103

1132 #, c-format

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

1134 msgstr ""

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

1136 "rebase."

1137

1083 -#: branch.c:106

1138 +#: branch.c:104

1139 #, c-format

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

1141 msgstr ""

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

1143

1089 -#: branch.c:110

1144 +#: branch.c:108

1145 #, c-format

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

1147 msgstr ""

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

1149 "rebase."

1150

1096 -#: branch.c:111

1151 +#: branch.c:109

1152 #, c-format

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

1154 msgstr ""

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

1156

1102 -#: branch.c:120

1157 +#: branch.c:118

1158 msgid "Unable to write upstream branch configuration"

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

1160

1106 -#: branch.c:157

1161 +#: branch.c:155

1162 #, c-format

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

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

1165

1111 -#: branch.c:190

1166 +#: branch.c:188

1167 #, c-format

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

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

1170

1116 -#: branch.c:209

1171 +#: branch.c:207

1172 #, c-format

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

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

1175

1121 -#: branch.c:214

1176 +#: branch.c:212

1177 msgid "Cannot force update the current branch."

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

1179

1125 -#: branch.c:234

1180 +#: branch.c:232

1181 #, c-format

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

1183 msgstr ""

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

1185 "no es una rama."

1186

1132 -#: branch.c:236

1187 +#: branch.c:234

1188 #, c-format

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

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

1191

1137 -#: branch.c:238

1192 +#: branch.c:236

1193 msgid ""

1194 "\n"

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

@@ -1155,100 +1210,100 @@ msgstr ""

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

1211 "el push."

1212

1158 -#: branch.c:281

1213 +#: branch.c:279

1214 #, c-format

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

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

1217

1163 -#: branch.c:301

1218 +#: branch.c:299

1219 #, c-format

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

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

1222

1168 -#: branch.c:306

1223 +#: branch.c:304

1224 #, c-format

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

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

1227

1173 -#: branch.c:360

1228 +#: branch.c:358

1229 #, c-format

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

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

1232

1178 -#: branch.c:383

1233 +#: branch.c:381

1234 #, c-format

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

1236 msgstr "HEAD del árbol de trabajo %s no esta actualizada"

1237

1183 -#: bundle.c:34

1238 +#: bundle.c:36

1239 #, c-format

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

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

1242

1188 -#: bundle.c:62

1243 +#: bundle.c:64

1244 #, c-format

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

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

1247

1193 -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

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

1249 #, c-format

1250 msgid "could not open '%s'"

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

1252

1198 -#: bundle.c:139

1253 +#: bundle.c:141

1254 msgid "Repository lacks these prerequisite commits:"

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

1256

1202 -#: bundle.c:190

1257 +#: bundle.c:192

1258 #, c-format

1259 msgid "The bundle contains this ref:"

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

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

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

1263

1209 -#: bundle.c:197

1264 +#: bundle.c:199

1265 msgid "The bundle records a complete history."

1266 msgstr "El bundle registra una historia completa."

1267

1213 -#: bundle.c:199

1268 +#: bundle.c:201

1269 #, c-format

1270 msgid "The bundle requires this ref:"

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

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

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

1274

1220 -#: bundle.c:258

1275 +#: bundle.c:260

1276 msgid "Could not spawn pack-objects"

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

1278

1224 -#: bundle.c:269

1279 +#: bundle.c:271

1280 msgid "pack-objects died"

1281 msgstr "pack-objects murió"

1282

1228 -#: bundle.c:311

1283 +#: bundle.c:313

1284 msgid "rev-list died"

1285 msgstr "rev-list murió"

1286

1232 -#: bundle.c:360

1287 +#: bundle.c:362

1288 #, c-format

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

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

1291

1237 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

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

1293 #, c-format

1294 msgid "unrecognized argument: %s"

1295 msgstr "argumento no reconocido: %s"

1296

1242 -#: bundle.c:458

1297 +#: bundle.c:461

1298 msgid "Refusing to create empty bundle."

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

1300

1246 -#: bundle.c:470

1301 +#: bundle.c:473

1302 #, c-format

1303 msgid "cannot create '%s'"

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

1305

1251 -#: bundle.c:498

1306 +#: bundle.c:501

1307 msgid "index-pack died"

1308 msgstr "index-pack murió"

1309

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

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

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

1314

1260 -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1261 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

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

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

1317 #: builtin/replace.c:448

1318 #, c-format

1319 msgid "could not parse %s"

1320 msgstr "no se puede analizar %s"

1321

1267 -#: commit.c:45

1322 +#: commit.c:50

1323 #, c-format

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

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

1326

1272 -#: commit.c:182

1327 +#: commit.c:191

1328 msgid ""

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

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

@@ -1289,7 +1344,7 @@ msgstr ""

1344 "Apapa este mensaje ejecutando\n"

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

1346

1292 -#: commit.c:1540

1347 +#: commit.c:1629

1348 msgid ""

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

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

@@ -1300,188 +1355,396 @@ msgstr ""

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

1356 "su proyecto.\n"

1357

1303 -#: commit-graph.c:669

1358 +#: commit-graph.c:83

1359 +#, c-format

1360 +msgid "graph file %s is too small"

1361 +msgstr "archivo graph %s es muy pequeño"

1362 +

1363 +#: commit-graph.c:90

1364 +#, c-format

1365 +msgid "graph signature %X does not match signature %X"

1366 +msgstr "firma de graph %X no concuerda con firma %X"

1367 +

1368 +#: commit-graph.c:97

1369 +#, c-format

1370 +msgid "graph version %X does not match version %X"

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

1372 +

1373 +#: commit-graph.c:104

1374 +#, c-format

1375 +msgid "hash version %X does not match version %X"

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

1377 +

1378 +#: commit-graph.c:128

1379 +#, c-format

1380 +msgid "improper chunk offset %08x%08x"

1381 +msgstr "offset del chunk impropio %08x%08x"

1382 +

1383 +#: commit-graph.c:164

1384 +#, c-format

1385 +msgid "chunk id %08x appears multiple times"

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

1387 +

1388 +#: commit-graph.c:261

1389 +#, c-format

1390 +msgid "could not find commit %s"

1391 +msgstr "no se pudo encontrar commit %s"

1392 +

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

1394 +#, c-format

1395 +msgid "unable to get type of object %s"

1396 +msgstr "incapaz de obtener el tipo de objeto: %s"

1397 +

1398 +#: commit-graph.c:730

1399 +#, c-format

1400 +msgid "error adding pack %s"

1401 +msgstr "error agregando pack %s"

1402 +

1403 +#: commit-graph.c:732

1404 +#, c-format

1405 +msgid "error opening index for %s"

1406 +msgstr "error abriendo index para %s"

1407 +

1408 +#: commit-graph.c:773

1409 #, c-format

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

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

1412

1308 -#: commit-graph.c:696

1413 +#: commit-graph.c:800

1414 msgid "too many commits to write graph"

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

1416

1312 -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1417 +#: commit-graph.c:806

1418 #, c-format

1314 -msgid "cannot mkdir %s"

1315 -msgstr "no se pude crear directorio %s"

1419 +msgid "unable to create leading directories of %s"

1420 +msgstr "no se pudo crear directorios principales para %s"

1421 +

1422 +#: commit-graph.c:904

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

1424 +msgstr ""

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

1426 +"corrupto"

1427

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

1429 msgid "memory exhausted"

1430 msgstr "memoria agotada"

1431

1321 -#: config.c:187

1432 +#: config.c:123

1433 +#, c-format

1434 +msgid ""

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

1436 +"\t%s\n"

1437 +"from\n"

1438 +"\t%s\n"

1439 +"This might be due to circular includes."

1440 +msgstr ""

1441 +"profundidad máxima de inclusión excedida (%d) mientras se incluía\n"

1442 +"\t%s\n"

1443 +"de\n"

1444 +"\t%s\n"

1445 +"Esto puede ser causado por inclusiones circulares."

1446 +

1447 +#: config.c:139

1448 +#, c-format

1449 +msgid "could not expand include path '%s'"

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

1451 +

1452 +#: config.c:150

1453 +msgid "relative config includes must come from files"

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

1455 +

1456 +#: config.c:190

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

1458 msgstr ""

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

1460

1326 -#: config.c:788

1461 +#: config.c:348

1462 +#, c-format

1463 +msgid "key does not contain a section: %s"

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

1465 +

1466 +#: config.c:354

1467 +#, c-format

1468 +msgid "key does not contain variable name: %s"

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

1470 +

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

1472 +#, c-format

1473 +msgid "invalid key: %s"

1474 +msgstr "llave invalida: %s"

1475 +

1476 +#: config.c:384

1477 +#, c-format

1478 +msgid "invalid key (newline): %s"

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

1480 +

1481 +#: config.c:420 config.c:432

1482 +#, c-format

1483 +msgid "bogus config parameter: %s"

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

1485 +

1486 +#: config.c:467

1487 +#, c-format

1488 +msgid "bogus format in %s"

1489 +msgstr "formato malogrado en %s"

1490 +

1491 +#: config.c:793

1492 #, c-format

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

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

1495

1331 -#: config.c:792

1496 +#: config.c:797

1497 #, c-format

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

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

1500

1336 -#: config.c:796

1501 +#: config.c:801

1502 #, c-format

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

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

1505

1341 -#: config.c:800

1506 +#: config.c:805

1507 #, c-format

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

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

1510

1346 -#: config.c:804

1511 +#: config.c:809

1512 #, c-format

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

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

1515

1351 -#: config.c:808

1516 +#: config.c:813

1517 #, c-format

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

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

1520

1356 -#: config.c:936

1521 +#: config.c:952

1522 msgid "out of range"

1523 msgstr "fuera de rango"

1524

1360 -#: config.c:936

1525 +#: config.c:952

1526 msgid "invalid unit"

1527 msgstr "unidad invalida"

1528

1364 -#: config.c:942

1529 +#: config.c:958

1530 #, c-format

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

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

1533

1369 -#: config.c:947

1534 +#: config.c:963

1535 #, c-format

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

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

1538

1374 -#: config.c:950

1539 +#: config.c:966

1540 #, c-format

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

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

1543

1379 -#: config.c:953

1544 +#: config.c:969

1545 #, c-format

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

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

1548

1384 -#: config.c:956

1549 +#: config.c:972

1550 #, c-format

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

1552 msgstr ""

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

1554

1390 -#: config.c:959

1555 +#: config.c:975

1556 #, c-format

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

1558 msgstr ""

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

1560

1396 -#: config.c:962

1561 +#: config.c:978

1562 #, c-format

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

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

1565

1401 -#: config.c:1057

1566 +#: config.c:1073

1567 #, c-format

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

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

1570

1406 -#: config.c:1066

1571 +#: config.c:1082

1572 #, c-format

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

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

1575

1411 -#: config.c:1171 config.c:1182

1576 +#: config.c:1173

1577 +#, c-format

1578 +msgid "abbrev length out of range: %d"

1579 +msgstr "largo de abreviatura fuera de rango: %d"

1580 +

1581 +#: config.c:1187 config.c:1198

1582 #, c-format

1583 msgid "bad zlib compression level %d"

1584 msgstr "mala compresión zlib en nivel %d"

1585

1416 -#: config.c:1307

1586 +#: config.c:1290

1587 +msgid "core.commentChar should only be one character"

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

1589 +

1590 +#: config.c:1323

1591 #, c-format

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

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

1594

1421 -#: config.c:1473

1595 +#: config.c:1403

1596 +#, c-format

1597 +msgid "malformed value for %s"

1598 +msgstr "valor malformado para %s"

1599 +

1600 +#: config.c:1429

1601 +#, c-format

1602 +msgid "malformed value for %s: %s"

1603 +msgstr "valor malformado para %s: %s"

1604 +

1605 +#: config.c:1430

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

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

1608 +

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

1610 #, c-format

1611 msgid "bad pack compression level %d"

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

1613

1426 -#: config.c:1681

1614 +#: config.c:1610

1615 +#, c-format

1616 +msgid "unable to load config blob object '%s'"

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

1618 +

1619 +#: config.c:1613

1620 +#, c-format

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

1622 +msgstr "referencia '%s' no apunta a un blob"

1623 +

1624 +#: config.c:1630

1625 +#, c-format

1626 +msgid "unable to resolve config blob '%s'"

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

1628 +

1629 +#: config.c:1660

1630 +#, c-format

1631 +msgid "failed to parse %s"

1632 +msgstr "no se pudo analizar %s"

1633 +

1634 +#: config.c:1700

1635 msgid "unable to parse command-line config"

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

1637

1430 -#: config.c:2013

1638 +#: config.c:2032

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

1640 msgstr ""

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

1642

1435 -#: config.c:2200

1643 +#: config.c:2202

1644 #, c-format

1645 msgid "Invalid %s: '%s'"

1646 msgstr "Invalido %s: '%s'"

1647

1440 -#: config.c:2243

1648 +#: config.c:2245

1649 #, c-format

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

1651 msgstr ""

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

1653 "defecto"

1654

1447 -#: config.c:2269

1655 +#: config.c:2271

1656 #, c-format

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

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

1659

1452 -#: config.c:2294

1660 +#: config.c:2296

1661 #, c-format

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

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

1664

1457 -#: config.c:2296

1665 +#: config.c:2298

1666 #, c-format

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

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

1669

1462 -#: config.c:2402

1670 +#: config.c:2379

1671 +#, c-format

1672 +msgid "invalid section name '%s'"

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

1674 +

1675 +#: config.c:2411

1676 #, c-format

1677 msgid "%s has multiple values"

1678 msgstr "%s tiene múltiples valores"

1679

1467 -#: config.c:2766 config.c:3019

1680 +#: config.c:2440

1681 +#, c-format

1682 +msgid "failed to write new configuration file %s"

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

1684 +

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

1686 +#, c-format

1687 +msgid "could not lock config file %s"

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

1689 +

1690 +#: config.c:2702

1691 +#, c-format

1692 +msgid "opening %s"

1693 +msgstr "abriendo %s"

1694 +

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

1696 +#, c-format

1697 +msgid "invalid pattern: %s"

1698 +msgstr "patrón inválido: %s"

1699 +

1700 +#: config.c:2762

1701 +#, c-format

1702 +msgid "invalid config file %s"

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

1704 +

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

1706 #, c-format

1707 msgid "fstat on %s failed"

1708 msgstr "fstat en %s falló"

1709

1472 -#: config.c:2905

1710 +#: config.c:2786

1711 +#, c-format

1712 +msgid "unable to mmap '%s'"

1713 +msgstr "no es posible hacer mmap '%s'"

1714 +

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

1716 +#, c-format

1717 +msgid "chmod on %s failed"

1718 +msgstr "chmod en %s falló"

1719 +

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

1721 +#, c-format

1722 +msgid "could not write config file %s"

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

1724 +

1725 +#: config.c:2914

1726 #, c-format

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

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

1729

1477 -#: config.c:2907 builtin/remote.c:779

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

1731 #, c-format

1732 msgid "could not unset '%s'"

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

1734

1735 +#: config.c:3006

1736 +#, c-format

1737 +msgid "invalid section name: %s"

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

1739 +

1740 +#: config.c:3173

1741 +#, c-format

1742 +msgid "missing value for '%s'"

1743 +msgstr "valor faltante para '%s'"

1744 +

1745 #: connect.c:61

1483 -msgid "The remote end hung up upon initial contact"

1484 -msgstr "El remoto se colgó en el contacto inicial"

1746 +msgid "the remote end hung up upon initial contact"

1747 +msgstr "el remoto se colgó en el contacto inicial"

1748

1749 #: connect.c:63

1750 msgid ""

@@ -1495,58 +1758,212 @@ msgstr ""

1758 "Por favor asegúrese que tiene los permisos de acceso correctos\n"

1759 "y que el repositorio existe."

1760

1498 -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1761 +#: connect.c:81

1762 +#, c-format

1763 +msgid "server doesn't support '%s'"

1764 +msgstr "servidor no soporta '%s'"

1765 +

1766 +#: connect.c:103

1767 +#, c-format

1768 +msgid "server doesn't support feature '%s'"

1769 +msgstr "servidor no soporta feature '%s'"

1770 +

1771 +#: connect.c:114

1772 +msgid "expected flush after capabilities"

1773 +msgstr "se espera flush tras capacidades"

1774 +

1775 +#: connect.c:233

1776 +#, c-format

1777 +msgid "ignoring capabilities after first line '%s'"

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

1779 +

1780 +#: connect.c:252

1781 +msgid "protocol error: unexpected capabilities^{}"

1782 +msgstr "error de protocolo: capacidades imprevistas^{}"

1783 +

1784 +#: connect.c:273

1785 +#, c-format

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

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

1788 +

1789 +#: connect.c:275

1790 +msgid "repository on the other end cannot be shallow"

1791 +msgstr "el repositorio en el otro final no puede ser superficial"

1792 +

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

1794 +#, c-format

1795 +msgid "remote error: %s"

1796 +msgstr "error remoto: %s"

1797 +

1798 +#: connect.c:316

1799 +msgid "invalid packet"

1800 +msgstr "paquete inválido"

1801 +

1802 +#: connect.c:336

1803 +#, c-format

1804 +msgid "protocol error: unexpected '%s'"

1805 +msgstr "error de protocolo: '%s' inesperado"

1806 +

1807 +#: connect.c:444

1808 +#, c-format

1809 +msgid "invalid ls-refs response: %s"

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

1811 +

1812 +#: connect.c:448

1813 +msgid "expected flush after ref listing"

1814 +msgstr "flush esperado tras listado de refs"

1815 +

1816 +#: connect.c:547

1817 +#, c-format

1818 +msgid "protocol '%s' is not supported"

1819 +msgstr "protocolo '%s' no es soportado"

1820 +

1821 +#: connect.c:598

1822 +msgid "unable to set SO_KEEPALIVE on socket"

1823 +msgstr "no es posible configurar SO_KEEPALIVE en el socket"

1824 +

1825 +#: connect.c:638 connect.c:701

1826 +#, c-format

1827 +msgid "Looking up %s ... "

1828 +msgstr "Revisando %s... "

1829 +

1830 +#: connect.c:642

1831 +#, c-format

1832 +msgid "unable to look up %s (port %s) (%s)"

1833 +msgstr "no se puede revisar %s (puerto %s) (%s)"

1834 +

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

1836 +#: connect.c:646 connect.c:717

1837 +#, c-format

1838 +msgid ""

1839 +"done.\n"

1840 +"Connecting to %s (port %s) ... "

1841 +msgstr ""

1842 +"hecho.\n"

1843 +"Conectando a %s (puerto %s) ... "

1844 +

1845 +#: connect.c:668 connect.c:745

1846 +#, c-format

1847 +msgid ""

1848 +"unable to connect to %s:\n"

1849 +"%s"

1850 +msgstr ""

1851 +"no es posible conectar a %s:\n"

1852 +"%s"

1853 +

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

1855 +#: connect.c:674 connect.c:751

1856 +msgid "done."

1857 +msgstr "hecho."

1858 +

1859 +#: connect.c:705

1860 +#, c-format

1861 +msgid "unable to look up %s (%s)"

1862 +msgstr "no es posible revisar %s (%s)"

1863 +

1864 +#: connect.c:711

1865 +#, c-format

1866 +msgid "unknown port %s"

1867 +msgstr "puerto desconocido %s"

1868 +

1869 +#: connect.c:848 connect.c:1174

1870 +#, c-format

1871 +msgid "strange hostname '%s' blocked"

1872 +msgstr "hostname extraño '%s' bloqueado"

1873 +

1874 +#: connect.c:850

1875 +#, c-format

1876 +msgid "strange port '%s' blocked"

1877 +msgstr "puerto extraño '%s' bloqueado"

1878 +

1879 +#: connect.c:860

1880 +#, c-format

1881 +msgid "cannot start proxy %s"

1882 +msgstr "no se puede comenzar proxy %s"

1883 +

1884 +#: connect.c:927

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

1886 +msgstr ""

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

1888 +

1889 +#: connect.c:1122

1890 +msgid "ssh variant 'simple' does not support -4"

1891 +msgstr "variante 'simple' de ssh no soporta -4"

1892 +

1893 +#: connect.c:1134

1894 +msgid "ssh variant 'simple' does not support -6"

1895 +msgstr "variante 'simple' de ssh no soporta -6"

1896 +

1897 +#: connect.c:1151

1898 +msgid "ssh variant 'simple' does not support setting port"

1899 +msgstr "variante ssh 'simple' no soporta configurar puerto"

1900 +

1901 +#: connect.c:1262

1902 +#, c-format

1903 +msgid "strange pathname '%s' blocked"

1904 +msgstr "ruta extraña '%s' bloqueada"

1905 +

1906 +#: connect.c:1307

1907 +msgid "unable to fork"

1908 +msgstr "no es posible hacer fork"

1909 +

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

1911 msgid "Checking connectivity"

1912 msgstr "Verificando conectividad"

1913

1502 -#: connected.c:78

1914 +#: connected.c:80

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

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

1917

1506 -#: connected.c:98

1918 +#: connected.c:100

1919 msgid "failed write to rev-list"

1920 msgstr "falló escribir a rev-list"

1921

1510 -#: connected.c:105

1922 +#: connected.c:107

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

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

1925

1514 -#: convert.c:206

1926 +#: convert.c:194

1927 #, c-format

1516 -msgid "CRLF would be replaced by LF in %s."

1517 -msgstr "CRLF será reemplazado por LF en %s."

1928 +msgid "illegal crlf_action %d"

1929 +msgstr "crlf_action %d ilegal"

1930

1519 -#: convert.c:208

1931 +#: convert.c:207

1932 +#, c-format

1933 +msgid "CRLF would be replaced by LF in %s"

1934 +msgstr "CRLF será reemplazado por LF en %s"

1935 +

1936 +#: convert.c:209

1937 #, c-format

1938 msgid ""

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

1523 -"The file will have its original line endings in your working directory."

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

1941 msgstr ""

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

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

1944 "trabajo."

1945

1529 -#: convert.c:216

1946 +#: convert.c:217

1947 #, c-format

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

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

1950

1534 -#: convert.c:218

1951 +#: convert.c:219

1952 #, c-format

1953 msgid ""

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

1538 -"The file will have its original line endings in your working directory."

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

1956 msgstr ""

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

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

1959 "trabajo."

1960

1544 -#: convert.c:279

1961 +#: convert.c:280

1962 #, c-format

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

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

1965

1549 -#: convert.c:286

1966 +#: convert.c:287

1967 #, c-format

1968 msgid ""

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

@@ -1555,12 +1972,12 @@ msgstr ""

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

1973 "working-tree-encoding."

1974

1558 -#: convert.c:304

1975 +#: convert.c:305

1976 #, c-format

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

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

1979

1563 -#: convert.c:306

1980 +#: convert.c:307

1981 #, c-format

1982 msgid ""

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

@@ -1569,20 +1986,72 @@ msgstr ""

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

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

1988

1572 -#: convert.c:424

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

1990 #, c-format

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

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

1993

1577 -#: convert.c:467

1994 +#: convert.c:468

1995 #, c-format

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

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

1998

1582 -#: convert.c:1225

1999 +#: convert.c:674

2000 +#, c-format

2001 +msgid "cannot fork to run external filter '%s'"

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

2003 +

2004 +#: convert.c:694

2005 +#, c-format

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

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

2008 +

2009 +#: convert.c:701

2010 +#, c-format

2011 +msgid "external filter '%s' failed %d"

2012 +msgstr "filtro externo '%s' falló %d"

2013 +

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

2015 +#, c-format

2016 +msgid "read from external filter '%s' failed"

2017 +msgstr "lectura de filtro externo '%s' falló"

2018 +

2019 +#: convert.c:742 convert.c:796

2020 +#, c-format

2021 +msgid "external filter '%s' failed"

2022 +msgstr "filtro externo '%s' falló"

2023 +

2024 +#: convert.c:844

2025 +msgid "unexpected filter type"

2026 +msgstr "tipo de filtro inesperado"

2027 +

2028 +#: convert.c:855

2029 +msgid "path name too long for external filter"

2030 +msgstr "nombre de ruta muy largo para filtro externo"

2031 +

2032 +#: convert.c:929

2033 +#, c-format

2034 +msgid ""

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

2036 +"been filtered"

2037 +msgstr ""

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

2039 +"filtradas"

2040 +

2041 +#: convert.c:1228

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

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

2044

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

2046 +#, c-format

2047 +msgid "%s: clean filter '%s' failed"

2048 +msgstr "%s: falló al limpiar filtro '%s'"

2049 +

2050 +#: convert.c:1480

2051 +#, c-format

2052 +msgid "%s: smudge filter %s failed"

2053 +msgstr "%s: filtro smudge %s falló"

2054 +

2055 #: date.c:116

2056 msgid "in the future"

2057 msgstr "en el futuro"

@@ -1656,40 +2125,53 @@ msgstr[1] "hace %<PRIuMAX> años"

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

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

2127

1659 -#: diffcore-rename.c:535

2128 +#: diffcore-rename.c:536

2129 msgid "Performing inexact rename detection"

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

2131

1663 -#: diff.c:74

2132 +#: diff.c:108

2133 #, c-format

2134 msgid "option '%s' requires a value"

2135 msgstr "opción '%s' requiere un valor"

2136

1668 -#: diff.c:152

2137 +#: diff.c:158

2138 #, c-format

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

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

2141

1673 -#: diff.c:157

2142 +#: diff.c:163

2143 #, c-format

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

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

2146

1678 -#: diff.c:281

2147 +#: diff.c:291

2148 +msgid ""

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

2150 +"'dimmed-zebra', 'plain'"

2151 +msgstr ""

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

2153 +"'dimmed_zebra', 'plain'"

2154 +

2155 +#: diff.c:316

2156 +#, c-format

2157 +msgid "ignoring unknown color-moved-ws mode '%s'"

2158 +msgstr "ignorando modo desconocido color-moved-ws '%s'"

2159 +

2160 +#: diff.c:323

2161 msgid ""

1680 -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1681 -"'plain'"

2162 +"color-moved-ws: allow-indentation-change cannot be combined with other white "

2163 +"space modes"

2164 msgstr ""

1683 -"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, "

1684 -"'plain'"

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

2166 +"modos de espacios en blanco"

2167

1686 -#: diff.c:341

2168 +#: diff.c:394

2169 #, c-format

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

2171 msgstr ""

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

2173

1692 -#: diff.c:401

2174 +#: diff.c:454

2175 #, c-format

2176 msgid ""

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

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

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

2181 "%s"

2182

1701 -#: diff.c:3823

2183 +#: diff.c:4096

2184 #, c-format

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

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

2187

1706 -#: diff.c:4153

2188 +#: diff.c:4427

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

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

2191

1710 -#: diff.c:4156

2192 +#: diff.c:4430

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

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

2195

1714 -#: diff.c:4244

2196 +#: diff.c:4508

2197 msgid "--follow requires exactly one pathspec"

2198 msgstr "--follow requiere exactamente un pathspec"

2199

1718 -#: diff.c:4410

2200 +#: diff.c:4674

2201 #, c-format

2202 msgid ""

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

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

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

2207 "%s"

2208

1727 -#: diff.c:4424

2209 +#: diff.c:4688

2210 #, c-format

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

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

2213

1732 -#: diff.c:5500

2214 +#: diff.c:5766

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

2216 msgstr ""

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

2218

1737 -#: diff.c:5503

2219 +#: diff.c:5769

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

2221 msgstr ""

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

2223

1742 -#: diff.c:5506

2224 +#: diff.c:5772

2225 #, c-format

2226 msgid ""

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

@@ -1747,25 +2229,41 @@ msgstr ""

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

2230 "intentar el comando."

2231

1750 -#: dir.c:1867

2232 +#: dir.c:569

2233 +#, c-format

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

2235 +msgstr ""

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

2237 +

2238 +#: dir.c:958

2239 +#, c-format

2240 +msgid "cannot use %s as an exclude file"

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

2242 +

2243 +#: dir.c:1873

2244 #, c-format

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

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

2247

1755 -#: dir.c:2109

2248 +#: dir.c:2115

2249 msgid "failed to get kernel name and information"

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

2251

1759 -#: dir.c:2233

1760 -msgid "Untracked cache is disabled on this system or location."

1761 -msgstr "Untracked cache esta desactivado en este sistema o ubicación."

2252 +#: dir.c:2239

2253 +msgid "untracked cache is disabled on this system or location"

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

2255 +

2256 +#: dir.c:3037

2257 +#, c-format

2258 +msgid "index file corrupt in repo %s"

2259 +msgstr "archivo índice corrompido en repositorio %s"

2260

1763 -#: dir.c:3075 dir.c:3080

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

2262 #, c-format

2263 msgid "could not create directories for %s"

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

2265

1768 -#: dir.c:3109

2266 +#: dir.c:3116

2267 #, c-format

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

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

@@ -1775,218 +2273,272 @@ msgstr "no se pudo migrar el directorio git de '%s' a '%s'"

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

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

2275

1778 -#: entry.c:177

2276 +#: entry.c:178

2277 msgid "Filtering content"

2278 msgstr "Filtrando contenido"

2279

1782 -#: entry.c:435

2280 +#: entry.c:437

2281 #, c-format

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

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

2284

2285 +#: environment.c:150

2286 +#, c-format

2287 +msgid "bad git namespace path \"%s\""

2288 +msgstr "ruta de namespace de git mala \"%s\""

2289 +

2290 +#: environment.c:332

2291 +#, c-format

2292 +msgid "could not set GIT_DIR to '%s'"

2293 +msgstr "no se pudo configurar GIT_DIR a '%s'"

2294 +

2295 +#: exec-cmd.c:361

2296 +#, c-format

2297 +msgid "too many args to run %s"

2298 +msgstr "demasiados argumentos para correr %s"

2299 +

2300 #: fetch-object.c:17

2301 msgid "Remote with no URL"

2302 msgstr "Remoto sin URL"

2303

1791 -#: fetch-pack.c:254

2304 +#: fetch-pack.c:152

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

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

2307

1795 -#: fetch-pack.c:266

2308 +#: fetch-pack.c:164

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

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

2311

1799 -#: fetch-pack.c:285 builtin/archive.c:63

1800 -#, c-format

1801 -msgid "remote error: %s"

1802 -msgstr "error remoto: %s"

1803 -

1804 -#: fetch-pack.c:286

2312 +#: fetch-pack.c:184

2313 #, c-format

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

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

2316

1809 -#: fetch-pack.c:338

2317 +#: fetch-pack.c:254

2318 msgid "--stateless-rpc requires multi_ack_detailed"

2319 msgstr "--stateless-rpc requiere multi_ack_detailed"

2320

1813 -#: fetch-pack.c:429 fetch-pack.c:1310

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

2322 #, c-format

2323 msgid "invalid shallow line: %s"

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

2325

1818 -#: fetch-pack.c:435 fetch-pack.c:1316

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

2327 #, c-format

2328 msgid "invalid unshallow line: %s"

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

2330

1823 -#: fetch-pack.c:437 fetch-pack.c:1318

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

2332 #, c-format

2333 msgid "object not found: %s"

2334 msgstr "objeto no encontrado: %s"

2335

1828 -#: fetch-pack.c:440 fetch-pack.c:1321

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

2337 #, c-format

2338 msgid "error in object: %s"

2339 msgstr "error en objeto: %s"

2340

1833 -#: fetch-pack.c:442 fetch-pack.c:1323

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

2342 #, c-format

2343 msgid "no shallow found: %s"

2344 msgstr "superficie no encontrada: %s"

2345

1838 -#: fetch-pack.c:445 fetch-pack.c:1326

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

2347 #, c-format

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

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

2350

1843 -#: fetch-pack.c:486

2351 +#: fetch-pack.c:399

2352 #, c-format

2353 msgid "got %s %d %s"

2354 msgstr "se obtuvo %s %d %s"

2355

1848 -#: fetch-pack.c:500

2356 +#: fetch-pack.c:416

2357 #, c-format

2358 msgid "invalid commit %s"

2359 msgstr "commit inválido %s"

2360

1853 -#: fetch-pack.c:533

2361 +#: fetch-pack.c:447

2362 msgid "giving up"

2363 msgstr "rindiéndose"

2364

1857 -#: fetch-pack.c:543 progress.c:229

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

2366 msgid "done"

2367 msgstr "listo"

2368

1861 -#: fetch-pack.c:555

2369 +#: fetch-pack.c:471

2370 #, c-format

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

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

2373

1866 -#: fetch-pack.c:601

2374 +#: fetch-pack.c:517

2375 #, c-format

2376 msgid "Marking %s as complete"

2377 msgstr "Marcando %s como completa"

2378

1871 -#: fetch-pack.c:828

2379 +#: fetch-pack.c:764

2380 #, c-format

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

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

2383

1876 -#: fetch-pack.c:869

2384 +#: fetch-pack.c:803

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

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

2387

1880 -#: fetch-pack.c:877

2388 +#: fetch-pack.c:811

2389 msgid "protocol error: bad pack header"

2390 msgstr "error de protocolo: mal paquete de header"

2391

1884 -#: fetch-pack.c:944

2392 +#: fetch-pack.c:879

2393 #, c-format

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

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

2396

1889 -#: fetch-pack.c:960

2397 +#: fetch-pack.c:895

2398 #, c-format

2399 msgid "%s failed"

2400 msgstr "%s falló"

2401

1894 -#: fetch-pack.c:962

2402 +#: fetch-pack.c:897

2403 msgid "error in sideband demultiplexer"

2404 msgstr "error en demultiplexor de banda lateral"

2405

1898 -#: fetch-pack.c:989

2406 +#: fetch-pack.c:926

2407 msgid "Server does not support shallow clients"

2408 msgstr "Servidor no soporta clientes superficiales"

2409

1902 -#: fetch-pack.c:993

2410 +#: fetch-pack.c:930

2411 msgid "Server supports multi_ack_detailed"

2412 msgstr "Servidor soporta ulti_ack_detailed"

2413

1906 -#: fetch-pack.c:996

2414 +#: fetch-pack.c:933

2415 msgid "Server supports no-done"

2416 msgstr "Servidor soporta no-done"

2417

1910 -#: fetch-pack.c:1002

2418 +#: fetch-pack.c:939

2419 msgid "Server supports multi_ack"

2420 msgstr "Servidor soporta multi_ack"

2421

1914 -#: fetch-pack.c:1006

2422 +#: fetch-pack.c:943

2423 msgid "Server supports side-band-64k"

2424 msgstr "Servidor soporta side-band-64k"

2425

1918 -#: fetch-pack.c:1010

2426 +#: fetch-pack.c:947

2427 msgid "Server supports side-band"

2428 msgstr "Servidor soporta side-band"

2429

1922 -#: fetch-pack.c:1014

2430 +#: fetch-pack.c:951

2431 msgid "Server supports allow-tip-sha1-in-want"

2432 msgstr "Servidor soporta allow-tip-sha1-in-want"

2433

1926 -#: fetch-pack.c:1018

2434 +#: fetch-pack.c:955

2435 msgid "Server supports allow-reachable-sha1-in-want"

2436 msgstr "Servidor soporta allow-reachable-sha1-in-want"

2437

1930 -#: fetch-pack.c:1028

2438 +#: fetch-pack.c:965

2439 msgid "Server supports ofs-delta"

2440 msgstr "Servidor soporta ofs-delta"

2441

1934 -#: fetch-pack.c:1034 fetch-pack.c:1204

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

2443 msgid "Server supports filter"

2444 msgstr "Servidor soporta filtro"

2445

1938 -#: fetch-pack.c:1042

2446 +#: fetch-pack.c:979

2447 #, c-format

2448 msgid "Server version is %.*s"

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

2450

1943 -#: fetch-pack.c:1048

2451 +#: fetch-pack.c:985

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

2453 msgstr "Servidor no soporta --shalow-since"

2454

1947 -#: fetch-pack.c:1052

2455 +#: fetch-pack.c:989

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

2457 msgstr "Servidor no soporta --shalow-exclude"

2458

1951 -#: fetch-pack.c:1054

2459 +#: fetch-pack.c:991

2460 msgid "Server does not support --deepen"

2461 msgstr "Servidor no soporta --deepen"

2462

1955 -#: fetch-pack.c:1065

2463 +#: fetch-pack.c:1004

2464 msgid "no common commits"

2465 msgstr "no hay commits comunes"

2466

1959 -#: fetch-pack.c:1077 fetch-pack.c:1414

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

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

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

2470

1963 -#: fetch-pack.c:1199

2471 +#: fetch-pack.c:1145

2472 msgid "Server does not support shallow requests"

2473 msgstr "Servidor no soporta peticiones superficiales"

2474

1967 -#: fetch-pack.c:1584

2475 +#: fetch-pack.c:1191

2476 +#, c-format

2477 +msgid "error reading section header '%s'"

2478 +msgstr "error leyendo sección header '%s'"

2479 +

2480 +#: fetch-pack.c:1197

2481 +#, c-format

2482 +msgid "expected '%s', received '%s'"

2483 +msgstr "se esperaba '%s', se recibió '%s'"

2484 +

2485 +#: fetch-pack.c:1236

2486 +#, c-format

2487 +msgid "unexpected acknowledgment line: '%s'"

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

2489 +

2490 +#: fetch-pack.c:1241

2491 +#, c-format

2492 +msgid "error processing acks: %d"

2493 +msgstr "error procesando acks: %d"

2494 +

2495 +#: fetch-pack.c:1278

2496 +#, c-format

2497 +msgid "error processing shallow info: %d"

2498 +msgstr "error procesando información superficial: %d"

2499 +

2500 +#: fetch-pack.c:1294

2501 +#, c-format

2502 +msgid "expected wanted-ref, got '%s'"

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

2504 +

2505 +#: fetch-pack.c:1304

2506 +#, c-format

2507 +msgid "unexpected wanted-ref: '%s'"

2508 +msgstr "wanted-ref inesperado: '%s'"

2509 +

2510 +#: fetch-pack.c:1308

2511 +#, c-format

2512 +msgid "error processing wanted refs: %d"

2513 +msgstr "error procesando refs deseadas: %d"

2514 +

2515 +#: fetch-pack.c:1603

2516 msgid "no matching remote head"

2517 msgstr "no concuerda el head remoto"

2518

1971 -#: fetch-pack.c:1610

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

2520 +msgid "remote did not send all necessary objects"

2521 +msgstr "remoto no mando todos los objetos necesarios"

2522 +

2523 +#: fetch-pack.c:1647

2524 #, c-format

2525 msgid "no such remote ref %s"

2526 msgstr "no existe ref remota %s"

2527

1976 -#: fetch-pack.c:1613

2528 +#: fetch-pack.c:1650

2529 #, c-format

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

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

2532

1981 -#: gpg-interface.c:185

2533 +#: gpg-interface.c:253

2534 msgid "gpg failed to sign the data"

2535 msgstr "gpg falló al firmar la data"

2536

1985 -#: gpg-interface.c:210

2537 +#: gpg-interface.c:279

2538 msgid "could not create temporary file"

2539 msgstr "no se pudo crear archivo temporal"

2540

1989 -#: gpg-interface.c:213

2541 +#: gpg-interface.c:282

2542 #, c-format

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

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

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

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

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

2550

1999 -#: grep.c:2020

2551 +#: grep.c:2115

2552 #, c-format

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

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

2555

2004 -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

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

2557 #: builtin/rm.c:134

2558 #, c-format

2559 msgid "failed to stat '%s'"

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

2561

2010 -#: grep.c:2048

2562 +#: grep.c:2143

2563 #, c-format

2564 msgid "'%s': short read"

2565 msgstr "'%s': lectura corta"

@@ -2086,7 +2638,7 @@ msgstr "comando de listado de tipos no soportado '%s'"

2638 msgid "The common Git guides are:"

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

2640

2089 -#: help.c:467

2641 +#: help.c:552

2642 #, c-format

2643 msgid ""

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

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

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

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

2649

2098 -#: help.c:526

2650 +#: help.c:611

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

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

2653

2102 -#: help.c:548

2654 +#: help.c:633

2655 #, c-format

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

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

2658

2107 -#: help.c:553

2659 +#: help.c:638

2660 #, c-format

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

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

2663

2112 -#: help.c:558

2664 +#: help.c:643

2665 #, c-format

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

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

2668

2117 -#: help.c:566

2669 +#: help.c:651

2670 #, c-format

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

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

2673

2122 -#: help.c:570

2674 +#: help.c:655

2675 msgid ""

2676 "\n"

2677 "The most similar command is"

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

2685 "\n"

2686 "Los comandos mas similares son"

2687

2136 -#: help.c:585

2688 +#: help.c:670

2689 msgid "git version [<options>]"

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

2691

2140 -#: help.c:652

2692 +#: help.c:738

2693 #, c-format

2694 msgid "%s: %s - %s"

2695 msgstr "%s: %s - %s"

2696

2145 -#: help.c:656

2697 +#: help.c:742

2698 msgid ""

2699 "\n"

2700 "Did you mean this?"

@@ -2210,7 +2762,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

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

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

2764

2213 -#: ident.c:416 builtin/commit.c:587

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

2766 #, c-format

2767 msgid "invalid date format: %s"

2768 msgstr "formato de fecha invalido: %s"

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

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

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

2802

2251 -#: merge.c:71

2803 +#: merge.c:40

2804 msgid "failed to read the cache"

2805 msgstr "falló al leer la cache"

2806

2255 -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2256 -#: builtin/checkout.c:606 builtin/clone.c:761

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

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

2809 msgid "unable to write new index file"

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

2811

2260 -#: merge-recursive.c:298

2812 +#: merge-recursive.c:303

2813 msgid "(bad commit)\n"

2814 msgstr "(mal commit)\n"

2815

2264 -#: merge-recursive.c:320

2816 +#: merge-recursive.c:325

2817 #, c-format

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

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

2820

2269 -#: merge-recursive.c:328

2821 +#: merge-recursive.c:333

2822 #, c-format

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

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

2825

2274 -#: merge-recursive.c:410

2826 +#: merge-recursive.c:415

2827 msgid "error building trees"

2828 msgstr "error construyendo árboles"

2829

2278 -#: merge-recursive.c:881

2830 +#: merge-recursive.c:886

2831 #, c-format

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

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

2834

2283 -#: merge-recursive.c:892

2835 +#: merge-recursive.c:897

2836 #, c-format

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

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

2839

2288 -#: merge-recursive.c:906 merge-recursive.c:925

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

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

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

2843

2292 -#: merge-recursive.c:915

2844 +#: merge-recursive.c:920

2845 #, c-format

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

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

2848

2297 -#: merge-recursive.c:957 builtin/cat-file.c:37

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

2850 #, c-format

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

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

2853

2302 -#: merge-recursive.c:959

2854 +#: merge-recursive.c:964

2855 #, c-format

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

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

2858

2307 -#: merge-recursive.c:983

2859 +#: merge-recursive.c:988

2860 #, c-format

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

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

2863

2312 -#: merge-recursive.c:994

2864 +#: merge-recursive.c:999

2865 #, c-format

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

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

2868

2317 -#: merge-recursive.c:999

2869 +#: merge-recursive.c:1004

2870 #, c-format

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

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

2873

2322 -#: merge-recursive.c:1186

2874 +#: merge-recursive.c:1191

2875 #, c-format

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

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

2878

2327 -#: merge-recursive.c:1193

2879 +#: merge-recursive.c:1198

2880 #, c-format

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

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

2883

2332 -#: merge-recursive.c:1200

2884 +#: merge-recursive.c:1205

2885 #, c-format

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

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

2888

2337 -#: merge-recursive.c:1208 merge-recursive.c:1220

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

2890 #, c-format

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

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

2893

2342 -#: merge-recursive.c:1211 merge-recursive.c:1223

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

2895 #, c-format

2896 msgid "Fast-forwarding submodule %s"

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

2898

2347 -#: merge-recursive.c:1245

2899 +#: merge-recursive.c:1250

2900 #, c-format

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

2902 msgstr ""

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

2904

2353 -#: merge-recursive.c:1249

2905 +#: merge-recursive.c:1254

2906 #, c-format

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

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

2909

2358 -#: merge-recursive.c:1250

2910 +#: merge-recursive.c:1255

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

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

2913

2362 -#: merge-recursive.c:1253

2914 +#: merge-recursive.c:1258

2915 #, c-format

2916 msgid ""

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

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

2928 "\n"

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

2930

2379 -#: merge-recursive.c:1262

2931 +#: merge-recursive.c:1267

2932 #, c-format

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

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

2935

2384 -#: merge-recursive.c:1321

2936 +#: merge-recursive.c:1326

2937 msgid "Failed to execute internal merge"

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

2939

2388 -#: merge-recursive.c:1326

2940 +#: merge-recursive.c:1331

2941 #, c-format

2942 msgid "Unable to add %s to database"

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

2944

2393 -#: merge-recursive.c:1358

2945 +#: merge-recursive.c:1363

2946 #, c-format

2947 msgid "Auto-merging %s"

2948 msgstr "Auto-fusionando %s"

2949

2398 -#: merge-recursive.c:1423

2950 +#: merge-recursive.c:1434

2951 #, c-format

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

2953 msgstr ""

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

2955 "cambio."

2956

2405 -#: merge-recursive.c:1475

2957 +#: merge-recursive.c:1501

2958 #, c-format

2959 msgid ""

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

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

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

2964 "en el árbol."

2965

2414 -#: merge-recursive.c:1480

2966 +#: merge-recursive.c:1506

2967 #, c-format

2968 msgid ""

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

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

2972 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

2973 "permanece en el árbol."

2974

2423 -#: merge-recursive.c:1487

2975 +#: merge-recursive.c:1513

2976 #, c-format

2977 msgid ""

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

@@ -2429,7 +2981,7 @@ msgstr ""

2981 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "

2982 "dejada en el árbol, en %s."

2983

2432 -#: merge-recursive.c:1492

2984 +#: merge-recursive.c:1518

2985 #, c-format

2986 msgid ""

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

@@ -2438,32 +2990,32 @@ msgstr ""

2990 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

2991 "permanece en el árbol en %s."

2992

2441 -#: merge-recursive.c:1526

2993 +#: merge-recursive.c:1552

2994 msgid "rename"

2995 msgstr "renombrar"

2996

2445 -#: merge-recursive.c:1526

2997 +#: merge-recursive.c:1552

2998 msgid "renamed"

2999 msgstr "renombrado"

3000

2449 -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2450 -#: merge-recursive.c:3086

3001 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3002 +#: merge-recursive.c:3129

3003 #, c-format

3004 msgid "Refusing to lose dirty file at %s"

3005 msgstr "Rehusando perder el archivo sucio en %s"

3006

2455 -#: merge-recursive.c:1594

3007 +#: merge-recursive.c:1620

3008 #, c-format

3009 msgid "%s is a directory in %s adding as %s instead"

3010 msgstr "%s es un directorio en %s agregando como %s más bien"

3011

2460 -#: merge-recursive.c:1599

3012 +#: merge-recursive.c:1625

3013 #, c-format

3014 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3015 msgstr ""

3016 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"

3017

2466 -#: merge-recursive.c:1625

3018 +#: merge-recursive.c:1651

3019 #, c-format

3020 msgid ""

3021 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2472,30 +3024,30 @@ msgstr ""

3024 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "

3025 "renombrar \"%s\"->\"%s\" en \"%s\"%s"

3026

2475 -#: merge-recursive.c:1630

3027 +#: merge-recursive.c:1656

3028 msgid " (left unresolved)"

3029 msgstr " (dejado sin resolver)"

3030

2479 -#: merge-recursive.c:1694

3031 +#: merge-recursive.c:1720

3032 #, c-format

3033 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

3034 msgstr ""

3035 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

3036 "%s"

3037

2486 -#: merge-recursive.c:1733

3038 +#: merge-recursive.c:1759

3039 #, c-format

3040 msgid "Renaming %s to %s and %s to %s instead"

3041 msgstr "Renombrando %s a %s y %s a %s más bien"

3042

2491 -#: merge-recursive.c:1745

3043 +#: merge-recursive.c:1771

3044 #, c-format

3045 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3046 msgstr ""

3047 "Rehusando perder el archivo no rastreado en %s, incluso aunque se está "

3048 "interponiendo."

3049

2498 -#: merge-recursive.c:1951

3050 +#: merge-recursive.c:1977

3051 #, c-format

3052 msgid ""

3053 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -2506,7 +3058,7 @@ msgstr ""

3058 "colocar %s porque el directorio %s fue renombrado a otros múltiples "

3059 "directorios, sin ningún que contenga la mayoría de archivos."

3060

2509 -#: merge-recursive.c:1983

3061 +#: merge-recursive.c:2009

3062 #, c-format

3063 msgid ""

3064 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -2516,7 +3068,7 @@ msgstr ""

3068 "existente en %s se interpone con el cambio de nombres implícito, poniendo "

3069 "la(s) siguiente(s) ruta(s) aquí: %s."

3070

2519 -#: merge-recursive.c:1993

3071 +#: merge-recursive.c:2019

3072 #, c-format

3073 msgid ""

3074 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -2525,7 +3077,7 @@ msgstr ""

3077 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

3078 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"

3079

2528 -#: merge-recursive.c:2085

3080 +#: merge-recursive.c:2111

3081 #, c-format

3082 msgid ""

3083 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -2534,7 +3086,7 @@ msgstr ""

3086 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

3087 "Renombrar directorio %s->%s en %s"

3088

2537 -#: merge-recursive.c:2330

3089 +#: merge-recursive.c:2356

3090 #, c-format

3091 msgid ""

3092 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -2543,126 +3095,131 @@ msgstr ""

3095 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

3096 "renombrado."

3097

2546 -#: merge-recursive.c:2736

3098 +#: merge-recursive.c:2762

3099 #, c-format

3100 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

3101 msgstr ""

3102 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"

3103

2552 -#: merge-recursive.c:2751

3104 +#: merge-recursive.c:2777

3105 #, c-format

3106 msgid "Adding merged %s"

3107 msgstr "Agregar %s fusionado"

3108

2557 -#: merge-recursive.c:2758 merge-recursive.c:3089

3109 +#: merge-recursive.c:2784 merge-recursive.c:3132

3110 #, c-format

3111 msgid "Adding as %s instead"

3112 msgstr "Agregando más bien como %s"

3113

2562 -#: merge-recursive.c:2914

3114 +#: merge-recursive.c:2941

3115 #, c-format

3116 msgid "cannot read object %s"

3117 msgstr "no se pudo leer el objeto %s"

3118

2567 -#: merge-recursive.c:2917

3119 +#: merge-recursive.c:2944

3120 #, c-format

3121 msgid "object %s is not a blob"

3122 msgstr "objeto %s no es un blob"

3123

2572 -#: merge-recursive.c:2986

3124 +#: merge-recursive.c:3013

3125 msgid "modify"

3126 msgstr "modificar"

3127

2576 -#: merge-recursive.c:2986

3128 +#: merge-recursive.c:3013

3129 msgid "modified"

3130 msgstr "modificado"

3131

2580 -#: merge-recursive.c:2997

3132 +#: merge-recursive.c:3024

3133 msgid "content"

3134 msgstr "contenido"

3135

2584 -#: merge-recursive.c:3004

3136 +#: merge-recursive.c:3031

3137 msgid "add/add"

3138 msgstr "agregar/agregar"

3139

2588 -#: merge-recursive.c:3046

3140 +#: merge-recursive.c:3076

3141 #, c-format

3142 msgid "Skipped %s (merged same as existing)"

3143 msgstr "Saltado %s (fusionado como existente)"

3144

2593 -#: merge-recursive.c:3055 git-submodule.sh:895

3145 +#: merge-recursive.c:3098 git-submodule.sh:865

3146 msgid "submodule"

3147 msgstr "submódulo"

3148

2597 -#: merge-recursive.c:3056

3149 +#: merge-recursive.c:3099

3150 #, c-format

3151 msgid "CONFLICT (%s): Merge conflict in %s"

3152 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

3153

2602 -#: merge-recursive.c:3178

3154 +#: merge-recursive.c:3221

3155 #, c-format

3156 msgid "Removing %s"

3157 msgstr "Eliminando %s"

3158

2607 -#: merge-recursive.c:3204

3159 +#: merge-recursive.c:3247

3160 msgid "file/directory"

3161 msgstr "archivo/directorio"

3162

2611 -#: merge-recursive.c:3210

3163 +#: merge-recursive.c:3253

3164 msgid "directory/file"

3165 msgstr "directorio/archivo"

3166

2615 -#: merge-recursive.c:3217

3167 +#: merge-recursive.c:3260

3168 #, c-format

3169 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

3170 msgstr ""

3171 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "

3172 "%s"

3173

2622 -#: merge-recursive.c:3226

3174 +#: merge-recursive.c:3269

3175 #, c-format

3176 msgid "Adding %s"

3177 msgstr "Agregando %s"

3178

2627 -#: merge-recursive.c:3267

3179 +#: merge-recursive.c:3303

3180 #, c-format

2629 -msgid "Dirty index: cannot merge (dirty: %s)"

2630 -msgstr "Índice sucio: no se puede fusionar (sucio: %s)"

3181 +msgid ""

3182 +"Your local changes to the following files would be overwritten by merge:\n"

3183 +" %s"

3184 +msgstr ""

3185 +"Los cambios locales de los siguientes archivos serán sobreescritos por "

3186 +"merge:\n"

3187 +" %s"

3188

2632 -#: merge-recursive.c:3271

3189 +#: merge-recursive.c:3314

3190 msgid "Already up to date!"

3191 msgstr "¡Ya está actualizado!"

3192

2636 -#: merge-recursive.c:3280

3193 +#: merge-recursive.c:3323

3194 #, c-format

3195 msgid "merging of trees %s and %s failed"

3196 msgstr "falló la fusión de los árboles %s y %s"

3197

2641 -#: merge-recursive.c:3379

3198 +#: merge-recursive.c:3422

3199 msgid "Merging:"

3200 msgstr "Fusionando:"

3201

2645 -#: merge-recursive.c:3392

3202 +#: merge-recursive.c:3435

3203 #, c-format

3204 msgid "found %u common ancestor:"

3205 msgid_plural "found %u common ancestors:"

3206 msgstr[0] "se encontró %u ancestro común:"

3207 msgstr[1] "se encontraron %u ancestros comunes:"

3208

2652 -#: merge-recursive.c:3431

3209 +#: merge-recursive.c:3474

3210 msgid "merge returned no commit"

3211 msgstr "la fusión no devolvió ningún commit"

3212

2656 -#: merge-recursive.c:3495

3213 +#: merge-recursive.c:3540

3214 #, c-format

3215 msgid "Could not parse object '%s'"

3216 msgstr "No se pudo analizar el objeto '%s'"

3217

2661 -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

3218 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3219 msgid "Unable to write index."

3220 msgstr "Incapaz de escribir el índice."

3221

2665 -#: notes-merge.c:272

3222 +#: notes-merge.c:274

3223 #, c-format

3224 msgid ""

3225 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2674,23 +3231,23 @@ msgstr ""

3231 "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "

3232 "nota de fusión."

3233

2677 -#: notes-merge.c:279

3234 +#: notes-merge.c:281

3235 #, c-format

3236 msgid "You have not concluded your notes merge (%s exists)."

3237 msgstr "No has terminado tus notas de fusión (%s existe)."

3238

2682 -#: notes-utils.c:43

3239 +#: notes-utils.c:45

3240 msgid "Cannot commit uninitialized/unreferenced notes tree"

3241 msgstr ""

3242 "No se puede realizar commit, notas del árbol no inicializadas o no "

3243 "referenciadas"

3244

2688 -#: notes-utils.c:102

3245 +#: notes-utils.c:104

3246 #, c-format

3247 msgid "Bad notes.rewriteMode value: '%s'"

3248 msgstr "Mal valor para notes.rewriteMode: '%s'"

3249

2693 -#: notes-utils.c:112

3250 +#: notes-utils.c:114

3251 #, c-format

3252 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3253 msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

@@ -2699,37 +3256,57 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"

3256 #. the environment variable, the second %s is

3257 #. its value.

3258 #.

2702 -#: notes-utils.c:142

3259 +#: notes-utils.c:144

3260 #, c-format

3261 msgid "Bad %s value: '%s'"

3262 msgstr "Mal valor para %s: '%s'"

3263

2707 -#: object.c:242

3264 +#: object.c:54

3265 +#, c-format

3266 +msgid "invalid object type \"%s\""

3267 +msgstr "tipo de objeto \"%s\" inválido"

3268 +

3269 +#: object.c:173

3270 +#, c-format

3271 +msgid "object %s is a %s, not a %s"

3272 +msgstr "objeto %s es un %s, no un %s"

3273 +

3274 +#: object.c:233

3275 +#, c-format

3276 +msgid "object %s has unknown type id %d"

3277 +msgstr "El objeto %s tiene un id de tipo desconocido %d"

3278 +

3279 +#: object.c:246

3280 #, c-format

3281 msgid "unable to parse object: %s"

3282 msgstr "incapaz de analizar objeto: %s"

3283

3284 +#: object.c:266 object.c:277

3285 +#, c-format

3286 +msgid "sha1 mismatch %s"

3287 +msgstr "sha1 no concuerda %s"

3288 +

3289 #: packfile.c:563

3290 msgid "offset before end of packfile (broken .idx?)"

3291 msgstr "offset antes del final del paquete (broken .idx?)"

3292

2716 -#: packfile.c:1742

3293 +#: packfile.c:1745

3294 #, c-format

3295 msgid "offset before start of pack index for %s (corrupt index?)"

3296 msgstr ""

3297 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"

3298

2722 -#: packfile.c:1746

3299 +#: packfile.c:1749

3300 #, c-format

3301 msgid "offset beyond end of pack index for %s (truncated index?)"

3302 msgstr ""

3303 "offset más allá del índice de fin de paquete para %s (índice truncado?)"

3304

2728 -#: parse-options.c:621

3305 +#: parse-options.c:672

3306 msgid "..."

3307 msgstr "..."

3308

2732 -#: parse-options.c:640

3309 +#: parse-options.c:691

3310 #, c-format

3311 msgid "usage: %s"

3312 msgstr "uso: %s"

@@ -2737,17 +3314,17 @@ msgstr "uso: %s"

3314 #. TRANSLATORS: the colon here should align with the

3315 #. one in "usage: %s" translation.

3316 #.

2740 -#: parse-options.c:646

3317 +#: parse-options.c:697

3318 #, c-format

3319 msgid " or: %s"

3320 msgstr " o: %s"

3321

2745 -#: parse-options.c:649

3322 +#: parse-options.c:700

3323 #, c-format

3324 msgid " %s"

3325 msgstr " %s"

3326

2750 -#: parse-options.c:688

3327 +#: parse-options.c:739

3328 msgid "-NUM"

3329 msgstr "-NUM"

3330

@@ -2841,11 +3418,71 @@ msgstr "%s: magic pathspec no soportado por este comando: %s"

3418 msgid "pathspec '%s' is beyond a symbolic link"

3419 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

3420

3421 +#: pkt-line.c:104

3422 +msgid "flush packet write failed"

3423 +msgstr "limpieza de escritura de paquetes falló"

3424 +

3425 +#: pkt-line.c:142 pkt-line.c:228

3426 +msgid "protocol error: impossibly long line"

3427 +msgstr "error de protocolo: línea imposiblemente larga"

3428 +

3429 +#: pkt-line.c:158 pkt-line.c:160

3430 +msgid "packet write with format failed"

3431 +msgstr "escritura de paquetes con formato falló"

3432 +

3433 +#: pkt-line.c:192

3434 +msgid "packet write failed - data exceeds max packet size"

3435 +msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"

3436 +

3437 +#: pkt-line.c:199 pkt-line.c:206

3438 +msgid "packet write failed"

3439 +msgstr "escritura de paquetes falló"

3440 +

3441 +#: pkt-line.c:291

3442 +msgid "read error"

3443 +msgstr "error de lectura"

3444 +

3445 +#: pkt-line.c:299

3446 +msgid "the remote end hung up unexpectedly"

3447 +msgstr "El remoto se colgó de manera inesperada"

3448 +

3449 +#: pkt-line.c:327

3450 +#, c-format

3451 +msgid "protocol error: bad line length character: %.4s"

3452 +msgstr "error de protocolo: mal caracter de largo de línea: %.4s"

3453 +

3454 +#: pkt-line.c:337 pkt-line.c:342

3455 +#, c-format

3456 +msgid "protocol error: bad line length %d"

3457 +msgstr "error de protocolo: mal largo de línea %d"

3458 +

3459 #: pretty.c:962

3460 msgid "unable to parse --pretty format"

3461 msgstr "incapaz de analizar el formato --pretty"

3462

2848 -#: read-cache.c:1500

3463 +#: range-diff.c:48

3464 +msgid "could not start `log`"

3465 +msgstr "no se pudo comenzar `log`"

3466 +

3467 +#: range-diff.c:51

3468 +msgid "could not read `log` output"

3469 +msgstr "no se pudo leer output de `log`"

3470 +

3471 +#: range-diff.c:66 sequencer.c:4540

3472 +#, c-format

3473 +msgid "could not parse commit '%s'"

3474 +msgstr "no se pudo analizar commit '%s'"

3475 +

3476 +#: range-diff.c:196

3477 +msgid "failed to generate diff"

3478 +msgstr "falló al generar diff"

3479 +

3480 +#: range-diff.c:421 range-diff.c:423

3481 +#, c-format

3482 +msgid "could not parse log for '%s'"

3483 +msgstr "no se pudo leer el log para '%s'"

3484 +

3485 +#: read-cache.c:1579

3486 #, c-format

3487 msgid ""

3488 "index.version set, but the value is invalid.\n"

@@ -2854,7 +3491,7 @@ msgstr ""

3491 "index.version configurado, pero el valor no es válido.\n"

3492 "Usando versión %i"

3493

2857 -#: read-cache.c:1510

3494 +#: read-cache.c:1589

3495 #, c-format

3496 msgid ""

3497 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2863,227 +3500,329 @@ msgstr ""

3500 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"

3501 "Usando versión %i"

3502

2866 -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

3503 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3504 #, c-format

3505 msgid "could not close '%s'"

3506 msgstr "no se pudo cerrar '%s'"

3507

2871 -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

3508 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3509 #, c-format

3510 msgid "could not stat '%s'"

3511 msgstr "no se pudo definir '%s'"

3512

2876 -#: read-cache.c:2490

3513 +#: read-cache.c:2666

3514 #, c-format

3515 msgid "unable to open git dir: %s"

3516 msgstr "no es posible abrir el directorio de git: %s"

3517

2881 -#: read-cache.c:2502

3518 +#: read-cache.c:2678

3519 #, c-format

3520 msgid "unable to unlink: %s"

3521 msgstr "no es posible remover el vinculo: %s"

3522

2886 -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2887 -#: builtin/am.c:779

3523 +#: refs.c:192

3524 +#, c-format

3525 +msgid "%s does not point to a valid object!"

3526 +msgstr "%s no apunta a ningún objeto válido!"

3527 +

3528 +#: refs.c:579

3529 +#, c-format

3530 +msgid "ignoring dangling symref %s"

3531 +msgstr "ignorando referencia rota %s"

3532 +

3533 +#: refs.c:581 ref-filter.c:2067

3534 +#, c-format

3535 +msgid "ignoring broken ref %s"

3536 +msgstr "ignorando referencia rota %s"

3537 +

3538 +#: refs.c:685

3539 +#, c-format

3540 +msgid "could not open '%s' for writing: %s"

3541 +msgstr "no se pudo abrir '%s' para escritura: %s"

3542 +

3543 +#: refs.c:695 refs.c:746

3544 +#, c-format

3545 +msgid "could not read ref '%s'"

3546 +msgstr "No se pudo leer la referencia '%s'"

3547 +

3548 +#: refs.c:701

3549 +#, c-format

3550 +msgid "ref '%s' already exists"

3551 +msgstr "ref '%s' ya existe"

3552 +

3553 +#: refs.c:706

3554 +#, c-format

3555 +msgid "unexpected object ID when writing '%s'"

3556 +msgstr "ID de objecto inesperado cuando se escribía '%s'"

3557 +

3558 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3559 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3560 +#: wrapper.c:656

3561 +#, c-format

3562 +msgid "could not write to '%s'"

3563 +msgstr "no se pudo escribir en '%s'"

3564 +

3565 +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3566 +#: builtin/am.c:780

3567 #, c-format

3568 msgid "could not open '%s' for writing"

3569 msgstr "no se pudo abrir '%s' para escritura"

3570

2892 -#: refs.c:1880

3571 +#: refs.c:748

3572 +#, c-format

3573 +msgid "unexpected object ID when deleting '%s'"

3574 +msgstr "ID de objecto inesperado cuando se borraba '%s'"

3575 +

3576 +#: refs.c:879

3577 +#, c-format

3578 +msgid "log for ref %s has gap after %s"

3579 +msgstr "log de ref %s tiene un vacío tras %s"

3580 +

3581 +#: refs.c:885

3582 +#, c-format

3583 +msgid "log for ref %s unexpectedly ended on %s"

3584 +msgstr "log de ref %s finalizado inesperadamente en %s"

3585 +

3586 +#: refs.c:943

3587 +#, c-format

3588 +msgid "log for %s is empty"

3589 +msgstr "log de %s está vacío"

3590 +

3591 +#: refs.c:1035

3592 +#, c-format

3593 +msgid "refusing to update ref with bad name '%s'"

3594 +msgstr "rehusando actualizar ref con mal nombre '%s'"

3595 +

3596 +#: refs.c:1111

3597 +#, c-format

3598 +msgid "update_ref failed for ref '%s': %s"

3599 +msgstr "update_ref falló para ref '%s': %s"

3600 +

3601 +#: refs.c:1853

3602 +#, c-format

3603 +msgid "multiple updates for ref '%s' not allowed"

3604 +msgstr "múltiples actualizaciones para ref '%s' no permitidas"

3605 +

3606 +#: refs.c:1885

3607 msgid "ref updates forbidden inside quarantine environment"

3608 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

3609

3610 +#: refs.c:1981 refs.c:2011

3611 +#, c-format

3612 +msgid "'%s' exists; cannot create '%s'"

3613 +msgstr "'%s' existe; no se puede crear '%s'"

3614 +

3615 +#: refs.c:1987 refs.c:2022

3616 +#, c-format

3617 +msgid "cannot process '%s' and '%s' at the same time"

3618 +msgstr "No se puede procesar '%s' y '%s' al mismo tiempo"

3619 +

3620 #: refs/files-backend.c:1191

3621 #, c-format

3622 msgid "could not remove reference %s"

3623 msgstr "no se pudo remover la referencia %s"

3624

2901 -#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2902 -#: refs/packed-backend.c:1541

3625 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3626 +#: refs/packed-backend.c:1542

3627 #, c-format

3628 msgid "could not delete reference %s: %s"

3629 msgstr "no se pudo eliminar la referencia %s: %s"

3630

2907 -#: refs/files-backend.c:1208 refs/packed-backend.c:1544

3631 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3632 #, c-format

3633 msgid "could not delete references: %s"

3634 msgstr "no se pudo eliminar la referencia: %s"

3635

2912 -#: ref-filter.c:35 wt-status.c:1850

3636 +#: refspec.c:137

3637 +#, c-format

3638 +msgid "invalid refspec '%s'"

3639 +msgstr "refspec inválido: '%s'"

3640 +

3641 +#: ref-filter.c:38 wt-status.c:1850

3642 msgid "gone"

3643 msgstr "desaparecido"

3644

2916 -#: ref-filter.c:36

3645 +#: ref-filter.c:39

3646 #, c-format

3647 msgid "ahead %d"

3648 msgstr "adelante %d"

3649

2921 -#: ref-filter.c:37

3650 +#: ref-filter.c:40

3651 #, c-format

3652 msgid "behind %d"

3653 msgstr "detrás %d"

3654

2926 -#: ref-filter.c:38

3655 +#: ref-filter.c:41

3656 #, c-format

3657 msgid "ahead %d, behind %d"

3658 msgstr "delante %d, detrás %d"

3659

2931 -#: ref-filter.c:121

3660 +#: ref-filter.c:137

3661 #, c-format

3662 msgid "expected format: %%(color:<color>)"

3663 msgstr "formato esperado: %%(color:<color>)"

3664

2936 -#: ref-filter.c:123

3665 +#: ref-filter.c:139

3666 #, c-format

3667 msgid "unrecognized color: %%(color:%s)"

3668 msgstr "color no reconocido: %%(color:%s)"

3669

2941 -#: ref-filter.c:145

3670 +#: ref-filter.c:161

3671 #, c-format

3672 msgid "Integer value expected refname:lstrip=%s"

3673 msgstr "Valor entero esperado refname:lstrip=%s"

3674

2946 -#: ref-filter.c:149

3675 +#: ref-filter.c:165

3676 #, c-format

3677 msgid "Integer value expected refname:rstrip=%s"

3678 msgstr "Valor entero esperado refname:rstrip=%s"

3679

2951 -#: ref-filter.c:151

3680 +#: ref-filter.c:167

3681 #, c-format

3682 msgid "unrecognized %%(%s) argument: %s"

3683 msgstr "argumento: %s no reconocido %%(%s)"

3684

2956 -#: ref-filter.c:206

3685 +#: ref-filter.c:222

3686 +#, c-format

3687 +msgid "%%(objecttype) does not take arguments"

3688 +msgstr "%%(objecttype) no toma ningún argumento"

3689 +

3690 +#: ref-filter.c:234

3691 +#, c-format

3692 +msgid "%%(objectsize) does not take arguments"

3693 +msgstr "%%(objectsize) no toma argumentos"

3694 +

3695 +#: ref-filter.c:246

3696 #, c-format

3697 msgid "%%(body) does not take arguments"

3698 msgstr "%%(body) no toma ningún argumento"

3699

2961 -#: ref-filter.c:215

3700 +#: ref-filter.c:255

3701 #, c-format

3702 msgid "%%(subject) does not take arguments"

3703 msgstr "%%(subject) no toma ningún argumento"

3704

2966 -#: ref-filter.c:235

3705 +#: ref-filter.c:275

3706 #, c-format

3707 msgid "unknown %%(trailers) argument: %s"

3708 msgstr "%%(trailers) desconocidos, argumento: %s"

3709

2971 -#: ref-filter.c:264

3710 +#: ref-filter.c:304

3711 #, c-format

3712 msgid "positive value expected contents:lines=%s"

3713 msgstr "valor positivo esperado contents:lines=%s"

3714

2976 -#: ref-filter.c:266

3715 +#: ref-filter.c:306

3716 #, c-format

3717 msgid "unrecognized %%(contents) argument: %s"

3718 msgstr "argumento %s no reconocido %%(contents)"

3719

2981 -#: ref-filter.c:281

3720 +#: ref-filter.c:321

3721 #, c-format

3722 msgid "positive value expected objectname:short=%s"

3723 msgstr "valor positivo esperado objectname:short=%s"

3724

2986 -#: ref-filter.c:285

3725 +#: ref-filter.c:325

3726 #, c-format

3727 msgid "unrecognized %%(objectname) argument: %s"

3728 msgstr "argumento: %s no reconocido %%(objectname)"

3729

2991 -#: ref-filter.c:315

3730 +#: ref-filter.c:355

3731 #, c-format

3732 msgid "expected format: %%(align:<width>,<position>)"

3733 msgstr "formato esperado: %%(align:<ancho>,<posición>)"

3734

2996 -#: ref-filter.c:327

3735 +#: ref-filter.c:367

3736 #, c-format

3737 msgid "unrecognized position:%s"

3738 msgstr "posición desconocida: %s"

3739

3001 -#: ref-filter.c:334

3740 +#: ref-filter.c:374

3741 #, c-format

3742 msgid "unrecognized width:%s"

3743 msgstr "ancho desconocido: %s"

3744

3006 -#: ref-filter.c:343

3745 +#: ref-filter.c:383

3746 #, c-format

3747 msgid "unrecognized %%(align) argument: %s"

3748 msgstr "argumento no reconocido para %%(align): %s"

3749

3011 -#: ref-filter.c:351

3750 +#: ref-filter.c:391

3751 #, c-format

3752 msgid "positive width expected with the %%(align) atom"

3753 msgstr "se esperaba un ancho positivo con el átomo %%(align)"

3754

3016 -#: ref-filter.c:369

3755 +#: ref-filter.c:409

3756 #, c-format

3757 msgid "unrecognized %%(if) argument: %s"

3758 msgstr "argumento: %s no reconocido %%(if)"

3759

3021 -#: ref-filter.c:464

3760 +#: ref-filter.c:505

3761 #, c-format

3762 msgid "malformed field name: %.*s"

3763 msgstr "nombre mal formado de campo: %.*s"

3764

3026 -#: ref-filter.c:491

3765 +#: ref-filter.c:532

3766 #, c-format

3767 msgid "unknown field name: %.*s"

3768 msgstr "nombre de campo desconocido: %.*s"

3769

3031 -#: ref-filter.c:608

3770 +#: ref-filter.c:656

3771 #, c-format

3772 msgid "format: %%(if) atom used without a %%(then) atom"

3773 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"

3774

3036 -#: ref-filter.c:671

3775 +#: ref-filter.c:719

3776 #, c-format

3777 msgid "format: %%(then) atom used without an %%(if) atom"

3778 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"

3779

3041 -#: ref-filter.c:673

3780 +#: ref-filter.c:721

3781 #, c-format

3782 msgid "format: %%(then) atom used more than once"

3783 msgstr "formato: átomo %%(then) usado mas de una vez"

3784

3046 -#: ref-filter.c:675

3785 +#: ref-filter.c:723

3786 #, c-format

3787 msgid "format: %%(then) atom used after %%(else)"

3788 msgstr "formato: átomo %%(then) usado después de %%(else)"

3789

3051 -#: ref-filter.c:703

3790 +#: ref-filter.c:751

3791 #, c-format

3792 msgid "format: %%(else) atom used without an %%(if) atom"

3793 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

3794

3056 -#: ref-filter.c:705

3795 +#: ref-filter.c:753

3796 #, c-format

3797 msgid "format: %%(else) atom used without a %%(then) atom"

3798 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"

3799

3061 -#: ref-filter.c:707

3800 +#: ref-filter.c:755

3801 #, c-format

3802 msgid "format: %%(else) atom used more than once"

3803 msgstr "formato: átomo %%(else) usado mas de una vez"

3804

3066 -#: ref-filter.c:722

3805 +#: ref-filter.c:770

3806 #, c-format

3807 msgid "format: %%(end) atom used without corresponding atom"

3808 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

3809

3071 -#: ref-filter.c:779

3810 +#: ref-filter.c:827

3811 #, c-format

3812 msgid "malformed format string %s"

3813 msgstr "formato de cadena mal formado %s"

3814

3076 -#: ref-filter.c:1387

3815 +#: ref-filter.c:1416

3816 #, c-format

3817 msgid "(no branch, rebasing %s)"

3818 msgstr "(no hay rama, rebasando %s)"

3819

3081 -#: ref-filter.c:1390

3820 +#: ref-filter.c:1419

3821 #, c-format

3822 msgid "(no branch, rebasing detached HEAD %s)"

3823 msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"

3824

3086 -#: ref-filter.c:1393

3825 +#: ref-filter.c:1422

3826 #, c-format

3827 msgid "(no branch, bisect started on %s)"

3828 msgstr "(no hay rama, comenzando bisecado en %s)"

@@ -3091,7 +3830,7 @@ msgstr "(no hay rama, comenzando bisecado en %s)"

3830 #. TRANSLATORS: make sure this matches "HEAD

3831 #. detached at " in wt-status.c

3832 #.

3094 -#: ref-filter.c:1401

3833 +#: ref-filter.c:1430

3834 #, c-format

3835 msgid "(HEAD detached at %s)"

3836 msgstr "(HEAD desacoplado en %s)"

@@ -3099,148 +3838,143 @@ msgstr "(HEAD desacoplado en %s)"

3838 #. TRANSLATORS: make sure this matches "HEAD

3839 #. detached from " in wt-status.c

3840 #.

3102 -#: ref-filter.c:1408

3841 +#: ref-filter.c:1437

3842 #, c-format

3843 msgid "(HEAD detached from %s)"

3844 msgstr "(HEAD desacoplado de %s)"

3845

3107 -#: ref-filter.c:1412

3846 +#: ref-filter.c:1441

3847 msgid "(no branch)"

3848 msgstr "(sin rama)"

3849

3111 -#: ref-filter.c:1442

3850 +#: ref-filter.c:1475 ref-filter.c:1623

3851 #, c-format

3852 msgid "missing object %s for %s"

3853 msgstr "falta objeto %s para %s"

3854

3116 -#: ref-filter.c:1445

3855 +#: ref-filter.c:1483

3856 #, c-format

3857 msgid "parse_object_buffer failed on %s for %s"

3858 msgstr "parse_object_buffer falló en %s para %s"

3859

3121 -#: ref-filter.c:1902

3860 +#: ref-filter.c:1980

3861 #, c-format

3862 msgid "malformed object at '%s'"

3863 msgstr "objeto mal formado en '%s'"

3864

3126 -#: ref-filter.c:1984

3865 +#: ref-filter.c:2062

3866 #, c-format

3867 msgid "ignoring ref with broken name %s"

3868 msgstr "ignorando referencia con nombre roto %s"

3869

3131 -#: ref-filter.c:1989

3132 -#, c-format

3133 -msgid "ignoring broken ref %s"

3134 -msgstr "ignorando referencia rota %s"

3135 -

3136 -#: ref-filter.c:2261

3870 +#: ref-filter.c:2340

3871 #, c-format

3872 msgid "format: %%(end) atom missing"

3873 msgstr "formato: falta átomo %%(end)"

3874

3141 -#: ref-filter.c:2365

3875 +#: ref-filter.c:2444

3876 #, c-format

3877 msgid "malformed object name %s"

3878 msgstr "nombre de objeto mal formado %s"

3879

3146 -#: remote.c:605

3880 +#: remote.c:606

3881 #, c-format

3882 msgid "Cannot fetch both %s and %s to %s"

3883 msgstr "No se pueden traer ambos %s y %s a %s"

3884

3151 -#: remote.c:609

3885 +#: remote.c:610

3886 #, c-format

3887 msgid "%s usually tracks %s, not %s"

3888 msgstr "%s por lo general hace seguimiento a %s, no a %s"

3889

3156 -#: remote.c:613

3890 +#: remote.c:614

3891 #, c-format

3892 msgid "%s tracks both %s and %s"

3893 msgstr "%s hace seguimiento tanto a %s como a %s"

3894

3161 -#: remote.c:621

3895 +#: remote.c:622

3896 msgid "Internal error"

3897 msgstr "Error interno"

3898

3165 -#: remote.c:1534 remote.c:1635

3899 +#: remote.c:1536 remote.c:1637

3900 msgid "HEAD does not point to a branch"

3901 msgstr "HEAD no apunta a ninguna rama"

3902

3169 -#: remote.c:1543

3903 +#: remote.c:1545

3904 #, c-format

3905 msgid "no such branch: '%s'"

3906 msgstr "no existe tal rama: '%s'"

3907

3174 -#: remote.c:1546

3908 +#: remote.c:1548

3909 #, c-format

3910 msgid "no upstream configured for branch '%s'"

3911 msgstr "no se ha configurado upstream para la rama '%s'"

3912

3179 -#: remote.c:1552

3913 +#: remote.c:1554

3914 #, c-format

3915 msgid "upstream branch '%s' not stored as a remote-tracking branch"

3916 msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"

3917

3184 -#: remote.c:1567

3918 +#: remote.c:1569

3919 #, c-format

3920 msgid "push destination '%s' on remote '%s' has no local tracking branch"

3921 msgstr ""

3922 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"

3923

3190 -#: remote.c:1579

3924 +#: remote.c:1581

3925 #, c-format

3926 msgid "branch '%s' has no remote for pushing"

3927 msgstr "la rama '%s' no tiene remoto para enviar"

3928

3195 -#: remote.c:1589

3929 +#: remote.c:1591

3930 #, c-format

3931 msgid "push refspecs for '%s' do not include '%s'"

3932 msgstr "refspecs del push para '%s' no incluyen '%s'"

3933

3200 -#: remote.c:1602

3934 +#: remote.c:1604

3935 msgid "push has no destination (push.default is 'nothing')"

3936 msgstr "push no tiene destino (push.default es 'nada')"

3937

3204 -#: remote.c:1624

3938 +#: remote.c:1626

3939 msgid "cannot resolve 'simple' push to a single destination"

3940 msgstr "no se puede resolver push 'simple' para un destino único"

3941

3208 -#: remote.c:1939

3942 +#: remote.c:1951

3943 #, c-format

3944 msgid "Your branch is based on '%s', but the upstream is gone.\n"

3945 msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n"

3946

3213 -#: remote.c:1943

3947 +#: remote.c:1955

3948 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

3949 msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"

3950

3217 -#: remote.c:1946

3951 +#: remote.c:1958

3952 #, c-format

3953 msgid "Your branch is up to date with '%s'.\n"

3954 msgstr "Tu rama está actualizada con '%s'.\n"

3955

3222 -#: remote.c:1950

3956 +#: remote.c:1962

3957 #, c-format

3958 msgid "Your branch and '%s' refer to different commits.\n"

3959 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"

3960

3227 -#: remote.c:1953

3961 +#: remote.c:1965

3962 #, c-format

3963 msgid " (use \"%s\" for details)\n"

3964 msgstr " (usa \"%s\" para detalles)\n"

3965

3232 -#: remote.c:1957

3966 +#: remote.c:1969

3967 #, c-format

3968 msgid "Your branch is ahead of '%s' by %d commit.\n"

3969 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

3970 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"

3971 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"

3972

3239 -#: remote.c:1963

3973 +#: remote.c:1975

3974 msgid " (use \"git push\" to publish your local commits)\n"

3975 msgstr " (usa \"git push\" para publicar tus commits locales)\n"

3976

3243 -#: remote.c:1966

3977 +#: remote.c:1978

3978 #, c-format

3979 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

3980 msgid_plural ""

@@ -3250,11 +3984,11 @@ msgstr[0] ""

3984 msgstr[1] ""

3985 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"

3986

3253 -#: remote.c:1974

3987 +#: remote.c:1986

3988 msgid " (use \"git pull\" to update your local branch)\n"

3989 msgstr " (usa \"git pull\" para actualizar tu rama local)\n"

3990

3257 -#: remote.c:1977

3991 +#: remote.c:1989

3992 #, c-format

3993 msgid ""

3994 "Your branch and '%s' have diverged,\n"

@@ -3269,20 +4003,35 @@ msgstr[1] ""

4003 "Tu rama y '%s' han divergido,\n"

4004 "y tienen %d y %d commits diferentes cada una respectivamente.\n"

4005

3272 -#: remote.c:1987

4006 +#: remote.c:1999

4007 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

4008 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

4009

3276 -#: revision.c:2289

4010 +#: replace-object.c:20

4011 +#, c-format

4012 +msgid "bad replace ref name: %s"

4013 +msgstr "mal nombre de ref de reemplazo: %s"

4014 +

4015 +#: replace-object.c:29

4016 +#, c-format

4017 +msgid "duplicate replace ref: %s"

4018 +msgstr "duplicar ref de reemplazo: %s"

4019 +

4020 +#: replace-object.c:72

4021 +#, c-format

4022 +msgid "replace depth too high for object %s"

4023 +msgstr "remplazar profundiad muy elevada para objeto %s"

4024 +

4025 +#: revision.c:2305

4026 msgid "your current branch appears to be broken"

4027 msgstr "tu rama actual parece estar rota"

4028

3280 -#: revision.c:2292

4029 +#: revision.c:2308

4030 #, c-format

4031 msgid "your current branch '%s' does not have any commits yet"

4032 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

4033

3285 -#: revision.c:2489

4034 +#: revision.c:2505

4035 msgid "--first-parent is incompatible with --bisect"

4036 msgstr "--first-parent es incompatible con --bisect"

4037

@@ -3300,30 +4049,30 @@ msgstr ""

4049 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "

4050 "false`."

4051

3303 -#: send-pack.c:141

4052 +#: send-pack.c:142

4053 msgid "unexpected flush packet while reading remote unpack status"

4054 msgstr ""

4055 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"

4056

3308 -#: send-pack.c:143

4057 +#: send-pack.c:144

4058 #, c-format

4059 msgid "unable to parse remote unpack status: %s"

4060 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"

4061

3313 -#: send-pack.c:145

4062 +#: send-pack.c:146

4063 #, c-format

4064 msgid "remote unpack failed: %s"

4065 msgstr "desempaquetado remoto falló: %s"

4066

3318 -#: send-pack.c:308

4067 +#: send-pack.c:309

4068 msgid "failed to sign the push certificate"

4069 msgstr "falló al firmar el certificado de push"

4070

3322 -#: send-pack.c:421

4071 +#: send-pack.c:422

4072 msgid "the receiving end does not support --signed push"

4073 msgstr "el final receptor no soporta --signed push"

4074

3326 -#: send-pack.c:423

4075 +#: send-pack.c:424

4076 msgid ""

4077 "not sending a push certificate since the receiving end does not support --"

4078 "signed push"

@@ -3331,42 +4080,42 @@ msgstr ""

4080 "no se manda un certificado de push ya que el destino no soporta push firmado "

4081 "(--signed )"

4082

3334 -#: send-pack.c:435

4083 +#: send-pack.c:436

4084 msgid "the receiving end does not support --atomic push"

4085 msgstr "el destino no soporta push atómicos (--atomic)"

4086

3338 -#: send-pack.c:440

4087 +#: send-pack.c:441

4088 msgid "the receiving end does not support push options"

4089 msgstr "el destino no soporta opciones de push"

4090

3342 -#: sequencer.c:175

4091 +#: sequencer.c:177

4092 #, c-format

4093 msgid "invalid commit message cleanup mode '%s'"

4094 msgstr "mensaje de commit inválido, modo cleanup '%s'"

4095

3347 -#: sequencer.c:275

4096 +#: sequencer.c:278

4097 #, c-format

4098 msgid "could not delete '%s'"

4099 msgstr "no se pudo borrar '%s'"

4100

3352 -#: sequencer.c:301

4101 +#: sequencer.c:304

4102 msgid "revert"

4103 msgstr "revertir"

4104

3356 -#: sequencer.c:303

4105 +#: sequencer.c:306

4106 msgid "cherry-pick"

4107 msgstr "cherry-pick"

4108

3360 -#: sequencer.c:305

4109 +#: sequencer.c:308

4110 msgid "rebase -i"

4111 msgstr "rebase -i"

4112

3364 -#: sequencer.c:307

4113 +#: sequencer.c:310

4114 #, c-format

3366 -msgid "Unknown action: %d"

3367 -msgstr "Acción desconocida: %d"

4115 +msgid "unknown action: %d"

4116 +msgstr "acción desconocida: %d"

4117

3369 -#: sequencer.c:364

4118 +#: sequencer.c:367

4119 msgid ""

4120 "after resolving the conflicts, mark the corrected paths\n"

4121 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3374,7 +4123,7 @@ msgstr ""

4123 "después de resolver los conflictos, marca las rutas corregidas\n"

4124 "con 'git add <rutas>' o 'git rm <rutas>'"

4125

3377 -#: sequencer.c:367

4126 +#: sequencer.c:370

4127 msgid ""

4128 "after resolving the conflicts, mark the corrected paths\n"

4129 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3384,45 +4133,39 @@ msgstr ""

4133 "con 'git add <rutas>' o 'git rm <rutas>'\n"

4134 "y haz un commit del resultado con 'git commit'"

4135

3387 -#: sequencer.c:380 sequencer.c:2468

4136 +#: sequencer.c:383 sequencer.c:2488

4137 #, c-format

4138 msgid "could not lock '%s'"

4139 msgstr "no se pudo bloquear '%s'"

4140

3392 -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3393 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3394 -#, c-format

3395 -msgid "could not write to '%s'"

3396 -msgstr "no se pudo escribir en '%s'"

3397 -

3398 -#: sequencer.c:387

4141 +#: sequencer.c:390

4142 #, c-format

4143 msgid "could not write eol to '%s'"

4144 msgstr "no se pudo escribir EOL en '%s'"

4145

3403 -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3404 -#: sequencer.c:2702

4146 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4147 +#: sequencer.c:2741

4148 #, c-format

4149 msgid "failed to finalize '%s'"

4150 msgstr "falló al finalizar '%s'"

4151

3409 -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3410 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3411 -#: builtin/merge.c:1046

4152 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4153 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4154 +#: builtin/merge.c:1081

4155 #, c-format

4156 msgid "could not read '%s'"

4157 msgstr "no se pudo leer '%s'"

4158

3416 -#: sequencer.c:441

4159 +#: sequencer.c:444

4160 #, c-format

4161 msgid "your local changes would be overwritten by %s."

4162 msgstr "tus cambios locales serán sobreescritos por %s."

4163

3421 -#: sequencer.c:445

4164 +#: sequencer.c:448

4165 msgid "commit your changes or stash them to proceed."

4166 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

4167

3425 -#: sequencer.c:474

4168 +#: sequencer.c:477

4169 #, c-format

4170 msgid "%s: fast-forward"

4171 msgstr "%s: avance rápido"

@@ -3430,20 +4173,35 @@ msgstr "%s: avance rápido"

4173 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

4174 #. "rebase -i".

4175 #.

3433 -#: sequencer.c:563

4176 +#: sequencer.c:566

4177 #, c-format

4178 msgid "%s: Unable to write new index file"

4179 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

4180

3438 -#: sequencer.c:579

4181 +#: sequencer.c:582

4182 msgid "unable to update cache tree"

4183 msgstr "no es posible actualizar el árbol de la caché"

4184

3442 -#: sequencer.c:592

4185 +#: sequencer.c:595

4186 msgid "could not resolve HEAD commit"

4187 msgstr "no se pudo resolver el commit de HEAD"

4188

3446 -#: sequencer.c:749

4189 +#: sequencer.c:723 sequencer.c:740

4190 +#, c-format

4191 +msgid "could not parse '%s' (looking for '%s')"

4192 +msgstr "no se pudo configurar '%s' (buscando '%s')"

4193 +

4194 +#: sequencer.c:731

4195 +#, c-format

4196 +msgid "bad quoting on %s value in '%s'"

4197 +msgstr "mal citado en %s valor en '%s'"

4198 +

4199 +#: sequencer.c:747

4200 +#, c-format

4201 +msgid "invalid date format '%s' in '%s'"

4202 +msgstr "formato de fecha inválido '%s' en '%s'"

4203 +

4204 +#: sequencer.c:761

4205 #, c-format

4206 msgid ""

4207 "you have staged changes in your working tree\n"

@@ -3473,15 +4231,15 @@ msgstr ""

4231 "\n"

4232 " git rebase --continue\n"

4233

3476 -#: sequencer.c:818

4234 +#: sequencer.c:830

4235 msgid "writing root commit"

4236 msgstr "escribiendo commit raíz"

4237

3480 -#: sequencer.c:1043

4238 +#: sequencer.c:1055

4239 msgid "'prepare-commit-msg' hook failed"

4240 msgstr "hook 'prepare-commit-msg' falló"

4241

3484 -#: sequencer.c:1050

4242 +#: sequencer.c:1062

4243 msgid ""

4244 "Your name and email address were configured automatically based\n"

4245 "on your username and hostname. Please check that they are accurate.\n"

@@ -3508,7 +4266,7 @@ msgstr ""

4266 "\n"

4267 " git commit --amend --reset-author\n"

4268

3511 -#: sequencer.c:1063

4269 +#: sequencer.c:1075

4270 msgid ""

4271 "Your name and email address were configured automatically based\n"

4272 "on your username and hostname. Please check that they are accurate.\n"

@@ -3532,313 +4290,342 @@ msgstr ""

4290 "\n"

4291 " git commit --amend --reset-author\n"

4292

3535 -#: sequencer.c:1103

4293 +#: sequencer.c:1115

4294 msgid "couldn't look up newly created commit"

4295 msgstr "no se pudo revisar el commit recién creado"

4296

3539 -#: sequencer.c:1105

4297 +#: sequencer.c:1117

4298 msgid "could not parse newly created commit"

4299 msgstr "no se pudo analizar el commit recién creado"

4300

3543 -#: sequencer.c:1151

4301 +#: sequencer.c:1163

4302 msgid "unable to resolve HEAD after creating commit"

4303 msgstr "no se pudo resolver HEAD tras crear el commit"

4304

3547 -#: sequencer.c:1153

4305 +#: sequencer.c:1165

4306 msgid "detached HEAD"

4307 msgstr "HEAD desacoplado"

4308

3551 -#: sequencer.c:1157

4309 +#: sequencer.c:1169

4310 msgid " (root-commit)"

4311 msgstr " (commit-raíz)"

4312

3555 -#: sequencer.c:1178

4313 +#: sequencer.c:1190

4314 msgid "could not parse HEAD"

4315 msgstr "no se pudo analizar HEAD"

4316

3559 -#: sequencer.c:1180

4317 +#: sequencer.c:1192

4318 #, c-format

4319 msgid "HEAD %s is not a commit!"

4320 msgstr "HEAD %s no es un commit!"

4321

3564 -#: sequencer.c:1184 builtin/commit.c:1528

4322 +#: sequencer.c:1196 builtin/commit.c:1528

4323 msgid "could not parse HEAD commit"

4324 msgstr "no se pudo analizar el commit de HEAD"

4325

3568 -#: sequencer.c:1235 sequencer.c:1832

4326 +#: sequencer.c:1247 sequencer.c:1845

4327 msgid "unable to parse commit author"

4328 msgstr "no es posible analizar el autor del commit"

4329

3572 -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

4330 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4331 msgid "git write-tree failed to write a tree"

4332 msgstr "git write-tree falló al escribir el árbol"

4333

3576 -#: sequencer.c:1262 sequencer.c:1317

4334 +#: sequencer.c:1274 sequencer.c:1329

4335 #, c-format

4336 msgid "unable to read commit message from '%s'"

4337 msgstr "no se puede leer el mensaje del commit de '%s'"

4338

3581 -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3582 -#: builtin/merge.c:850

4339 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4340 +#: builtin/merge.c:880

4341 msgid "failed to write commit object"

4342 msgstr "falló al escribir el objeto commit"

4343

3586 -#: sequencer.c:1344

4344 +#: sequencer.c:1356

4345 #, c-format

4346 msgid "could not parse commit %s"

4347 msgstr "no se pudo analizar commit %s"

4348

3591 -#: sequencer.c:1349

4349 +#: sequencer.c:1361

4350 #, c-format

4351 msgid "could not parse parent commit %s"

4352 msgstr "no se pudo analizar el commit padre %s"

4353

3596 -#: sequencer.c:1500 sequencer.c:1525

4354 +#: sequencer.c:1457 sequencer.c:1565

4355 +#, c-format

4356 +msgid "unknown command: %d"

4357 +msgstr "comando desconocido: %d"

4358 +

4359 +#: sequencer.c:1512 sequencer.c:1537

4360 #, c-format

4361 msgid "This is a combination of %d commits."

4362 msgstr "Esta es una combinación de %d commits."

4363

3601 -#: sequencer.c:1510 sequencer.c:4355

4364 +#: sequencer.c:1522 sequencer.c:4520

4365 msgid "need a HEAD to fixup"

4366 msgstr "se necesita un HEAD para arreglar"

4367

3605 -#: sequencer.c:1512 sequencer.c:2729

4368 +#: sequencer.c:1524 sequencer.c:2768

4369 msgid "could not read HEAD"

4370 msgstr "no se pudo leer HEAD"

4371

3609 -#: sequencer.c:1514

4372 +#: sequencer.c:1526

4373 msgid "could not read HEAD's commit message"

4374 msgstr "no se pudo leer el mensaje de commit de HEAD"

4375

3613 -#: sequencer.c:1520

4376 +#: sequencer.c:1532

4377 #, c-format

4378 msgid "cannot write '%s'"

4379 msgstr "no se puede escribir '%s'"

4380

3618 -#: sequencer.c:1527 git-rebase--interactive.sh:457

4381 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4382 msgid "This is the 1st commit message:"

4383 msgstr "Este es el mensaje del 1er commit:"

4384

3622 -#: sequencer.c:1535

4385 +#: sequencer.c:1547

4386 #, c-format

4387 msgid "could not read commit message of %s"

4388 msgstr "no se puede leer el mensaje del commit de %s"

4389

3627 -#: sequencer.c:1542

4390 +#: sequencer.c:1554

4391 #, c-format

4392 msgid "This is the commit message #%d:"

4393 msgstr "Este es el mensaje del commit #%d:"

4394

3632 -#: sequencer.c:1548

4395 +#: sequencer.c:1560

4396 #, c-format

3634 -msgid "The commit message #%d will be skipped:"

3635 -msgstr "El mensaje del commit #%d será saltado:"

3636 -

3637 -#: sequencer.c:1553

3638 -#, c-format

3639 -msgid "unknown command: %d"

3640 -msgstr "comando desconocido: %d"

4397 +msgid "The commit message #%d will be skipped:"

4398 +msgstr "El mensaje del commit #%d será saltado:"

4399

3642 -#: sequencer.c:1631

4400 +#: sequencer.c:1643

4401 msgid "your index file is unmerged."

4402 msgstr "tu archivo índice no esta fusionado."

4403

3646 -#: sequencer.c:1638

4404 +#: sequencer.c:1650

4405 msgid "cannot fixup root commit"

4406 msgstr "no se puede arreglar el commit raíz"

4407

3650 -#: sequencer.c:1657

4408 +#: sequencer.c:1669

4409 #, c-format

4410 msgid "commit %s is a merge but no -m option was given."

4411 msgstr "el commit %s es una fusión pero no se entrego la opción -m."

4412

3655 -#: sequencer.c:1665

4413 +#: sequencer.c:1677

4414 #, c-format

4415 msgid "commit %s does not have parent %d"

4416 msgstr "el commit %s no tiene un padre %d"

4417

3660 -#: sequencer.c:1669

4418 +#: sequencer.c:1681

4419 #, c-format

4420 msgid "mainline was specified but commit %s is not a merge."

4421 msgstr "línea principal especificada pero el commit %s no es una fusión."

4422

3665 -#: sequencer.c:1675

4423 +#: sequencer.c:1687

4424 #, c-format

4425 msgid "cannot get commit message for %s"

4426 msgstr "no se puede obtener el mensaje de commit para %s"

4427

4428 #. TRANSLATORS: The first %s will be a "todo" command like

4429 #. "revert" or "pick", the second %s a SHA1.

3672 -#: sequencer.c:1694

4430 +#: sequencer.c:1706

4431 #, c-format

4432 msgid "%s: cannot parse parent commit %s"

4433 msgstr "%s: no se puede analizar el commit padre %s"

4434

3677 -#: sequencer.c:1759

4435 +#: sequencer.c:1771

4436 #, c-format

4437 msgid "could not rename '%s' to '%s'"

4438 msgstr "no se puede renombrar '%s' a '%s'"

4439

3682 -#: sequencer.c:1813

4440 +#: sequencer.c:1826

4441 #, c-format

4442 msgid "could not revert %s... %s"

4443 msgstr "no se pudo revertir %s... %s"

4444

3687 -#: sequencer.c:1814

4445 +#: sequencer.c:1827

4446 #, c-format

4447 msgid "could not apply %s... %s"

4448 msgstr "no se pudo aplicar %s... %s"

4449

3692 -#: sequencer.c:1864

3693 -msgid "empty commit set passed"

3694 -msgstr "conjunto de commits vacío entregado"

3695 -

3696 -#: sequencer.c:1874

4450 +#: sequencer.c:1885

4451 #, c-format

4452 msgid "git %s: failed to read the index"

4453 msgstr "git %s: falló al leer el índice"

4454

3701 -#: sequencer.c:1881

4455 +#: sequencer.c:1892

4456 #, c-format

4457 msgid "git %s: failed to refresh the index"

4458 msgstr "git %s: falló al refrescar el índice"

4459

3706 -#: sequencer.c:1961

4460 +#: sequencer.c:1972

4461 #, c-format

4462 msgid "%s does not accept arguments: '%s'"

4463 msgstr "%s no acepta los argumentos: '%s'"

4464

3711 -#: sequencer.c:1970

4465 +#: sequencer.c:1981

4466 #, c-format

4467 msgid "missing arguments for %s"

4468 msgstr "faltan argumentos para para %s"

4469

3716 -#: sequencer.c:2029

4470 +#: sequencer.c:2040

4471 #, c-format

4472 msgid "invalid line %d: %.*s"

4473 msgstr "línea inválida %d: %.*s"

4474

3721 -#: sequencer.c:2037

4475 +#: sequencer.c:2048

4476 #, c-format

4477 msgid "cannot '%s' without a previous commit"

4478 msgstr "no se puede '%s' sin un commit previo"

4479

3726 -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

4480 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4481 #, c-format

4482 msgid "could not read '%s'."

4483 msgstr "no se puede leer '%s'."

4484

3731 -#: sequencer.c:2108

4485 +#: sequencer.c:2119

4486 msgid "please fix this using 'git rebase --edit-todo'."

4487 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

4488

3735 -#: sequencer.c:2110

4489 +#: sequencer.c:2121

4490 #, c-format

4491 msgid "unusable instruction sheet: '%s'"

4492 msgstr "hoja de instrucciones inutilizable: '%s'"

4493

3740 -#: sequencer.c:2115

4494 +#: sequencer.c:2126

4495 msgid "no commits parsed."

4496 msgstr "ningún commit analizado."

4497

3744 -#: sequencer.c:2126

4498 +#: sequencer.c:2137

4499 msgid "cannot cherry-pick during a revert."

4500 msgstr "no se puede realizar cherry-pick durante un revert."

4501

3748 -#: sequencer.c:2128

4502 +#: sequencer.c:2139

4503 msgid "cannot revert during a cherry-pick."

4504 msgstr "no se puede realizar un revert durante un cherry-pick."

4505

3752 -#: sequencer.c:2195

3753 -#, c-format

3754 -msgid "invalid key: %s"

3755 -msgstr "llave invalida: %s"

3756 -

3757 -#: sequencer.c:2198

4506 +#: sequencer.c:2209

4507 #, c-format

4508 msgid "invalid value for %s: %s"

4509 msgstr "valor invalido para %s: %s"

4510

3762 -#: sequencer.c:2269

4511 +#: sequencer.c:2285

4512 msgid "unusable squash-onto"

4513 msgstr "squash-onto inservible"

4514

3766 -#: sequencer.c:2285

4515 +#: sequencer.c:2301

4516 #, c-format

4517 msgid "malformed options sheet: '%s'"

4518 msgstr "hoja de opciones mal formada: '%s'"

4519

3771 -#: sequencer.c:2323

4520 +#: sequencer.c:2335 sequencer.c:3775

4521 +msgid "empty commit set passed"

4522 +msgstr "conjunto de commits vacío entregado"

4523 +

4524 +#: sequencer.c:2343

4525 msgid "a cherry-pick or revert is already in progress"

4526 msgstr "un cherry-pick o revert ya esta en progreso"

4527

3775 -#: sequencer.c:2324

4528 +#: sequencer.c:2344

4529 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

4530 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""

4531

3779 -#: sequencer.c:2327

4532 +#: sequencer.c:2347

4533 #, c-format

4534 msgid "could not create sequencer directory '%s'"

4535 msgstr "no se pudo crear un directorio secuenciador '%s'"

4536

3784 -#: sequencer.c:2341

4537 +#: sequencer.c:2361

4538 msgid "could not lock HEAD"

4539 msgstr "no se pudo bloquear HEAD"

4540

3788 -#: sequencer.c:2396 sequencer.c:3403

4541 +#: sequencer.c:2416 sequencer.c:3543

4542 msgid "no cherry-pick or revert in progress"

4543 msgstr "ningún cherry-pick o revert en progreso"

4544

3792 -#: sequencer.c:2398

4545 +#: sequencer.c:2418

4546 msgid "cannot resolve HEAD"

4547 msgstr "no se puede resolver HEAD"

4548

3796 -#: sequencer.c:2400 sequencer.c:2435

4549 +#: sequencer.c:2420 sequencer.c:2455

4550 msgid "cannot abort from a branch yet to be born"

4551 msgstr "no se puede abortar de una rama por nacer"

4552

3800 -#: sequencer.c:2421 builtin/grep.c:720

4553 +#: sequencer.c:2441 builtin/grep.c:721

4554 #, c-format

4555 msgid "cannot open '%s'"

4556 msgstr "no se puede abrir '%s'"

4557

3805 -#: sequencer.c:2423

4558 +#: sequencer.c:2443

4559 #, c-format

4560 msgid "cannot read '%s': %s"

4561 msgstr "no se puede leer '%s': %s"

4562

3810 -#: sequencer.c:2424

4563 +#: sequencer.c:2444

4564 msgid "unexpected end of file"

4565 msgstr "final de archivo inesperado"

4566

3814 -#: sequencer.c:2430

4567 +#: sequencer.c:2450

4568 #, c-format

4569 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

4570 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"

4571

3819 -#: sequencer.c:2441

4572 +#: sequencer.c:2461

4573 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

4574 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

4575

3823 -#: sequencer.c:2545 sequencer.c:3321

4576 +#: sequencer.c:2565 sequencer.c:3461

4577 #, c-format

4578 msgid "could not update %s"

4579 msgstr "no se puede actualizar %s"

4580

3828 -#: sequencer.c:2583 sequencer.c:3301

4581 +#: sequencer.c:2603 sequencer.c:3441

4582 msgid "cannot read HEAD"

4583 msgstr "no se puede leer HEAD"

4584

3832 -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

4585 +#: sequencer.c:2618

4586 +#, c-format

4587 +msgid "unable to copy '%s' to '%s'"

4588 +msgstr "no se pudo copiar '%s' a '%s'"

4589 +

4590 +#: sequencer.c:2626

4591 +#, c-format

4592 +msgid ""

4593 +"You can amend the commit now, with\n"

4594 +"\n"

4595 +" git commit --amend %s\n"

4596 +"\n"

4597 +"Once you are satisfied with your changes, run\n"

4598 +"\n"

4599 +" git rebase --continue\n"

4600 +msgstr ""

4601 +"Puede enmendar el commit ahora, con\n"

4602 +"\n"

4603 +"\tgit commit --amend %s\n"

4604 +"\n"

4605 +"Una vez que esté satisfecho con los cambios, ejecute\n"

4606 +"\n"

4607 +"\tgit rebase --continue\n"

4608 +

4609 +#: sequencer.c:2636

4610 +#, c-format

4611 +msgid "Could not apply %s... %.*s"

4612 +msgstr "No se pudo aplicar %s... %.*s"

4613 +

4614 +#: sequencer.c:2643

4615 +#, c-format

4616 +msgid "Could not merge %.*s"

4617 +msgstr "No se pudo fusionar %.*s"

4618 +

4619 +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4620 #, c-format

4621 msgid "could not copy '%s' to '%s'"

4622 msgstr "no se pudo copiar '%s' a '%s'"

4623

3837 -#: sequencer.c:2641

4624 +#: sequencer.c:2680 sequencer.c:3095

4625 msgid "could not read index"

4626 msgstr "no se pudo leer índice"

4627

3841 -#: sequencer.c:2646

4628 +#: sequencer.c:2685

4629 #, c-format

4630 msgid ""

4631 "execution failed: %s\n"

@@ -3853,11 +4640,11 @@ msgstr ""

4640 " git rebase --continue\n"

4641 "\n"

4642

3856 -#: sequencer.c:2652

4643 +#: sequencer.c:2691

4644 msgid "and made changes to the index and/or the working tree\n"

4645 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

4646

3860 -#: sequencer.c:2658

4647 +#: sequencer.c:2697

4648 #, c-format

4649 msgid ""

4650 "execution succeeded: %s\n"

@@ -3874,62 +4661,81 @@ msgstr ""

4661 " git rebase --continue\n"

4662 "\n"

4663

3877 -#: sequencer.c:2771

4664 +#: sequencer.c:2758

4665 +#, c-format

4666 +msgid "illegal label name: '%.*s'"

4667 +msgstr "nombre de label ilegal: '%.*s'"

4668 +

4669 +#: sequencer.c:2810

4670 msgid "writing fake root commit"

4671 msgstr "escribiendo commit raíz falso"

4672

3881 -#: sequencer.c:2776

4673 +#: sequencer.c:2815

4674 msgid "writing squash-onto"

4675 msgstr "escribiendo squash-onto"

4676

3885 -#: sequencer.c:2811

4677 +#: sequencer.c:2850

4678 #, c-format

4679 msgid "failed to find tree of %s"

4680 msgstr "falló al encontrar árbol de %s"

4681

3890 -#: sequencer.c:2829

4682 +#: sequencer.c:2868

4683 msgid "could not write index"

4684 msgstr "no se pudo escribir índice"

4685

3894 -#: sequencer.c:2861

4686 +#: sequencer.c:2895

4687 +#, c-format

4688 +msgid "could not resolve '%s'"

4689 +msgstr "no se pudo resolver '%s'"

4690 +

4691 +#: sequencer.c:2921

4692 msgid "cannot merge without a current revision"

4693 msgstr "no se puede fusionar sin una versión actual"

4694

3898 -#: sequencer.c:2884

4695 +#: sequencer.c:2943

4696 #, c-format

3900 -msgid "could not resolve '%s'"

3901 -msgstr "no se pudo resolver '%s'"

4697 +msgid "unable to parse '%.*s'"

4698 +msgstr "no se puede analizar '%.*s'"

4699 +

4700 +#: sequencer.c:2952

4701 +#, c-format

4702 +msgid "nothing to merge: '%.*s'"

4703 +msgstr "nada para fusionar: '%.*s'"

4704 +

4705 +#: sequencer.c:2964

4706 +msgid "octopus merge cannot be executed on top of a [new root]"

4707 +msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"

4708

3903 -#: sequencer.c:2906

4709 +#: sequencer.c:2979

4710 #, c-format

4711 msgid "could not get commit message of '%s'"

4712 msgstr "no se puede leer el mensaje del commit '%s'"

4713

3908 -#: sequencer.c:2916 sequencer.c:2941

4714 +#: sequencer.c:2989 sequencer.c:3015

4715 #, c-format

4716 msgid "could not write '%s'"

4717 msgstr "no se pudo escribir '%s'"

4718

3913 -#: sequencer.c:3005

4719 +#: sequencer.c:3127

4720 #, c-format

4721 msgid "could not even attempt to merge '%.*s'"

4722 msgstr "no se pudo intentar fusionar '%.*s'"

4723

3918 -#: sequencer.c:3021

4724 +#: sequencer.c:3143

4725 msgid "merge: Unable to write new index file"

4726 msgstr "fusión: No se puede escribir el nuevo archivo índice"

4727

3922 -#: sequencer.c:3088

4728 +#: sequencer.c:3211

4729 #, c-format

4730 msgid "Applied autostash.\n"

4731 msgstr "Autostash aplicado.\n"

4732

3927 -#: sequencer.c:3100

4733 +#: sequencer.c:3223

4734 #, c-format

4735 msgid "cannot store %s"

4736 msgstr "no se puede guardar %s"

4737

3932 -#: sequencer.c:3103 git-rebase.sh:188

4738 +#: sequencer.c:3226 git-rebase.sh:188

4739 #, c-format

4740 msgid ""

4741 "Applying autostash resulted in conflicts.\n"

@@ -3941,7 +4747,7 @@ msgstr ""

4747 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

4748 "momento.\n"

4749

3944 -#: sequencer.c:3134

4750 +#: sequencer.c:3257

4751 #, c-format

4752 msgid ""

4753 "Could not execute the todo command\n"

@@ -3962,48 +4768,48 @@ msgstr ""

4768 " git rebase --edit-todo\n"

4769 " git rebase --continue\n"

4770

3965 -#: sequencer.c:3202

4771 +#: sequencer.c:3325

4772 #, c-format

4773 msgid "Stopped at %s... %.*s\n"

4774 msgstr "Detenido en %s... %.*s\n"

4775

3970 -#: sequencer.c:3264

4776 +#: sequencer.c:3404

4777 #, c-format

4778 msgid "unknown command %d"

4779 msgstr "comando desconocido %d"

4780

3975 -#: sequencer.c:3309

4781 +#: sequencer.c:3449

4782 msgid "could not read orig-head"

4783 msgstr "no se puede leer orig-head"

4784

3979 -#: sequencer.c:3314 sequencer.c:4352

4785 +#: sequencer.c:3454 sequencer.c:4517

4786 msgid "could not read 'onto'"

4787 msgstr "no se puede leer 'onto'"

4788

3983 -#: sequencer.c:3328

4789 +#: sequencer.c:3468

4790 #, c-format

4791 msgid "could not update HEAD to %s"

4792 msgstr "no se puede actualizar HEAD a %s"

4793

3988 -#: sequencer.c:3414

4794 +#: sequencer.c:3554

4795 msgid "cannot rebase: You have unstaged changes."

4796 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

4797

3992 -#: sequencer.c:3423

4798 +#: sequencer.c:3563

4799 msgid "cannot amend non-existing commit"

4800 msgstr "no se puede arreglar un commit no existente"

4801

3996 -#: sequencer.c:3425

4802 +#: sequencer.c:3565

4803 #, c-format

4804 msgid "invalid file: '%s'"

4805 msgstr "archivo invalido: '%s'"

4806

4001 -#: sequencer.c:3427

4807 +#: sequencer.c:3567

4808 #, c-format

4809 msgid "invalid contents: '%s'"

4810 msgstr "contenido inválido: '%s'"

4811

4006 -#: sequencer.c:3430

4812 +#: sequencer.c:3570

4813 msgid ""

4814 "\n"

4815 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4014,54 +4820,54 @@ msgstr ""

4820 "un commit con estos\n"

4821 "primero y luego ejecuta 'git rebase --continue' de nuevo."

4822

4017 -#: sequencer.c:3455 sequencer.c:3493

4823 +#: sequencer.c:3595 sequencer.c:3633

4824 #, c-format

4825 msgid "could not write file: '%s'"

4826 msgstr "no se pudo escribir el archivo: '%s'"

4827

4022 -#: sequencer.c:3508

4828 +#: sequencer.c:3648

4829 msgid "could not remove CHERRY_PICK_HEAD"

4830 msgstr "no se puede remover CHERRY_PICK_HEAD"

l10n: es.po v2.19.0 round 2