3f3e3f9209 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2019-06-04 08:24+0800\n"

11 -"PO-Revision-Date: 2019-06-04 18:51-0500\n"

10 +"POT-Creation-Date: 2019-08-10 20:12+0800\n"

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

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

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

14 "Language: es\n"

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

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

19 "X-Generator: Poedit 2.2\n"

20

21 -#: advice.c:103

21 +#: advice.c:109

22 #, c-format

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

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

25

26 -#: advice.c:156

26 +#: advice.c:162

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

31 +#: advice.c:164

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

35 +#: advice.c:166

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

39 +#: advice.c:168

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

43 +#: advice.c:170

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

47 +#: advice.c:172

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

52 +#: advice.c:180

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,49 +57,63 @@ 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:182

60 +#: advice.c:188

61 msgid "Exiting because of an unresolved conflict."

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

63

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

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

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

68 +#: advice.c:195

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

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

71

72 -#: advice.c:190

72 +#: advice.c:196

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:196

76 +#: advice.c:202

77 #, c-format

78 msgid ""

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

79 +"Note: switching to '%s'.\n"

80 "\n"

81 "You are in 'detached HEAD' state. You can look around, make experimental\n"

82 "changes and commit them, and you can discard any commits you make in this\n"

83 -"state without impacting any branches by performing another checkout.\n"

83 +"state without impacting any branches by switching back to a branch.\n"

84 "\n"

85 "If you want to create a new branch to retain commits you create, you may\n"

86 -"do so (now or later) by using -b with the checkout command again. Example:\n"

86 +"do so (now or later) by using -c with the switch command. Example:\n"

87 "\n"

88 -" git checkout -b <new-branch-name>\n"

88 +" git switch -c <new-branch-name>\n"

89 +"\n"

90 +"Or undo this operation with:\n"

91 +"\n"

92 +" git switch -\n"

93 +"\n"

94 +"Turn off this advice by setting config variable advice.detachedHead to "

95 +"false\n"

96 "\n"

97 msgstr ""

91 -"Nota: actualizando el árbol de trabajo '%s'.\n"

98 +"Nota: cambiando a '%s'.\n"

99 "\n"

100 "Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n"

94 -"cambios experimentales y confirmarlos, y puedes descartar cualquier\n"

101 +"cambios experimentales y hacer commits, y puedes descartar cualquier\n"

102 "commit que hayas hecho en este estado sin impactar a tu rama realizando\n"

103 "otro checkout.\n"

104 "\n"

105 "Si quieres crear una nueva rama para mantener los commits que has creado,\n"

99 -"puedes hacerlo (ahora o después) usando -b con el comando checkout. "

106 +"puedes hacerlo (ahora o después) usando -c con el comando checkout. "

107 "Ejemplo:\n"

108 "\n"

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

109 +" git switch -c <nombre-de-nueva-rama>\n"

110 +"\n"

111 +"O deshacer la operación con:\n"

112 +"\n"

113 +" git switch -\n"

114 +"\n"

115 +"Apaga este aviso mediante la variable de config advice.detachedHead en "

116 +"false\n"

117 "\n"

118

119 #: alias.c:50

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

124 msgid "unclosed quote"

125 msgstr "comillas incompletas"

126

113 -#: apply.c:63

127 +#: apply.c:69

128 #, c-format

129 msgid "unrecognized whitespace option '%s'"

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

131

118 -#: apply.c:79

132 +#: apply.c:85

133 #, c-format

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

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

136

123 -#: apply.c:129

137 +#: apply.c:135

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

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

140

127 -#: apply.c:131

141 +#: apply.c:137

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

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

144

131 -#: apply.c:134

145 +#: apply.c:140

146 msgid "--3way outside a repository"

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

148

135 -#: apply.c:145

149 +#: apply.c:151

150 msgid "--index outside a repository"

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

152

139 -#: apply.c:148

153 +#: apply.c:154

154 msgid "--cached outside a repository"

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

156

143 -#: apply.c:829

157 +#: apply.c:801

158 #, c-format

159 msgid "Cannot prepare timestamp regexp %s"

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

161

148 -#: apply.c:838

162 +#: apply.c:810

163 #, c-format

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

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

166

153 -#: apply.c:912

167 +#: apply.c:884

168 #, c-format

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

170 msgstr ""

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

172

159 -#: apply.c:950

173 +#: apply.c:922

174 #, c-format

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

176 msgstr ""

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

178 "lalínea %d"

179

166 -#: apply.c:956

180 +#: apply.c:928

181 #, c-format

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

183 msgstr ""

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

185 "lalínea %d"

186

173 -#: apply.c:957

187 +#: apply.c:929

188 #, c-format

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

190 msgstr ""

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

192 "lalínea %d"

193

180 -#: apply.c:962

194 +#: apply.c:934

195 #, c-format

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

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

198

185 -#: apply.c:991

199 +#: apply.c:963

200 #, c-format

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

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

203

190 -#: apply.c:1310

204 +#: apply.c:1282

205 #, c-format

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

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

208

195 -#: apply.c:1482

209 +#: apply.c:1460

210 #, c-format

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

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

213

200 -#: apply.c:1551

214 +#: apply.c:1529

215 #, c-format

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

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

218

205 -#: apply.c:1571

219 +#: apply.c:1551

220 #, c-format

221 msgid ""

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

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

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

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

233

220 -#: apply.c:1584

234 +#: apply.c:1564

235 #, c-format

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

237 msgstr ""

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

239

226 -#: apply.c:1772

240 +#: apply.c:1752

241 msgid "new file depends on old contents"

242 msgstr "el nuevo archivo depende de contenidos viejos"

243

230 -#: apply.c:1774

244 +#: apply.c:1754

245 msgid "deleted file still has contents"

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

247

234 -#: apply.c:1808

248 +#: apply.c:1788

249 #, c-format

250 msgid "corrupt patch at line %d"

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

252

239 -#: apply.c:1845

253 +#: apply.c:1825

254 #, c-format

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

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

257

244 -#: apply.c:1847

258 +#: apply.c:1827

259 #, c-format

260 msgid "deleted file %s still has contents"

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

262

249 -#: apply.c:1850

263 +#: apply.c:1830

264 #, c-format

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

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

267

254 -#: apply.c:1997

268 +#: apply.c:1977

269 #, c-format

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

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

272

259 -#: apply.c:2034

273 +#: apply.c:2014

274 #, c-format

275 msgid "unrecognized binary patch at line %d"

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

277

264 -#: apply.c:2196

278 +#: apply.c:2176

279 #, c-format

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

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

282

269 -#: apply.c:2282

283 +#: apply.c:2262

284 #, c-format

285 msgid "unable to read symlink %s"

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

287

274 -#: apply.c:2286

288 +#: apply.c:2266

289 #, c-format

290 msgid "unable to open or read %s"

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

292

279 -#: apply.c:2945

293 +#: apply.c:2925

294 #, c-format

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

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

297

284 -#: apply.c:3066

298 +#: apply.c:3046

299 #, c-format

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

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

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

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

304

291 -#: apply.c:3078

305 +#: apply.c:3058

306 #, c-format

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

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

309

296 -#: apply.c:3084

310 +#: apply.c:3064

311 #, c-format

312 msgid ""

313 "while searching for:\n"

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

316 "mientras se busca:\n"

317 "%.*s"

318

305 -#: apply.c:3106

319 +#: apply.c:3086

320 #, c-format

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

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

323

310 -#: apply.c:3114

324 +#: apply.c:3094

325 #, c-format

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

327 msgstr ""

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

329

316 -#: apply.c:3161

330 +#: apply.c:3141

331 #, c-format

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

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

334

321 -#: apply.c:3171

335 +#: apply.c:3151

336 #, c-format

337 msgid ""

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

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

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

341 "actuales."

342

329 -#: apply.c:3179

343 +#: apply.c:3159

344 #, c-format

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

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

347

334 -#: apply.c:3197

348 +#: apply.c:3177

349 #, c-format

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

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

352

339 -#: apply.c:3210

353 +#: apply.c:3190

354 #, c-format

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

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

357

344 -#: apply.c:3216

358 +#: apply.c:3196

359 #, c-format

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

361 msgstr ""

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

363 "obtuvo %s)"

364

351 -#: apply.c:3237

365 +#: apply.c:3217

366 #, c-format

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

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

369

356 -#: apply.c:3360

370 +#: apply.c:3340

371 #, c-format

372 msgid "cannot checkout %s"

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

374

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

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

376 #, c-format

377 msgid "failed to read %s"

378 msgstr "no se pudo leer %s"

379

366 -#: apply.c:3420

380 +#: apply.c:3400

381 #, c-format

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

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

384

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

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

386 #, c-format

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

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

389

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

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

391 #, c-format

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

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

394

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

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

396 #, c-format

397 msgid "%s: does not match index"

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

399

386 -#: apply.c:3579

400 +#: apply.c:3559

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

402 msgstr ""

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

404 "vías."

405

392 -#: apply.c:3582

406 +#: apply.c:3562

407 #, c-format

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

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

410

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

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

412 #, c-format

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

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

415

402 -#: apply.c:3614

416 +#: apply.c:3594

417 #, c-format

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

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

420

407 -#: apply.c:3628

421 +#: apply.c:3608

422 #, c-format

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

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

425

412 -#: apply.c:3633

426 +#: apply.c:3613

427 #, c-format

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

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

430

417 -#: apply.c:3659

431 +#: apply.c:3639

432 msgid "removal patch leaves file contents"

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

434

421 -#: apply.c:3732

435 +#: apply.c:3712

436 #, c-format

437 msgid "%s: wrong type"

438 msgstr "%s: tipo incorrecto"

439

426 -#: apply.c:3734

440 +#: apply.c:3714

441 #, c-format

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

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

444

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

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

446 #: read-cache.c:1309

447 #, c-format

448 msgid "invalid path '%s'"

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

450

437 -#: apply.c:3943

451 +#: apply.c:3923

452 #, c-format

453 msgid "%s: already exists in index"

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

455

442 -#: apply.c:3946

456 +#: apply.c:3926

457 #, c-format

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

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

460

447 -#: apply.c:3966

461 +#: apply.c:3946

462 #, c-format

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

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

465

452 -#: apply.c:3971

466 +#: apply.c:3951

467 #, c-format

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

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

470

457 -#: apply.c:3991

471 +#: apply.c:3971

472 #, c-format

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

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

475

462 -#: apply.c:3995

476 +#: apply.c:3975

477 #, c-format

478 msgid "%s: patch does not apply"

479 msgstr "%s: el parche no aplica"

480

467 -#: apply.c:4010

481 +#: apply.c:3990

482 #, c-format

483 msgid "Checking patch %s..."

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

485

472 -#: apply.c:4102

486 +#: apply.c:4082

487 #, c-format

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

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

490

477 -#: apply.c:4109

491 +#: apply.c:4089

492 #, c-format

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

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

495

482 -#: apply.c:4112

496 +#: apply.c:4092

497 #, c-format

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

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

500

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

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

502 #, c-format

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

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

505

492 -#: apply.c:4121

506 +#: apply.c:4101

507 #, c-format

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

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

510

497 -#: apply.c:4131

511 +#: apply.c:4111

512 #, c-format

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

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

515

502 -#: apply.c:4269

516 +#: apply.c:4249

517 #, c-format

518 msgid "unable to remove %s from index"

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

520

507 -#: apply.c:4303

521 +#: apply.c:4283

522 #, c-format

523 msgid "corrupt patch for submodule %s"

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

525

512 -#: apply.c:4309

526 +#: apply.c:4289

527 #, c-format

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

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

530

517 -#: apply.c:4317

531 +#: apply.c:4297

532 #, c-format

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

534 msgstr ""

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

536

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

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

538 #, c-format

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

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

541

528 -#: apply.c:4366

542 +#: apply.c:4346

543 #, c-format

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

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

546

533 -#: apply.c:4370

547 +#: apply.c:4350

548 #, c-format

549 msgid "closing file '%s'"

550 msgstr "cerrando archivo '%s'"

551

538 -#: apply.c:4440

552 +#: apply.c:4420

553 #, c-format

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

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

556

543 -#: apply.c:4538

557 +#: apply.c:4518

558 #, c-format

559 msgid "Applied patch %s cleanly."

560 msgstr "Parche %s aplicado limpiamente."

561

548 -#: apply.c:4546

562 +#: apply.c:4526

563 msgid "internal error"

564 msgstr "error interno"

565

552 -#: apply.c:4549

566 +#: apply.c:4529

567 #, c-format

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

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

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

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

572

559 -#: apply.c:4560

573 +#: apply.c:4540

574 #, c-format

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

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

577

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

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

579 #, c-format

580 msgid "cannot open %s"

581 msgstr "no se puede abrir %s"

582

569 -#: apply.c:4582

583 +#: apply.c:4562

584 #, c-format

585 msgid "Hunk #%d applied cleanly."

586 msgstr "Hunk #%d aplicado limpiamente."

587

574 -#: apply.c:4586

588 +#: apply.c:4566

589 #, c-format

590 msgid "Rejected hunk #%d."

591 msgstr "Hunk #%d rechazado."

592

579 -#: apply.c:4696

593 +#: apply.c:4676

594 #, c-format

595 msgid "Skipped patch '%s'."

596 msgstr "Parche '%s' saltado."

597

584 -#: apply.c:4704

598 +#: apply.c:4684

599 msgid "unrecognized input"

600 msgstr "input no reconocido"

601

588 -#: apply.c:4724

602 +#: apply.c:4704

603 msgid "unable to read index file"

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

605

592 -#: apply.c:4879

606 +#: apply.c:4859

607 #, c-format

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

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

610

597 -#: apply.c:4906

611 +#: apply.c:4886

612 #, c-format

613 msgid "squelched %d whitespace error"

614 msgid_plural "squelched %d whitespace errors"

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

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

617

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

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

619 #, c-format

620 msgid "%d line adds whitespace errors."

621 msgid_plural "%d lines add whitespace errors."

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

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

624

611 -#: apply.c:4920

625 +#: apply.c:4900

626 #, c-format

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

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

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

631 msgstr[1] ""

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

633

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

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

635 msgid "Unable to write new index file"

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

637

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

625 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271

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

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

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

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

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

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

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

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

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

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

644 msgid "path"

645 msgstr "ruta"

646

633 -#: apply.c:4964

647 +#: apply.c:4944

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

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

650

637 -#: apply.c:4967

651 +#: apply.c:4947

652 msgid "apply changes matching the given path"

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

654

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

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

656 msgid "num"

657 msgstr "num"

658

645 -#: apply.c:4970

659 +#: apply.c:4950

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

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

662

649 -#: apply.c:4973

663 +#: apply.c:4953

664 msgid "ignore additions made by the patch"

665 msgstr "ignorar adiciones hechas por el parche"

666

653 -#: apply.c:4975

667 +#: apply.c:4955

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

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

670

657 -#: apply.c:4979

671 +#: apply.c:4959

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

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

674

661 -#: apply.c:4981

675 +#: apply.c:4961

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

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

678

665 -#: apply.c:4983

679 +#: apply.c:4963

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

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

682

669 -#: apply.c:4985

683 +#: apply.c:4965

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

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

686

673 -#: apply.c:4987

687 +#: apply.c:4967

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

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

690

677 -#: apply.c:4989

691 +#: apply.c:4969

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

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

694

681 -#: apply.c:4991

695 +#: apply.c:4971

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

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

698

685 -#: apply.c:4994

699 +#: apply.c:4974

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

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

702

689 -#: apply.c:4996

703 +#: apply.c:4976

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

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

706

693 -#: apply.c:4998

707 +#: apply.c:4978

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

709 msgstr ""

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

711

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

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

713 msgid "paths are separated with NUL character"

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

715

702 -#: apply.c:5003

716 +#: apply.c:4983

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

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

719

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

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

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

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

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

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

723 msgid "action"

724 msgstr "acción"

725

712 -#: apply.c:5005

726 +#: apply.c:4985

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

728 msgstr ""

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

730 "blanco"

731

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

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

733 msgid "ignore changes in whitespace when finding context"

734 msgstr ""

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

736

723 -#: apply.c:5014

737 +#: apply.c:4994

738 msgid "apply the patch in reverse"

739 msgstr "aplicar el parche en reversa"

740

727 -#: apply.c:5016

741 +#: apply.c:4996

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

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

744

731 -#: apply.c:5018

745 +#: apply.c:4998

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

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

748

735 -#: apply.c:5020

749 +#: apply.c:5000

750 msgid "allow overlapping hunks"

751 msgstr "permitir solapamiento de hunks"

752

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

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

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

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

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

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

756 msgid "be verbose"

757 msgstr "ser verboso"

758

745 -#: apply.c:5023

759 +#: apply.c:5003

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

761 msgstr ""

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

763 "archivo"

764

751 -#: apply.c:5026

765 +#: apply.c:5006

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

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

768

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

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

770 msgid "root"

771 msgstr "raíz"

772

759 -#: apply.c:5029

773 +#: apply.c:5009

774 msgid "prepend <root> to all filenames"

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

776

@@ -799,98 +813,98 @@ msgstr "nombre de objeto no válido: %s"

813 msgid "not a tree object: %s"

814 msgstr "no es un objeto tree: %s"

815

802 -#: archive.c:424

816 +#: archive.c:426

817 msgid "current working directory is untracked"

818 msgstr "directorio de trabajo actual no rastreado"

819

806 -#: archive.c:455

820 +#: archive.c:457

821 msgid "fmt"

822 msgstr "fmt"

823

810 -#: archive.c:455

824 +#: archive.c:457

825 msgid "archive format"

826 msgstr "formato del archivo"

827

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

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

829 msgid "prefix"

830 msgstr "prefijo"

831

818 -#: archive.c:457

832 +#: archive.c:459

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

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

835

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

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

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

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

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

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

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

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

841 msgid "file"

842 msgstr "carpeta"

843

830 -#: archive.c:459 builtin/archive.c:90

844 +#: archive.c:461 builtin/archive.c:90

845 msgid "write the archive to this file"

846 msgstr "escribe el archivo en esta carpeta"

847

834 -#: archive.c:461

848 +#: archive.c:463

849 msgid "read .gitattributes in working directory"

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

851

838 -#: archive.c:462

852 +#: archive.c:464

853 msgid "report archived files on stderr"

854 msgstr "reportar archivos archivados por stderr"

855

842 -#: archive.c:463

856 +#: archive.c:465

857 msgid "store only"

858 msgstr "solo guardar"

859

846 -#: archive.c:464

860 +#: archive.c:466

861 msgid "compress faster"

848 -msgstr "comprimir mas rápido"

862 +msgstr "comprimir más rápido"

863

850 -#: archive.c:472

864 +#: archive.c:474

865 msgid "compress better"

866 msgstr "comprimir mejor"

867

854 -#: archive.c:475

868 +#: archive.c:477

869 msgid "list supported archive formats"

870 msgstr "listar los formatos de carpeta soportados"

871

858 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113

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

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

873 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

874 msgid "repo"

875 msgstr "repo"

876

863 -#: archive.c:478 builtin/archive.c:92

877 +#: archive.c:480 builtin/archive.c:92

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

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

880

867 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707

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

882 #: builtin/notes.c:498

883 msgid "command"

884 msgstr "comando"

885

872 -#: archive.c:480 builtin/archive.c:94

886 +#: archive.c:482 builtin/archive.c:94

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

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

889

876 -#: archive.c:487

890 +#: archive.c:489

891 msgid "Unexpected option --remote"

892 msgstr "Opción inesperada --remote"

893

880 -#: archive.c:489

894 +#: archive.c:491

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

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

897

884 -#: archive.c:491

898 +#: archive.c:493

899 msgid "Unexpected option --output"

900 msgstr "Opción inesperada --output"

901

888 -#: archive.c:513

902 +#: archive.c:515

903 #, c-format

904 msgid "Unknown archive format '%s'"

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

906

893 -#: archive.c:520

907 +#: archive.c:522

908 #, c-format

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

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

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

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

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

950

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

951 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233

952 #, c-format

953 msgid "deflate error (%d)"

954 msgstr "error al desinflar (%d)"

@@ -947,7 +961,7 @@ msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"

961 #: attr.c:211

962 #, c-format

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

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

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

965

966 #: attr.c:368

967 #, c-format

@@ -975,7 +989,7 @@ msgstr "¡No podemos biseccionar más!\n"

989 #: bisect.c:733

990 #, c-format

991 msgid "Not a valid commit name %s"

978 -msgstr "No es un nombre de commit valido %s"

992 +msgstr "No es un nombre de commit válido %s"

993

994 #: bisect.c:758

995 #, c-format

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

1027 msgstr ""

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

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

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

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

1031

1032 #: bisect.c:789

1033 #, c-format

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

1050 msgid "a %s revision is needed"

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

1052

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

1053 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1054 #, c-format

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

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

1057

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

1058 +#: bisect.c:928 builtin/merge.c:148

1059 #, c-format

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

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

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

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

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

1097

1084 -#: blame.c:1794

1098 +#: blame.c:2697

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

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

1101

1088 -#: blame.c:1808

1102 +#: blame.c:2711

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

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

1105

1092 -#: blame.c:1829

1106 +#: blame.c:2732

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

1108 msgstr ""

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

1110

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

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

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

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

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

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

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

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

1115 #: builtin/shortlog.c:192

1116 msgid "revision walk setup failed"

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

1118

1105 -#: blame.c:1856

1119 +#: blame.c:2759

1120 msgid ""

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

1122 msgstr ""

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

1124 "del primer padre"

1125

1112 -#: blame.c:1867

1126 +#: blame.c:2770

1127 #, c-format

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

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

1130

1117 -#: blame.c:1878

1131 +#: blame.c:2781

1132 #, c-format

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

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

@@ -1199,7 +1213,7 @@ msgstr "No rastreando: información ambigua para la referencia %s"

1213 #: branch.c:189

1214 #, c-format

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

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

1216 +msgstr "'%s' no es un nombre válido de rama."

1217

1218 #: branch.c:208

1219 #, c-format

@@ -1246,7 +1260,7 @@ msgstr ""

1260 #: branch.c:281

1261 #, c-format

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

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

1263 +msgstr "Nombre de objeto no válido: '%s'."

1264

1265 #: branch.c:301

1266 #, c-format

@@ -1256,14 +1270,14 @@ msgstr "Nombre de objeto ambiguo: '%s'."

1270 #: branch.c:306

1271 #, c-format

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

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

1273 +msgstr "Punto de rama no válido: '%s'."

1274

1261 -#: branch.c:359

1275 +#: branch.c:364

1276 #, c-format

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

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

1279

1266 -#: branch.c:382

1280 +#: branch.c:387

1281 #, c-format

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

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

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

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

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

1294

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

1282 -#: builtin/commit.c:788

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

1296 +#: builtin/commit.c:791

1297 #, c-format

1298 msgid "could not open '%s'"

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

@@ -1288,60 +1302,64 @@ msgstr "no se pudo abrir '%s'"

1302 msgid "Repository lacks these prerequisite commits:"

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

1304

1291 -#: bundle.c:194

1305 +#: bundle.c:146

1306 +msgid "need a repository to verify a bundle"

1307 +msgstr "se necesita un repositorio para verificar un bundle"

1308 +

1309 +#: bundle.c:197

1310 #, c-format

1311 msgid "The bundle contains this ref:"

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

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

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

1315

1298 -#: bundle.c:201

1316 +#: bundle.c:204

1317 msgid "The bundle records a complete history."

1318 msgstr "El bundle registra una historia completa."

1319

1302 -#: bundle.c:203

1320 +#: bundle.c:206

1321 #, c-format

1322 msgid "The bundle requires this ref:"

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

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

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

1326

1309 -#: bundle.c:269

1327 +#: bundle.c:272

1328 msgid "unable to dup bundle descriptor"

1329 msgstr "incapaz de duplicar bundle descriptor"

1330

1313 -#: bundle.c:276

1331 +#: bundle.c:279

1332 msgid "Could not spawn pack-objects"

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

1334

1317 -#: bundle.c:287

1335 +#: bundle.c:290

1336 msgid "pack-objects died"

1337 msgstr "pack-objects murió"

1338

1321 -#: bundle.c:329

1339 +#: bundle.c:332

1340 msgid "rev-list died"

1341 msgstr "rev-list murió"

1342

1325 -#: bundle.c:378

1343 +#: bundle.c:381

1344 #, c-format

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

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

1347

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

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

1349 #, c-format

1350 msgid "unrecognized argument: %s"

1351 msgstr "argumento no reconocido: %s"

1352

1335 -#: bundle.c:465

1353 +#: bundle.c:468

1354 msgid "Refusing to create empty bundle."

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

1356

1339 -#: bundle.c:475

1357 +#: bundle.c:478

1358 #, c-format

1359 msgid "cannot create '%s'"

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

1361

1344 -#: bundle.c:500

1362 +#: bundle.c:503

1363 msgid "index-pack died"

1364 msgstr "index-pack murió"

1365

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

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

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

1370

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

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

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

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

1373 #, c-format

1374 msgid "could not parse %s"

1375 msgstr "no se puede analizar %s"

@@ -1361,7 +1379,7 @@ msgstr "no se puede analizar %s"

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

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

1381

1364 -#: commit.c:193

1382 +#: commit.c:192

1383 msgid ""

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

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

@@ -1381,227 +1399,282 @@ msgstr ""

1399 "Apapa este mensaje ejecutando\n"

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

1401

1384 -#: commit.c:1128

1402 +#: commit.c:1127

1403 #, c-format

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

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

1406

1389 -#: commit.c:1131

1407 +#: commit.c:1130

1408 #, c-format

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

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

1411

1394 -#: commit.c:1134

1412 +#: commit.c:1133

1413 #, c-format

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

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

1416

1399 -#: commit.c:1137

1417 +#: commit.c:1136

1418 #, c-format

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

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

1421

1404 -#: commit.c:1391

1422 +#: commit.c:1390

1423 msgid ""

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

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

1426 "variable i18n.commitencoding to the encoding your project uses.\n"

1427 msgstr ""

1428 "Peligro: el mensaje del commit no se ajusta a UTF-8.\n"

1411 -"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n"

1429 +"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"

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

1413 -"su proyecto.\n"

1431 +"tu proyecto.\n"

1432

1415 -#: commit-graph.c:105

1433 +#: commit-graph.c:127

1434 msgid "commit-graph file is too small"

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

1436

1419 -#: commit-graph.c:170

1437 +#: commit-graph.c:192

1438 #, c-format

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

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

1441

1424 -#: commit-graph.c:177

1442 +#: commit-graph.c:199

1443 #, c-format

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

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

1446

1429 -#: commit-graph.c:184

1447 +#: commit-graph.c:206

1448 #, c-format

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

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

1451

1434 -#: commit-graph.c:207

1452 +#: commit-graph.c:229

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

1454 msgstr ""

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

1456 "incompleto"

1457

1440 -#: commit-graph.c:218

1458 +#: commit-graph.c:240

1459 #, c-format

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

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

1462

1445 -#: commit-graph.c:255

1463 +#: commit-graph.c:283

1464 #, c-format

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

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

1467

1450 -#: commit-graph.c:390

1468 +#: commit-graph.c:347

1469 +msgid "commit-graph has no base graphs chunk"

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

1471 +

1472 +#: commit-graph.c:357

1473 +msgid "commit-graph chain does not match"

1474 +msgstr "cadena commit-graph no concuerda"

1475 +

1476 +#: commit-graph.c:404

1477 +#, c-format

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

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

1480 +

1481 +#: commit-graph.c:430

1482 +msgid "unable to find all commit-graph files"

1483 +msgstr "no es posible encontrar los archivos commit-graph"

1484 +

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

1486 +msgid "invalid commit position. commit-graph is likely corrupt"

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

1488 +

1489 +#: commit-graph.c:575

1490 #, c-format

1491 msgid "could not find commit %s"

1492 msgstr "no se pudo encontrar commit %s"

1493

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

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

1495 #, c-format

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

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

1498

1460 -#: commit-graph.c:765

1499 +#: commit-graph.c:1034

1500 msgid "Loading known commits in commit graph"

1501 msgstr "Cargando commits conocidos en commit graph"

1502

1464 -#: commit-graph.c:781

1503 +#: commit-graph.c:1051

1504 msgid "Expanding reachable commits in commit graph"

1505 msgstr "Expandiendo commits alcanzables en commit graph"

1506

1468 -#: commit-graph.c:793

1507 +#: commit-graph.c:1070

1508 msgid "Clearing commit marks in commit graph"

1509 msgstr "Limpiando marcas de commits en commit graph"

1510

1472 -#: commit-graph.c:813

1511 +#: commit-graph.c:1089

1512 msgid "Computing commit graph generation numbers"

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

1514

1476 -#: commit-graph.c:930

1515 +#: commit-graph.c:1163

1516 #, c-format

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

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

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

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

1521

1483 -#: commit-graph.c:943

1522 +#: commit-graph.c:1176

1523 #, c-format

1524 msgid "error adding pack %s"

1525 msgstr "error agregando pack %s"

1526

1488 -#: commit-graph.c:945

1527 +#: commit-graph.c:1180

1528 #, c-format

1529 msgid "error opening index for %s"

1530 msgstr "error abriendo index para %s"

1531

1493 -#: commit-graph.c:959

1532 +#: commit-graph.c:1204

1533 #, c-format

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

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

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

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

1538

1500 -#: commit-graph.c:991

1539 +#: commit-graph.c:1238

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

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

1542

1504 -#: commit-graph.c:1004

1543 +#: commit-graph.c:1253

1544 msgid "Counting distinct commits in commit graph"

1545 msgstr "Contando commits distintos en commit graph"

1546

1508 -#: commit-graph.c:1017

1509 -#, c-format

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

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

1512 -

1513 -#: commit-graph.c:1026

1547 +#: commit-graph.c:1284

1548 msgid "Finding extra edges in commit graph"

1549 msgstr "Encontrando esquinas extra en commit graph"

1550

1517 -#: commit-graph.c:1050

1518 -msgid "too many commits to write graph"

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

1551 +#: commit-graph.c:1332

1552 +msgid "failed to write correct number of base graph ids"

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

1554

1521 -#: commit-graph.c:1057 midx.c:819

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

1556 #, c-format

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

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

1559

1526 -#: commit-graph.c:1097

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

1561 +#, c-format

1562 +msgid "unable to create '%s'"

1563 +msgstr "no se puede crear '%s'"

1564 +

1565 +#: commit-graph.c:1437

1566 #, c-format

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

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

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

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

1571

1533 -#: commit-graph.c:1162

1572 +#: commit-graph.c:1478

1573 +msgid "unable to open commit-graph chain file"

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

1575 +

1576 +#: commit-graph.c:1490

1577 +msgid "failed to rename base commit-graph file"

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

1579 +

1580 +#: commit-graph.c:1510

1581 +msgid "failed to rename temporary commit-graph file"

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

1583 +

1584 +#: commit-graph.c:1621

1585 +msgid "Scanning merged commits"

1586 +msgstr "Escaneando commits fusionados"

1587 +

1588 +#: commit-graph.c:1632

1589 +#, c-format

1590 +msgid "unexpected duplicate commit id %s"

1591 +msgstr "id de commit duplicado inesperado %s"

1592 +

1593 +#: commit-graph.c:1657

1594 +msgid "Merging commit-graph"

1595 +msgstr "Fusionando commit-graph"

1596 +

1597 +#: commit-graph.c:1844

1598 +#, c-format

1599 +msgid "the commit graph format cannot write %d commits"

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

1601 +

1602 +#: commit-graph.c:1855

1603 +msgid "too many commits to write graph"

1604 +msgstr "demasiados commits para escribir el gráfico"

1605 +

1606 +#: commit-graph.c:1945

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

1608 msgstr ""

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

1610 "corrupto"

1611

1539 -#: commit-graph.c:1172

1612 +#: commit-graph.c:1955

1613 #, c-format

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

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

1616

1544 -#: commit-graph.c:1182 commit-graph.c:1197

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

1618 #, c-format

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

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

1621

1549 -#: commit-graph.c:1189

1622 +#: commit-graph.c:1972

1623 #, c-format

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

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

1626

1554 -#: commit-graph.c:1206

1627 +#: commit-graph.c:1989

1628 msgid "Verifying commits in commit graph"

1629 msgstr "Verificando commits en commit graph"

1630

1558 -#: commit-graph.c:1219

1631 +#: commit-graph.c:2002

1632 #, c-format

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

1634 msgstr ""

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

1636 "graph"

1637

1565 -#: commit-graph.c:1226

1638 +#: commit-graph.c:2009

1639 #, c-format

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

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

1642

1570 -#: commit-graph.c:1236

1643 +#: commit-graph.c:2019

1644 #, c-format

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

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

1647

1575 -#: commit-graph.c:1242

1648 +#: commit-graph.c:2028

1649 #, c-format

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

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

1652

1580 -#: commit-graph.c:1255

1653 +#: commit-graph.c:2041

1654 #, c-format

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

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

1657

1585 -#: commit-graph.c:1260

1658 +#: commit-graph.c:2046

1659 #, c-format

1660 msgid ""

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

1662 msgstr ""

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

1664

1592 -#: commit-graph.c:1264

1665 +#: commit-graph.c:2050

1666 #, c-format

1667 msgid ""

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

1669 msgstr ""

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

1671

1599 -#: commit-graph.c:1279

1672 +#: commit-graph.c:2065

1673 #, c-format

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

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

1676

1604 -#: commit-graph.c:1285

1677 +#: commit-graph.c:2071

1678 #, c-format

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

1680 msgstr ""

@@ -1611,7 +1684,7 @@ msgstr ""

1684 msgid "memory exhausted"

1685 msgstr "memoria agotada"

1686

1614 -#: config.c:123

1687 +#: config.c:124

1688 #, c-format

1689 msgid ""

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

@@ -1626,300 +1699,300 @@ msgstr ""

1699 "\t%s\n"

1700 "Esto puede ser causado por inclusiones circulares."

1701

1629 -#: config.c:139

1702 +#: config.c:140

1703 #, c-format

1704 msgid "could not expand include path '%s'"

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

1706

1634 -#: config.c:150

1707 +#: config.c:151

1708 msgid "relative config includes must come from files"

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

1710

1638 -#: config.c:190

1711 +#: config.c:197

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

1713 msgstr ""

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

1715

1643 -#: config.c:348

1716 +#: config.c:376

1717 #, c-format

1718 msgid "key does not contain a section: %s"

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

1720

1648 -#: config.c:354

1721 +#: config.c:382

1722 #, c-format

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

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

1725

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

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

1727 #, c-format

1728 msgid "invalid key: %s"

1729 msgstr "llave inválida: %s"

1730

1658 -#: config.c:384

1731 +#: config.c:412

1732 #, c-format

1733 msgid "invalid key (newline): %s"

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

1735

1663 -#: config.c:420 config.c:432

1736 +#: config.c:448 config.c:460

1737 #, c-format

1738 msgid "bogus config parameter: %s"

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

1740

1668 -#: config.c:467

1741 +#: config.c:495

1742 #, c-format

1743 msgid "bogus format in %s"

1744 msgstr "formato malogrado en %s"

1745

1673 -#: config.c:793

1746 +#: config.c:821

1747 #, c-format

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

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

1750

1678 -#: config.c:797

1751 +#: config.c:825

1752 #, c-format

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

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

1755

1683 -#: config.c:801

1756 +#: config.c:829

1757 #, c-format

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

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

1760

1688 -#: config.c:805

1761 +#: config.c:833

1762 #, c-format

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

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

1765

1693 -#: config.c:809

1766 +#: config.c:837

1767 #, c-format

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

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

1770

1698 -#: config.c:813

1771 +#: config.c:841

1772 #, c-format

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

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

1775

1703 -#: config.c:952

1776 +#: config.c:978

1777 msgid "out of range"

1778 msgstr "fuera de rango"

1779

1707 -#: config.c:952

1780 +#: config.c:978

1781 msgid "invalid unit"

1782 msgstr "unidad inválida"

1783

1711 -#: config.c:958

1784 +#: config.c:979

1785 #, c-format

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

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

1788

1716 -#: config.c:963

1789 +#: config.c:998

1790 #, c-format

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

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

1793

1721 -#: config.c:966

1794 +#: config.c:1001

1795 #, c-format

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

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

1798

1726 -#: config.c:969

1799 +#: config.c:1004

1800 #, c-format

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

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

1803

1731 -#: config.c:972

1804 +#: config.c:1007

1805 #, c-format

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

1807 msgstr ""

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

1809

1737 -#: config.c:975

1810 +#: config.c:1010

1811 #, c-format

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

1813 msgstr ""

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

1815

1743 -#: config.c:978

1816 +#: config.c:1013

1817 #, c-format

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

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

1820

1748 -#: config.c:1073

1821 +#: config.c:1108

1822 #, c-format

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

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

1825

1753 -#: config.c:1082

1826 +#: config.c:1117

1827 #, c-format

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

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

1830

1758 -#: config.c:1173

1831 +#: config.c:1208

1832 #, c-format

1833 msgid "abbrev length out of range: %d"

1834 msgstr "largo de abreviatura fuera de rango: %d"

1835

1763 -#: config.c:1187 config.c:1198

1836 +#: config.c:1222 config.c:1233

1837 #, c-format

1838 msgid "bad zlib compression level %d"

1839 msgstr "nivel de compresión de zlib erróneo %d"

1840

1768 -#: config.c:1290

1841 +#: config.c:1325

1842 msgid "core.commentChar should only be one character"

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

1844

1772 -#: config.c:1323

1845 +#: config.c:1358

1846 #, c-format

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

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

1849

1777 -#: config.c:1395

1850 +#: config.c:1430

1851 #, c-format

1852 msgid "malformed value for %s"

1853 msgstr "valor malformado para %s"

1854

1782 -#: config.c:1421

1855 +#: config.c:1456

1856 #, c-format

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

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

1859

1787 -#: config.c:1422

1860 +#: config.c:1457

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

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

1863

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

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

1865 #, c-format

1866 msgid "bad pack compression level %d"

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

1868

1796 -#: config.c:1604

1869 +#: config.c:1639

1870 #, c-format

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

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

1873

1801 -#: config.c:1607

1874 +#: config.c:1642

1875 #, c-format

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

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

1878

1806 -#: config.c:1624

1879 +#: config.c:1659

1880 #, c-format

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

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

1883

1811 -#: config.c:1654

1884 +#: config.c:1689

1885 #, c-format

1886 msgid "failed to parse %s"

1887 msgstr "no se pudo analizar %s"

1888

1816 -#: config.c:1710

1889 +#: config.c:1745

1890 msgid "unable to parse command-line config"

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

1892

1820 -#: config.c:2059

1893 +#: config.c:2094

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

1895 msgstr ""

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

1897

1825 -#: config.c:2229

1898 +#: config.c:2264

1899 #, c-format

1900 msgid "Invalid %s: '%s'"

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

1901 +msgstr "Inválido %s: '%s'"

1902

1830 -#: config.c:2272

1903 +#: config.c:2307

1904 #, c-format

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

1906 msgstr ""

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

1908 "defecto"

1909

1837 -#: config.c:2298

1910 +#: config.c:2333

1911 #, c-format

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

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

1914

1842 -#: config.c:2344

1915 +#: config.c:2379

1916 #, c-format

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

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

1919

1847 -#: config.c:2346

1920 +#: config.c:2381

1921 #, c-format

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

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

1924

1852 -#: config.c:2427

1925 +#: config.c:2462

1926 #, c-format

1927 msgid "invalid section name '%s'"

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

1929

1857 -#: config.c:2459

1930 +#: config.c:2494

1931 #, c-format

1932 msgid "%s has multiple values"

1933 msgstr "%s tiene múltiples valores"

1934

1862 -#: config.c:2488

1935 +#: config.c:2523

1936 #, c-format

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

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

1939

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

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

1941 #, c-format

1942 msgid "could not lock config file %s"

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

1944

1872 -#: config.c:2751

1945 +#: config.c:2786

1946 #, c-format

1947 msgid "opening %s"

1948 msgstr "abriendo %s"

1949

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

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

1951 #, c-format

1952 msgid "invalid pattern: %s"

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

1954

1882 -#: config.c:2811

1955 +#: config.c:2846

1956 #, c-format

1957 msgid "invalid config file %s"

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

1959

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

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

1961 #, c-format

1962 msgid "fstat on %s failed"

1963 msgstr "fstat en %s falló"

1964

1892 -#: config.c:2835

1965 +#: config.c:2870

1966 #, c-format

1967 msgid "unable to mmap '%s'"

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

1969

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

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

1971 #, c-format

1972 msgid "chmod on %s failed"

1973 msgstr "chmod en %s falló"

1974

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

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

1976 #, c-format

1977 msgid "could not write config file %s"

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

1979

1907 -#: config.c:2963

1980 +#: config.c:2998

1981 #, c-format

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

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

1984

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

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

1986 #, c-format

1987 msgid "could not unset '%s'"

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

1989

1917 -#: config.c:3055

1990 +#: config.c:3090

1991 #, c-format

1992 msgid "invalid section name: %s"

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

1994

1922 -#: config.c:3222

1995 +#: config.c:3257

1996 #, c-format

1997 msgid "missing value for '%s'"

1998 msgstr "valor faltante para '%s'"

@@ -1937,7 +2010,7 @@ msgid ""

2010 msgstr ""

2011 "No se pudo leer del repositorio remoto.\n"

2012 "\n"

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

2013 +"Por favor asegúrate que tienes los permisos de acceso correctos\n"

2014 "y que el repositorio existe."

2015

2016 #: connect.c:81

@@ -2084,19 +2157,19 @@ msgstr "ruta extraña '%s' bloqueada"

2157 msgid "unable to fork"

2158 msgstr "no es posible hacer fork"

2159

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

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

2161 msgid "Checking connectivity"

2162 msgstr "Verificando conectividad"

2163

2091 -#: connected.c:97

2164 +#: connected.c:98

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

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

2167

2095 -#: connected.c:117

2168 +#: connected.c:118

2169 msgid "failed write to rev-list"

2170 msgstr "falló escribir a rev-list"

2171

2099 -#: connected.c:124

2172 +#: connected.c:125

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

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

2175

@@ -2314,7 +2387,7 @@ msgstr "falló al cargar isla de regex para '%s': %s"

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

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

2389

2317 -#: delta-islands.c:466

2390 +#: delta-islands.c:467

2391 #, c-format

2392 msgid "Marked %d islands, done.\n"

2393 msgstr "%d islas marcadas, listo.\n"

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

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

2465 "%s"

2466

2394 -#: diff.c:4210

2467 +#: diff.c:4215

2468 #, c-format

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

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

2471

2399 -#: diff.c:4555

2472 +#: diff.c:4560

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

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

2475

2403 -#: diff.c:4558

2476 +#: diff.c:4563

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

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

2479

2407 -#: diff.c:4636

2480 +#: diff.c:4641

2481 msgid "--follow requires exactly one pathspec"

2482 msgstr "--follow requiere exactamente un pathspec"

2483

2411 -#: diff.c:4684

2484 +#: diff.c:4689

2485 #, c-format

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

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

2488

2416 -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217

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

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

2491 #, c-format

2492 msgid "%s expects a numerical value"

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

2494

2422 -#: diff.c:4721

2495 +#: diff.c:4726

2496 #, c-format

2497 msgid ""

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

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

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

2502 "%s"

2503

2431 -#: diff.c:4806

2504 +#: diff.c:4811

2505 #, c-format

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

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

2508

2436 -#: diff.c:4830

2509 +#: diff.c:4835

2510 #, c-format

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

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

2513

2441 -#: diff.c:4844

2514 +#: diff.c:4849

2515 #, c-format

2516 msgid "unable to resolve '%s'"

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

2518

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

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

2520 #, c-format

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

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

2523

2451 -#: diff.c:4912

2524 +#: diff.c:4917

2525 #, c-format

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

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

2528

2456 -#: diff.c:4933

2529 +#: diff.c:4938

2530 #, c-format

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

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

2533

2461 -#: diff.c:4952

2534 +#: diff.c:4957

2535 #, c-format

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

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

2538

2466 -#: diff.c:4992

2539 +#: diff.c:4997

2540 msgid ""

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

2542 "\"histogram\""

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

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

2545 "\"histogram\""

2546

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

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

2548 #, c-format

2549 msgid "invalid argument to %s"

2550 msgstr "argumento inválido para %s"

2551

2479 -#: diff.c:5186

2552 +#: diff.c:5191

2553 #, c-format

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

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

2556

2484 -#: diff.c:5242

2557 +#: diff.c:5247

2558 #, c-format

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

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

2561

2489 -#: diff.c:5265

2562 +#: diff.c:5270

2563 msgid "Diff output format options"

2564 msgstr "Opciones de formato de salida para diff"

2565

2493 -#: diff.c:5267 diff.c:5273

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

2567 msgid "generate patch"

2568 msgstr "generar parche"

2569

2497 -#: diff.c:5270 builtin/log.c:167

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

2571 msgid "suppress diff output"

2572 msgstr "suprimir salida de diff"

2573

2501 -#: diff.c:5275 diff.c:5389 diff.c:5396

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

2575 msgid "<n>"

2576 msgstr "<n>"

2577

2505 -#: diff.c:5276 diff.c:5279

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

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

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

2581

2509 -#: diff.c:5281

2582 +#: diff.c:5286

2583 msgid "generate the diff in raw format"

2584 msgstr "genera el diff en formato raw"

2585

2513 -#: diff.c:5284

2586 +#: diff.c:5289

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

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

2589

2517 -#: diff.c:5288

2590 +#: diff.c:5293

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

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

2593

2521 -#: diff.c:5292

2594 +#: diff.c:5297

2595 msgid "machine friendly --stat"

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

2597

2525 -#: diff.c:5295

2598 +#: diff.c:5300

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

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

2601

2529 -#: diff.c:5297 diff.c:5305

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

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

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

2605

2533 -#: diff.c:5298

2606 +#: diff.c:5303

2607 msgid ""

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

2609 msgstr ""

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

2611 "subdirectorio"

2612

2540 -#: diff.c:5302

2613 +#: diff.c:5307

2614 msgid "synonym for --dirstat=cumulative"

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

2616

2544 -#: diff.c:5306

2617 +#: diff.c:5311

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

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

2620

2548 -#: diff.c:5310

2621 +#: diff.c:5315

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

2623 msgstr ""

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

2625 "en blanco"

2626

2554 -#: diff.c:5313

2627 +#: diff.c:5318

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

2629 msgstr ""

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

2631

2559 -#: diff.c:5316

2632 +#: diff.c:5321

2633 msgid "show only names of changed files"

2634 msgstr "mostrar solo nombres de archivos cambiados"

2635

2563 -#: diff.c:5319

2636 +#: diff.c:5324

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

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

2639

2567 -#: diff.c:5321

2640 +#: diff.c:5326

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

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

2643

2571 -#: diff.c:5322

2644 +#: diff.c:5327

2645 msgid "generate diffstat"

2646 msgstr "generar diffstat"

2647

2575 -#: diff.c:5324 diff.c:5327 diff.c:5330

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

2649 msgid "<width>"

2650 msgstr "<ancho>"

2651

2579 -#: diff.c:5325

2652 +#: diff.c:5330

2653 msgid "generate diffstat with a given width"

2654 msgstr "genera diffstat con un ancho dado"

2655

2583 -#: diff.c:5328

2656 +#: diff.c:5333

2657 msgid "generate diffstat with a given name width"

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

2659

2587 -#: diff.c:5331

2660 +#: diff.c:5336

2661 msgid "generate diffstat with a given graph width"

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

2663

2591 -#: diff.c:5333

2664 +#: diff.c:5338

2665 msgid "<count>"

2666 msgstr "<cantidad>"

2667

2595 -#: diff.c:5334

2668 +#: diff.c:5339

2669 msgid "generate diffstat with limited lines"

2670 msgstr "genera diffstat con líneas limitadas"

2671

2599 -#: diff.c:5337

2672 +#: diff.c:5342

2673 msgid "generate compact summary in diffstat"

2674 msgstr "genera un resumen compacto de diffstat"

2675

2603 -#: diff.c:5340

2676 +#: diff.c:5345

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

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

2679

2607 -#: diff.c:5343

2680 +#: diff.c:5348

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

2682 msgstr ""

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

2684 "\""

2685

2613 -#: diff.c:5345

2686 +#: diff.c:5350

2687 msgid "show colored diff"

2688 msgstr "mostrar diff colorido"

2689

2617 -#: diff.c:5346

2690 +#: diff.c:5351

2691 msgid "<kind>"

2692 msgstr "<tipo>"

2693

2621 -#: diff.c:5347

2694 +#: diff.c:5352

2695 msgid ""

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

2697 "diff"

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

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

2700 "'new' del diff"

2701

2629 -#: diff.c:5350

2702 +#: diff.c:5355

2703 msgid ""

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

2705 "--numstat"

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

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

2708 "o --numstat"

2709

2637 -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465

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

2711 msgid "<prefix>"

2712 msgstr "<prefijo>"

2713

2641 -#: diff.c:5354

2714 +#: diff.c:5359

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

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

2717

2645 -#: diff.c:5357

2718 +#: diff.c:5362

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

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

2721

2649 -#: diff.c:5360

2722 +#: diff.c:5365

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

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

2725

2653 -#: diff.c:5363

2726 +#: diff.c:5368

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

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

2729

2657 -#: diff.c:5366

2730 +#: diff.c:5371

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

2732 msgstr ""

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

2734 "líneas"

2735

2663 -#: diff.c:5370 diff.c:5375 diff.c:5380

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

2737 msgid "<char>"

2738 msgstr "<char>"

2739

2667 -#: diff.c:5371

2740 +#: diff.c:5376

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

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

2743

2671 -#: diff.c:5376

2744 +#: diff.c:5381

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

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

2747

2675 -#: diff.c:5381

2748 +#: diff.c:5386

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

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

2751

2679 -#: diff.c:5384

2752 +#: diff.c:5389

2753 msgid "Diff rename options"

2754 msgstr "Opciones de diff rename"

2755

2683 -#: diff.c:5385

2756 +#: diff.c:5390

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

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

2759

2687 -#: diff.c:5386

2760 +#: diff.c:5391

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

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

2763

2691 -#: diff.c:5390

2764 +#: diff.c:5395

2765 msgid "detect renames"

2766 msgstr "detectar renombrados"

2767

2695 -#: diff.c:5394

2768 +#: diff.c:5399

2769 msgid "omit the preimage for deletes"

2770 msgstr "omite la preimage para borrados"

2771

2699 -#: diff.c:5397

2772 +#: diff.c:5402

2773 msgid "detect copies"

2774 msgstr "detectar copias"

2775

2703 -#: diff.c:5401

2776 +#: diff.c:5406

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

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

2779

2707 -#: diff.c:5403

2780 +#: diff.c:5408

2781 msgid "disable rename detection"

2782 msgstr "deshabilita detección de renombres"

2783

2711 -#: diff.c:5406

2784 +#: diff.c:5411

2785 msgid "use empty blobs as rename source"

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

2787

2715 -#: diff.c:5408

2788 +#: diff.c:5413

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

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

2791

2719 -#: diff.c:5411

2792 +#: diff.c:5416

2793 msgid ""

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

2795 "given limit"

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

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

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

2799

2727 -#: diff.c:5413

2800 +#: diff.c:5418

2801 msgid "Diff algorithm options"

2802 msgstr "Opciones de algoritmos de diff"

2803

2731 -#: diff.c:5415

2804 +#: diff.c:5420

2805 msgid "produce the smallest possible diff"

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

2807

2735 -#: diff.c:5418

2808 +#: diff.c:5423

2809 msgid "ignore whitespace when comparing lines"

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

2811

2739 -#: diff.c:5421

2812 +#: diff.c:5426

2813 msgid "ignore changes in amount of whitespace"

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

2815

2743 -#: diff.c:5424

2816 +#: diff.c:5429

2817 msgid "ignore changes in whitespace at EOL"

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

2819

2747 -#: diff.c:5427

2820 +#: diff.c:5432

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

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

2823

2751 -#: diff.c:5430

2824 +#: diff.c:5435

2825 msgid "ignore changes whose lines are all blank"

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

2827

2755 -#: diff.c:5433

2828 +#: diff.c:5438

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

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

2831

2759 -#: diff.c:5436

2832 +#: diff.c:5441

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

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

2835

2763 -#: diff.c:5440

2836 +#: diff.c:5445

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

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

2839

2767 -#: diff.c:5442

2840 +#: diff.c:5447

2841 msgid "<algorithm>"

2842 msgstr "<algoritmo>"

2843

2771 -#: diff.c:5443

2844 +#: diff.c:5448

2845 msgid "choose a diff algorithm"

2846 msgstr "escoge un algoritmo para diff"

2847

2775 -#: diff.c:5445

2848 +#: diff.c:5450

2849 msgid "<text>"

2850 msgstr "<texto>"

2851

2779 -#: diff.c:5446

2852 +#: diff.c:5451

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

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

2855

2783 -#: diff.c:5448 diff.c:5457 diff.c:5460

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

2857 msgid "<mode>"

2858 msgstr "<modo>"

2859

2787 -#: diff.c:5449

2860 +#: diff.c:5454

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

2862 msgstr ""

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

2864

2792 -#: diff.c:5451 diff.c:5454 diff.c:5499

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

2866 msgid "<regex>"

2867 msgstr "<regex>"

2868

2796 -#: diff.c:5452

2869 +#: diff.c:5457

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

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

2872

2800 -#: diff.c:5455

2873 +#: diff.c:5460

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

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

2876

2804 -#: diff.c:5458

2877 +#: diff.c:5463

2878 msgid "moved lines of code are colored differently"

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

2880

2808 -#: diff.c:5461

2881 +#: diff.c:5466

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

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

2884

2812 -#: diff.c:5464

2885 +#: diff.c:5469

2886 msgid "Other diff options"

2887 msgstr "Otras opciones de diff"

2888

2816 -#: diff.c:5466

2889 +#: diff.c:5471

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

2891 msgstr ""

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

2893 "paths relativos"

2894

2822 -#: diff.c:5470

2895 +#: diff.c:5475

2896 msgid "treat all files as text"

2897 msgstr "tratar todos los archivos como texto"

2898

2826 -#: diff.c:5472

2899 +#: diff.c:5477

2900 msgid "swap two inputs, reverse the diff"

2901 msgstr "cambia dos inputs, invierte el diff"

2902

2830 -#: diff.c:5474

2903 +#: diff.c:5479

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

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

2906

2834 -#: diff.c:5476

2907 +#: diff.c:5481

2908 msgid "disable all output of the program"

2909 msgstr "deshabilita todo el output del programa"

2910

2838 -#: diff.c:5478

2911 +#: diff.c:5483

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

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

2914

2842 -#: diff.c:5480

2915 +#: diff.c:5485

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

2917 msgstr ""

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

2919

2847 -#: diff.c:5482

2920 +#: diff.c:5487

2921 msgid "<when>"

2922 msgstr "<cuando>"

2923

2851 -#: diff.c:5483

2924 +#: diff.c:5488

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

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

2927

2855 -#: diff.c:5486

2928 +#: diff.c:5491

2929 msgid "<format>"

2930 msgstr "<formato>"

2931

2859 -#: diff.c:5487

2932 +#: diff.c:5492

2933 msgid "specify how differences in submodules are shown"

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

2935

2863 -#: diff.c:5491

2936 +#: diff.c:5496

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

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

2939

2867 -#: diff.c:5494

2940 +#: diff.c:5499

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

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

2943

2871 -#: diff.c:5496

2944 +#: diff.c:5501

2945 msgid "<string>"

2946 msgstr "<string>"

2947

2875 -#: diff.c:5497

2948 +#: diff.c:5502

2949 msgid ""

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

2951 "string"

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

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

2954 "especificado"

2955

2883 -#: diff.c:5500

2956 +#: diff.c:5505

2957 msgid ""

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

2959 "regex"

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

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

2962 "especificado"

2963

2891 -#: diff.c:5503

2964 +#: diff.c:5508

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

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

2967

2895 -#: diff.c:5506

2968 +#: diff.c:5511

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

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

2971

2899 -#: diff.c:5509

2972 +#: diff.c:5514

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

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

2975

2903 -#: diff.c:5510

2976 +#: diff.c:5515

2977 msgid "<object-id>"

2978 msgstr "<id-objeto>"

2979

2907 -#: diff.c:5511

2980 +#: diff.c:5516

2981 msgid ""

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

2983 "object"

@@ -2912,38 +2985,38 @@ msgstr ""

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

2986 "especificado"

2987

2915 -#: diff.c:5513

2988 +#: diff.c:5518

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

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

2991

2919 -#: diff.c:5514

2992 +#: diff.c:5519

2993 msgid "select files by diff type"

2994 msgstr "selecciona archivos por tipo de diff"

2995

2923 -#: diff.c:5516

2996 +#: diff.c:5521

2997 msgid "<file>"

2998 msgstr "<archivo>"

2999

2927 -#: diff.c:5517

3000 +#: diff.c:5522

3001 msgid "Output to a specific file"

3002 msgstr "Output a un archivo específico"

3003

2931 -#: diff.c:6150

3004 +#: diff.c:6177

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

3006 msgstr ""

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

3008

2936 -#: diff.c:6153

3009 +#: diff.c:6180

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

3011 msgstr ""

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

3013

2941 -#: diff.c:6156

3014 +#: diff.c:6183

3015 #, c-format

3016 msgid ""

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

3018 msgstr ""

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

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

3020 "intentar el comando."

3021

3022 #: dir.c:537

@@ -3044,32 +3117,32 @@ msgstr "no se puede escribir al remoto"

3117 msgid "--stateless-rpc requires multi_ack_detailed"

3118 msgstr "--stateless-rpc requiere multi_ack_detailed"

3119

3047 -#: fetch-pack.c:360 fetch-pack.c:1271

3120 +#: fetch-pack.c:360 fetch-pack.c:1284

3121 #, c-format

3122 msgid "invalid shallow line: %s"

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

3124

3052 -#: fetch-pack.c:366 fetch-pack.c:1277

3125 +#: fetch-pack.c:366 fetch-pack.c:1290

3126 #, c-format

3127 msgid "invalid unshallow line: %s"

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

3129

3057 -#: fetch-pack.c:368 fetch-pack.c:1279

3130 +#: fetch-pack.c:368 fetch-pack.c:1292

3131 #, c-format

3132 msgid "object not found: %s"

3133 msgstr "objeto no encontrado: %s"

3134

3062 -#: fetch-pack.c:371 fetch-pack.c:1282

3135 +#: fetch-pack.c:371 fetch-pack.c:1295

3136 #, c-format

3137 msgid "error in object: %s"

3138 msgstr "error en objeto: %s"

3139

3067 -#: fetch-pack.c:373 fetch-pack.c:1284

3140 +#: fetch-pack.c:373 fetch-pack.c:1297

3141 #, c-format

3142 msgid "no shallow found: %s"

3143 msgstr "superficie no encontrada: %s"

3144

3072 -#: fetch-pack.c:376 fetch-pack.c:1288

3145 +#: fetch-pack.c:376 fetch-pack.c:1301

3146 #, c-format

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

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

@@ -3088,7 +3161,7 @@ msgstr "commit inválido %s"

3161 msgid "giving up"

3162 msgstr "rindiéndose"

3163

3091 -#: fetch-pack.c:477 progress.c:284

3164 +#: fetch-pack.c:477 progress.c:277

3165 msgid "done"

3166 msgstr "listo"

3167

@@ -3129,154 +3202,130 @@ msgstr "%s falló"

3202 msgid "error in sideband demultiplexer"

3203 msgstr "error en demultiplexor de banda lateral"

3204

3132 -#: fetch-pack.c:906

3133 -msgid "Server does not support shallow clients"

3134 -msgstr "El servidor no soporta clientes superficiales"

3135 -

3136 -#: fetch-pack.c:910

3137 -msgid "Server supports multi_ack_detailed"

3138 -msgstr "El servidor soporta ulti_ack_detailed"

3139 -

3140 -#: fetch-pack.c:913

3141 -msgid "Server supports no-done"

3142 -msgstr "El servidor soporta no-done"

3143 -

3144 -#: fetch-pack.c:919

3145 -msgid "Server supports multi_ack"

3146 -msgstr "El servidor soporta multi_ack"

3147 -

3148 -#: fetch-pack.c:923

3149 -msgid "Server supports side-band-64k"

3150 -msgstr "El servidor soporta side-band-64k"

3151 -

3152 -#: fetch-pack.c:927

3153 -msgid "Server supports side-band"

3154 -msgstr "El servidor soporta side-band"

3155 -

3156 -#: fetch-pack.c:931

3157 -msgid "Server supports allow-tip-sha1-in-want"

3158 -msgstr "El servidor soporta allow-tip-sha1-in-want"

3159 -

3160 -#: fetch-pack.c:935

3161 -msgid "Server supports allow-reachable-sha1-in-want"

3162 -msgstr "El servidor soporta allow-reachable-sha1-in-want"

3163 -

3164 -#: fetch-pack.c:945

3165 -msgid "Server supports ofs-delta"

3166 -msgstr "El servidor soporta ofs-delta"

3167 -

3168 -#: fetch-pack.c:951 fetch-pack.c:1144

3169 -msgid "Server supports filter"

3170 -msgstr "El servidor soporta filtro"

3171 -

3172 -#: fetch-pack.c:959

3205 +#: fetch-pack.c:908

3206 #, c-format

3207 msgid "Server version is %.*s"

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

3209

3177 -#: fetch-pack.c:965

3210 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3211 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3212 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3213 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3214 +#, c-format

3215 +msgid "Server supports %s"

3216 +msgstr "El servidor soporta %s"

3217 +

3218 +#: fetch-pack.c:915

3219 +msgid "Server does not support shallow clients"

3220 +msgstr "El servidor no soporta clientes superficiales"

3221 +

3222 +#: fetch-pack.c:975

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

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

3225

3181 -#: fetch-pack.c:969

3226 +#: fetch-pack.c:980

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

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

3229

3185 -#: fetch-pack.c:971

3230 +#: fetch-pack.c:984

3231 msgid "Server does not support --deepen"

3232 msgstr "El servidor no soporta --deepen"

3233

3189 -#: fetch-pack.c:988

3234 +#: fetch-pack.c:1001

3235 msgid "no common commits"

3236 msgstr "no hay commits comunes"

3237

3193 -#: fetch-pack.c:1000 fetch-pack.c:1449

3238 +#: fetch-pack.c:1013 fetch-pack.c:1462

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

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

3241

3197 -#: fetch-pack.c:1138

3242 +#: fetch-pack.c:1151

3243 msgid "Server does not support shallow requests"

3244 msgstr "El servidor no soporta peticiones superficiales"

3245

3201 -#: fetch-pack.c:1171

3246 +#: fetch-pack.c:1157

3247 +msgid "Server supports filter"

3248 +msgstr "El servidor soporta filtro"

3249 +

3250 +#: fetch-pack.c:1184

3251 msgid "unable to write request to remote"

3252 msgstr "no se puede escribir request al remoto"

3253

3205 -#: fetch-pack.c:1189

3254 +#: fetch-pack.c:1202

3255 #, c-format

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

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

3258

3210 -#: fetch-pack.c:1195

3259 +#: fetch-pack.c:1208

3260 #, c-format

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

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

3263

3215 -#: fetch-pack.c:1234

3264 +#: fetch-pack.c:1247

3265 #, c-format

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

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

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

3268

3220 -#: fetch-pack.c:1239

3269 +#: fetch-pack.c:1252

3270 #, c-format

3271 msgid "error processing acks: %d"

3272 msgstr "error procesando acks: %d"

3273

3225 -#: fetch-pack.c:1249

3274 +#: fetch-pack.c:1262

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

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

3277

3229 -#: fetch-pack.c:1251

3278 +#: fetch-pack.c:1264

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

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

3281

3233 -#: fetch-pack.c:1293

3282 +#: fetch-pack.c:1306

3283 #, c-format

3284 msgid "error processing shallow info: %d"

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

3286

3238 -#: fetch-pack.c:1340

3287 +#: fetch-pack.c:1353

3288 #, c-format

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

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

3291

3243 -#: fetch-pack.c:1345

3292 +#: fetch-pack.c:1358

3293 #, c-format

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

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

3296

3248 -#: fetch-pack.c:1350

3297 +#: fetch-pack.c:1363

3298 #, c-format

3299 msgid "error processing wanted refs: %d"

3300 msgstr "error procesando refs deseadas: %d"

3301

3253 -#: fetch-pack.c:1676

3302 +#: fetch-pack.c:1689

3303 msgid "no matching remote head"

3304 msgstr "no concuerda el head remoto"

3305

3257 -#: fetch-pack.c:1699 builtin/clone.c:673

3306 +#: fetch-pack.c:1712 builtin/clone.c:686

3307 msgid "remote did not send all necessary objects"

3308 msgstr "remoto no mando todos los objetos necesarios"

3309

3261 -#: fetch-pack.c:1726

3310 +#: fetch-pack.c:1739

3311 #, c-format

3312 msgid "no such remote ref %s"

3313 msgstr "no existe ref remota %s"

3314

3266 -#: fetch-pack.c:1729

3315 +#: fetch-pack.c:1742

3316 #, c-format

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

3318 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"

3319

3271 -#: gpg-interface.c:318

3320 +#: gpg-interface.c:321

3321 msgid "gpg failed to sign the data"

3322 msgstr "gpg falló al firmar la data"

3323

3275 -#: gpg-interface.c:344

3324 +#: gpg-interface.c:347

3325 msgid "could not create temporary file"

3326 msgstr "no se pudo crear archivo temporal"

3327

3279 -#: gpg-interface.c:347

3328 +#: gpg-interface.c:350

3329 #, c-format

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

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

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

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

3336 msgstr "ignora color inválido '%.*s' en log.graphColors"

3337

3289 -#: grep.c:2113

3338 +#: grep.c:2117

3339 #, c-format

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

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

3342

3294 -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

3343 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3344 #: builtin/rm.c:135

3345 #, c-format

3346 msgid "failed to stat '%s'"

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

3348

3300 -#: grep.c:2141

3349 +#: grep.c:2145

3350 #, c-format

3351 msgid "'%s': short read"

3352 msgstr "'%s': lectura corta"

@@ -3367,7 +3416,7 @@ msgstr "comandos disponibles de git desde otro lugar en tu $PATH"

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

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

3418

3370 -#: help.c:363 git.c:97

3419 +#: help.c:363 git.c:98

3420 #, c-format

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

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

@@ -3430,10 +3479,10 @@ msgid_plural ""

3479 "The most similar commands are"

3480 msgstr[0] ""

3481 "\n"

3433 -"El comando mas similar es"

3482 +"El comando más similar es"

3483 msgstr[1] ""

3484 "\n"

3436 -"Los comandos mas similares son"

3485 +"Los comandos más similares son"

3486

3487 #: help.c:714

3488 msgid "git version [<options>]"

@@ -3512,7 +3561,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

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

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

3563

3515 -#: ident.c:436 builtin/commit.c:608

3564 +#: ident.c:436 builtin/commit.c:611

3565 #, c-format

3566 msgid "invalid date format: %s"

3567 msgstr "formato de fecha inválido: %s"

@@ -3544,6 +3593,11 @@ msgstr "se esperaba 'tree:<depth>'"

3593 msgid "sparse:path filters support has been dropped"

3594 msgstr "soporte para filtros sparse:path ha sido discontinuado"

3595

3596 +#: list-objects-filter-options.c:94

3597 +#, c-format

3598 +msgid "invalid filter-spec '%s'"

3599 +msgstr "filtro -spec inválido '%s'"

3600 +

3601 #: list-objects-filter-options.c:158

3602 msgid "cannot change partial clone promisor remote"

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

@@ -3577,8 +3631,8 @@ msgstr "No se pudo crear '%s.lock': %s"

3631 msgid "failed to read the cache"

3632 msgstr "falló al leer la cache"

3633

3580 -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3581 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3634 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3635 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3636 #: builtin/stash.c:264

3637 msgid "unable to write new index file"

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

@@ -3601,91 +3655,91 @@ msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."

3655 msgid "error building trees"

3656 msgstr "error construyendo árboles"

3657

3604 -#: merge-recursive.c:861

3658 +#: merge-recursive.c:863

3659 #, c-format

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

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

3662

3609 -#: merge-recursive.c:872

3663 +#: merge-recursive.c:874

3664 #, c-format

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

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

3667

3614 -#: merge-recursive.c:886 merge-recursive.c:905

3668 +#: merge-recursive.c:888 merge-recursive.c:907

3669 msgid ": perhaps a D/F conflict?"

3670 msgstr ": tal vez un conflicto D/F?"

3671

3618 -#: merge-recursive.c:895

3672 +#: merge-recursive.c:897

3673 #, c-format

3674 msgid "refusing to lose untracked file at '%s'"

3675 msgstr "rehusando perder el archivo rastreado en '%s'"

3676

3623 -#: merge-recursive.c:936 builtin/cat-file.c:40

3677 +#: merge-recursive.c:938 builtin/cat-file.c:40

3678 #, c-format

3679 msgid "cannot read object %s '%s'"

3680 msgstr "no se puede leer el objeto %s '%s'"

3681

3628 -#: merge-recursive.c:939

3682 +#: merge-recursive.c:941

3683 #, c-format

3684 msgid "blob expected for %s '%s'"

3685 msgstr "se esperaba blob para %s '%s'"

3686

3633 -#: merge-recursive.c:963

3687 +#: merge-recursive.c:965

3688 #, c-format

3689 msgid "failed to open '%s': %s"

3690 msgstr "falló al abrir '%s': %s"

3691

3638 -#: merge-recursive.c:974

3692 +#: merge-recursive.c:976

3693 #, c-format

3694 msgid "failed to symlink '%s': %s"

3695 msgstr "falló al crear el enlace simbólico '%s': %s"

3696

3643 -#: merge-recursive.c:979

3697 +#: merge-recursive.c:981

3698 #, c-format

3699 msgid "do not know what to do with %06o %s '%s'"

3700 msgstr "no se que hacer con %06o %s '%s'"

3701

3648 -#: merge-recursive.c:1175

3702 +#: merge-recursive.c:1177

3703 #, c-format

3704 msgid "Failed to merge submodule %s (not checked out)"

3705 msgstr "Falló al fusionar el submódulo %s (no revisado)"

3706

3653 -#: merge-recursive.c:1182

3707 +#: merge-recursive.c:1184

3708 #, c-format

3709 msgid "Failed to merge submodule %s (commits not present)"

3710 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"

3711

3658 -#: merge-recursive.c:1189

3712 +#: merge-recursive.c:1191

3713 #, c-format

3714 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3715 msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"

3716

3663 -#: merge-recursive.c:1197 merge-recursive.c:1209

3717 +#: merge-recursive.c:1199 merge-recursive.c:1211

3718 #, c-format

3719 msgid "Fast-forwarding submodule %s to the following commit:"

3720 msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"

3721

3668 -#: merge-recursive.c:1200 merge-recursive.c:1212

3722 +#: merge-recursive.c:1202 merge-recursive.c:1214

3723 #, c-format

3724 msgid "Fast-forwarding submodule %s"

3725 msgstr "Avance rápido en submódulo %s"

3726

3673 -#: merge-recursive.c:1235

3727 +#: merge-recursive.c:1237

3728 #, c-format

3729 msgid "Failed to merge submodule %s (merge following commits not found)"

3730 msgstr ""

3731 "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"

3732

3679 -#: merge-recursive.c:1239

3733 +#: merge-recursive.c:1241

3734 #, c-format

3735 msgid "Failed to merge submodule %s (not fast-forward)"

3736 msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"

3737

3684 -#: merge-recursive.c:1240

3738 +#: merge-recursive.c:1242

3739 msgid "Found a possible merge resolution for the submodule:\n"

3740 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"

3741

3688 -#: merge-recursive.c:1243

3742 +#: merge-recursive.c:1245

3743 #, c-format

3744 msgid ""

3745 "If this is correct simply add it to the index for example\n"

@@ -3702,33 +3756,33 @@ msgstr ""

3756 "\n"

3757 "el cual aceptará esta sugerencia.\n"

3758

3705 -#: merge-recursive.c:1252

3759 +#: merge-recursive.c:1254

3760 #, c-format

3761 msgid "Failed to merge submodule %s (multiple merges found)"

3762 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"

3763

3710 -#: merge-recursive.c:1325

3764 +#: merge-recursive.c:1327

3765 msgid "Failed to execute internal merge"

3766 msgstr "Falló al ejecutar la fusión interna"

3767

3714 -#: merge-recursive.c:1330

3768 +#: merge-recursive.c:1332

3769 #, c-format

3770 msgid "Unable to add %s to database"

3771 msgstr "No es posible agregar %s a la base de datos"

3772

3719 -#: merge-recursive.c:1362

3773 +#: merge-recursive.c:1364

3774 #, c-format

3775 msgid "Auto-merging %s"

3776 msgstr "Auto-fusionando %s"

3777

3724 -#: merge-recursive.c:1385

3778 +#: merge-recursive.c:1387

3779 #, c-format

3780 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3781 msgstr ""

3782 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "

3783 "cambio."

3784

3731 -#: merge-recursive.c:1457

3785 +#: merge-recursive.c:1459

3786 #, c-format

3787 msgid ""

3788 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -3737,7 +3791,7 @@ msgstr ""

3791 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "

3792 "en el árbol."

3793

3740 -#: merge-recursive.c:1462

3794 +#: merge-recursive.c:1464

3795 #, c-format

3796 msgid ""

3797 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3746,7 +3800,7 @@ msgstr ""

3800 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

3801 "permanece en el árbol."

3802

3749 -#: merge-recursive.c:1469

3803 +#: merge-recursive.c:1471

3804 #, c-format

3805 msgid ""

3806 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -3755,7 +3809,7 @@ msgstr ""

3809 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "

3810 "dejada en el árbol, en %s."

3811

3758 -#: merge-recursive.c:1474

3812 +#: merge-recursive.c:1476

3813 #, c-format

3814 msgid ""

3815 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3764,44 +3818,44 @@ msgstr ""

3818 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

3819 "permanece en el árbol en %s."

3820

3767 -#: merge-recursive.c:1509

3821 +#: merge-recursive.c:1511

3822 msgid "rename"

3823 msgstr "renombrar"

3824

3771 -#: merge-recursive.c:1509

3825 +#: merge-recursive.c:1511

3826 msgid "renamed"

3827 msgstr "renombrado"

3828

3775 -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3829 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3830 #, c-format

3831 msgid "Refusing to lose dirty file at %s"

3832 msgstr "Rehusando perder el archivo sucio en %s"

3833

3780 -#: merge-recursive.c:1599

3834 +#: merge-recursive.c:1601

3835 #, c-format

3836 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3837 msgstr ""

3838 "Rehusando perder el archivo no rastreado en %s, incluso aunque se está "

3839 "interponiendo."

3840

3787 -#: merge-recursive.c:1657

3841 +#: merge-recursive.c:1659

3842 #, c-format

3843 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

3844 msgstr ""

3845 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"

3846

3793 -#: merge-recursive.c:1687

3847 +#: merge-recursive.c:1690

3848 #, c-format

3849 msgid "%s is a directory in %s adding as %s instead"

3850 msgstr "%s es un directorio en %s agregando como %s más bien"

3851

3798 -#: merge-recursive.c:1692

3852 +#: merge-recursive.c:1695

3853 #, c-format

3854 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3855 msgstr ""

3856 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"

3857

3804 -#: merge-recursive.c:1711

3858 +#: merge-recursive.c:1714

3859 #, c-format

3860 msgid ""

3861 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -3810,18 +3864,18 @@ msgstr ""

3864 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "

3865 "renombrar \"%s\"->\"%s\" en \"%s\"%s"

3866

3813 -#: merge-recursive.c:1716

3867 +#: merge-recursive.c:1719

3868 msgid " (left unresolved)"

3869 msgstr " (dejado sin resolver)"

3870

3817 -#: merge-recursive.c:1825

3871 +#: merge-recursive.c:1828

3872 #, c-format

3873 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

3874 msgstr ""

3875 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

3876 "%s"

3877

3824 -#: merge-recursive.c:2030

3878 +#: merge-recursive.c:2035

3879 #, c-format

3880 msgid ""

3881 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3832,7 +3886,7 @@ msgstr ""

3886 "colocar %s porque el directorio %s fue renombrado a otros múltiples "

3887 "directorios, sin ningún que contenga la mayoría de archivos."

3888

3835 -#: merge-recursive.c:2062

3889 +#: merge-recursive.c:2067

3890 #, c-format

3891 msgid ""

3892 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3842,7 +3896,7 @@ msgstr ""

3896 "existente en %s se interpone con el cambio de nombres implícito, poniendo "

3897 "la(s) siguiente(s) ruta(s) aquí: %s."

3898

3845 -#: merge-recursive.c:2072

3899 +#: merge-recursive.c:2077

3900 #, c-format

3901 msgid ""

3902 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3851,7 +3905,7 @@ msgstr ""

3905 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

3906 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"

3907

3854 -#: merge-recursive.c:2164

3908 +#: merge-recursive.c:2169

3909 #, c-format

3910 msgid ""

3911 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3860,7 +3914,7 @@ msgstr ""

3914 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

3915 "Renombrar directorio %s->%s en %s"

3916

3863 -#: merge-recursive.c:2408

3917 +#: merge-recursive.c:2413

3918 #, c-format

3919 msgid ""

3920 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3869,52 +3923,52 @@ msgstr ""

3923 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

3924 "renombrado."

3925

3872 -#: merge-recursive.c:2929

3926 +#: merge-recursive.c:2938

3927 #, c-format

3928 msgid "cannot read object %s"

3929 msgstr "no se pudo leer el objeto %s"

3930

3877 -#: merge-recursive.c:2932

3931 +#: merge-recursive.c:2941

3932 #, c-format

3933 msgid "object %s is not a blob"

3934 msgstr "objeto %s no es un blob"

3935

3882 -#: merge-recursive.c:2996

3936 +#: merge-recursive.c:3005

3937 msgid "modify"

3938 msgstr "modificar"

3939

3886 -#: merge-recursive.c:2996

3940 +#: merge-recursive.c:3005

3941 msgid "modified"

3942 msgstr "modificado"

3943

3890 -#: merge-recursive.c:3008

3944 +#: merge-recursive.c:3017

3945 msgid "content"

3946 msgstr "contenido"

3947

3894 -#: merge-recursive.c:3012

3948 +#: merge-recursive.c:3021

3949 msgid "add/add"

3950 msgstr "agregar/agregar"

3951

3898 -#: merge-recursive.c:3035

3952 +#: merge-recursive.c:3044

3953 #, c-format

3954 msgid "Skipped %s (merged same as existing)"

3955 msgstr "Saltado %s (fusionado como existente)"

3956

3903 -#: merge-recursive.c:3057 git-submodule.sh:937

3957 +#: merge-recursive.c:3066 git-submodule.sh:937

3958 msgid "submodule"

3959 msgstr "submódulo"

3960

3907 -#: merge-recursive.c:3058

3961 +#: merge-recursive.c:3067

3962 #, c-format

3963 msgid "CONFLICT (%s): Merge conflict in %s"

3964 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

3965

3912 -#: merge-recursive.c:3088

3966 +#: merge-recursive.c:3097

3967 #, c-format

3968 msgid "Adding as %s instead"

3969 msgstr "Agregando más bien como %s"

3970

3917 -#: merge-recursive.c:3170

3971 +#: merge-recursive.c:3179

3972 #, c-format

3973 msgid ""

3974 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3923,7 +3977,7 @@ msgstr ""

3977 "Path actualizado: %s agregado en %s dentro de un directorio que fue "

3978 "renombrado en %s; moviéndolo a %s."

3979

3926 -#: merge-recursive.c:3173

3980 +#: merge-recursive.c:3182

3981 #, c-format

3982 msgid ""

3983 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3932,7 +3986,7 @@ msgstr ""

3986 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

3987 "que fue renombrado en %s, sugerimos que debería ser movido a %s."

3988

3935 -#: merge-recursive.c:3177

3989 +#: merge-recursive.c:3186

3990 #, c-format

3991 msgid ""

3992 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -3941,7 +3995,7 @@ msgstr ""

3995 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

3996 "renombrado en %s; moviéndolo a %s."

3997

3944 -#: merge-recursive.c:3180

3998 +#: merge-recursive.c:3189

3999 #, c-format

4000 msgid ""

4001 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -3951,37 +4005,37 @@ msgstr ""

4005 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

4006 "movido a %s."

4007

3954 -#: merge-recursive.c:3294

4008 +#: merge-recursive.c:3303

4009 #, c-format

4010 msgid "Removing %s"

4011 msgstr "Eliminando %s"

4012

3959 -#: merge-recursive.c:3317

4013 +#: merge-recursive.c:3326

4014 msgid "file/directory"

4015 msgstr "archivo/directorio"

4016

3963 -#: merge-recursive.c:3322

4017 +#: merge-recursive.c:3331

4018 msgid "directory/file"

4019 msgstr "directorio/archivo"

4020

3967 -#: merge-recursive.c:3329

4021 +#: merge-recursive.c:3338

4022 #, c-format

4023 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

4024 msgstr ""

4025 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "

4026 "%s"

4027

3974 -#: merge-recursive.c:3338

4028 +#: merge-recursive.c:3347

4029 #, c-format

4030 msgid "Adding %s"

4031 msgstr "Agregando %s"

4032

3979 -#: merge-recursive.c:3347

4033 +#: merge-recursive.c:3356

4034 #, c-format

4035 msgid "CONFLICT (add/add): Merge conflict in %s"

4036 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

4037

3984 -#: merge-recursive.c:3385

4038 +#: merge-recursive.c:3394

4039 #, c-format

4040 msgid ""

4041 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3991,177 +4045,190 @@ msgstr ""

4045 "merge:\n"

4046 " %s"

4047

3994 -#: merge-recursive.c:3396

4048 +#: merge-recursive.c:3405

4049 msgid "Already up to date!"

4050 msgstr "¡Ya está actualizado!"

4051

3998 -#: merge-recursive.c:3405

4052 +#: merge-recursive.c:3414

4053 #, c-format

4054 msgid "merging of trees %s and %s failed"

4055 msgstr "falló la fusión de los árboles %s y %s"

4056

4003 -#: merge-recursive.c:3504

4057 +#: merge-recursive.c:3513

4058 msgid "Merging:"

4059 msgstr "Fusionando:"

4060

4007 -#: merge-recursive.c:3517

4061 +#: merge-recursive.c:3526

4062 #, c-format

4063 msgid "found %u common ancestor:"

4064 msgid_plural "found %u common ancestors:"

4065 msgstr[0] "se encontró %u ancestro común:"

4066 msgstr[1] "se encontraron %u ancestros comunes:"

4067

4014 -#: merge-recursive.c:3556

4068 +#: merge-recursive.c:3565

4069 msgid "merge returned no commit"

4070 msgstr "la fusión no devolvió ningún commit"

4071

4018 -#: merge-recursive.c:3622

4072 +#: merge-recursive.c:3631

4073 #, c-format

4074 msgid "Could not parse object '%s'"

4075 msgstr "No se pudo analizar el objeto '%s'"

4076

4023 -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4077 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4078 msgid "Unable to write index."

4079 msgstr "Incapaz de escribir el índice."

4080

4027 -#: midx.c:66

4081 +#: midx.c:69

4082 #, c-format

4083 msgid "multi-pack-index file %s is too small"

4084 msgstr "archivo multi-pack-index %s es muy pequeño"

4085

4032 -#: midx.c:82

4086 +#: midx.c:85

4087 #, c-format

4088 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4089 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"

4090

4037 -#: midx.c:87

4091 +#: midx.c:90

4092 #, c-format

4093 msgid "multi-pack-index version %d not recognized"

4094 msgstr "versión %d de multi-pack-index no reconocida"

4095

4042 -#: midx.c:92

4096 +#: midx.c:95

4097 #, c-format

4098 msgid "hash version %u does not match"

4099 msgstr "versión de hash %u no concuerda"

4100

4047 -#: midx.c:106

4101 +#: midx.c:109

4102 msgid "invalid chunk offset (too large)"

4103 msgstr "offset inválido del conjunto (muy grande)"

4104

4051 -#: midx.c:130

4105 +#: midx.c:133

4106 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4107 msgstr ""

4108 "terminando multi-pack-index porque el id del conjunto aparece antes de lo "

4109 "esperado"

4110

4057 -#: midx.c:143

4111 +#: midx.c:146

4112 msgid "multi-pack-index missing required pack-name chunk"

4113 msgstr "multi-pack-index le falta el conjunto pack-name requerido"

4114

4061 -#: midx.c:145

4115 +#: midx.c:148

4116 msgid "multi-pack-index missing required OID fanout chunk"

4117 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4118

4065 -#: midx.c:147

4119 +#: midx.c:150

4120 msgid "multi-pack-index missing required OID lookup chunk"

4121 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"

4122

4069 -#: midx.c:149

4123 +#: midx.c:152

4124 msgid "multi-pack-index missing required object offsets chunk"

4125 msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"

4126

4073 -#: midx.c:163

4127 +#: midx.c:166

4128 #, c-format

4129 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4130 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"

4131

4078 -#: midx.c:208

4132 +#: midx.c:211

4133 #, c-format

4134 msgid "bad pack-int-id: %u (%u total packs)"

4135 msgstr "mal pack-int-id: %u (%u paquetes totales)"

4136

4083 -#: midx.c:258

4137 +#: midx.c:261

4138 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4139 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4140

4087 -#: midx.c:286

4141 +#: midx.c:289

4142 msgid "error preparing packfile from multi-pack-index"

4143 msgstr "error preparando packfile de multi-pack-index"

4144

4091 -#: midx.c:457

4145 +#: midx.c:470

4146 #, c-format

4147 msgid "failed to add packfile '%s'"

4148 msgstr "falló al agregar packfile '%s'"

4149

4096 -#: midx.c:463

4150 +#: midx.c:476

4151 #, c-format

4152 msgid "failed to open pack-index '%s'"

4153 msgstr "falló al abrir pack-index '%s'"

4154

4101 -#: midx.c:557

4155 +#: midx.c:536

4156 #, c-format

4157 msgid "failed to locate object %d in packfile"

4158 msgstr "falló al ubicar objeto %d en packfile"

4159

4106 -#: midx.c:993

4160 +#: midx.c:865

4161 +#, c-format

4162 +msgid "did not see pack-file %s to drop"

4163 +msgstr "no se vió pack-file %s caer"

4164 +

4165 +#: midx.c:1036

4166 #, c-format

4167 msgid "failed to clear multi-pack-index at %s"

4168 msgstr "falló al limpiar multi-pack-index en %s"

4169

4111 -#: midx.c:1048

4170 +#: midx.c:1091

4171 msgid "Looking for referenced packfiles"

4172 msgstr "Buscando por packfiles referidos"

4173

4115 -#: midx.c:1063

4174 +#: midx.c:1106

4175 #, c-format

4176 msgid ""

4177 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4178 msgstr ""

4179 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4180

4122 -#: midx.c:1067

4181 +#: midx.c:1110

4182 msgid "Verifying OID order in MIDX"

4183 msgstr "Verificando orden de OID en MIDX"

4184

4126 -#: midx.c:1076

4185 +#: midx.c:1119

4186 #, c-format

4187 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4188 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4189

4131 -#: midx.c:1095

4190 +#: midx.c:1138

4191 msgid "Sorting objects by packfile"

4192 msgstr "Ordenando objetos por packfile"

4193

4135 -#: midx.c:1101

4194 +#: midx.c:1144

4195 msgid "Verifying object offsets"

4196 msgstr "Verificando offsets de objetos"

4197

4139 -#: midx.c:1117

4198 +#: midx.c:1160

4199 #, c-format

4200 msgid "failed to load pack entry for oid[%d] = %s"

4201 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4202

4144 -#: midx.c:1123

4203 +#: midx.c:1166

4204 #, c-format

4205 msgid "failed to load pack-index for packfile %s"

4206 msgstr "falló al cargar el pack-index para packfile %s"

4207

4149 -#: midx.c:1132

4208 +#: midx.c:1175

4209 #, c-format

4210 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4211 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4212

4154 -#: name-hash.c:531

4213 +#: midx.c:1350

4214 +msgid "could not start pack-objects"

4215 +msgstr "no se pudo empezar los pack-objetcts"

4216 +

4217 +#: midx.c:1369

4218 +msgid "could not finish pack-objects"

4219 +msgstr "no se pudo finalizar pack-objetcts"

4220 +

4221 +#: name-hash.c:532

4222 #, c-format

4223 msgid "unable to create lazy_dir thread: %s"

4224 msgstr "no es posible crear hilo lazy_dir: %s"

4225

4159 -#: name-hash.c:553

4226 +#: name-hash.c:554

4227 #, c-format

4228 msgid "unable to create lazy_name thread: %s"

4229 msgstr "no es posible crear hilo lazy_name: %s"

4230

4164 -#: name-hash.c:559

4231 +#: name-hash.c:560

4232 #, c-format

4233 msgid "unable to join lazy_name thread: %s"

4234 msgstr "no es posible unir hilo lazy_name: %s"

@@ -4233,17 +4300,17 @@ msgstr "incapaz de analizar objeto: %s"

4300 msgid "hash mismatch %s"

4301 msgstr "hash no concuerda %s"

4302

4236 -#: packfile.c:617

4303 +#: packfile.c:648

4304 msgid "offset before end of packfile (broken .idx?)"

4305 msgstr "offset antes del final del paquete (broken .idx?)"

4306

4240 -#: packfile.c:1868

4307 +#: packfile.c:1899

4308 #, c-format

4309 msgid "offset before start of pack index for %s (corrupt index?)"

4310 msgstr ""

4311 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"

4312

4246 -#: packfile.c:1872

4313 +#: packfile.c:1903

4314 #, c-format

4315 msgid "offset beyond end of pack index for %s (truncated index?)"

4316 msgstr ""

@@ -4302,7 +4369,7 @@ msgstr "switch desconocido `%c'"

4369 #: parse-options.c:863

4370 #, c-format

4371 msgid "unknown non-ascii option in string: `%s'"

4305 -msgstr "opcion desconocida en string no ascii: `%s'"

4372 +msgstr "opción desconocida en string no ascii: `%s'"

4373

4374 #: parse-options.c:887

4375 msgid "..."

@@ -4499,24 +4566,29 @@ msgstr "no es posible crear lstat hilado: %s"

4566 msgid "unable to parse --pretty format"

4567 msgstr "incapaz de analizar el formato --pretty"

4568

4502 -#: range-diff.c:56

4569 +#: range-diff.c:70

4570 msgid "could not start `log`"

4571 msgstr "no se pudo comenzar `log`"

4572

4506 -#: range-diff.c:59

4573 +#: range-diff.c:72

4574 msgid "could not read `log` output"

4575 msgstr "no se pudo leer output de `log`"

4576

4510 -#: range-diff.c:74 sequencer.c:4897

4577 +#: range-diff.c:91 sequencer.c:5021

4578 #, c-format

4579 msgid "could not parse commit '%s'"

4580 msgstr "no se pudo analizar commit '%s'"

4581

4515 -#: range-diff.c:224

4582 +#: range-diff.c:117

4583 +#, c-format

4584 +msgid "could not parse git header '%.*s'"

4585 +msgstr "no se puede analizar git header '%.*s'"

4586 +

4587 +#: range-diff.c:274

4588 msgid "failed to generate diff"

4589 msgstr "falló al generar diff"

4590

4519 -#: range-diff.c:455 range-diff.c:457

4591 +#: range-diff.c:506 range-diff.c:508

4592 #, c-format

4593 msgid "could not parse log for '%s'"

4594 msgstr "no se pudo leer el log para '%s'"

@@ -4632,11 +4704,10 @@ msgid "unordered stage entries for '%s'"

4704 msgstr "entradas de stage desordenadas para '%s'"

4705

4706 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4635 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4636 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4637 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4638 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4639 -#: builtin/submodule--helper.c:330

4707 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4708 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4709 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4710 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4711 msgid "index file corrupt"

4712 msgstr "archivo índice corrompido"

4713

@@ -4690,12 +4761,12 @@ msgstr "no se pudo refrescar el index compartido '%s'"

4761 msgid "broken index, expect %s in %s, got %s"

4762 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

4763

4693 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4764 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4765 #, c-format

4766 msgid "could not close '%s'"

4767 msgstr "no se pudo cerrar '%s'"

4768

4698 -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4769 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4770 #, c-format

4771 msgid "could not stat '%s'"

4772 msgstr "no se pudo definir '%s'"

@@ -4776,7 +4847,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

4847 msgstr[0] "Rebase %s en %s (%d comando)"

4848 msgstr[1] "Rebase %s en %s (%d comandos)"

4849

4779 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4850 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

4851 msgid ""

4852 "\n"

4853 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4784,7 +4855,7 @@ msgstr ""

4855 "\n"

4856 "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"

4857

4787 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4858 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

4859 msgid ""

4860 "\n"

4861 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4792,7 +4863,7 @@ msgstr ""

4863 "\n"

4864 "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"

4865

4795 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

4866 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

4867 msgid ""

4868 "\n"

4869 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4801,12 +4872,12 @@ msgid ""

4872 "\n"

4873 msgstr ""

4874 "\n"

4804 -"Esta editando el archivo TODO de un rebase interactivo.\n"

4805 -"Para continuar el rebase después de editar, ejecute:\n"

4875 +"Estás editando el archivo TODO de un rebase interactivo.\n"

4876 +"Para continuar el rebase después de editar, ejecuta:\n"

4877 " git rebase --continue\n"

4878 "\n"

4879

4809 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

4880 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

4881 msgid ""

4882 "\n"

4883 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4816,12 +4887,12 @@ msgstr ""

4887 "Como sea, si quieres borrar todo, el rebase será abortado.\n"

4888 "\n"

4889

4819 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

4890 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

4891 msgid "Note that empty commits are commented out"

4892 msgstr "Tenga en cuenta que los commits vacíos están comentados"

4893

4823 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4824 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4894 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4895 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4896 #, c-format

4897 msgid "could not write '%s'"

4898 msgstr "no se pudo escribir '%s'"

@@ -4838,7 +4909,7 @@ msgid ""

4909 "Dropped commits (newer to older):\n"

4910 msgstr ""

4911 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

4841 -"Commits botados (empezando con el mas nuevo):\n"

4912 +"Commits botados (empezando con el más nuevo):\n"

4913

4914 #: rebase-interactive.c:180

4915 #, c-format

@@ -4858,97 +4929,98 @@ msgstr ""

4929 "Los posibles comportamientos son: ignore,warn,error.\n"

4930 "\n"

4931

4861 -#: refs.c:192

4932 +#: refs.c:262

4933 #, c-format

4934 msgid "%s does not point to a valid object!"

4935 msgstr "%s no apunta a ningún objeto válido!"

4936

4866 -#: refs.c:597

4937 +#: refs.c:667

4938 #, c-format

4939 msgid "ignoring dangling symref %s"

4940 msgstr "ignorando referencia rota %s"

4941

4871 -#: refs.c:599 ref-filter.c:1982

4942 +#: refs.c:669 ref-filter.c:2092

4943 #, c-format

4944 msgid "ignoring broken ref %s"

4945 msgstr "ignorando referencia rota %s"

4946

4876 -#: refs.c:734

4947 +#: refs.c:804

4948 #, c-format

4949 msgid "could not open '%s' for writing: %s"

4950 msgstr "no se pudo abrir '%s' para escritura: %s"

4951

4881 -#: refs.c:744 refs.c:795

4952 +#: refs.c:814 refs.c:865

4953 #, c-format

4954 msgid "could not read ref '%s'"

4955 msgstr "no se pudo leer la referencia '%s'"

4956

4886 -#: refs.c:750

4957 +#: refs.c:820

4958 #, c-format

4959 msgid "ref '%s' already exists"

4960 msgstr "ref '%s' ya existe"

4961

4891 -#: refs.c:755

4962 +#: refs.c:825

4963 #, c-format

4964 msgid "unexpected object ID when writing '%s'"

4965 msgstr "ID de objecto inesperado cuando se escribía '%s'"

4966

4896 -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4897 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4967 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4968 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4969 #, c-format

4970 msgid "could not write to '%s'"

4971 msgstr "no se pudo escribir en '%s'"

4972

4902 -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4973 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4974 +#: builtin/rebase.c:1003

4975 #, c-format

4976 msgid "could not open '%s' for writing"

4977 msgstr "no se pudo abrir '%s' para escritura"

4978

4907 -#: refs.c:797

4979 +#: refs.c:867

4980 #, c-format

4981 msgid "unexpected object ID when deleting '%s'"

4982 msgstr "ID de objecto inesperado cuando se borraba '%s'"

4983

4912 -#: refs.c:928

4984 +#: refs.c:998

4985 #, c-format

4986 msgid "log for ref %s has gap after %s"

4987 msgstr "log de ref %s tiene un vacío tras %s"

4988

4917 -#: refs.c:934

4989 +#: refs.c:1004

4990 #, c-format

4991 msgid "log for ref %s unexpectedly ended on %s"

4992 msgstr "log de ref %s finalizado inesperadamente en %s"

4993

4922 -#: refs.c:993

4994 +#: refs.c:1063

4995 #, c-format

4996 msgid "log for %s is empty"

4997 msgstr "log de %s está vacío"

4998

4927 -#: refs.c:1085

4999 +#: refs.c:1155

5000 #, c-format

5001 msgid "refusing to update ref with bad name '%s'"

5002 msgstr "rehusando actualizar ref con mal nombre '%s'"

5003

4932 -#: refs.c:1161

5004 +#: refs.c:1231

5005 #, c-format

5006 msgid "update_ref failed for ref '%s': %s"

5007 msgstr "update_ref falló para ref '%s': %s"

5008

4937 -#: refs.c:1942

5009 +#: refs.c:2012

5010 #, c-format

5011 msgid "multiple updates for ref '%s' not allowed"

5012 msgstr "múltiples actualizaciones para ref '%s' no permitidas"

5013

4942 -#: refs.c:1974

5014 +#: refs.c:2044

5015 msgid "ref updates forbidden inside quarantine environment"

5016 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

5017

4946 -#: refs.c:2070 refs.c:2100

5018 +#: refs.c:2140 refs.c:2170

5019 #, c-format

5020 msgid "'%s' exists; cannot create '%s'"

5021 msgstr "'%s' existe; no se puede crear '%s'"

5022

4951 -#: refs.c:2076 refs.c:2111

5023 +#: refs.c:2146 refs.c:2181

5024 #, c-format

5025 msgid "cannot process '%s' and '%s' at the same time"

5026 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

@@ -4974,268 +5046,252 @@ msgstr "no se pudo eliminar la referencia: %s"

5046 msgid "invalid refspec '%s'"

5047 msgstr "refspec inválido: '%s'"

5048

4977 -#: ref-filter.c:39 wt-status.c:1909

5049 +#: ref-filter.c:42 wt-status.c:1934

5050 msgid "gone"

5051 msgstr "desaparecido"

5052

4981 -#: ref-filter.c:40

5053 +#: ref-filter.c:43

5054 #, c-format

5055 msgid "ahead %d"

5056 msgstr "adelante %d"

5057

4986 -#: ref-filter.c:41

5058 +#: ref-filter.c:44

5059 #, c-format

5060 msgid "behind %d"

5061 msgstr "detrás %d"

5062

4991 -#: ref-filter.c:42

5063 +#: ref-filter.c:45

5064 #, c-format

5065 msgid "ahead %d, behind %d"

5066 msgstr "delante %d, detrás %d"

5067

4996 -#: ref-filter.c:138

5068 +#: ref-filter.c:162

5069 #, c-format

5070 msgid "expected format: %%(color:<color>)"

5071 msgstr "formato esperado: %%(color:<color>)"

5072

5001 -#: ref-filter.c:140

5073 +#: ref-filter.c:164

5074 #, c-format

5075 msgid "unrecognized color: %%(color:%s)"

5076 msgstr "color no reconocido: %%(color:%s)"

5077

5006 -#: ref-filter.c:162

5078 +#: ref-filter.c:186

5079 #, c-format

5080 msgid "Integer value expected refname:lstrip=%s"

5081 msgstr "Valor entero esperado refname:lstrip=%s"

5082

5011 -#: ref-filter.c:166

5083 +#: ref-filter.c:190

5084 #, c-format

5085 msgid "Integer value expected refname:rstrip=%s"

5086 msgstr "Valor entero esperado refname:rstrip=%s"

5087

5016 -#: ref-filter.c:168

5088 +#: ref-filter.c:192

5089 #, c-format

5090 msgid "unrecognized %%(%s) argument: %s"

5091 msgstr "argumento: %s no reconocido %%(%s)"

5092

5021 -#: ref-filter.c:223

5093 +#: ref-filter.c:247

5094 #, c-format

5095 msgid "%%(objecttype) does not take arguments"

5096 msgstr "%%(objecttype) no toma ningún argumento"

5097

5026 -#: ref-filter.c:245

5098 +#: ref-filter.c:269

5099 #, c-format

5100 msgid "unrecognized %%(objectsize) argument: %s"

5101 msgstr "%%(objectsize) no reconocido argumento: %s"

5102

5031 -#: ref-filter.c:253

5103 +#: ref-filter.c:277

5104 #, c-format

5105 msgid "%%(deltabase) does not take arguments"

5106 msgstr "%%(deltabase) no toma argumentos"

5107

5036 -#: ref-filter.c:265

5108 +#: ref-filter.c:289

5109 #, c-format

5110 msgid "%%(body) does not take arguments"

5111 msgstr "%%(body) no toma ningún argumento"

5112

5041 -#: ref-filter.c:274

5113 +#: ref-filter.c:298

5114 #, c-format

5115 msgid "%%(subject) does not take arguments"

5116 msgstr "%%(subject) no toma ningún argumento"

5117

5046 -#: ref-filter.c:296

5118 +#: ref-filter.c:320

5119 #, c-format

5120 msgid "unknown %%(trailers) argument: %s"

5121 msgstr "%%(trailers) desconocidos, argumento: %s"

5122

5051 -#: ref-filter.c:325

5123 +#: ref-filter.c:349

5124 #, c-format

5125 msgid "positive value expected contents:lines=%s"

5126 msgstr "valor positivo esperado contents:lines=%s"

5127

5056 -#: ref-filter.c:327

5128 +#: ref-filter.c:351

5129 #, c-format

5130 msgid "unrecognized %%(contents) argument: %s"

5131 msgstr "argumento %s no reconocido %%(contents)"

5132

5061 -#: ref-filter.c:342

5133 +#: ref-filter.c:366

5134 #, c-format

5135 msgid "positive value expected objectname:short=%s"

5136 msgstr "valor positivo esperado objectname:short=%s"

5137

5066 -#: ref-filter.c:346

5138 +#: ref-filter.c:370

5139 #, c-format

5140 msgid "unrecognized %%(objectname) argument: %s"

5141 msgstr "argumento: %s no reconocido %%(objectname)"

5142

5071 -#: ref-filter.c:376

5143 +#: ref-filter.c:400

5144 #, c-format

5145 msgid "expected format: %%(align:<width>,<position>)"

5146 msgstr "formato esperado: %%(align:<ancho>,<posición>)"

5147

5076 -#: ref-filter.c:388

5148 +#: ref-filter.c:412

5149 #, c-format

5150 msgid "unrecognized position:%s"

5151 msgstr "posición desconocida: %s"

5152

5081 -#: ref-filter.c:395

5153 +#: ref-filter.c:419

5154 #, c-format

5155 msgid "unrecognized width:%s"

5156 msgstr "ancho desconocido: %s"

5157

5086 -#: ref-filter.c:404

5158 +#: ref-filter.c:428

5159 #, c-format

5160 msgid "unrecognized %%(align) argument: %s"

5161 msgstr "argumento no reconocido para %%(align): %s"

5162

5091 -#: ref-filter.c:412

5163 +#: ref-filter.c:436

5164 #, c-format

5165 msgid "positive width expected with the %%(align) atom"

5166 msgstr "se esperaba un ancho positivo con el átomo %%(align)"

5167

5096 -#: ref-filter.c:430

5168 +#: ref-filter.c:454

5169 #, c-format

5170 msgid "unrecognized %%(if) argument: %s"

5171 msgstr "argumento: %s no reconocido %%(if)"

5172

5101 -#: ref-filter.c:531

5173 +#: ref-filter.c:556

5174 #, c-format

5175 msgid "malformed field name: %.*s"

5176 msgstr "nombre mal formado de campo: %.*s"

5177

5106 -#: ref-filter.c:558

5178 +#: ref-filter.c:583

5179 #, c-format

5180 msgid "unknown field name: %.*s"

5181 msgstr "nombre de campo desconocido: %.*s"

5182

5111 -#: ref-filter.c:562

5183 +#: ref-filter.c:587

5184 #, c-format

5185 msgid ""

5186 "not a git repository, but the field '%.*s' requires access to object data"

5187 msgstr ""

5188 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"

5189

5118 -#: ref-filter.c:686

5190 +#: ref-filter.c:711

5191 #, c-format

5192 msgid "format: %%(if) atom used without a %%(then) atom"

5193 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"

5194

5123 -#: ref-filter.c:749

5195 +#: ref-filter.c:774

5196 #, c-format

5197 msgid "format: %%(then) atom used without an %%(if) atom"

5198 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"

5199

5128 -#: ref-filter.c:751

5200 +#: ref-filter.c:776

5201 #, c-format

5202 msgid "format: %%(then) atom used more than once"

5131 -msgstr "formato: átomo %%(then) usado mas de una vez"

5203 +msgstr "formato: átomo %%(then) usado más de una vez"

5204

5133 -#: ref-filter.c:753

5205 +#: ref-filter.c:778

5206 #, c-format

5207 msgid "format: %%(then) atom used after %%(else)"

5208 msgstr "formato: átomo %%(then) usado después de %%(else)"

5209

5138 -#: ref-filter.c:781

5210 +#: ref-filter.c:806

5211 #, c-format

5212 msgid "format: %%(else) atom used without an %%(if) atom"

5213 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

5214

5143 -#: ref-filter.c:783

5215 +#: ref-filter.c:808

5216 #, c-format

5217 msgid "format: %%(else) atom used without a %%(then) atom"

5218 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"

5219

5148 -#: ref-filter.c:785

5220 +#: ref-filter.c:810

5221 #, c-format

5222 msgid "format: %%(else) atom used more than once"

5151 -msgstr "formato: átomo %%(else) usado mas de una vez"

5223 +msgstr "formato: átomo %%(else) usado más de una vez"

5224

5153 -#: ref-filter.c:800

5225 +#: ref-filter.c:825

5226 #, c-format

5227 msgid "format: %%(end) atom used without corresponding atom"

5228 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

5229

5158 -#: ref-filter.c:857

5230 +#: ref-filter.c:882

5231 #, c-format

5232 msgid "malformed format string %s"

5233 msgstr "formato de cadena mal formado %s"

5234

5163 -#: ref-filter.c:1453

5164 -#, c-format

5165 -msgid "(no branch, rebasing %s)"

5166 -msgstr "(no hay rama, rebasando %s)"

5167 -

5168 -#: ref-filter.c:1456

5169 -#, c-format

5170 -msgid "(no branch, rebasing detached HEAD %s)"

5171 -msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"

5172 -

5173 -#: ref-filter.c:1459

5235 +#: ref-filter.c:1485

5236 #, c-format

5175 -msgid "(no branch, bisect started on %s)"

5176 -msgstr "(no hay rama, comenzando biseccón en %s)"

5237 +msgid "no branch, rebasing %s"

5238 +msgstr "no hay rama, rebasando %s"

5239

5178 -#. TRANSLATORS: make sure this matches "HEAD

5179 -#. detached at " in wt-status.c

5180 -#.

5181 -#: ref-filter.c:1467

5240 +#: ref-filter.c:1488

5241 #, c-format

5183 -msgid "(HEAD detached at %s)"

5184 -msgstr "(HEAD desacoplado en %s)"

5242 +msgid "no branch, rebasing detached HEAD %s"

5243 +msgstr "(o hay rama, rebasando con HEAD desacoplado %s"

5244

5186 -#. TRANSLATORS: make sure this matches "HEAD

5187 -#. detached from " in wt-status.c

5188 -#.

5189 -#: ref-filter.c:1474

5245 +#: ref-filter.c:1491

5246 #, c-format

5191 -msgid "(HEAD detached from %s)"

5192 -msgstr "(HEAD desacoplado de %s)"

5247 +msgid "no branch, bisect started on %s"

5248 +msgstr "no hay rama, comenzando biseccón en %s"

5249

5194 -#: ref-filter.c:1478

5195 -msgid "(no branch)"

5196 -msgstr "(sin rama)"

5250 +#: ref-filter.c:1501

5251 +msgid "no branch"

5252 +msgstr "sin rama"

5253

5198 -#: ref-filter.c:1512 ref-filter.c:1669

5254 +#: ref-filter.c:1537 ref-filter.c:1743

5255 #, c-format

5256 msgid "missing object %s for %s"

5257 msgstr "falta objeto %s para %s"

5258

5203 -#: ref-filter.c:1522

5259 +#: ref-filter.c:1547

5260 #, c-format

5261 msgid "parse_object_buffer failed on %s for %s"

5262 msgstr "parse_object_buffer falló en %s para %s"

5263

5208 -#: ref-filter.c:1888

5264 +#: ref-filter.c:1998

5265 #, c-format

5266 msgid "malformed object at '%s'"

5267 msgstr "objeto mal formado en '%s'"

5268

5213 -#: ref-filter.c:1977

5269 +#: ref-filter.c:2087

5270 #, c-format

5271 msgid "ignoring ref with broken name %s"

5272 msgstr "ignorando referencia con nombre roto %s"

5273

5218 -#: ref-filter.c:2263

5274 +#: ref-filter.c:2382

5275 #, c-format

5276 msgid "format: %%(end) atom missing"

5277 msgstr "formato: falta átomo %%(end)"

5278

5223 -#: ref-filter.c:2363

5279 +#: ref-filter.c:2482

5280 #, c-format

5281 msgid "option `%s' is incompatible with --merged"

5282 msgstr "opción `%s' es incompatible con --merged"

5283

5228 -#: ref-filter.c:2366

5284 +#: ref-filter.c:2485

5285 #, c-format

5286 msgid "option `%s' is incompatible with --no-merged"

5287 msgstr "opción `%s' es incompatible con --no-merged"

5288

5233 -#: ref-filter.c:2376

5289 +#: ref-filter.c:2495

5290 #, c-format

5291 msgid "malformed object name %s"

5292 msgstr "nombre de objeto mal formado %s"

5293

5238 -#: ref-filter.c:2381

5294 +#: ref-filter.c:2500

5295 #, c-format

5296 msgid "option `%s' must point to a commit"

5297 msgstr "opción '%s' debe apuntar a un commit"

@@ -5579,8 +5635,8 @@ msgstr "no se puede desvincular stray '%s'"

5635 msgid "Recorded preimage for '%s'"

5636 msgstr "Resolución precargada para '%s'"

5637

5582 -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5583 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5638 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5639 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5640 #, c-format

5641 msgid "could not create directory '%s'"

5642 msgstr "no se pudo crear el directorio '%s'"

@@ -5614,20 +5670,20 @@ msgstr "Se olvidó resolución para '%s'\n"

5670 msgid "unable to open rr-cache directory"

5671 msgstr "no es posible abrir directorio rr-cache"

5672

5617 -#: revision.c:2476

5673 +#: revision.c:2507

5674 msgid "your current branch appears to be broken"

5675 msgstr "tu rama actual parece estar rota"

5676

5621 -#: revision.c:2479

5677 +#: revision.c:2510

5678 #, c-format

5679 msgid "your current branch '%s' does not have any commits yet"

5680 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

5681

5626 -#: revision.c:2679

5682 +#: revision.c:2710

5683 msgid "--first-parent is incompatible with --bisect"

5684 msgstr "--first-parent es incompatible con --bisect"

5685

5630 -#: revision.c:2683

5686 +#: revision.c:2714

5687 msgid "-L does not yet support diff formats besides -p and -s"

5688 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

5689

@@ -5699,24 +5755,29 @@ msgstr "mensaje de commit inválido, modo cleanup '%s'"

5755 msgid "could not delete '%s'"

5756 msgstr "no se pudo borrar '%s'"

5757

5702 -#: sequencer.c:318

5758 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5759 +#, c-format

5760 +msgid "could not remove '%s'"

5761 +msgstr "no se pudo eliminar'%s'"

5762 +

5763 +#: sequencer.c:321

5764 msgid "revert"

5765 msgstr "revertir"

5766

5706 -#: sequencer.c:320

5767 +#: sequencer.c:323

5768 msgid "cherry-pick"

5769 msgstr "cherry-pick"

5770

5710 -#: sequencer.c:322

5771 +#: sequencer.c:325

5772 msgid "rebase -i"

5773 msgstr "rebase -i"

5774

5714 -#: sequencer.c:324

5775 +#: sequencer.c:327

5776 #, c-format

5777 msgid "unknown action: %d"

5778 msgstr "acción desconocida: %d"

5779

5719 -#: sequencer.c:382

5780 +#: sequencer.c:385

5781 msgid ""

5782 "after resolving the conflicts, mark the corrected paths\n"

5783 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5724,7 +5785,7 @@ msgstr ""

5785 "después de resolver los conflictos, marca las rutas corregidas\n"

5786 "con 'git add <rutas>' o 'git rm <rutas>'"

5787

5727 -#: sequencer.c:385

5788 +#: sequencer.c:388

5789 msgid ""

5790 "after resolving the conflicts, mark the corrected paths\n"

5791 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5734,44 +5795,44 @@ msgstr ""

5795 "con 'git add <rutas>' o 'git rm <rutas>'\n"

5796 "y haz un commit del resultado con 'git commit'"

5797

5737 -#: sequencer.c:398 sequencer.c:2801

5798 +#: sequencer.c:401 sequencer.c:2909

5799 #, c-format

5800 msgid "could not lock '%s'"

5801 msgstr "no se pudo bloquear '%s'"

5802

5742 -#: sequencer.c:405

5803 +#: sequencer.c:408

5804 #, c-format

5805 msgid "could not write eol to '%s'"

5806 msgstr "no se pudo escribir EOL en '%s'"

5807

5747 -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5748 -#: sequencer.c:3084

5808 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5809 +#: sequencer.c:3192

5810 #, c-format

5811 msgid "failed to finalize '%s'"

5812 msgstr "falló al finalizar '%s'"

5813

5753 -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5754 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5755 -#: builtin/merge.c:1115 builtin/rebase.c:567

5814 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5815 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5816 +#: builtin/merge.c:1112 builtin/rebase.c:567

5817 #, c-format

5818 msgid "could not read '%s'"

5819 msgstr "no se pudo leer '%s'"

5820

5760 -#: sequencer.c:459

5821 +#: sequencer.c:462

5822 #, c-format

5823 msgid "your local changes would be overwritten by %s."

5824 msgstr "tus cambios locales serán sobreescritos por %s."

5825

5765 -#: sequencer.c:463

5826 +#: sequencer.c:466

5827 msgid "commit your changes or stash them to proceed."

5828 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

5829

5769 -#: sequencer.c:495

5830 +#: sequencer.c:498

5831 #, c-format

5832 msgid "%s: fast-forward"

5833 msgstr "%s: avance rápido"

5834

5774 -#: sequencer.c:534 builtin/tag.c:555

5835 +#: sequencer.c:537 builtin/tag.c:565

5836 #, c-format

5837 msgid "Invalid cleanup mode %s"

5838 msgstr "Modo cleanup inválido %s"

@@ -5779,70 +5840,70 @@ msgstr "Modo cleanup inválido %s"

5840 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

5841 #. "rebase -i".

5842 #.

5782 -#: sequencer.c:629

5843 +#: sequencer.c:632

5844 #, c-format

5845 msgid "%s: Unable to write new index file"

5846 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

5847

5787 -#: sequencer.c:646

5848 +#: sequencer.c:649

5849 msgid "unable to update cache tree"

5850 msgstr "no es posible actualizar el árbol de la caché"

5851

5791 -#: sequencer.c:660

5852 +#: sequencer.c:663

5853 msgid "could not resolve HEAD commit"

5854 msgstr "no se pudo resolver el commit de HEAD"

5855

5795 -#: sequencer.c:740

5856 +#: sequencer.c:743

5857 #, c-format

5858 msgid "no key present in '%.*s'"

5859 msgstr "no hay llave presente en '%.*s'"

5860

5800 -#: sequencer.c:751

5861 +#: sequencer.c:754

5862 #, c-format

5863 msgid "unable to dequote value of '%s'"

5864 msgstr "no es posible dequote para '%s'"

5865

5805 -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5806 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5866 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5867 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5868 #, c-format

5869 msgid "could not open '%s' for reading"

5870 msgstr "no se pudo abrir '%s' para lectura"

5871

5811 -#: sequencer.c:798

5872 +#: sequencer.c:801

5873 msgid "'GIT_AUTHOR_NAME' already given"

5874 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

5875

5815 -#: sequencer.c:803

5876 +#: sequencer.c:806

5877 msgid "'GIT_AUTHOR_EMAIL' already given"

5878 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

5879

5819 -#: sequencer.c:808

5880 +#: sequencer.c:811

5881 msgid "'GIT_AUTHOR_DATE' already given"

5882 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

5883

5823 -#: sequencer.c:812

5884 +#: sequencer.c:815

5885 #, c-format

5886 msgid "unknown variable '%s'"

5887 msgstr "variable desconocida '%s'"

5888

5828 -#: sequencer.c:817

5889 +#: sequencer.c:820

5890 msgid "missing 'GIT_AUTHOR_NAME'"

5891 msgstr "falta 'GIT_AUTHOR_NAME'"

5892

5832 -#: sequencer.c:819

5893 +#: sequencer.c:822

5894 msgid "missing 'GIT_AUTHOR_EMAIL'"

5895 msgstr "falta 'GIT_AUTHOR_EMAIL'"

5896

5836 -#: sequencer.c:821

5897 +#: sequencer.c:824

5898 msgid "missing 'GIT_AUTHOR_DATE'"

5899 msgstr "falta 'GIT_AUTHOR_DATE'"

5900

5840 -#: sequencer.c:881

5901 +#: sequencer.c:884

5902 #, c-format

5903 msgid "invalid date format '%s' in '%s'"

5904 msgstr "formato de fecha inválido '%s' en '%s'"

5905

5845 -#: sequencer.c:898

5906 +#: sequencer.c:901

5907 #, c-format

5908 msgid ""

5909 "you have staged changes in your working tree\n"

@@ -5872,15 +5933,15 @@ msgstr ""

5933 "\n"

5934 " git rebase --continue\n"

5935

5875 -#: sequencer.c:992

5936 +#: sequencer.c:995

5937 msgid "writing root commit"

5938 msgstr "escribiendo commit raíz"

5939

5879 -#: sequencer.c:1213

5940 +#: sequencer.c:1216

5941 msgid "'prepare-commit-msg' hook failed"

5942 msgstr "hook 'prepare-commit-msg' falló"

5943

5883 -#: sequencer.c:1220

5944 +#: sequencer.c:1223

5945 msgid ""

5946 "Your name and email address were configured automatically based\n"

5947 "on your username and hostname. Please check that they are accurate.\n"

@@ -5907,7 +5968,7 @@ msgstr ""

5968 "\n"

5969 " git commit --amend --reset-author\n"

5970

5910 -#: sequencer.c:1233

5971 +#: sequencer.c:1236

5972 msgid ""

5973 "Your name and email address were configured automatically based\n"

5974 "on your username and hostname. Please check that they are accurate.\n"

@@ -5931,305 +5992,348 @@ msgstr ""

5992 "\n"

5993 " git commit --amend --reset-author\n"

5994

5934 -#: sequencer.c:1275

5995 +#: sequencer.c:1278

5996 msgid "couldn't look up newly created commit"

5997 msgstr "no se pudo revisar el commit recién creado"

5998

5938 -#: sequencer.c:1277

5999 +#: sequencer.c:1280

6000 msgid "could not parse newly created commit"

6001 msgstr "no se pudo analizar el commit recién creado"

6002

5942 -#: sequencer.c:1323

6003 +#: sequencer.c:1326

6004 msgid "unable to resolve HEAD after creating commit"

6005 msgstr "no se pudo resolver HEAD tras crear el commit"

6006

5946 -#: sequencer.c:1325

6007 +#: sequencer.c:1328

6008 msgid "detached HEAD"

6009 msgstr "HEAD desacoplado"

6010

5950 -#: sequencer.c:1329

6011 +#: sequencer.c:1332

6012 msgid " (root-commit)"

6013 msgstr " (commit-raíz)"

6014

5954 -#: sequencer.c:1350

6015 +#: sequencer.c:1353

6016 msgid "could not parse HEAD"

6017 msgstr "no se pudo analizar HEAD"

6018

5958 -#: sequencer.c:1352

6019 +#: sequencer.c:1355

6020 #, c-format

6021 msgid "HEAD %s is not a commit!"

6022 msgstr "HEAD %s no es un commit!"

6023

5963 -#: sequencer.c:1356 builtin/commit.c:1551

6024 +#: sequencer.c:1359 builtin/commit.c:1571

6025 msgid "could not parse HEAD commit"

6026 msgstr "no se pudo analizar el commit de HEAD"

6027

5967 -#: sequencer.c:1408 sequencer.c:2001

6028 +#: sequencer.c:1411 sequencer.c:2004

6029 msgid "unable to parse commit author"

6030 msgstr "no es posible analizar el autor del commit"

6031

5971 -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

6032 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6033 msgid "git write-tree failed to write a tree"

6034 msgstr "git write-tree falló al escribir el árbol"

6035

5975 -#: sequencer.c:1435 sequencer.c:1496

6036 +#: sequencer.c:1438 sequencer.c:1499

6037 #, c-format

6038 msgid "unable to read commit message from '%s'"

6039 msgstr "no se puede leer el mensaje del commit de '%s'"

6040

5980 -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5981 -#: builtin/merge.c:906

6041 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6042 +#: builtin/merge.c:903

6043 msgid "failed to write commit object"

6044 msgstr "falló al escribir el objeto commit"

6045

5985 -#: sequencer.c:1523

6046 +#: sequencer.c:1526

6047 #, c-format

6048 msgid "could not parse commit %s"

6049 msgstr "no se pudo analizar commit %s"

6050

5990 -#: sequencer.c:1528

6051 +#: sequencer.c:1531

6052 #, c-format

6053 msgid "could not parse parent commit %s"

6054 msgstr "no se pudo analizar el commit padre %s"

6055

5995 -#: sequencer.c:1602 sequencer.c:1712

6056 +#: sequencer.c:1605 sequencer.c:1715

6057 #, c-format

6058 msgid "unknown command: %d"

6059 msgstr "comando desconocido: %d"

6060

6000 -#: sequencer.c:1659 sequencer.c:1684

6061 +#: sequencer.c:1662 sequencer.c:1687

6062 #, c-format

6063 msgid "This is a combination of %d commits."

6064 msgstr "Esta es una combinación de %d commits."

6065

6005 -#: sequencer.c:1669

6066 +#: sequencer.c:1672

6067 msgid "need a HEAD to fixup"

6068 msgstr "se necesita un HEAD para arreglar"

6069

6009 -#: sequencer.c:1671 sequencer.c:3111

6070 +#: sequencer.c:1674 sequencer.c:3219

6071 msgid "could not read HEAD"

6072 msgstr "no se pudo leer HEAD"

6073

6013 -#: sequencer.c:1673

6074 +#: sequencer.c:1676

6075 msgid "could not read HEAD's commit message"

6076 msgstr "no se pudo leer el mensaje de commit de HEAD"

6077

6017 -#: sequencer.c:1679

6078 +#: sequencer.c:1682

6079 #, c-format

6080 msgid "cannot write '%s'"

6081 msgstr "no se puede escribir '%s'"

6082

6022 -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

6083 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6084 msgid "This is the 1st commit message:"

6085 msgstr "Este es el mensaje del 1er commit:"

6086

6026 -#: sequencer.c:1694

6087 +#: sequencer.c:1697

6088 #, c-format

6089 msgid "could not read commit message of %s"

6090 msgstr "no se puede leer el mensaje del commit de %s"

6091

6031 -#: sequencer.c:1701

6092 +#: sequencer.c:1704

6093 #, c-format

6094 msgid "This is the commit message #%d:"

6095 msgstr "Este es el mensaje del commit #%d:"

6096

6036 -#: sequencer.c:1707

6097 +#: sequencer.c:1710

6098 #, c-format

6099 msgid "The commit message #%d will be skipped:"

6100 msgstr "El mensaje del commit #%d será saltado:"

6101

6041 -#: sequencer.c:1795

6102 +#: sequencer.c:1798

6103 msgid "your index file is unmerged."

6104 msgstr "tu archivo índice no está fusionado."

6105

6045 -#: sequencer.c:1802

6106 +#: sequencer.c:1805

6107 msgid "cannot fixup root commit"

6108 msgstr "no se puede arreglar el commit raíz"

6109

6049 -#: sequencer.c:1821

6110 +#: sequencer.c:1824

6111 #, c-format

6112 msgid "commit %s is a merge but no -m option was given."

6113 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."

6114

6054 -#: sequencer.c:1829 sequencer.c:1837

6115 +#: sequencer.c:1832 sequencer.c:1840

6116 #, c-format

6117 msgid "commit %s does not have parent %d"

6118 msgstr "el commit %s no tiene un padre %d"

6119

6059 -#: sequencer.c:1843

6120 +#: sequencer.c:1846

6121 #, c-format

6122 msgid "cannot get commit message for %s"

6123 msgstr "no se puede obtener el mensaje de commit para %s"

6124

6125 #. TRANSLATORS: The first %s will be a "todo" command like

6126 #. "revert" or "pick", the second %s a SHA1.

6066 -#: sequencer.c:1862

6127 +#: sequencer.c:1865

6128 #, c-format

6129 msgid "%s: cannot parse parent commit %s"

6130 msgstr "%s: no se puede analizar el commit padre %s"

6131

6071 -#: sequencer.c:1927

6132 +#: sequencer.c:1930

6133 #, c-format

6134 msgid "could not rename '%s' to '%s'"

6135 msgstr "no se puede renombrar '%s' a '%s'"

6136

6076 -#: sequencer.c:1982

6137 +#: sequencer.c:1985

6138 #, c-format

6139 msgid "could not revert %s... %s"

6140 msgstr "no se pudo revertir %s... %s"

6141

6081 -#: sequencer.c:1983

6142 +#: sequencer.c:1986

6143 #, c-format

6144 msgid "could not apply %s... %s"

6145 msgstr "no se pudo aplicar %s... %s"

6146

6086 -#: sequencer.c:2042

6147 +#: sequencer.c:2045

6148 #, c-format

6149 msgid "git %s: failed to read the index"

6150 msgstr "git %s: falló al leer el índice"

6151

6091 -#: sequencer.c:2049

6152 +#: sequencer.c:2052

6153 #, c-format

6154 msgid "git %s: failed to refresh the index"

6155 msgstr "git %s: falló al refrescar el índice"

6156

6096 -#: sequencer.c:2118

6157 +#: sequencer.c:2128

6158 #, c-format

6159 msgid "%s does not accept arguments: '%s'"

6160 msgstr "%s no acepta los argumentos: '%s'"

6161

6101 -#: sequencer.c:2127

6162 +#: sequencer.c:2137

6163 #, c-format

6164 msgid "missing arguments for %s"

6165 msgstr "faltan argumentos para para %s"

6166

6106 -#: sequencer.c:2164

6167 +#: sequencer.c:2174

6168 #, c-format

6169 msgid "could not parse '%.*s'"

6170 msgstr "no se puede analizar '%.*s'"

6171

6111 -#: sequencer.c:2226

6172 +#: sequencer.c:2228

6173 #, c-format

6174 msgid "invalid line %d: %.*s"

6175 msgstr "línea inválida %d: %.*s"

6176

6116 -#: sequencer.c:2237

6177 +#: sequencer.c:2239

6178 #, c-format

6179 msgid "cannot '%s' without a previous commit"

6180 msgstr "no se puede '%s' sin un commit previo"

6181

6121 -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

6182 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6183 #: builtin/rebase.c:204 builtin/rebase.c:229

6184 #, c-format

6185 msgid "could not read '%s'."

6186 msgstr "no se puede leer '%s'."

6187

6127 -#: sequencer.c:2360

6188 +#: sequencer.c:2323

6189 +msgid "cancelling a cherry picking in progress"

6190 +msgstr "cancelando cherry-pick en progreso"

6191 +

6192 +#: sequencer.c:2330

6193 +msgid "cancelling a revert in progress"

6194 +msgstr "cancelando revert en progreso"

6195 +

6196 +#: sequencer.c:2364

6197 msgid "please fix this using 'git rebase --edit-todo'."

6198 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

6199

6131 -#: sequencer.c:2362

6200 +#: sequencer.c:2366

6201 #, c-format

6202 msgid "unusable instruction sheet: '%s'"

6203 msgstr "hoja de instrucciones inutilizable: '%s'"

6204

6136 -#: sequencer.c:2367

6205 +#: sequencer.c:2371

6206 msgid "no commits parsed."

6207 msgstr "ningún commit analizado."

6208

6140 -#: sequencer.c:2378

6209 +#: sequencer.c:2382

6210 msgid "cannot cherry-pick during a revert."

6211 msgstr "no se puede realizar cherry-pick durante un revert."

6212

6144 -#: sequencer.c:2380

6213 +#: sequencer.c:2384

6214 msgid "cannot revert during a cherry-pick."

6215 msgstr "no se puede realizar un revert durante un cherry-pick."

6216

6148 -#: sequencer.c:2462

6217 +#: sequencer.c:2466

6218 #, c-format

6219 msgid "invalid value for %s: %s"

6220 msgstr "valor inválido para %s: %s"

6221

6153 -#: sequencer.c:2549

6222 +#: sequencer.c:2553

6223 msgid "unusable squash-onto"

6224 msgstr "squash-onto inservible"

6225

6157 -#: sequencer.c:2565

6226 +#: sequencer.c:2569

6227 #, c-format

6228 msgid "malformed options sheet: '%s'"

6229 msgstr "hoja de opciones mal formada: '%s'"

6230

6162 -#: sequencer.c:2648 sequencer.c:4227

6231 +#: sequencer.c:2652 sequencer.c:4351

6232 msgid "empty commit set passed"

6233 msgstr "conjunto de commits vacío entregado"

6234

6166 -#: sequencer.c:2656

6167 -msgid "a cherry-pick or revert is already in progress"

6168 -msgstr "un cherry-pick o revert ya está en progreso"

6235 +#: sequencer.c:2668

6236 +msgid "revert is already in progress"

6237 +msgstr "revert ya está en progreso"

6238

6170 -#: sequencer.c:2657

6171 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

6172 -msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""

6239 +#: sequencer.c:2670

6240 +#, c-format

6241 +msgid "try \"git revert (--continue | %s--abort | --quit)\""

6242 +msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""

6243 +

6244 +#: sequencer.c:2673

6245 +msgid "cherry-pick is already in progress"

6246 +msgstr "cherry-pick ya está en progreso"

6247 +

6248 +#: sequencer.c:2675

6249 +#, c-format

6250 +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6251 +msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""

6252

6174 -#: sequencer.c:2660

6253 +#: sequencer.c:2689

6254 #, c-format

6255 msgid "could not create sequencer directory '%s'"

6256 msgstr "no se pudo crear un directorio secuenciador '%s'"

6257

6179 -#: sequencer.c:2674

6258 +#: sequencer.c:2704

6259 msgid "could not lock HEAD"

6260 msgstr "no se pudo bloquear HEAD"

6261

6183 -#: sequencer.c:2729 sequencer.c:3979

6262 +#: sequencer.c:2764 sequencer.c:4103

6263 msgid "no cherry-pick or revert in progress"

6264 msgstr "ningún cherry-pick o revert en progreso"

6265

6187 -#: sequencer.c:2731

6266 +#: sequencer.c:2766 sequencer.c:2777

6267 msgid "cannot resolve HEAD"

6268 msgstr "no se puede resolver HEAD"

6269

6191 -#: sequencer.c:2733 sequencer.c:2768

6270 +#: sequencer.c:2768 sequencer.c:2812

6271 msgid "cannot abort from a branch yet to be born"

6272 msgstr "no se puede abortar de una rama por nacer"

6273

6195 -#: sequencer.c:2754 builtin/grep.c:732

6274 +#: sequencer.c:2798 builtin/grep.c:734

6275 #, c-format

6276 msgid "cannot open '%s'"

6277 msgstr "no se puede abrir '%s'"

6278

6200 -#: sequencer.c:2756

6279 +#: sequencer.c:2800

6280 #, c-format

6281 msgid "cannot read '%s': %s"

6282 msgstr "no se puede leer '%s': %s"

6283

6205 -#: sequencer.c:2757

6284 +#: sequencer.c:2801

6285 msgid "unexpected end of file"

6286 msgstr "final de archivo inesperado"

6287

6209 -#: sequencer.c:2763

6288 +#: sequencer.c:2807

6289 #, c-format

6290 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6291 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"

6292

6214 -#: sequencer.c:2774

6293 +#: sequencer.c:2818

6294 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6216 -msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

6295 +msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!"

6296 +

6297 +#: sequencer.c:2859

6298 +msgid "no revert in progress"

6299 +msgstr "no hay revert en progreso"

6300 +

6301 +#: sequencer.c:2867

6302 +msgid "no cherry-pick in progress"

6303 +msgstr "ningún cherry-pick en progreso"

6304 +

6305 +#: sequencer.c:2877

6306 +msgid "failed to skip the commit"

6307 +msgstr "falló al escribir el commit"

6308 +

6309 +#: sequencer.c:2884

6310 +msgid "there is nothing to skip"

6311 +msgstr "no hay nada que saltar"

6312

6218 -#: sequencer.c:2903 sequencer.c:3894

6313 +#: sequencer.c:2887

6314 +#, c-format

6315 +msgid ""

6316 +"have you committed already?\n"

6317 +"try \"git %s --continue\""

6318 +msgstr ""

6319 +"¿ya has hecho el commit?\n"

6320 +"intenta \"git %s --continue\""

6321 +

6322 +#: sequencer.c:3011 sequencer.c:4015

6323 #, c-format

6324 msgid "could not update %s"

6325 msgstr "no se puede actualizar %s"

6326

6223 -#: sequencer.c:2941 sequencer.c:3874

6327 +#: sequencer.c:3049 sequencer.c:3995

6328 msgid "cannot read HEAD"

6329 msgstr "no se puede leer HEAD"

6330

6227 -#: sequencer.c:2958

6331 +#: sequencer.c:3066

6332 #, c-format

6333 msgid "unable to copy '%s' to '%s'"

6334 msgstr "no se pudo copiar '%s' a '%s'"

6335

6232 -#: sequencer.c:2966

6336 +#: sequencer.c:3074

6337 #, c-format

6338 msgid ""

6339 "You can amend the commit now, with\n"

@@ -6240,35 +6344,35 @@ msgid ""

6344 "\n"

6345 " git rebase --continue\n"

6346 msgstr ""

6243 -"Puede enmendar el commit ahora, con\n"

6347 +"Puedes enmendar el commit ahora, con\n"

6348 "\n"

6349 "\tgit commit --amend %s\n"

6350 "\n"

6247 -"Una vez que esté satisfecho con los cambios, ejecute\n"

6351 +"Una vez que estés satisfecho con los cambios, ejecuta\n"

6352 "\n"

6353 "\tgit rebase --continue\n"

6354

6251 -#: sequencer.c:2976

6355 +#: sequencer.c:3084

6356 #, c-format

6357 msgid "Could not apply %s... %.*s"

6358 msgstr "No se pudo aplicar %s... %.*s"

6359

6256 -#: sequencer.c:2983

6360 +#: sequencer.c:3091

6361 #, c-format

6362 msgid "Could not merge %.*s"

6363 msgstr "No se pudo fusionar %.*s"

6364

6261 -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633

l10n: es: 2.23.0 round 2