f8038f5b2a · matheusbsbs/matheus-bagliano

@@ -1,5 +1,5 @@

1 # Spanish translations for Git.

3 # This file is distributed under the same license as the Git package.

4 # Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017.

5 #

@@ -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: 2017-10-17 09:44+0800\n"

11 -"PO-Revision-Date: 2017-11-06 14:10-0500\n"

10 +"POT-Creation-Date: 2017-12-31 10:45+0800\n"

11 +"PO-Revision-Date: 2018-01-04 15:57-0500\n"

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

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

14 "Language: es\n"

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

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

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

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

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

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

20

21 -#: advice.c:58

21 +#: advice.c:62

22 #, c-format

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

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

25

26 -#: advice.c:86

26 +#: advice.c:90

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

31 +#: advice.c:92

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

35 +#: advice.c:94

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

39 +#: advice.c:96

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

43 +#: advice.c:98

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

47 +#: advice.c:100

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

52 +#: advice.c:108

53 msgid ""

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

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

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

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

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

59

60 -#: advice.c:112

60 +#: advice.c:116

61 msgid "Exiting because of an unresolved conflict."

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

63

64 -#: advice.c:117 builtin/merge.c:1211

64 +#: advice.c:121 builtin/merge.c:1213

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

68 +#: advice.c:123

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

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

71

72 -#: advice.c:120

72 +#: advice.c:124

73 msgid "Exiting because of unfinished merge."

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

75

76 -#: advice.c:126

76 +#: advice.c:130

77 #, c-format

78 msgid ""

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

@@ -112,89 +112,89 @@ msgstr "opción de espacios en blanco no reconocida '%s'"

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

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

114

115 -#: apply.c:125

115 +#: apply.c:122

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

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

118

119 -#: apply.c:127

119 +#: apply.c:124

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

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

122

123 -#: apply.c:130

123 +#: apply.c:127

124 msgid "--3way outside a repository"

125 msgstr "--3way esta fuera de un repositorio"

126

127 -#: apply.c:141

127 +#: apply.c:138

128 msgid "--index outside a repository"

129 msgstr "--index esta fuera de un repositorio"

130

131 -#: apply.c:144

131 +#: apply.c:141

132 msgid "--cached outside a repository"

133 msgstr "--cached esta fuera de un repositorio"

134

135 -#: apply.c:845

135 +#: apply.c:821

136 #, c-format

137 msgid "Cannot prepare timestamp regexp %s"

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

139

140 -#: apply.c:854

140 +#: apply.c:830

141 #, c-format

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

143 msgstr "regexec retorno %d para la entrada: %s"

144

145 -#: apply.c:928

145 +#: apply.c:904

146 #, c-format

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

148 msgstr ""

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

150

151 -#: apply.c:966

151 +#: apply.c:942

152 #, c-format

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

154 msgstr ""

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

156 "%d"

157

158 -#: apply.c:972

158 +#: apply.c:948

159 #, c-format

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

161 msgstr ""

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

163 "%d"

164

165 -#: apply.c:973

165 +#: apply.c:949

166 #, c-format

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

168 msgstr ""

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

170 "%d"

171

172 -#: apply.c:978

172 +#: apply.c:954

173 #, c-format

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

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

176

177 -#: apply.c:1007

177 +#: apply.c:983

178 #, c-format

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

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

181

182 -#: apply.c:1325

182 +#: apply.c:1301

183 #, c-format

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

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

186

187 -#: apply.c:1497

187 +#: apply.c:1473

188 #, c-format

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

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

191

192 -#: apply.c:1566

192 +#: apply.c:1542

193 #, c-format

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

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

196

197 -#: apply.c:1586

197 +#: apply.c:1562

198 #, c-format

199 msgid ""

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

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

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

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

211

212 -#: apply.c:1599

212 +#: apply.c:1575

213 #, c-format

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

215 msgstr ""

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

217

218 -#: apply.c:1787

218 +#: apply.c:1763

219 msgid "new file depends on old contents"

220 msgstr "el nuevo archivo depende de contenidos viejos"

221

222 -#: apply.c:1789

222 +#: apply.c:1765

223 msgid "deleted file still has contents"

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

225

226 -#: apply.c:1823

226 +#: apply.c:1799

227 #, c-format

228 msgid "corrupt patch at line %d"

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

230

231 -#: apply.c:1860

231 +#: apply.c:1836

232 #, c-format

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

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

235

236 -#: apply.c:1862

236 +#: apply.c:1838

237 #, c-format

238 msgid "deleted file %s still has contents"

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

240

241 -#: apply.c:1865

241 +#: apply.c:1841

242 #, c-format

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

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

245

246 -#: apply.c:2012

246 +#: apply.c:1988

247 #, c-format

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

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

250

251 -#: apply.c:2049

251 +#: apply.c:2025

252 #, c-format

253 msgid "unrecognized binary patch at line %d"

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

255

256 -#: apply.c:2209

256 +#: apply.c:2185

257 #, c-format

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

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

260

261 -#: apply.c:2295

261 +#: apply.c:2271

262 #, c-format

263 msgid "unable to read symlink %s"

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

265

266 -#: apply.c:2299

266 +#: apply.c:2275

267 #, c-format

268 msgid "unable to open or read %s"

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

270

271 -#: apply.c:2958

271 +#: apply.c:2934

272 #, c-format

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

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

275

276 -#: apply.c:3077

276 +#: apply.c:3055

277 #, c-format

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

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

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

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

282

283 -#: apply.c:3089

283 +#: apply.c:3067

284 #, c-format

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

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

287

288 -#: apply.c:3095

288 +#: apply.c:3073

289 #, c-format

290 msgid ""

291 "while searching for:\n"

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

294 "Mientras se busca:\n"

295 "%.*s"

296

297 -#: apply.c:3117

297 +#: apply.c:3095

298 #, c-format

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

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

301

302 -#: apply.c:3125

302 +#: apply.c:3103

303 #, c-format

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

305 msgstr ""

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

307

308 -#: apply.c:3171

308 +#: apply.c:3149

309 #, c-format

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

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

312

313 -#: apply.c:3181

313 +#: apply.c:3159

314 #, c-format

315 msgid ""

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

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

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

319 "actuales."

320

321 -#: apply.c:3189

321 +#: apply.c:3167

322 #, c-format

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

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

325

326 -#: apply.c:3207

326 +#: apply.c:3185

327 #, c-format

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

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

330

331 -#: apply.c:3220

331 +#: apply.c:3198

332 #, c-format

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

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

335

336 -#: apply.c:3226

336 +#: apply.c:3204

337 #, c-format

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

339 msgstr ""

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

341 "obtuvo %s)"

342

343 -#: apply.c:3247

343 +#: apply.c:3225

344 #, c-format

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

346 msgstr "el parche fallo: %s:%ld"

347

348 -#: apply.c:3369

348 +#: apply.c:3347

349 #, c-format

350 msgid "cannot checkout %s"

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

352

353 -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

353 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

354 #, c-format

355 msgid "failed to read %s"

356 msgstr "no se pudo leer %s"

357

358 -#: apply.c:3426

358 +#: apply.c:3404

359 #, c-format

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

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

362

363 -#: apply.c:3455 apply.c:3695

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

364 #, c-format

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

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

367

368 -#: apply.c:3538 apply.c:3709

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

369 #, c-format

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

371 msgstr "%s: no existe en el indice"

372

373 -#: apply.c:3547 apply.c:3717

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

374 #, c-format

375 msgid "%s: does not match index"

376 msgstr "%s: no concuerda con el indice"

377

378 -#: apply.c:3582

378 +#: apply.c:3560

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

380 msgstr ""

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

382 "vias"

383

384 -#: apply.c:3585

384 +#: apply.c:3563

385 #, c-format

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

387 msgstr "Retrocediendo en un merge de tres-vias...\n"

388

389 -#: apply.c:3601 apply.c:3605

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

390 #, c-format

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

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

393

394 -#: apply.c:3617

394 +#: apply.c:3595

395 #, c-format

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

397 msgstr "Fallo el merge en retroceso de tres-vias...\n"

398

399 -#: apply.c:3631

399 +#: apply.c:3609

400 #, c-format

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

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

403

404 -#: apply.c:3636

404 +#: apply.c:3614

405 #, c-format

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

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

408

409 -#: apply.c:3662

409 +#: apply.c:3640

410 msgid "removal patch leaves file contents"

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

412

413 -#: apply.c:3734

413 +#: apply.c:3712

414 #, c-format

415 msgid "%s: wrong type"

416 msgstr "%s: tipo incorrecto"

417

418 -#: apply.c:3736

418 +#: apply.c:3714

419 #, c-format

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

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

422

423 -#: apply.c:3886 apply.c:3888

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

424 #, c-format

425 msgid "invalid path '%s'"

426 msgstr "ruta invalida '%s'"

427

428 -#: apply.c:3944

428 +#: apply.c:3922

429 #, c-format

430 msgid "%s: already exists in index"

431 msgstr "%s: ya existe en el indice"

432

433 -#: apply.c:3947

433 +#: apply.c:3925

434 #, c-format

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

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

437

438 -#: apply.c:3967

438 +#: apply.c:3945

439 #, c-format

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

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

442

443 -#: apply.c:3972

443 +#: apply.c:3950

444 #, c-format

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

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

447

448 -#: apply.c:3992

448 +#: apply.c:3970

449 #, c-format

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

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

452

453 -#: apply.c:3996

453 +#: apply.c:3974

454 #, c-format

455 msgid "%s: patch does not apply"

456 msgstr "%s: el parche no aplica"

457

458 -#: apply.c:4011

458 +#: apply.c:3989

459 #, c-format

460 msgid "Checking patch %s..."

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

462

463 -#: apply.c:4102

463 +#: apply.c:4080

464 #, c-format

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

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

467

468 -#: apply.c:4109

468 +#: apply.c:4087

469 #, c-format

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

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

472

473 -#: apply.c:4112

473 +#: apply.c:4090

474 #, c-format

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

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

477

478 -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

478 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

479 #, c-format

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

481 msgstr "make_cache_entry fallo para la ruta '%s'"

482

483 -#: apply.c:4121

483 +#: apply.c:4099

484 #, c-format

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

486 msgstr "no se pudo anadir %s al índice temporal"

487

488 -#: apply.c:4131

488 +#: apply.c:4109

489 #, c-format

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

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

492

493 -#: apply.c:4269

493 +#: apply.c:4247

494 #, c-format

495 msgid "unable to remove %s from index"

496 msgstr "no se puede remover %s del indice"

497

498 -#: apply.c:4304

498 +#: apply.c:4282

499 #, c-format

500 msgid "corrupt patch for submodule %s"

501 msgstr "parche corrupto para el submodulo %s"

502

503 -#: apply.c:4310

503 +#: apply.c:4288

504 #, c-format

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

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

507

508 -#: apply.c:4318

508 +#: apply.c:4296

509 #, c-format

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

511 msgstr ""

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

513

514 -#: apply.c:4324 apply.c:4468

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

515 #, c-format

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

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

518

519 -#: apply.c:4365

519 +#: apply.c:4343

520 #, c-format

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

522 msgstr "fallo escribir para '%s'"

523

524 -#: apply.c:4369

524 +#: apply.c:4347

525 #, c-format

526 msgid "closing file '%s'"

527 msgstr "cerrando archivo '%s'"

528

529 -#: apply.c:4439

529 +#: apply.c:4417

530 #, c-format

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

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

533

534 -#: apply.c:4537

534 +#: apply.c:4515

535 #, c-format

536 msgid "Applied patch %s cleanly."

537 msgstr "Parche %s aplicado limpiamente"

538

539 -#: apply.c:4545

539 +#: apply.c:4523

540 msgid "internal error"

541 msgstr "Error interno"

542

543 -#: apply.c:4548

543 +#: apply.c:4526

544 #, c-format

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

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

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

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

549

550 -#: apply.c:4559

550 +#: apply.c:4537

551 #, c-format

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

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

554

555 -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

555 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

556 #, c-format

557 msgid "cannot open %s"

558 msgstr "no se puede abrir %s"

559

560 -#: apply.c:4581

560 +#: apply.c:4559

561 #, c-format

562 msgid "Hunk #%d applied cleanly."

563 msgstr "Hunk #%d aplicado limpiamente"

564

565 -#: apply.c:4585

565 +#: apply.c:4563

566 #, c-format

567 msgid "Rejected hunk #%d."

568 msgstr "hunk #%d rechazado"

569

570 -#: apply.c:4695

570 +#: apply.c:4673

571 #, c-format

572 msgid "Skipped patch '%s'."

573 msgstr "Parche '%s' saltado."

574

575 -#: apply.c:4703

575 +#: apply.c:4681

576 msgid "unrecognized input"

577 msgstr "input no reconocido"

578

579 -#: apply.c:4722

579 +#: apply.c:4700

580 msgid "unable to read index file"

581 msgstr "no es posible leer el archivo indice"

582

583 -#: apply.c:4859

583 +#: apply.c:4837

584 #, c-format

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

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

587

588 -#: apply.c:4886

588 +#: apply.c:4864

589 #, c-format

590 msgid "squelched %d whitespace error"

591 msgid_plural "squelched %d whitespace errors"

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

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

594

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

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

596 #, c-format

597 msgid "%d line adds whitespace errors."

598 msgid_plural "%d lines add whitespace errors."

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

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

601

602 -#: apply.c:4900

602 +#: apply.c:4878

603 #, c-format

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

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

@@ -608,141 +608,142 @@ msgstr[0] ""

608 msgstr[1] ""

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

610

611 -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

611 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

612 msgid "Unable to write new index file"

613 msgstr "No es posible escribir el archivo indice"

614

615 -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

616 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

617 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

618 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

619 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

615 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

616 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

617 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

618 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

619 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

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

621 msgid "path"

622 msgstr "ruta"

623

624 -#: apply.c:4948

624 +#: apply.c:4922

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

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

627

628 -#: apply.c:4951

628 +#: apply.c:4925

629 msgid "apply changes matching the given path"

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

631

632 -#: apply.c:4953 builtin/am.c:2265

632 +#: apply.c:4927 builtin/am.c:2266

633 msgid "num"

634 msgstr "num"

635

636 -#: apply.c:4954

636 +#: apply.c:4928

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

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

639

640 -#: apply.c:4957

640 +#: apply.c:4931

641 msgid "ignore additions made by the patch"

642 msgstr "ignorar adiciones hechas por el parche"

643

644 -#: apply.c:4959

644 +#: apply.c:4933

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

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

647

648 -#: apply.c:4963

648 +#: apply.c:4937

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

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

651

652 -#: apply.c:4965

652 +#: apply.c:4939

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

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

655

656 -#: apply.c:4967

656 +#: apply.c:4941

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

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

659

660 -#: apply.c:4969

660 +#: apply.c:4943

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

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

663

664 -#: apply.c:4971

664 +#: apply.c:4945

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

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

667

668 -#: apply.c:4973

668 +#: apply.c:4947

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

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

671

672 -#: apply.c:4975

672 +#: apply.c:4949

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

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

675

676 -#: apply.c:4977

676 +#: apply.c:4951

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

678 msgstr "intentar merge de tres-vias si el parche no aplica"

679

680 -#: apply.c:4979

680 +#: apply.c:4953

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

682 msgstr ""

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

684

685 -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

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

686 msgid "paths are separated with NUL character"

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

688

689 -#: apply.c:4984

689 +#: apply.c:4958

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

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

692

693 -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

693 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

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

695 +#: builtin/pack-objects.c:3009

696 msgid "action"

697 msgstr "acción"

698

698 -#: apply.c:4986

699 +#: apply.c:4960

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

701 msgstr ""

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

703 "blanco"

704

704 -#: apply.c:4989 apply.c:4992

705 +#: apply.c:4963 apply.c:4966

706 msgid "ignore changes in whitespace when finding context"

707 msgstr ""

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

709

709 -#: apply.c:4995

710 +#: apply.c:4969

711 msgid "apply the patch in reverse"

712 msgstr "aplicar el parche en reversa"

713

713 -#: apply.c:4997

714 +#: apply.c:4971

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

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

717

717 -#: apply.c:4999

718 +#: apply.c:4973

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

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

721

721 -#: apply.c:5001

722 +#: apply.c:4975

723 msgid "allow overlapping hunks"

724 msgstr "permitir solapamiento de hunks"

725

725 -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

726 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

727 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

726 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

727 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

728 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

729 msgid "be verbose"

730 msgstr "ser verboso"

731

731 -#: apply.c:5004

732 +#: apply.c:4978

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

734 msgstr ""

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

736 "archivo"

737

737 -#: apply.c:5007

738 +#: apply.c:4981

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

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

741

741 -#: apply.c:5009 builtin/am.c:2253

742 +#: apply.c:4983 builtin/am.c:2254

743 msgid "root"

744 msgstr "raiz"

745

745 -#: apply.c:5010

746 +#: apply.c:4984

747 msgid "prepend <root> to all filenames"

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

749

@@ -765,7 +766,7 @@ msgstr ""

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

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

768

768 -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

769 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

770 #, c-format

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

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

@@ -778,7 +779,7 @@ msgstr "fmt"

779 msgid "archive format"

780 msgstr "formato del archivo"

781

781 -#: archive.c:437 builtin/log.c:1452

782 +#: archive.c:437 builtin/log.c:1459

783 msgid "prefix"

784 msgstr "prefijo"

785

@@ -786,9 +787,9 @@ msgstr "prefijo"

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

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

789

789 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

790 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

791 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

790 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

791 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

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

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

794 #: parse-options.h:153

795 msgid "file"

@@ -823,7 +824,7 @@ msgid "list supported archive formats"

824 msgstr "listar los formatos de carpeta soportados"

825

826 #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

826 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

827 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

828 msgid "repo"

829 msgstr "repo"

830

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

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

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

877

877 -#: bisect.c:447

878 +#: bisect.c:458

879 #, c-format

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

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

882

882 -#: bisect.c:655

883 +#: bisect.c:666

884 #, c-format

885 msgid "We cannot bisect more!\n"

886 msgstr "No podemos bisecar mas!\n"

887

887 -#: bisect.c:708

888 +#: bisect.c:720

889 #, c-format

890 msgid "Not a valid commit name %s"

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

892

892 -#: bisect.c:732

893 +#: bisect.c:744

894 #, c-format

895 msgid ""

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

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

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

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

901

901 -#: bisect.c:737

902 +#: bisect.c:749

903 #, c-format

904 msgid ""

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

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

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

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

910

910 -#: bisect.c:742

911 +#: bisect.c:754

912 #, c-format

913 msgid ""

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

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

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

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

919

919 -#: bisect.c:750

920 +#: bisect.c:762

921 #, c-format

922 msgid ""

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

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

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

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

930

930 -#: bisect.c:763

931 +#: bisect.c:775

932 #, c-format

933 msgid ""

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

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

939 "Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n"

940 "Vamos a continuar de todas maneras."

941

941 -#: bisect.c:798

942 +#: bisect.c:810

943 #, c-format

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

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

946

946 -#: bisect.c:850

947 +#: bisect.c:862

948 #, c-format

949 msgid "a %s revision is needed"

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

951

951 -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

952 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

953 #, c-format

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

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

956

956 -#: bisect.c:918

957 +#: bisect.c:930

958 #, c-format

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

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

961

961 -#: bisect.c:948

962 +#: bisect.c:960

963 msgid "reading bisect refs failed"

964 msgstr "fallo leer las refs de bisect"

965

965 -#: bisect.c:968

966 +#: bisect.c:979

967 #, c-format

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

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

970

970 -#: bisect.c:976

971 +#: bisect.c:987

972 #, c-format

973 msgid ""

974 "No testable commit found.\n"

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

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

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

979

979 -#: bisect.c:995

980 +#: bisect.c:1006

981 #, c-format

982 msgid "(roughly %d step)"

983 msgid_plural "(roughly %d steps)"

@@ -986,7 +987,7 @@ msgstr[1] "(aproximadamente %d pasos)"

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

988 #. steps)" translation.

989 #.

989 -#: bisect.c:1001

990 +#: bisect.c:1012

991 #, c-format

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

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

@@ -1006,9 +1007,9 @@ msgid "--reverse and --first-parent together require specified latest commit"

1007 msgstr ""

1008 "--reverse y --first-parent juntos requieren especificar el ultimo commit"

1009

1009 -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

1010 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

1011 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

1010 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

1011 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1012 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1013 #: builtin/shortlog.c:191

1014 msgid "revision walk setup failed"

1015 msgstr "fallo la configuración del camino de revisión"

@@ -1107,33 +1108,33 @@ msgstr "No es posible escribir la configuración de la rama upstream"

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

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

1110

1110 -#: branch.c:185

1111 +#: branch.c:189

1112 #, c-format

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

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

1115

1115 -#: branch.c:190

1116 +#: branch.c:208

1117 #, c-format

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

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

1120

1120 -#: branch.c:197

1121 +#: branch.c:213

1122 msgid "Cannot force update the current branch."

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

1124

1124 -#: branch.c:217

1125 +#: branch.c:233

1126 #, c-format

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

1128 msgstr ""

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

1130 "no es una rama"

1131

1131 -#: branch.c:219

1132 +#: branch.c:235

1133 #, c-format

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

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

1136

1136 -#: branch.c:221

1137 +#: branch.c:237

1138 msgid ""

1139 "\n"

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

@@ -1154,27 +1155,27 @@ msgstr ""

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

1156 "el push."

1157

1157 -#: branch.c:264

1158 +#: branch.c:280

1159 #, c-format

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

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

1162

1162 -#: branch.c:284

1163 +#: branch.c:300

1164 #, c-format

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

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

1167

1167 -#: branch.c:289

1168 +#: branch.c:305

1169 #, c-format

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

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

1172

1172 -#: branch.c:343

1173 +#: branch.c:359

1174 #, c-format

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

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

1177

1177 -#: branch.c:366

1178 +#: branch.c:382

1179 #, c-format

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

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

@@ -1189,9 +1190,8 @@ msgstr "'%s' no se ve como un archivo bundle v2"

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

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

1192

1192 -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1193 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1194 -#: sequencer.c:2949 builtin/commit.c:782

1193 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1194 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1195 #, c-format

1196 msgid "could not open '%s'"

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

@@ -1235,7 +1235,7 @@ msgstr "rev-list muerio"

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

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

1237

1238 -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1238 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1239 #, c-format

1240 msgid "unrecognized argument: %s"

1241 msgstr "argumento no reconocido: %s"

@@ -1258,8 +1258,8 @@ msgstr "index-pack murio"

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

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

1260

1261 -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1262 -#: builtin/am.c:1467 builtin/am.c:2105

1261 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465

1262 +#: builtin/am.c:1471 builtin/am.c:2106

1263 #, c-format

1264 msgid "could not parse %s"

1265 msgstr "no se puede analizar %s"

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

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

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

1271

1272 -#: commit.c:1517

1272 +#: commit.c:1524

1273 msgid ""

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

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

@@ -1280,170 +1280,175 @@ msgstr ""

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

1281 "su proyecto.\n"

1282

1283 -#: compat/obstack.c:406 compat/obstack.c:408

1283 +#: compat/obstack.c:405 compat/obstack.c:407

1284 msgid "memory exhausted"

1285 msgstr "memoria agotada"

1286

1287 -#: config.c:187

1287 +#: config.c:186

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

1289 msgstr ""

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

1291

1292 -#: config.c:721

1292 +#: config.c:720

1293 #, c-format

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

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

1296

1297 -#: config.c:725

1297 +#: config.c:724

1298 #, c-format

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

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

1301

1302 -#: config.c:729

1302 +#: config.c:728

1303 #, c-format

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

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

1306

1307 -#: config.c:733

1307 +#: config.c:732

1308 #, c-format

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

1310 msgstr "mala línea de config %d en el submodulo-blob %s"

1311

1312 -#: config.c:737

1312 +#: config.c:736

1313 #, c-format

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

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

1316

1317 -#: config.c:741

1317 +#: config.c:740

1318 #, c-format

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

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

1321

1322 -#: config.c:869

1322 +#: config.c:868

1323 msgid "out of range"

1324 msgstr "fuera de rango"

1325

1326 -#: config.c:869

1326 +#: config.c:868

1327 msgid "invalid unit"

1328 msgstr "unidad invalida"

1329

1330 -#: config.c:875

1330 +#: config.c:874

1331 #, c-format

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

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

1334

1335 -#: config.c:880

1335 +#: config.c:879

1336 #, c-format

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

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

1339

1340 -#: config.c:883

1340 +#: config.c:882

1341 #, c-format

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

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

1344

1345 -#: config.c:886

1345 +#: config.c:885

1346 #, c-format

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

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

1349

1350 -#: config.c:889

1350 +#: config.c:888

1351 #, c-format

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

1353 msgstr ""

1354 "mal valor de config numérica '%s' para '%s' en el submodulo-blob %s: %s"

1355

1356 -#: config.c:892

1356 +#: config.c:891

1357 #, c-format

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

1359 msgstr ""

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

1361

1362 -#: config.c:895

1362 +#: config.c:894

1363 #, c-format

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

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

1366

1367 -#: config.c:990

1367 +#: config.c:989

1368 #, c-format

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

1370 msgstr "fallo al expandir el directorio de usuario en: '%s'"

1371

1372 -#: config.c:1085 config.c:1096

1372 +#: config.c:998

1373 +#, c-format

1374 +msgid "'%s' for '%s' is not a valid timestamp"

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

1376 +

1377 +#: config.c:1094 config.c:1105

1378 #, c-format

1379 msgid "bad zlib compression level %d"

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

1381

1377 -#: config.c:1213

1382 +#: config.c:1222

1383 #, c-format

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

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

1386

1382 -#: config.c:1372

1387 +#: config.c:1378

1388 #, c-format

1389 msgid "bad pack compression level %d"

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

1391

1387 -#: config.c:1568

1392 +#: config.c:1574

1393 msgid "unable to parse command-line config"

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

1395

1391 -#: config.c:1900

1396 +#: config.c:1906

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

1398 msgstr ""

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

1400

1396 -#: config.c:2087

1401 +#: config.c:2093

1402 #, c-format

1403 msgid "Invalid %s: '%s'"

1404 msgstr "Invalido %s: '%s'"

1405

1401 -#: config.c:2130

1406 +#: config.c:2136

1407 #, c-format

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

1409 msgstr ""

1410 "valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"

1411

1407 -#: config.c:2156

1412 +#: config.c:2162

1413 #, c-format

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

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

1416

1412 -#: config.c:2167

1417 +#: config.c:2187

1418 #, c-format

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

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

1421

1417 -#: config.c:2169

1422 +#: config.c:2189

1423 #, c-format

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

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

1426

1422 -#: config.c:2228

1427 +#: config.c:2248

1428 #, c-format

1429 msgid "%s has multiple values"

1430 msgstr "%s tiene múltiples valores"

1431

1427 -#: config.c:2571 config.c:2789

1432 +#: config.c:2591 config.c:2808

1433 #, c-format

1434 msgid "fstat on %s failed"

1435 msgstr "fstat en %s fallo"

1436

1432 -#: config.c:2678

1437 +#: config.c:2698

1438 #, c-format

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

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

1441

1437 -#: config.c:2680 builtin/remote.c:776

1442 +#: config.c:2700 builtin/remote.c:776

1443 #, c-format

1444 msgid "could not unset '%s'"

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

1446

1442 -#: connect.c:50

1447 +#: connect.c:52

1448 msgid "The remote end hung up upon initial contact"

1449 msgstr "El remoto se colgó en el contacto inicial"

1450

1446 -#: connect.c:52

1451 +#: connect.c:54

1452 msgid ""

1453 "Could not read from remote repository.\n"

1454 "\n"

@@ -1574,7 +1579,7 @@ msgstr[1] "hace %<PRIuMAX> años"

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

1580 msgstr "fallo al leer orden de archivos '%s'"

1581

1577 -#: diffcore-rename.c:536

1582 +#: diffcore-rename.c:535

1583 msgid "Performing inexact rename detection"

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

1585

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

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

1612 msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'"

1613

1609 -#: diff.c:398

1614 +#: diff.c:401

1615 #, c-format

1616 msgid ""

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

@@ -1615,20 +1620,20 @@ msgstr ""

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

1621 "%s"

1622

1618 -#: diff.c:3861

1623 +#: diff.c:3799

1624 #, c-format

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

1626 msgstr "digg externo murió, deteniendo en %s"

1627

1623 -#: diff.c:4189

1628 +#: diff.c:4127

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

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

1631

1627 -#: diff.c:4279

1632 +#: diff.c:4215

1633 msgid "--follow requires exactly one pathspec"

1634 msgstr "--follow requiere exactamente un pathspec"

1635

1631 -#: diff.c:4445

1636 +#: diff.c:4381

1637 #, c-format

1638 msgid ""

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

@@ -1637,22 +1642,22 @@ msgstr ""

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

1643 "%s"

1644

1640 -#: diff.c:4459

1645 +#: diff.c:4395

1646 #, c-format

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

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

1649

1645 -#: diff.c:5505

1650 +#: diff.c:5446

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

1652 msgstr ""

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

1654

1650 -#: diff.c:5508

1655 +#: diff.c:5449

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

1657 msgstr ""

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

1659

1655 -#: diff.c:5511

1660 +#: diff.c:5452

1661 #, c-format

1662 msgid ""

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

@@ -1660,29 +1665,34 @@ msgstr ""

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

1666 "intentar el comando."

1667

1663 -#: dir.c:1983

1668 +#: dir.c:2100

1669 msgid "failed to get kernel name and information"

1670 msgstr "fallo al conseguir la información y nombre del kernel"

1671

1667 -#: dir.c:2102

1672 +#: dir.c:2219

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

1674 msgstr "Untracked cache esta desactivado en este sistema o ubicación"

1675

1671 -#: dir.c:2885 dir.c:2890

1676 +#: dir.c:3002 dir.c:3007

1677 #, c-format

1678 msgid "could not create directories for %s"

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

1680

1676 -#: dir.c:2915

1681 +#: dir.c:3032

1682 #, c-format

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

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

1685

1681 -#: entry.c:176

1686 +#: editor.c:61

1687 +#, c-format

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

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

1690 +

1691 +#: entry.c:177

1692 msgid "Filtering content"

1693 msgstr "Filtrando contenido"

1694

1685 -#: entry.c:433

1695 +#: entry.c:435

1696 #, c-format

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

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

@@ -1753,7 +1763,7 @@ msgstr "commit inválido %s"

1763 msgid "giving up"

1764 msgstr "rindiendose"

1765

1756 -#: fetch-pack.c:534 progress.c:242

1766 +#: fetch-pack.c:534 progress.c:229

1767 msgid "done"

1768 msgstr "listo"

1769

@@ -1767,104 +1777,104 @@ msgstr "se obtuvo %s (%d) %s"

1777 msgid "Marking %s as complete"

1778 msgstr "Marcando %s como completa"

1779

1770 -#: fetch-pack.c:776

1780 +#: fetch-pack.c:777

1781 #, c-format

1782 msgid "already have %s (%s)"

1783 msgstr "ya se tiene %s (%s)"

1784

1775 -#: fetch-pack.c:814

1785 +#: fetch-pack.c:815

1786 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1787 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"

1788

1779 -#: fetch-pack.c:822

1789 +#: fetch-pack.c:823

1790 msgid "protocol error: bad pack header"

1791 msgstr "error de protocolo: mal paquete de header"

1792

1783 -#: fetch-pack.c:878

1793 +#: fetch-pack.c:879

1794 #, c-format

1795 msgid "fetch-pack: unable to fork off %s"

1796 msgstr "fetch-pack: no se puede quitar %s"

1797

1788 -#: fetch-pack.c:894

1798 +#: fetch-pack.c:895

1799 #, c-format

1800 msgid "%s failed"

1801 msgstr "%s fallo"

1802

1793 -#: fetch-pack.c:896

1803 +#: fetch-pack.c:897

1804 msgid "error in sideband demultiplexer"

1805 msgstr "error en demultiplexor de banda lateral"

1806

1797 -#: fetch-pack.c:923

1807 +#: fetch-pack.c:924

1808 msgid "Server does not support shallow clients"

1809 msgstr "Servidor no soporta clientes superficiales"

1810

1801 -#: fetch-pack.c:927

1811 +#: fetch-pack.c:928

1812 msgid "Server supports multi_ack_detailed"

1813 msgstr "Servidor soporta ulti_ack_detailed"

1814

1805 -#: fetch-pack.c:930

1815 +#: fetch-pack.c:931

1816 msgid "Server supports no-done"

1817 msgstr "Servidor soporta no-done"

1818

1809 -#: fetch-pack.c:936

1819 +#: fetch-pack.c:937

1820 msgid "Server supports multi_ack"

1821 msgstr "Servidor soporta multi_ack"

1822

1813 -#: fetch-pack.c:940

1823 +#: fetch-pack.c:941

1824 msgid "Server supports side-band-64k"

1825 msgstr "Servidor soporta side-band-64k"

1826

1817 -#: fetch-pack.c:944

1827 +#: fetch-pack.c:945

1828 msgid "Server supports side-band"

1829 msgstr "Servidor soporta side-band"

1830

1821 -#: fetch-pack.c:948

1831 +#: fetch-pack.c:949

1832 msgid "Server supports allow-tip-sha1-in-want"

1833 msgstr "Servidor soporta allow-tip-sha1-in-want"

1834

1825 -#: fetch-pack.c:952

1835 +#: fetch-pack.c:953

1836 msgid "Server supports allow-reachable-sha1-in-want"

1837 msgstr "Servidor soporta allow-reachable-sha1-in-want"

1838

1829 -#: fetch-pack.c:962

1839 +#: fetch-pack.c:963

1840 msgid "Server supports ofs-delta"

1841 msgstr "Servidor soporta ofs-delta"

1842

1833 -#: fetch-pack.c:969

1843 +#: fetch-pack.c:970

1844 #, c-format

1845 msgid "Server version is %.*s"

1846 msgstr "Versión de servidor es %.*s"

1847

1838 -#: fetch-pack.c:975

1848 +#: fetch-pack.c:976

1849 msgid "Server does not support --shallow-since"

1850 msgstr "Servidor no soporta --shalow-since"

1851

1842 -#: fetch-pack.c:979

1852 +#: fetch-pack.c:980

1853 msgid "Server does not support --shallow-exclude"

1854 msgstr "Servidor no soporta --shalow-exclude"

1855

1846 -#: fetch-pack.c:981

1856 +#: fetch-pack.c:982

1857 msgid "Server does not support --deepen"

1858 msgstr "Servidor no soporta --deepen"

1859

1850 -#: fetch-pack.c:992

1860 +#: fetch-pack.c:993

1861 msgid "no common commits"

1862 msgstr "no hay commits comunes"

1863

1854 -#: fetch-pack.c:1004

1864 +#: fetch-pack.c:1005

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

1866 msgstr "git fetch-pack: fetch fallo"

1867

1858 -#: fetch-pack.c:1166

1868 +#: fetch-pack.c:1167

1869 msgid "no matching remote head"

1870 msgstr "no concuerda el head remoto"

1871

1862 -#: fetch-pack.c:1188

1872 +#: fetch-pack.c:1189

1873 #, c-format

1874 msgid "no such remote ref %s"

1875 msgstr "no existe ref remota %s"

1876

1867 -#: fetch-pack.c:1191

1877 +#: fetch-pack.c:1192

1878 #, c-format

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

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

@@ -1887,17 +1897,17 @@ msgstr "fallo al escribir la firma separada para '%s'"

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

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

1899

1890 -#: grep.c:1970

1900 +#: grep.c:2017

1901 #, c-format

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

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

1904

1895 -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1905 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1906 #, c-format

1907 msgid "failed to stat '%s'"

1908 msgstr "fallo al marcar '%s'"

1909

1900 -#: grep.c:1998

1910 +#: grep.c:2045

1911 #, c-format

1912 msgid "'%s': short read"

1913 msgstr "'%s': lectura corta"

@@ -1966,12 +1976,12 @@ msgstr[1] ""

1976 msgid "git version [<options>]"

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

1978

1969 -#: help.c:456

1979 +#: help.c:462

1980 #, c-format

1981 msgid "%s: %s - %s"

1982 msgstr "%s: %s - %s"

1983

1974 -#: help.c:460

1984 +#: help.c:466

1985 msgid ""

1986 "\n"

1987 "Did you mean this?"

@@ -2044,6 +2054,15 @@ msgstr "el nombre consiste solo de caracteres no permitidos: %s"

2054 msgid "invalid date format: %s"

2055 msgstr "formato de fecha invalido: %s"

2056

2057 +#: list-objects-filter-options.c:30

2058 +msgid "multiple object filter types cannot be combined"

2059 +msgstr "no se pueden combinar múltiples tipos de objeto filtro"

2060 +

2061 +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2062 +#, c-format

2063 +msgid "invalid filter-spec expression '%s'"

2064 +msgstr "expresión filter-spec inválida '%s'"

2065 +

2066 #: lockfile.c:151

2067 #, c-format

2068 msgid ""

@@ -2073,8 +2092,8 @@ msgstr "No se pudo crear '%s.lock': %s"

2092 msgid "failed to read the cache"

2093 msgstr "fallo al leer la cache"

2094

2076 -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

2077 -#: builtin/checkout.c:595 builtin/clone.c:754

2095 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

2096 +#: builtin/checkout.c:600 builtin/clone.c:754

2097 msgid "unable to write new index file"

2098 msgstr "no es posible escribir el archivo indice"

2099

@@ -2270,7 +2289,7 @@ msgstr "Saltado %s (fusionado como existente)"

2289 msgid "Auto-merging %s"

2290 msgstr "Auto-fusionando %s"

2291

2273 -#: merge-recursive.c:1775 git-submodule.sh:944

2292 +#: merge-recursive.c:1775 git-submodule.sh:932

2293 msgid "submodule"

2294 msgstr "submódulo"

2295

@@ -2292,48 +2311,48 @@ msgstr "archivo/directorio"

2311 msgid "directory/file"

2312 msgstr "directorio/archivo"

2313

2295 -#: merge-recursive.c:1908

2314 +#: merge-recursive.c:1909

2315 #, c-format

2316 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2317 msgstr ""

2318 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "

2319 "%s"

2320

2302 -#: merge-recursive.c:1917

2321 +#: merge-recursive.c:1918

2322 #, c-format

2323 msgid "Adding %s"

2324 msgstr "Agregando %s"

2325

2307 -#: merge-recursive.c:1954

2326 +#: merge-recursive.c:1955

2327 msgid "Already up to date!"

2328 msgstr "¡Ya está actualizado!"

2329

2311 -#: merge-recursive.c:1963

2330 +#: merge-recursive.c:1964

2331 #, c-format

2332 msgid "merging of trees %s and %s failed"

2333 msgstr "falló la fusión de los árboles %s y %s"

2334

2316 -#: merge-recursive.c:2060

2335 +#: merge-recursive.c:2061

2336 msgid "Merging:"

2337 msgstr "Fusionando:"

2338

2320 -#: merge-recursive.c:2073

2339 +#: merge-recursive.c:2074

2340 #, c-format

2341 msgid "found %u common ancestor:"

2342 msgid_plural "found %u common ancestors:"

2343 msgstr[0] "se encontró %u ancestro común:"

2344 msgstr[1] "se encontraron %u ancestros comunes:"

2345

2327 -#: merge-recursive.c:2112

2346 +#: merge-recursive.c:2113

2347 msgid "merge returned no commit"

2348 msgstr "la fusión no devolvió ningun commit"

2349

2331 -#: merge-recursive.c:2175

2350 +#: merge-recursive.c:2176

2351 #, c-format

2352 msgid "Could not parse object '%s'"

2353 msgstr "No se pudo analizar el objeto '%s'"

2354

2336 -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2355 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2356 msgid "Unable to write index."

2357 msgstr "Incapaz de escribir el índice."

2358

@@ -2506,15 +2525,7 @@ msgstr "'%s' (nemotecnico: '%c')"

2525 msgid "%s: pathspec magic not supported by this command: %s"

2526 msgstr "%s: magic pathspec no soportado por este comando: %s"

2527

2509 -#: pathspec.c:571

2510 -msgid ""

2511 -"empty strings as pathspecs will be made invalid in upcoming releases. please "

2512 -"use . instead if you meant to match all paths"

2513 -msgstr ""

2514 -"los strings vacíos como pathspecs serán inválidas en las próximas versiones. "

2515 -"por favor use . si quería hacer coincidir todas las rutas"

2516 -

2517 -#: pathspec.c:595

2528 +#: pathspec.c:592

2529 #, c-format

2530 msgid "pathspec '%s' is beyond a symbolic link"

2531 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

@@ -2523,7 +2534,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"

2534 msgid "unable to parse --pretty format"

2535 msgstr "incapaz de analizar el formato --pretty"

2536

2526 -#: read-cache.c:1443

2537 +#: read-cache.c:1472

2538 #, c-format

2539 msgid ""

2540 "index.version set, but the value is invalid.\n"

@@ -2532,7 +2543,7 @@ msgstr ""

2543 "index.version configurado, pero el valor no es válido.\n"

2544 "Usando versión %i"

2545

2535 -#: read-cache.c:1453

2546 +#: read-cache.c:1482

2547 #, c-format

2548 msgid ""

2549 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2541,52 +2552,52 @@ msgstr ""

2552 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"

2553 "Usando versión %i"

2554

2544 -#: read-cache.c:2316 builtin/merge.c:1046

2555 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2556 #, c-format

2557 msgid "could not close '%s'"

2558 msgstr "no se pudo cerrar '%s'"

2559

2549 -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2560 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2561 #, c-format

2562 msgid "could not stat '%s'"

2563 msgstr "no se pudo definir '%s'"

2564

2554 -#: read-cache.c:2407

2565 +#: read-cache.c:2455

2566 #, c-format

2567 msgid "unable to open git dir: %s"

2568 msgstr "no es posible abrir el directorio de git: %s"

2569

2559 -#: read-cache.c:2419

2570 +#: read-cache.c:2467

2571 #, c-format

2572 msgid "unable to unlink: %s"

2573 msgstr "no es posible remover el vinculo: %s"

2574

2564 -#: refs.c:638

2575 +#: refs.c:706

2576 #, c-format

2577 msgid "Could not open '%s' for writing"

2578 msgstr "No sepudo abrir '%s' para escritura"

2579

2569 -#: refs.c:1792

2580 +#: refs.c:1850

2581 msgid "ref updates forbidden inside quarantine environment"

2582 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"

2583

2573 -#: refs/files-backend.c:1136

2584 +#: refs/files-backend.c:1189

2585 #, c-format

2586 msgid "could not remove reference %s"

2587 msgstr "no se pudo remover la referencia %s"

2588

2578 -#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2579 -#: refs/packed-backend.c:1440

2589 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2590 +#: refs/packed-backend.c:1534

2591 #, c-format

2592 msgid "could not delete reference %s: %s"

2593 msgstr "no se pudo eliminar la referencia %s: %s"

2594

2584 -#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2595 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2596 #, c-format

2597 msgid "could not delete references: %s"

2598 msgstr "no se pudo eliminar la referencia: %s"

2599

2589 -#: ref-filter.c:35 wt-status.c:1811

2600 +#: ref-filter.c:35 wt-status.c:1816

2601 msgid "gone"

2602 msgstr "desaparecido"

2603

@@ -2605,157 +2616,157 @@ msgstr "detrás %d"

2616 msgid "ahead %d, behind %d"

2617 msgstr "delante %d, detrás %d"

2618

2608 -#: ref-filter.c:105

2619 +#: ref-filter.c:107

2620 #, c-format

2621 msgid "expected format: %%(color:<color>)"

2622 msgstr "formato esperado: %%(color:<color>)"

2623

2613 -#: ref-filter.c:107

2624 +#: ref-filter.c:109

2625 #, c-format

2626 msgid "unrecognized color: %%(color:%s)"

2627 msgstr "color no reconocido: %%(color:%s)"

2628

2618 -#: ref-filter.c:127

2629 +#: ref-filter.c:129

2630 #, c-format

2631 msgid "Integer value expected refname:lstrip=%s"

2632 msgstr "valor entero esperado refname:lstrip=%s"

2633

2623 -#: ref-filter.c:131

2634 +#: ref-filter.c:133

2635 #, c-format

2636 msgid "Integer value expected refname:rstrip=%s"

2637 msgstr "valor entero esperado refname:rstrip=%s"

2638

2628 -#: ref-filter.c:133

2639 +#: ref-filter.c:135

2640 #, c-format

2641 msgid "unrecognized %%(%s) argument: %s"

2642 msgstr "argumento: %s no reconocido %%(%s)"

2643

2633 -#: ref-filter.c:173

2644 +#: ref-filter.c:184

2645 #, c-format

2646 msgid "%%(body) does not take arguments"

2647 msgstr "%%(body) no toma ningún argumento"

2648

2638 -#: ref-filter.c:180

2649 +#: ref-filter.c:191

2650 #, c-format

2651 msgid "%%(subject) does not take arguments"

2652 msgstr "%%(subject) no toma ningún argumento"

2653

2643 -#: ref-filter.c:198

2654 +#: ref-filter.c:209

2655 #, c-format

2656 msgid "unknown %%(trailers) argument: %s"

2657 msgstr "%%(trailers) desconocidos, argumento: %s"

2658

2648 -#: ref-filter.c:221

2659 +#: ref-filter.c:232

2660 #, c-format

2661 msgid "positive value expected contents:lines=%s"

2662 msgstr "valor positivo esperado contents:lines=%s"

2663

2653 -#: ref-filter.c:223

2664 +#: ref-filter.c:234

2665 #, c-format

2666 msgid "unrecognized %%(contents) argument: %s"

2667 msgstr "argumento %s no reconocido %%(contents)"

2668

2658 -#: ref-filter.c:236

2669 +#: ref-filter.c:247

2670 #, c-format

2671 msgid "positive value expected objectname:short=%s"

2672 msgstr "valor positivo esperado objectname:short=%s"

2673

2663 -#: ref-filter.c:240

2674 +#: ref-filter.c:251

2675 #, c-format

2676 msgid "unrecognized %%(objectname) argument: %s"

2677 msgstr "argumento: %s no reconocido %%(objectname)"

2678

2668 -#: ref-filter.c:267

2679 +#: ref-filter.c:278

2680 #, c-format

2681 msgid "expected format: %%(align:<width>,<position>)"

2682 msgstr "formato esperado: %%(align:<ancho>,<posición>)"

2683

2673 -#: ref-filter.c:279

2684 +#: ref-filter.c:290

2685 #, c-format

2686 msgid "unrecognized position:%s"

2687 msgstr "posición desconocida: %s"

2688

2678 -#: ref-filter.c:283

2689 +#: ref-filter.c:294

2690 #, c-format

2691 msgid "unrecognized width:%s"

2692 msgstr "ancho desconocido: %s"

2693

2683 -#: ref-filter.c:289

2694 +#: ref-filter.c:300

2695 #, c-format

2696 msgid "unrecognized %%(align) argument: %s"

2697 msgstr "argumento no reconocido para %%(align): %s"

2698

2688 -#: ref-filter.c:293

2699 +#: ref-filter.c:304

2700 #, c-format

2701 msgid "positive width expected with the %%(align) atom"

2702 msgstr "se esperaba un ancho positivo con el átomo %%(align)"

2703

2693 -#: ref-filter.c:308

2704 +#: ref-filter.c:319

2705 #, c-format

2706 msgid "unrecognized %%(if) argument: %s"

2707 msgstr "argumento: %s no reconocido %%(if)"

2708

2698 -#: ref-filter.c:398

2709 +#: ref-filter.c:409

2710 #, c-format

2711 msgid "malformed field name: %.*s"

2712 msgstr "nombre malformado de campo: %.*s"

2713

2703 -#: ref-filter.c:424

2714 +#: ref-filter.c:435

2715 #, c-format

2716 msgid "unknown field name: %.*s"

2717 msgstr "nombre de campo desconocido: %.*s"

2718

2708 -#: ref-filter.c:536

2719 +#: ref-filter.c:547

2720 #, c-format

2721 msgid "format: %%(if) atom used without a %%(then) atom"

2722 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"

2723

2713 -#: ref-filter.c:596

2724 +#: ref-filter.c:607

2725 #, c-format

2726 msgid "format: %%(then) atom used without an %%(if) atom"

2727 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"

2728

2718 -#: ref-filter.c:598

2729 +#: ref-filter.c:609

2730 #, c-format

2731 msgid "format: %%(then) atom used more than once"

2732 msgstr "formato: átomo %%(then) usado mas de una vez"

2733

2723 -#: ref-filter.c:600

2734 +#: ref-filter.c:611

2735 #, c-format

2736 msgid "format: %%(then) atom used after %%(else)"

2737 msgstr "formato: átomo %%(then) usado después de %%(else)"

2738

2728 -#: ref-filter.c:626

2739 +#: ref-filter.c:637

2740 #, c-format

2741 msgid "format: %%(else) atom used without an %%(if) atom"

2742 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"

2743

2733 -#: ref-filter.c:628

2744 +#: ref-filter.c:639

2745 #, c-format

2746 msgid "format: %%(else) atom used without a %%(then) atom"

2747 msgstr "formato: átomo %%(else) usado sin un átomo %%(then) "

2748

2738 -#: ref-filter.c:630

2749 +#: ref-filter.c:641

2750 #, c-format

2751 msgid "format: %%(else) atom used more than once"

2752 msgstr "formato: átomo %%(else) usado mas de una vez"

2753

2743 -#: ref-filter.c:643

2754 +#: ref-filter.c:654

2755 #, c-format

2756 msgid "format: %%(end) atom used without corresponding atom"

2757 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"

2758

2748 -#: ref-filter.c:698

2759 +#: ref-filter.c:709

2760 #, c-format

2761 msgid "malformed format string %s"

2762 msgstr "formato de cadena malformado %s"

2763

2753 -#: ref-filter.c:1283

2764 +#: ref-filter.c:1313

2765 #, c-format

2766 msgid "(no branch, rebasing %s)"

2767 msgstr "(no hay rama, rebasando %s)"

2768

2758 -#: ref-filter.c:1286

2769 +#: ref-filter.c:1316

2770 #, c-format

2771 msgid "(no branch, bisect started on %s)"

2772 msgstr "(no hay rama, comenzando bisectado en %s)"

@@ -2763,7 +2774,7 @@ msgstr "(no hay rama, comenzando bisectado en %s)"

2774 #. TRANSLATORS: make sure this matches "HEAD

2775 #. detached at " in wt-status.c

2776 #.

2766 -#: ref-filter.c:1294

2777 +#: ref-filter.c:1324

2778 #, c-format

2779 msgid "(HEAD detached at %s)"

2780 msgstr "(HEAD desacoplado en %s)"

@@ -2771,154 +2782,152 @@ msgstr "(HEAD desacoplado en %s)"

2782 #. TRANSLATORS: make sure this matches "HEAD

2783 #. detached from " in wt-status.c

2784 #.

2774 -#: ref-filter.c:1301

2785 +#: ref-filter.c:1331

2786 #, c-format

2787 msgid "(HEAD detached from %s)"

2788 msgstr "(HEAD desacoplado de %s)"

2789

2779 -#: ref-filter.c:1305

2790 +#: ref-filter.c:1335

2791 msgid "(no branch)"

2792 msgstr "(sin rama)"

2793

2783 -#: ref-filter.c:1454 ref-filter.c:1485

2794 +#: ref-filter.c:1488 ref-filter.c:1519

2795 #, c-format

2796 msgid "missing object %s for %s"

2797 msgstr "objeto %s faltante para %s"

2798

2788 -#: ref-filter.c:1457 ref-filter.c:1488

2799 +#: ref-filter.c:1491 ref-filter.c:1522

2800 #, c-format

2801 msgid "parse_object_buffer failed on %s for %s"

2802 msgstr "parse_object_buffer falló en %s para %s"

2803

2793 -#: ref-filter.c:1788

2804 +#: ref-filter.c:1822

2805 #, c-format

2806 msgid "malformed object at '%s'"

2807 msgstr "objeto malformado en '%s'"

2808

2798 -#: ref-filter.c:1855

2809 +#: ref-filter.c:1889

2810 #, c-format

2811 msgid "ignoring ref with broken name %s"

2812 msgstr "ignorando referencia con nombre roto %s"

2813

2803 -#: ref-filter.c:1860

2814 +#: ref-filter.c:1894

2815 #, c-format

2816 msgid "ignoring broken ref %s"

2817 msgstr "ignorando referencia rota %s"

2818

2808 -#: ref-filter.c:2122

2819 +#: ref-filter.c:2156

2820 #, c-format

2821 msgid "format: %%(end) atom missing"

2822 msgstr "formato: falta átomo %%(end)"

2823

2813 -#: ref-filter.c:2216

2824 +#: ref-filter.c:2250

2825 #, c-format

2826 msgid "malformed object name %s"

2827 msgstr "nombre de objeto malformado %s"

2828

2818 -#: remote.c:750

2829 +#: remote.c:780

2830 #, c-format

2831 msgid "Cannot fetch both %s and %s to %s"

2832 msgstr "No se pueden traer ambos %s y %s a %s"

2833

2823 -#: remote.c:754

2834 +#: remote.c:784

2835 #, c-format

2836 msgid "%s usually tracks %s, not %s"

2837 msgstr "%s por lo general hace seguimiento a %s, no a %s"

2838

2828 -#: remote.c:758

2839 +#: remote.c:788

2840 #, c-format

2841 msgid "%s tracks both %s and %s"

2842 msgstr "%s hace seguimiento tanto a %s como a %s"

2843

2833 -#: remote.c:766

2844 +#: remote.c:796

2845 msgid "Internal error"

2846 msgstr "Error interno"

2847

2837 -#: remote.c:1681 remote.c:1783

2848 +#: remote.c:1711 remote.c:1813

2849 msgid "HEAD does not point to a branch"

2850 msgstr "HEAD no apunta a ninguna rama"

2851

2841 -#: remote.c:1690

2852 +#: remote.c:1720

2853 #, c-format

2854 msgid "no such branch: '%s'"

2855 msgstr "no existe tal rama: '%s'"

2856

2846 -#: remote.c:1693

2857 +#: remote.c:1723

2858 #, c-format

2859 msgid "no upstream configured for branch '%s'"

2860 msgstr "no se ha configurado upstream para la rama '%s'"

2861

2851 -#: remote.c:1699

2862 +#: remote.c:1729

2863 #, c-format

2864 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2865 msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"

2866

2856 -#: remote.c:1714

2867 +#: remote.c:1744

2868 #, c-format

2869 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2870 msgstr ""

2871 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"

2872

2862 -#: remote.c:1726

2873 +#: remote.c:1756

2874 #, c-format

2875 msgid "branch '%s' has no remote for pushing"

2876 msgstr "la rama '%s' no tiene remoto para enviar"

2877

2867 -#: remote.c:1737

2878 +#: remote.c:1767

2879 #, c-format

2880 msgid "push refspecs for '%s' do not include '%s'"

2881 msgstr "refspecs del push para '%s' no incluyen '%s'"

2882

2872 -#: remote.c:1750

2883 +#: remote.c:1780

2884 msgid "push has no destination (push.default is 'nothing')"

2885 msgstr "push no tiene destino (push.default es 'nada')"

2886

2876 -#: remote.c:1772

2887 +#: remote.c:1802

2888 msgid "cannot resolve 'simple' push to a single destination"

2889 msgstr "no se puede resolver push 'simple' para un destino unico"

2890

2880 -#: remote.c:2076

2891 +#: remote.c:2106

2892 #, c-format

2893 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2894 msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n"

2895

2885 -#: remote.c:2080

2896 +#: remote.c:2110

2897 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2898 msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"

2899

2889 -#: remote.c:2083

2900 +#: remote.c:2113

2901 #, c-format

2902 msgid "Your branch is up to date with '%s'.\n"

2903 msgstr "Tu rama está actualizada con '%s'.\n"

2904

2894 -#: remote.c:2087

2905 +#: remote.c:2117

2906 #, c-format

2907 msgid "Your branch is ahead of '%s' by %d commit.\n"

2908 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2909 msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"

2910 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"

2911

2901 -#: remote.c:2093

2912 +#: remote.c:2123

2913 msgid " (use \"git push\" to publish your local commits)\n"

2914 msgstr " (usa \"git push\" para publicar tus commits locales)\n"

2915

2905 -#: remote.c:2096

2916 +#: remote.c:2126

2917 #, c-format

2918 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2919 msgid_plural ""

2920 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"

2921 msgstr[0] ""

2911 -"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada "

2912 -"rápido.\n"

2922 +"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n"

2923 msgstr[1] ""

2914 -"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada "

2915 -"rápido.\n"

2924 +"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"

2925

2917 -#: remote.c:2104

2926 +#: remote.c:2134

2927 msgid " (use \"git pull\" to update your local branch)\n"

2928 msgstr " (usa \"git pull\" para actualizar tu rama local)\n"

2929

2921 -#: remote.c:2107

2930 +#: remote.c:2137

2931 #, c-format

2932 msgid ""

2933 "Your branch and '%s' have diverged,\n"

@@ -2933,27 +2942,37 @@ msgstr[1] ""

2942 "Tu rama y '%s' han divergido,\n"

2943 "y tienen %d y %d commits diferentes cada una respectivamente.\n"

2944

2936 -#: remote.c:2117

2945 +#: remote.c:2147

2946 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2947 msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"

2948

2940 -#: revision.c:2256

2949 +#: revision.c:2268

2950 msgid "your current branch appears to be broken"

2951 msgstr "tu rama actual parece estar rota"

2952

2944 -#: revision.c:2259

2953 +#: revision.c:2271

2954 #, c-format

2955 msgid "your current branch '%s' does not have any commits yet"

2956 msgstr "tu rama actual '%s' no tiene ningún commit todavía"

2957

2949 -#: revision.c:2453

2958 +#: revision.c:2465

2959 msgid "--first-parent is incompatible with --bisect"

2960 msgstr "--first-parent es incompatible con --bisect"

2961

2953 -#: run-command.c:644

2962 +#: run-command.c:645

2963 msgid "open /dev/null failed"

2964 msgstr "falló al abrir /dev/null"

2965

2966 +#: run-command.c:1188

2967 +#, c-format

2968 +msgid ""

2969 +"The '%s' hook was ignored because it's not set as executable.\n"

2970 +"You can disable this warning with `git config advice.ignoredHook false`."

2971 +msgstr ""

2972 +"El hook '%s' fue ifnorado porque no ha sido configurado como ejecutable.\n"

2973 +"Puedes desactivar esta advertencias con `git config advice.ignoredHook "

2974 +"false`."

2975 +

2976 #: send-pack.c:151

2977 #, c-format

2978 msgid "unable to parse remote unpack status: %s"

@@ -3023,13 +3042,13 @@ msgstr ""

3042 "con 'git add <rutas>' o 'git rm <rutas>'\n"

3043 "y haz un commit del resultado con 'git commit'"

3044

3026 -#: sequencer.c:297 sequencer.c:1704

3045 +#: sequencer.c:297 sequencer.c:1715

3046 #, c-format

3047 msgid "could not lock '%s'"

3048 msgstr "No se pudo bloquear '%s'"

3049

3031 -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3032 -#: sequencer.c:2733 sequencer.c:2749

3050 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

3051 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

3052 #, c-format

3053 msgid "could not write to '%s'"

3054 msgstr "No se pudo escribir en '%s'"

@@ -3039,13 +3058,13 @@ msgstr "No se pudo escribir en '%s'"

3058 msgid "could not write eol to '%s'"

3059 msgstr "No se pudo escribir EOL en '%s'"

3060

3042 -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3061 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

3062 #, c-format

3063 msgid "failed to finalize '%s'."

3064 msgstr "Fallo al finalizar '%s'."

3065

3047 -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3048 -#: builtin/commit.c:754 builtin/merge.c:1044

3066 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

3067 +#: builtin/commit.c:754 builtin/merge.c:1046

3068 #, c-format

3069 msgid "could not read '%s'"

3070 msgstr "No se pudo leer '%s'"

@@ -3067,20 +3086,20 @@ msgstr "%s: avance rápido"

3086 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3087 #. "rebase -i".

3088 #.

3070 -#: sequencer.c:474

3089 +#: sequencer.c:477

3090 #, c-format

3091 msgid "%s: Unable to write new index file"

3092 msgstr "%s: Incapaz de escribir el nuevo archivo índice"

3093

3075 -#: sequencer.c:493

3094 +#: sequencer.c:496

3095 msgid "could not resolve HEAD commit\n"

3096 msgstr "No se pudo resolver el commit de HEAD\n"

3097

3079 -#: sequencer.c:513

3098 +#: sequencer.c:516

3099 msgid "unable to update cache tree\n"

3100 msgstr "no es posible actualizar el árbol de la caché\n"

3101

3083 -#: sequencer.c:597

3102 +#: sequencer.c:600

3103 #, c-format

3104 msgid ""

3105 "you have staged changes in your working tree\n"

@@ -3110,17 +3129,17 @@ msgstr ""

3129 "\n"

3130 " git rebase --continue\n"

3131

3113 -#: sequencer.c:699

3132 +#: sequencer.c:702

3133 #, c-format

3134 msgid "could not parse commit %s\n"

3135 msgstr "No se pudo analizar commit %s.\n"

3136

3118 -#: sequencer.c:704

3137 +#: sequencer.c:707

3138 #, c-format

3139 msgid "could not parse parent commit %s\n"

3140 msgstr "No se pudo analizar el commit padre %s\n"

3141

3123 -#: sequencer.c:826

3142 +#: sequencer.c:836

3143 #, c-format

3144 msgid ""

3145 "unexpected 1st line of squash message:\n"

@@ -3131,7 +3150,7 @@ msgstr ""

3150 "\n"

3151 "\t%.*s"

3152

3134 -#: sequencer.c:832

3153 +#: sequencer.c:842

3154 #, c-format

3155 msgid ""

3156 "invalid 1st line of squash message:\n"

@@ -3142,230 +3161,230 @@ msgstr ""

3161 "\n"

3162 "\t%.*s"

3163

3145 -#: sequencer.c:838 sequencer.c:863

3164 +#: sequencer.c:848 sequencer.c:873

3165 #, c-format

3166 msgid "This is a combination of %d commits."

3167 msgstr "Esta es una combinación de %d commits."

3168

3150 -#: sequencer.c:847 sequencer.c:2681

3169 +#: sequencer.c:857 sequencer.c:2742

3170 msgid "need a HEAD to fixup"

3171 msgstr "se necesita un HEAD para arreglar"

3172

3154 -#: sequencer.c:849

3173 +#: sequencer.c:859

3174 msgid "could not read HEAD"

3175 msgstr "no se pudo leer HEAD"

3176

3158 -#: sequencer.c:851

3177 +#: sequencer.c:861

3178 msgid "could not read HEAD's commit message"

3179 msgstr "no se pudo leer el mensaje de commit de HEAD"

3180

3162 -#: sequencer.c:857

3181 +#: sequencer.c:867

3182 #, c-format

3183 msgid "cannot write '%s'"

3184 msgstr "no se puede escribir '%s'"

3185

3167 -#: sequencer.c:866 git-rebase--interactive.sh:446

3186 +#: sequencer.c:876 git-rebase--interactive.sh:446

3187 msgid "This is the 1st commit message:"

3188 msgstr "Este es el mensaje del 1er commit:"

3189

3171 -#: sequencer.c:874

3190 +#: sequencer.c:884

3191 #, c-format

3192 msgid "could not read commit message of %s"

3193 msgstr "no se puede leer el mensaje del commit de %s"

3194

3176 -#: sequencer.c:881

3195 +#: sequencer.c:891

3196 #, c-format

3197 msgid "This is the commit message #%d:"

3198 msgstr "este es el mensaje del commit #%d:"

3199

3181 -#: sequencer.c:886

3200 +#: sequencer.c:896

3201 #, c-format

3202 msgid "The commit message #%d will be skipped:"

3203 msgstr "El mensaje del commit #%d sera saltado: "

3204

3186 -#: sequencer.c:891

3205 +#: sequencer.c:901

3206 #, c-format

3207 msgid "unknown command: %d"

3208 msgstr "comando desconocido: %d"

3209

3191 -#: sequencer.c:957

3210 +#: sequencer.c:967

3211 msgid "your index file is unmerged."

3212 msgstr "tu archivo índice no esta fusionado."

3213

3195 -#: sequencer.c:975

3214 +#: sequencer.c:986

3215 #, c-format

3216 msgid "commit %s is a merge but no -m option was given."

3217 msgstr "el commit %s es una fusión pero no se entrego la opción -m."

3218

3200 -#: sequencer.c:983

3219 +#: sequencer.c:994

3220 #, c-format

3221 msgid "commit %s does not have parent %d"

3222 msgstr "el commit %s no tiene un padre %d"

3223

3205 -#: sequencer.c:987

3224 +#: sequencer.c:998

3225 #, c-format

3226 msgid "mainline was specified but commit %s is not a merge."

3227 msgstr "línea principal especificada pero el commit %s no es una fusión."

3228

3210 -#: sequencer.c:993

3229 +#: sequencer.c:1004

3230 #, c-format

3231 msgid "cannot get commit message for %s"

3232 msgstr "no se puede obtener el mensaje de commit para %s"

3233

3234 #. TRANSLATORS: The first %s will be a "todo" command like

3235 #. "revert" or "pick", the second %s a SHA1.

3217 -#: sequencer.c:1014

3236 +#: sequencer.c:1025

3237 #, c-format

3238 msgid "%s: cannot parse parent commit %s"

3239 msgstr "%s: no se puede analizar el commit padre %s"

3240

3222 -#: sequencer.c:1077 sequencer.c:1853

3241 +#: sequencer.c:1088 sequencer.c:1864

3242 #, c-format

3243 msgid "could not rename '%s' to '%s'"

3244 msgstr "No se puede renombrar '%s' a '%s'"

3245

3227 -#: sequencer.c:1128

3246 +#: sequencer.c:1139

3247 #, c-format

3248 msgid "could not revert %s... %s"

3249 msgstr "no se pudo revertir %s... %s"

3250

3232 -#: sequencer.c:1129

3251 +#: sequencer.c:1140

3252 #, c-format

3253 msgid "could not apply %s... %s"

3254 msgstr "no se pudo aplicar %s... %s"

3255

3237 -#: sequencer.c:1171

3256 +#: sequencer.c:1182

3257 msgid "empty commit set passed"

3258 msgstr "conjunto de commits vacío entregado"

3259

3241 -#: sequencer.c:1181

3260 +#: sequencer.c:1192

3261 #, c-format

3262 msgid "git %s: failed to read the index"

3263 msgstr "git %s: fallo al leer el índice"

3264

3246 -#: sequencer.c:1188

3265 +#: sequencer.c:1198

3266 #, c-format

3267 msgid "git %s: failed to refresh the index"

3268 msgstr "git %s: fallo al refrescar el índice"

3269

3251 -#: sequencer.c:1308

3270 +#: sequencer.c:1319

3271 #, c-format

3272 msgid "invalid line %d: %.*s"

3273 msgstr "línea inválida %d: %.*s"

3274

3256 -#: sequencer.c:1316

3275 +#: sequencer.c:1327

3276 #, c-format

3277 msgid "cannot '%s' without a previous commit"

3278 msgstr "no se puede '%s' sin un commit previo"

3279

3261 -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3262 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3280 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3281 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3282 #, c-format

3283 msgid "could not read '%s'."

3284 msgstr "no se puede leer '%s'."

3285

3267 -#: sequencer.c:1361

3286 +#: sequencer.c:1372

3287 msgid "please fix this using 'git rebase --edit-todo'."

3288 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

3289

3271 -#: sequencer.c:1363

3290 +#: sequencer.c:1374

3291 #, c-format

3292 msgid "unusable instruction sheet: '%s'"

3293 msgstr "hoja de instrucciones inutilízale: '%s'"

3294

3276 -#: sequencer.c:1368

3295 +#: sequencer.c:1379

3296 msgid "no commits parsed."

3297 msgstr "ningún commit analizado."

3298

3280 -#: sequencer.c:1379

3299 +#: sequencer.c:1390

3300 msgid "cannot cherry-pick during a revert."

3301 msgstr "no se puede realizar cherry-pick durante un revert."

3302

3284 -#: sequencer.c:1381

3303 +#: sequencer.c:1392

3304 msgid "cannot revert during a cherry-pick."

3305 msgstr "no se puede realizar un revert durante un cherry-pick"

3306

3288 -#: sequencer.c:1448

3307 +#: sequencer.c:1459

3308 #, c-format

3309 msgid "invalid key: %s"

3310 msgstr "llave invalida: %s"

3311

3293 -#: sequencer.c:1451

3312 +#: sequencer.c:1462

3313 #, c-format

3314 msgid "invalid value for %s: %s"

3315 msgstr "valor invalido para %s: %s"

3316

3298 -#: sequencer.c:1517

3317 +#: sequencer.c:1528

3318 #, c-format

3319 msgid "malformed options sheet: '%s'"

3320 msgstr "hoja de opciones mal formada: '%s'"

3321

3303 -#: sequencer.c:1555

3322 +#: sequencer.c:1566

3323 msgid "a cherry-pick or revert is already in progress"

3324 msgstr "un cherry-pick o rever ya esta en progreso"

3325

3307 -#: sequencer.c:1556

3326 +#: sequencer.c:1567

3327 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3328 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""

3329

3311 -#: sequencer.c:1559

3330 +#: sequencer.c:1570

3331 #, c-format

3332 msgid "could not create sequencer directory '%s'"

3333 msgstr "no se pudo crear un directorio secuenciador '%s' "

3334

3316 -#: sequencer.c:1574

3335 +#: sequencer.c:1585

3336 msgid "could not lock HEAD"

3337 msgstr "no se pudo bloquear HEAD"

3338

3320 -#: sequencer.c:1632 sequencer.c:2211

3339 +#: sequencer.c:1643 sequencer.c:2227

3340 msgid "no cherry-pick or revert in progress"

3341 msgstr "ningún cherry-pick o revert en progreso"

3342

3324 -#: sequencer.c:1634

3343 +#: sequencer.c:1645

3344 msgid "cannot resolve HEAD"

3345 msgstr "no se puede resolver HEAD"

3346

3328 -#: sequencer.c:1636 sequencer.c:1671

3347 +#: sequencer.c:1647 sequencer.c:1682

3348 msgid "cannot abort from a branch yet to be born"

3349 msgstr "no se puede abortar de una rama por nacer"

3350

3332 -#: sequencer.c:1657 builtin/grep.c:711

3351 +#: sequencer.c:1668 builtin/grep.c:713

3352 #, c-format

3353 msgid "cannot open '%s'"

3354 msgstr "no se puede abrir '%s'"

3355

3337 -#: sequencer.c:1659

3356 +#: sequencer.c:1670

3357 #, c-format

3358 msgid "cannot read '%s': %s"

3359 msgstr "no se puede leer '%s': %s"

3360

3342 -#: sequencer.c:1660

3361 +#: sequencer.c:1671

3362 msgid "unexpected end of file"

3363 msgstr "final de archivo inesperado"

3364

3346 -#: sequencer.c:1666

3365 +#: sequencer.c:1677

3366 #, c-format

3367 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3368 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"

3369

3351 -#: sequencer.c:1677

3370 +#: sequencer.c:1688

3371 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3372 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"

3373

3355 -#: sequencer.c:1818 sequencer.c:2109

3374 +#: sequencer.c:1829 sequencer.c:2125

3375 msgid "cannot read HEAD"

3376 msgstr "no se puede leer HEAD"

3377

3359 -#: sequencer.c:1858 builtin/difftool.c:640

3378 +#: sequencer.c:1869 builtin/difftool.c:639

3379 #, c-format

3380 msgid "could not copy '%s' to '%s'"

3381 msgstr "no se pudo copiar '%s' a '%s'"

3382

3364 -#: sequencer.c:1874

3383 +#: sequencer.c:1888

3384 msgid "could not read index"

3385 msgstr "no se pudo leer indice"

3386

3368 -#: sequencer.c:1879

3387 +#: sequencer.c:1893

3388 #, c-format

3389 msgid ""

3390 "execution failed: %s\n"

@@ -3380,11 +3399,11 @@ msgstr ""

3399 " git rebase --continue\n"

3400 "\n"

3401

3383 -#: sequencer.c:1885

3402 +#: sequencer.c:1899

3403 msgid "and made changes to the index and/or the working tree\n"

3404 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

3405

3387 -#: sequencer.c:1891

3406 +#: sequencer.c:1905

3407 #, c-format

3408 msgid ""

3409 "execution succeeded: %s\n"

@@ -3401,17 +3420,17 @@ msgstr ""

3420 " git rebase --continue\n"

3421 "\n"

3422

3404 -#: sequencer.c:1948

3423 +#: sequencer.c:1964

3424 #, c-format

3425 msgid "Applied autostash.\n"

3426 msgstr "Autostash aplicado.\n"

3427

3409 -#: sequencer.c:1960

3428 +#: sequencer.c:1976

3429 #, c-format

3430 msgid "cannot store %s"

3431 msgstr "no se puede guardar %s"

3432

3414 -#: sequencer.c:1963 git-rebase.sh:175

3433 +#: sequencer.c:1979 git-rebase.sh:175

3434 #, c-format

3435 msgid ""

3436 "Applying autostash resulted in conflicts.\n"

@@ -3423,57 +3442,57 @@ msgstr ""

3442 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

3443 "momento.\n"

3444

3426 -#: sequencer.c:2045

3445 +#: sequencer.c:2061

3446 #, c-format

3447 msgid "Stopped at %s... %.*s\n"

3448 msgstr "Detenido en %s... %.*s\n"

3449

3431 -#: sequencer.c:2087

3450 +#: sequencer.c:2103

3451 #, c-format

3452 msgid "unknown command %d"

3453 msgstr "comando desconocido %d"

3454

3436 -#: sequencer.c:2117

3455 +#: sequencer.c:2133

3456 msgid "could not read orig-head"

3457 msgstr "no se puede leer orig-head"

3458

3440 -#: sequencer.c:2122 sequencer.c:2678

3459 +#: sequencer.c:2138 sequencer.c:2739

3460 msgid "could not read 'onto'"

3461 msgstr "no se puede leer 'onto'"

3462

3444 -#: sequencer.c:2129

3463 +#: sequencer.c:2145

3464 #, c-format

3465 msgid "could not update %s"

3466 msgstr "no se puede actualizar %s"

3467

3449 -#: sequencer.c:2136

3468 +#: sequencer.c:2152

3469 #, c-format

3470 msgid "could not update HEAD to %s"

3471 msgstr "no se puede actualizar HEAD a %s"

3472

3454 -#: sequencer.c:2220

3473 +#: sequencer.c:2236

3474 msgid "cannot rebase: You have unstaged changes."

3475 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

3476

3458 -#: sequencer.c:2225

3477 +#: sequencer.c:2241

3478 msgid "could not remove CHERRY_PICK_HEAD"

3479 msgstr "no se puede remover CHERRY_PICK_HEAD"

3480

3462 -#: sequencer.c:2234

3481 +#: sequencer.c:2250

3482 msgid "cannot amend non-existing commit"

3483 msgstr "no se puede arreglar un commit no existente"

3484

3466 -#: sequencer.c:2236

3485 +#: sequencer.c:2252

3486 #, c-format

3487 msgid "invalid file: '%s'"

3488 msgstr "archivo invalido: '%s'"

3489

3471 -#: sequencer.c:2238

3490 +#: sequencer.c:2254

3491 #, c-format

3492 msgid "invalid contents: '%s'"

3493 msgstr "contenido inválido: '%s'"

3494

3476 -#: sequencer.c:2241

3495 +#: sequencer.c:2257

3496 msgid ""

3497 "\n"

3498 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3484,50 +3503,45 @@ msgstr ""

3503 "un commit con estos\n"

3504 "primero y luego ejecuta 'git rebase --continue' de nuevo."

3505

3487 -#: sequencer.c:2251

3506 +#: sequencer.c:2267

3507 msgid "could not commit staged changes."

3508 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

3509

3491 -#: sequencer.c:2331

3510 +#: sequencer.c:2347

3511 #, c-format

3512 msgid "%s: can't cherry-pick a %s"

3513 msgstr "%s: no se puede aplicar cherry-pick a un %s"

3514

3496 -#: sequencer.c:2335

3515 +#: sequencer.c:2351

3516 #, c-format

3517 msgid "%s: bad revision"

3518 msgstr "%s: mala revision"

3519

3501 -#: sequencer.c:2368

3520 +#: sequencer.c:2384

3521 msgid "can't revert as initial commit"

3522 msgstr "no se puede revertir como commit inicial"

3523

3505 -#: sequencer.c:2471

3524 +#: sequencer.c:2489

3525 msgid "make_script: unhandled options"

3526 msgstr "make_script: opciones desconocidas"

3527

3509 -#: sequencer.c:2474

3528 +#: sequencer.c:2492

3529 msgid "make_script: error preparing revisions"

3530 msgstr "make_script: error preparando revisiones"

3531

3513 -#: sequencer.c:2510

3532 +#: sequencer.c:2526 sequencer.c:2561

3533 #, c-format

3534 msgid "unusable todo list: '%s'"

3535 msgstr "lista de pendientes inutilízale: '%s'"

3536

3518 -#: sequencer.c:2516

3519 -#, c-format

3520 -msgid "unable to open '%s' for writing"

3521 -msgstr "No se pudo abrir '%s' para escritura"

3522 -

3523 -#: sequencer.c:2561

3537 +#: sequencer.c:2609

3538 #, c-format

3539 msgid ""

3540 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3541 msgstr ""

3542 "Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

3543

3530 -#: sequencer.c:2641

3544 +#: sequencer.c:2689

3545 #, c-format

3546 msgid ""

3547 "Warning: some commits may have been dropped accidentally.\n"

@@ -3536,7 +3550,7 @@ msgstr ""

3550 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

3551 "Commits botados (empezando con el mas nuevo):\n"

3552

3539 -#: sequencer.c:2648

3553 +#: sequencer.c:2696

3554 #, c-format

3555 msgid ""

3556 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3554,7 +3568,7 @@ msgstr ""

3568 "Los posibles comportamientos son: ignore,warn,error.\n"

3569 "\n"

3570

3557 -#: sequencer.c:2660

3571 +#: sequencer.c:2708

3572 #, c-format

3573 msgid ""

3574 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3565,31 +3579,21 @@ msgstr ""

3579 "rebase --continue'.\n"

3580 "O se puede abortar el rebase con 'git rebase --abort'.\n"

3581

3568 -#: sequencer.c:2708

3569 -#, c-format

3570 -msgid "could not parse commit '%s'"

3571 -msgstr "No se pudo analizar commit '%s'"

3572 -

3573 -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3574 -#: builtin/am.c:775

3582 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3583 +#: builtin/am.c:779

3584 #, c-format

3585 msgid "could not open '%s' for writing"

3586 msgstr "no se pudo abrir '%s' para escritura"

3587

3579 -#: sequencer.c:2756

3588 +#: sequencer.c:2769

3589 #, c-format

3581 -msgid "could not truncate '%s'"

3582 -msgstr "no se pudo truncar '%s'"

3590 +msgid "could not parse commit '%s'"

3591 +msgstr "No se pudo analizar commit '%s'"

3592

3584 -#: sequencer.c:2848

3593 +#: sequencer.c:2891

3594 msgid "the script was already rearranged."

3595 msgstr "este script ya fue reorganizado."

3596

3588 -#: sequencer.c:2953

3589 -#, c-format

3590 -msgid "could not finish '%s'"

3591 -msgstr "no se pudo finalizar '%s'"

3592 -

3597 #: setup.c:171

3598 #, c-format

3599 msgid ""

@@ -3623,35 +3627,35 @@ msgstr ""

3627 "Use '--' para separar rutas de revisiones, de esta manera:\n"

3628 "'git <comando> [<revisión>...] -- [<archivo>...]'"

3629

3626 -#: setup.c:499

3630 +#: setup.c:501

3631 #, c-format

3632 msgid "Expected git repo version <= %d, found %d"

3633 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

3634

3631 -#: setup.c:507

3635 +#: setup.c:509

3636 msgid "unknown repository extensions found:"

3637 msgstr "se encontró extensión de repositorio desconocida:"

3638

3635 -#: setup.c:806

3639 +#: setup.c:811

3640 #, c-format

3641 msgid "Not a git repository (or any of the parent directories): %s"

3642 msgstr ""

3643 "No es un repositorio git (ni ninguno de los directorios superiores): %s"

3644

3641 -#: setup.c:808 builtin/index-pack.c:1653

3645 +#: setup.c:813 builtin/index-pack.c:1653

3646 msgid "Cannot come back to cwd"

3647 msgstr "No se puede regresar a cwd"

3648

3645 -#: setup.c:1046

3649 +#: setup.c:1052

3650 msgid "Unable to read current working directory"

3651 msgstr "Incapaz de leer el directorio de trabajo actual"

3652

3649 -#: setup.c:1058 setup.c:1064

3653 +#: setup.c:1064 setup.c:1070

3654 #, c-format

3655 msgid "Cannot change to '%s'"

3656 msgstr "No se puede cambiar a '%s'"

3657

3654 -#: setup.c:1077

3658 +#: setup.c:1083

3659 #, c-format

3660 msgid ""

3661 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3661,7 +3665,7 @@ msgstr ""

3665 "Parando en el límite del sistema de archivos "

3666 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

3667

3664 -#: setup.c:1159

3668 +#: setup.c:1167

3669 #, c-format

3670 msgid ""

3671 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3670,43 +3674,43 @@ msgstr ""

3674 "Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

3675 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

3676

3673 -#: sha1_file.c:528

3677 +#: sha1_file.c:598

3678 #, c-format

3679 msgid "path '%s' does not exist"

3680 msgstr "ruta '%s' no existe"

3681

3678 -#: sha1_file.c:554

3682 +#: sha1_file.c:624

3683 #, c-format

3684 msgid "reference repository '%s' as a linked checkout is not supported yet."

3685 msgstr ""

3686 "repositorio de referencia '%s' como un checkout vinculado no es soportado "

3687 "todavía."

3688

3685 -#: sha1_file.c:560

3689 +#: sha1_file.c:630

3690 #, c-format

3691 msgid "reference repository '%s' is not a local repository."

3692 msgstr "repositorio de referencia '%s' no es un repositorio local."

3693

3690 -#: sha1_file.c:566

3694 +#: sha1_file.c:636

3695 #, c-format

3696 msgid "reference repository '%s' is shallow"

3697 msgstr "repositorio de referencia '%s' es superficial (shallow)"

3698

3695 -#: sha1_file.c:574

3699 +#: sha1_file.c:644

3700 #, c-format

3701 msgid "reference repository '%s' is grafted"

3702 msgstr "repositorio de referencia '% s' está injertado"

3703

3700 -#: sha1_name.c:420

3704 +#: sha1_name.c:422

3705 #, c-format

3706 msgid "short SHA1 %s is ambiguous"

3707 msgstr "SHA1 %s corta es ambigua"

3708

3705 -#: sha1_name.c:431

3709 +#: sha1_name.c:433

3710 msgid "The candidates are:"

3711 msgstr "Los candidatos son:"

3712

3709 -#: sha1_name.c:590

3713 +#: sha1_name.c:693

3714 msgid ""

3715 "Git normally never creates a ref that ends with 40 hex characters\n"

3716 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3729,70 +3733,70 @@ msgstr ""

3733 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"

3734 "ejecutando \"git config advice.objectNameWarning false\""

3735

3732 -#: submodule.c:93 submodule.c:127

3736 +#: submodule.c:96 submodule.c:130

3737 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3738 msgstr ""

3739 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"

3740

3737 -#: submodule.c:97 submodule.c:131

3741 +#: submodule.c:100 submodule.c:134

3742 #, c-format

3743 msgid "Could not find section in .gitmodules where path=%s"

3744 msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"

3745

3742 -#: submodule.c:105

3746 +#: submodule.c:108

3747 #, c-format

3748 msgid "Could not update .gitmodules entry %s"

3749 msgstr "No se pudo actualizar la entrada %s de .gitmodules"

3750

3747 -#: submodule.c:138

3751 +#: submodule.c:141

3752 #, c-format

3753 msgid "Could not remove .gitmodules entry for %s"

3754 msgstr "No se pudo remover la entrada %s de .gitmodules"

3755

3752 -#: submodule.c:149

3756 +#: submodule.c:152

3757 msgid "staging updated .gitmodules failed"

3758 msgstr "falló realizar stage a los .gitmodules actualizados"

3759

3756 -#: submodule.c:309

3760 +#: submodule.c:312

3761 #, c-format

3762 msgid "in unpopulated submodule '%s'"

3763 msgstr "en el submódulo no poblado '%s'"

3764

3761 -#: submodule.c:340

3765 +#: submodule.c:343

3766 #, c-format

3767 msgid "Pathspec '%s' is in submodule '%.*s'"

3768 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"

3769

3766 -#: submodule.c:799

3770 +#: submodule.c:833

3771 #, c-format

3772 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3773 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"

3774

3771 -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3775 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3776 msgid "Failed to resolve HEAD as a valid ref."

3777 msgstr "Fallo al resolver HEAD como un ref valido."

3778

3775 -#: submodule.c:1304

3779 +#: submodule.c:1370

3780 #, c-format

3781 msgid "'%s' not recognized as a git repository"

3782 msgstr "'%s' no reconocido como un repositorio git"

3783

3780 -#: submodule.c:1442

3784 +#: submodule.c:1508

3785 #, c-format

3786 msgid "could not start 'git status' in submodule '%s'"

3787 msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"

3788

3785 -#: submodule.c:1455

3789 +#: submodule.c:1521

3790 #, c-format

3791 msgid "could not run 'git status' in submodule '%s'"

3792 msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"

3793

3790 -#: submodule.c:1548

3794 +#: submodule.c:1614

3795 #, c-format

3796 msgid "submodule '%s' has dirty index"

3797 msgstr "submódulo '%s' tiene un índice corrupto"

3798

3795 -#: submodule.c:1809

3799 +#: submodule.c:1876

3800 #, c-format

3801 msgid ""

3802 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3800,18 +3804,18 @@ msgstr ""

3804 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "

3805 "soportado"

3806

3803 -#: submodule.c:1821 submodule.c:1877

3807 +#: submodule.c:1888 submodule.c:1944

3808 #, c-format

3809 msgid "could not lookup name for submodule '%s'"

3810 msgstr "no se pudo resolver el nombre para el submódulo '%s'"

3811

3808 -#: submodule.c:1825 builtin/submodule--helper.c:671

3809 -#: builtin/submodule--helper.c:681

3812 +#: submodule.c:1892 builtin/submodule--helper.c:909

3813 +#: builtin/submodule--helper.c:919

3814 #, c-format

3815 msgid "could not create directory '%s'"

3816 msgstr "no se pudo crear el directorio '%s'"

3817

3814 -#: submodule.c:1828

3818 +#: submodule.c:1895

3819 #, c-format

3820 msgid ""

3821 "Migrating git directory of '%s%s' from\n"

@@ -3822,20 +3826,20 @@ msgstr ""

3826 "'%s' hacia\n"

3827 "'%s'\n"

3828

3825 -#: submodule.c:1912

3829 +#: submodule.c:1979

3830 #, c-format

3831 msgid "could not recurse into submodule '%s'"

3832 msgstr "No pudo recursar en el submódulo '%s'"

3833

3830 -#: submodule.c:1956

3834 +#: submodule.c:2023

3835 msgid "could not start ls-files in .."

3836 msgstr "no se pudo comenzar ls-files en .."

3837

3834 -#: submodule.c:1976

3838 +#: submodule.c:2043

3839 msgid "BUG: returned path string doesn't match cwd?"

3840 msgstr "BUG: string de ruta recibido no concuerda con cwd?"

3841

3838 -#: submodule.c:1995

3842 +#: submodule.c:2062

3843 #, c-format

3844 msgid "ls-tree returned unexpected return code %d"

3845 msgstr "ls-tree retornó un código %d inesperado"

@@ -3903,17 +3907,17 @@ msgstr "no se pudo abrir el archivo temporal"

3907 msgid "could not rename temporary file to %s"

3908 msgstr "no se pudo renombrar el archivo temporal a %s"

3909

3906 -#: transport.c:62

3910 +#: transport.c:63

3911 #, c-format

3912 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3913 msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"

3914

3911 -#: transport.c:151

3915 +#: transport.c:152

3916 #, c-format

3917 msgid "transport: invalid depth option '%s'"

3918 msgstr "transport: opción inválida '%s'"

3919

3916 -#: transport.c:888

3920 +#: transport.c:904

3921 #, c-format

3922 msgid ""

3923 "The following submodule paths contain changes that can\n"

@@ -3922,7 +3926,7 @@ msgstr ""

3926 "La siguiente ruta de submódulo contiene cambios que no\n"

3927 "pueden ser encontrados en ningún remoto:\n"

3928

3925 -#: transport.c:892

3929 +#: transport.c:908

3930 #, c-format

3931 msgid ""

3932 "\n"

@@ -3949,11 +3953,11 @@ msgstr ""

3953 "para hacer un push al remoto.\n"

3954 "\n"

3955

3952 -#: transport.c:900

3956 +#: transport.c:916

3957 msgid "Aborting."

3958 msgstr "Abortando."

3959

3956 -#: transport-helper.c:1071

3960 +#: transport-helper.c:1074

3961 #, c-format

3962 msgid "Could not read ref %s"

3963 msgstr "No se pudo leer la referencia %s"

@@ -3974,7 +3978,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol"

3978 msgid "too-short tree file"

3979 msgstr "archivo de árbol muy corto"

3980

3977 -#: unpack-trees.c:106

3981 +#: unpack-trees.c:107

3982 #, c-format

3983 msgid ""

3984 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3985,7 +3989,7 @@ msgstr ""

3989 "%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar "

3990 "ramas."

3991

3988 -#: unpack-trees.c:108

3992 +#: unpack-trees.c:109

3993 #, c-format

3994 msgid ""

3995 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3995,7 +3999,7 @@ msgstr ""

3999 "checkout:\n"

4000 "%%s"

4001

3998 -#: unpack-trees.c:111

4002 +#: unpack-trees.c:112

4003 #, c-format

4004 msgid ""

4005 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4005,7 +4009,7 @@ msgstr ""

4009 "fusionar:\n"

4010 "%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar."

4011

4008 -#: unpack-trees.c:113

4012 +#: unpack-trees.c:114

4013 #, c-format

4014 msgid ""

4015 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4015,7 +4019,7 @@ msgstr ""

4019 "merge:\n"

4020 "%%s"

4021

4018 -#: unpack-trees.c:116

4022 +#: unpack-trees.c:117

4023 #, c-format

4024 msgid ""

4025 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4024,7 +4028,7 @@ msgstr ""

4028 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"

4029 "%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s."

4030

4027 -#: unpack-trees.c:118

4031 +#: unpack-trees.c:119

4032 #, c-format

4033 msgid ""

4034 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4033,7 +4037,7 @@ msgstr ""

4037 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"

4038 "%%s"

4039

4036 -#: unpack-trees.c:123

4040 +#: unpack-trees.c:124

4041 #, c-format

4042 msgid ""

4043 "Updating the following directories would lose untracked files in them:\n"

@@ -4043,7 +4047,7 @@ msgstr ""

4047 "seguimiento en ellos:\n"

4048 "%s"

4049

4046 -#: unpack-trees.c:127

4050 +#: unpack-trees.c:128

4051 #, c-format

4052 msgid ""

4053 "The following untracked working tree files would be removed by checkout:\n"

@@ -4053,7 +4057,7 @@ msgstr ""

4057 "removidos al actualizar el árbol de trabajo:\n"

4058 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4059

4056 -#: unpack-trees.c:129

4060 +#: unpack-trees.c:130

4061 #, c-format

4062 msgid ""

4063 "The following untracked working tree files would be removed by checkout:\n"

@@ -4063,7 +4067,7 @@ msgstr ""

4067 "al actualizar el árbol de trabajo:\n"

4068 "%%s"

4069

4066 -#: unpack-trees.c:132

4070 +#: unpack-trees.c:133

4071 #, c-format

4072 msgid ""

4073 "The following untracked working tree files would be removed by merge:\n"

@@ -4073,7 +4077,7 @@ msgstr ""

4077 "removidos al fusionar:\n"

4078 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4079

4076 -#: unpack-trees.c:134

4080 +#: unpack-trees.c:135

4081 #, c-format

4082 msgid ""

4083 "The following untracked working tree files would be removed by merge:\n"

@@ -4083,7 +4087,7 @@ msgstr ""

4087 "al fusionar:\n"

4088 "%%s"

4089

4086 -#: unpack-trees.c:137

4090 +#: unpack-trees.c:138

4091 #, c-format

4092 msgid ""

4093 "The following untracked working tree files would be removed by %s:\n"

@@ -4093,7 +4097,7 @@ msgstr ""

4097 "removidos al %s:\n"

4098 "%%sPor favor, muévelos o elimínalos antes de %s."

4099

4096 -#: unpack-trees.c:139

4100 +#: unpack-trees.c:140

4101 #, c-format

4102 msgid ""

4103 "The following untracked working tree files would be removed by %s:\n"

@@ -4103,7 +4107,7 @@ msgstr ""

4107 "removidos al ejecutar %s:\n"

4108 "%%s"

4109

4106 -#: unpack-trees.c:144

4110 +#: unpack-trees.c:145

4111 #, c-format

4112 msgid ""

4113 "The following untracked working tree files would be overwritten by "

@@ -4114,7 +4118,7 @@ msgstr ""

4118 "sobrescritos al actualizar el árbol de trabajo:\n"

4119 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."

4120

4117 -#: unpack-trees.c:146

4121 +#: unpack-trees.c:147

4122 #, c-format

4123 msgid ""

4124 "The following untracked working tree files would be overwritten by "

@@ -4125,7 +4129,7 @@ msgstr ""

4129 "sobrescritos al actualizar el árbol de trabajo:\n"

4130 "%%s"

4131

4128 -#: unpack-trees.c:149

4132 +#: unpack-trees.c:150

4133 #, c-format

4134 msgid ""

4135 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4135,7 +4139,7 @@ msgstr ""

4139 "sobrescritos al fusionar:\n"

4140 "%%sPor favor, muévelos o elimínalos antes de fusionar."

4141

4138 -#: unpack-trees.c:151

4142 +#: unpack-trees.c:152

4143 #, c-format

4144 msgid ""

4145 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4145,7 +4149,7 @@ msgstr ""

4149 "sobrescritos al fusionar:\n"

4150 "%%s"

4151

4148 -#: unpack-trees.c:154

4152 +#: unpack-trees.c:155

4153 #, c-format

4154 msgid ""

4155 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4155,7 +4159,7 @@ msgstr ""

4159 "sobrescritos al %s:\n"

4160 "%%sPor favor, muévelos o elimínalos antes de %s."

4161

4158 -#: unpack-trees.c:156

4162 +#: unpack-trees.c:157

4163 #, c-format

4164 msgid ""

4165 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4165,12 +4169,12 @@ msgstr ""

4169 "por %s:\n"

4170 "%%s"

4171

4168 -#: unpack-trees.c:163

4172 +#: unpack-trees.c:164

4173 #, c-format

4174 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4175 msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir"

4176

4173 -#: unpack-trees.c:166

4177 +#: unpack-trees.c:167

4178 #, c-format

4179 msgid ""

4180 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4180,7 +4184,7 @@ msgstr ""

4184 "actualizadas:\n"

4185 "%s"

4186

4183 -#: unpack-trees.c:168

4187 +#: unpack-trees.c:169

4188 #, c-format

4189 msgid ""

4190 "The following working tree files would be overwritten by sparse checkout "

@@ -4191,7 +4195,7 @@ msgstr ""

4195 "actualización sparse checkout:\n"

4196 "%s"

4197

4194 -#: unpack-trees.c:170

4198 +#: unpack-trees.c:171

4199 #, c-format

4200 msgid ""

4201 "The following working tree files would be removed by sparse checkout "

@@ -4202,7 +4206,7 @@ msgstr ""

4206 "actualización sparse checkout:\n"

4207 "%s"

4208

4205 -#: unpack-trees.c:172

4209 +#: unpack-trees.c:173

4210 #, c-format

4211 msgid ""

4212 "Cannot update submodule:\n"

@@ -4211,12 +4215,12 @@ msgstr ""

4215 "No se puede actualizar le submodulo:\n"

4216 "%s"

4217

4214 -#: unpack-trees.c:249

4218 +#: unpack-trees.c:250

4219 #, c-format

4220 msgid "Aborting\n"

4221 msgstr "Abortando\n"

4222

4219 -#: unpack-trees.c:331

4223 +#: unpack-trees.c:332

4224 msgid "Checking out files"

4225 msgstr "Revisando archivos"

4226

@@ -4259,8 +4263,8 @@ msgstr "fallo al leer '%s'"

4263 msgid "could not open '%s' for reading and writing"

4264 msgstr "no se pudo abrir '%s' para lectura y escritura"

4265

4262 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4263 -#: builtin/am.c:858 builtin/merge.c:1041

4266 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4267 +#: builtin/am.c:862 builtin/merge.c:1043

4268 #, c-format

4269 msgid "could not open '%s' for reading"

4270 msgstr "no se pudo abrir '%s' para lectura"

@@ -4274,16 +4278,6 @@ msgstr "no es posible acceder '%s'"

4278 msgid "unable to get current working directory"

4279 msgstr "no es posible obtener el directorio de trabajo actual"

4280

4277 -#: wrapper.c:656

4278 -#, c-format

4279 -msgid "could not write to %s"

4280 -msgstr "no se pudo escribir en %s"

4281 -

4282 -#: wrapper.c:658

4283 -#, c-format

4284 -msgid "could not close %s"

4285 -msgstr "no se pudo cerrar %s"

4286 -

4281 #: wt-status.c:150

4282 msgid "Unmerged paths:"

4283 msgstr "rutas no fusionadas:"

@@ -4311,11 +4305,11 @@ msgstr ""

4305 msgid " (use \"git rm <file>...\" to mark resolution)"

4306 msgstr " (usa \"git rm <file>...\" para marcar la resolución)"

4307

4314 -#: wt-status.c:198 wt-status.c:979

4308 +#: wt-status.c:198 wt-status.c:984

4309 msgid "Changes to be committed:"

4310 msgstr "Cambios a ser confirmados:"

4311

4318 -#: wt-status.c:216 wt-status.c:988

4312 +#: wt-status.c:216 wt-status.c:993

4313 msgid "Changes not staged for commit:"

4314 msgstr "Cambios no rastreados para el commit:"

4315

@@ -4421,22 +4415,22 @@ msgstr "contenido modificado, "

4415 msgid "untracked content, "

4416 msgstr "contenido no rastreado, "

4417

4424 -#: wt-status.c:819

4418 +#: wt-status.c:824

4419 #, c-format

4420 msgid "Your stash currently has %d entry"

4421 msgid_plural "Your stash currently has %d entries"

4422 msgstr[0] "Tu stash actualmente tine %d entrada"

4423 msgstr[1] "Tu stash actualmente tiene %d entradas"

4424

4431 -#: wt-status.c:851

4425 +#: wt-status.c:856

4426 msgid "Submodules changed but not updated:"

4427 msgstr "Submodulos cambiados pero no actualizados:"

4428

4435 -#: wt-status.c:853

4429 +#: wt-status.c:858

4430 msgid "Submodule changes to be committed:"

4431 msgstr "Submodulos cambiados listos para realizar commit:"

4432

4439 -#: wt-status.c:935

4433 +#: wt-status.c:940

4434 msgid ""

4435 "Do not modify or remove the line above.\n"

4436 "Everything below it will be ignored."

@@ -4444,107 +4438,107 @@ msgstr ""

4438 "No modifique o borre la línea de encima.\n"

4439 "Todo lo que este por abajo será removido."

4440

4447 -#: wt-status.c:1048

4441 +#: wt-status.c:1053

4442 msgid "You have unmerged paths."

4443 msgstr "tienes rutas no fusionadas"

4444

4451 -#: wt-status.c:1051

4445 +#: wt-status.c:1056

4446 msgid " (fix conflicts and run \"git commit\")"

4447 msgstr " (arregla los conflictos y corre \"git commit\""

4448

4455 -#: wt-status.c:1053

4449 +#: wt-status.c:1058

4450 msgid " (use \"git merge --abort\" to abort the merge)"

4451 msgstr " (usa \"git merge --abort\" para abortar la fusion)"

4452

4459 -#: wt-status.c:1058

4453 +#: wt-status.c:1063

4454 msgid "All conflicts fixed but you are still merging."

4455 msgstr "Todos los conflictos resueltos pero sigues fusionando."

4456

4463 -#: wt-status.c:1061

4457 +#: wt-status.c:1066

4458 msgid " (use \"git commit\" to conclude merge)"

4459 msgstr " (usa \"git commit\" para concluir la fusión)"

4460

4467 -#: wt-status.c:1071

4461 +#: wt-status.c:1076

4462 msgid "You are in the middle of an am session."

4463 msgstr "Estas en medio de una sesión am."

4464

4471 -#: wt-status.c:1074

4465 +#: wt-status.c:1079

4466 msgid "The current patch is empty."

4467 msgstr "El parche actual esta vacío."

4468

4475 -#: wt-status.c:1078

4469 +#: wt-status.c:1083

4470 msgid " (fix conflicts and then run \"git am --continue\")"

4471 msgstr " (arregla los conflictos y luego corre \"git am --continue\""

4472

4479 -#: wt-status.c:1080

4473 +#: wt-status.c:1085

4474 msgid " (use \"git am --skip\" to skip this patch)"

4475 msgstr " (usa \"git am --skip\" para saltar este parche)"

4476

4483 -#: wt-status.c:1082

4477 +#: wt-status.c:1087

4478 msgid " (use \"git am --abort\" to restore the original branch)"

4479 msgstr " (usa \"git am --abort\" para restaurar la rama original)"

4480

4487 -#: wt-status.c:1214

4481 +#: wt-status.c:1219

4482 msgid "git-rebase-todo is missing."

4483 msgstr "git-rebase-todo no esta presente."

4484

4491 -#: wt-status.c:1216

4485 +#: wt-status.c:1221

4486 msgid "No commands done."

4487 msgstr "No se realizaron los comandos."

4488

4495 -#: wt-status.c:1219

4489 +#: wt-status.c:1224

4490 #, c-format

4491 msgid "Last command done (%d command done):"

4492 msgid_plural "Last commands done (%d commands done):"

4493 msgstr[0] "El ultimo comando realizado (%d comando realizado):"

4494 msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):"

4495

4502 -#: wt-status.c:1230

4496 +#: wt-status.c:1235

4497 #, c-format

4498 msgid " (see more in file %s)"

4499 msgstr " (ver mas en el archivo %s)"

4500

4507 -#: wt-status.c:1235

4501 +#: wt-status.c:1240

4502 msgid "No commands remaining."

4503 msgstr "No quedan mas comandos."

4504

4511 -#: wt-status.c:1238

4505 +#: wt-status.c:1243

4506 #, c-format

4507 msgid "Next command to do (%d remaining command):"

4508 msgid_plural "Next commands to do (%d remaining commands):"

4509 msgstr[0] "Siguiente comando a realizar (%d comando restante)"

4510 msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes="

4511

4518 -#: wt-status.c:1246

4512 +#: wt-status.c:1251

4513 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4514 msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"

4515

4522 -#: wt-status.c:1259

4516 +#: wt-status.c:1264

4517 #, c-format

4518 msgid "You are currently rebasing branch '%s' on '%s'."

4519 msgstr "Estas aplicando un rebase de la rama '%s' en '%s."

4520

4527 -#: wt-status.c:1264

4521 +#: wt-status.c:1269

4522 msgid "You are currently rebasing."

4523 msgstr "Estas aplicando un rebase."

4524

4531 -#: wt-status.c:1278

4525 +#: wt-status.c:1283

4526 msgid " (fix conflicts and then run \"git rebase --continue\")"

4527 msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"

4528

4535 -#: wt-status.c:1280

4529 +#: wt-status.c:1285

4530 msgid " (use \"git rebase --skip\" to skip this patch)"

4531 msgstr " (usa \"git rebase --skip\" para omitir este parche)"

4532

4539 -#: wt-status.c:1282

4533 +#: wt-status.c:1287

4534 msgid " (use \"git rebase --abort\" to check out the original branch)"

4535 msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"

4536

4543 -#: wt-status.c:1288

4537 +#: wt-status.c:1293

4538 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4539 msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"

4540

4547 -#: wt-status.c:1292

4541 +#: wt-status.c:1297

4542 #, c-format

4543 msgid ""

4544 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4552,128 +4546,128 @@ msgstr ""

4546 "Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en "

4547 "'%s'."

4548

4555 -#: wt-status.c:1297

4549 +#: wt-status.c:1302

4550 msgid "You are currently splitting a commit during a rebase."

4551 msgstr "Estas dividiendo un commit durante un rebase."

4552

4559 -#: wt-status.c:1300

4553 +#: wt-status.c:1305

4554 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4555 msgstr ""

4556 " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"

4557 "continue\")"

4558

4565 -#: wt-status.c:1304

4559 +#: wt-status.c:1309

4560 #, c-format

4561 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4562 msgstr ""

4563 "Estas editando un commit mientras se aplica un rebase de la rama '%s' en "

4564 "'%s'."

4565

4572 -#: wt-status.c:1309

4566 +#: wt-status.c:1314

4567 msgid "You are currently editing a commit during a rebase."

4568 msgstr "Estas editando un commit durante un rebase."

4569

4576 -#: wt-status.c:1312

4570 +#: wt-status.c:1317

4571 msgid " (use \"git commit --amend\" to amend the current commit)"

4572 msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"

4573

4580 -#: wt-status.c:1314

4574 +#: wt-status.c:1319

4575 msgid ""

4576 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4577 msgstr ""

4578 " (usa \"git rebase --continue\" una vez que estés satisfecho con tus "

4579 "cambios)"

4580

4587 -#: wt-status.c:1324

4581 +#: wt-status.c:1329

4582 #, c-format

4583 msgid "You are currently cherry-picking commit %s."

4584 msgstr "Estas realizando un cherry-picking en el commit %s."

4585

4592 -#: wt-status.c:1329

4586 +#: wt-status.c:1334

4587 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4588 msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"

4589

4596 -#: wt-status.c:1332

4590 +#: wt-status.c:1337

4591 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4592 msgstr ""

4593 " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"

4594

4601 -#: wt-status.c:1334

4595 +#: wt-status.c:1339

4596 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4597 msgstr ""

4598 " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"

4599

4606 -#: wt-status.c:1343

4600 +#: wt-status.c:1348

4601 #, c-format

4602 msgid "You are currently reverting commit %s."

4603 msgstr "Estas revirtiendo el commit %s."

4604

4611 -#: wt-status.c:1348

4605 +#: wt-status.c:1353

4606 msgid " (fix conflicts and run \"git revert --continue\")"

4607 msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"

4608

4615 -#: wt-status.c:1351

4609 +#: wt-status.c:1356

4610 msgid " (all conflicts fixed: run \"git revert --continue\")"

4611 msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"

4612

4619 -#: wt-status.c:1353

4613 +#: wt-status.c:1358

4614 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4615 msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"

4616

4623 -#: wt-status.c:1364

4617 +#: wt-status.c:1369

4618 #, c-format

4619 msgid "You are currently bisecting, started from branch '%s'."

4620 msgstr "Estas aplicando un bisect, comenzando en la rama '%s'."

4621

4628 -#: wt-status.c:1368

4622 +#: wt-status.c:1373

4623 msgid "You are currently bisecting."

4624 msgstr "Estas aplicando un bisect."

4625

4632 -#: wt-status.c:1371

4626 +#: wt-status.c:1376

4627 msgid " (use \"git bisect reset\" to get back to the original branch)"

4628 msgstr " (usa \"git bisect reset\" para volver a la rama original)"

4629

4636 -#: wt-status.c:1568

4630 +#: wt-status.c:1573

4631 msgid "On branch "

4632 msgstr "En la rama "

4633

4640 -#: wt-status.c:1574

4634 +#: wt-status.c:1579

4635 msgid "interactive rebase in progress; onto "

4636 msgstr "rebase interactivo en progreso; en"

4637

4644 -#: wt-status.c:1576

4638 +#: wt-status.c:1581

4639 msgid "rebase in progress; onto "

4640 msgstr "rebase en progreso; en"

4641

4648 -#: wt-status.c:1581

4642 +#: wt-status.c:1586

4643 msgid "HEAD detached at "

4644 msgstr "HEAD desacoplada en"

4645

4652 -#: wt-status.c:1583

4646 +#: wt-status.c:1588

4647 msgid "HEAD detached from "

4648 msgstr "HEAD desacoplada de"

4649

4656 -#: wt-status.c:1586

4650 +#: wt-status.c:1591

4651 msgid "Not currently on any branch."

4652 msgstr "Actualmente no estás en ninguna rama."

4653

4660 -#: wt-status.c:1606

4654 +#: wt-status.c:1611

4655 msgid "Initial commit"

4656 msgstr "Confirmación inicial"

4657

4664 -#: wt-status.c:1607

4658 +#: wt-status.c:1612

4659 msgid "No commits yet"

4660 msgstr "No hay commits todavia"

4661

4668 -#: wt-status.c:1621

4662 +#: wt-status.c:1626

4663 msgid "Untracked files"

4664 msgstr "Archivos sin seguimiento"

4665

4672 -#: wt-status.c:1623

4666 +#: wt-status.c:1628

4667 msgid "Ignored files"

4668 msgstr "Archivos ignorados"

4669

4676 -#: wt-status.c:1627

4670 +#: wt-status.c:1632

4671 #, c-format

4672 msgid ""

4673 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4684,97 +4678,96 @@ msgstr ""

4678 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"

4679 "nuevos archivos usted mismo (vea 'git help status')."

4680

4687 -#: wt-status.c:1633

4681 +#: wt-status.c:1638

4682 #, c-format

4683 msgid "Untracked files not listed%s"

4684 msgstr "Archivos no rastreados no son mostrados %s"

4685

4692 -#: wt-status.c:1635

4686 +#: wt-status.c:1640

4687 msgid " (use -u option to show untracked files)"

4688 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"

4689

4696 -#: wt-status.c:1641

4690 +#: wt-status.c:1646

4691 msgid "No changes"

4692 msgstr "Sin cambios"

4693

4700 -#: wt-status.c:1646

4694 +#: wt-status.c:1651

4695 #, c-format

4696 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4697 msgstr ""

4704 -"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a"

4705 -"\")\n"

4698 +"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"

4699

4707 -#: wt-status.c:1649

4700 +#: wt-status.c:1654

4701 #, c-format

4702 msgid "no changes added to commit\n"

4703 msgstr "no se agregaron cambios al commit\n"

4704

4712 -#: wt-status.c:1652

4705 +#: wt-status.c:1657

4706 #, c-format

4707 msgid ""

4708 "nothing added to commit but untracked files present (use \"git add\" to "

4709 "track)\n"

4710 msgstr ""

4718 -"no hay nada agregado al commit pero hay archivos sin seguimiento "

4719 -"presentes (usa \"git add\" para hacerles seguimiento)\n"

4711 +"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "

4712 +"(usa \"git add\" para hacerles seguimiento)\n"

4713

4721 -#: wt-status.c:1655

4714 +#: wt-status.c:1660

4715 #, c-format

4716 msgid "nothing added to commit but untracked files present\n"

4717 msgstr ""

4718 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "

4719 "presentes\n"

4720

4728 -#: wt-status.c:1658

4721 +#: wt-status.c:1663

4722 #, c-format

4723 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4724 msgstr ""

4725 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "

4726 "hacerles seguimiento)\n"

4727

4735 -#: wt-status.c:1661 wt-status.c:1666

4728 +#: wt-status.c:1666 wt-status.c:1671

4729 #, c-format

4730 msgid "nothing to commit\n"

4731 msgstr "nada para hacer commit\n"

4732

4740 -#: wt-status.c:1664

4733 +#: wt-status.c:1669

4734 #, c-format

4735 msgid "nothing to commit (use -u to show untracked files)\n"

4736 msgstr ""

4737 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"

4738

4746 -#: wt-status.c:1668

4739 +#: wt-status.c:1673

4740 #, c-format

4741 msgid "nothing to commit, working tree clean\n"

4742 msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"

4743

4751 -#: wt-status.c:1780

4744 +#: wt-status.c:1785

4745 msgid "No commits yet on "

4746 msgstr "No hay commits todavía en "

4747

4755 -#: wt-status.c:1784

4748 +#: wt-status.c:1789

4749 msgid "HEAD (no branch)"

4750 msgstr "HEAD (sin rama)"

4751

4759 -#: wt-status.c:1813 wt-status.c:1821

4752 +#: wt-status.c:1818 wt-status.c:1826

4753 msgid "behind "

4754 msgstr "detras"

4755

4763 -#: wt-status.c:1816 wt-status.c:1819

4756 +#: wt-status.c:1821 wt-status.c:1824

4757 msgid "ahead "

4758 msgstr "adelante"

4759

4760 #. TRANSLATORS: the action is e.g. "pull with rebase"

4768 -#: wt-status.c:2311

4761 +#: wt-status.c:2318

4762 #, c-format

4763 msgid "cannot %s: You have unstaged changes."

4764 msgstr "no se puede %s: Tienes cambios sin marcar."

4765

4773 -#: wt-status.c:2317

4766 +#: wt-status.c:2324

4767 msgid "additionally, your index contains uncommitted changes."

4768 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

4769

4777 -#: wt-status.c:2319

4770 +#: wt-status.c:2326

4771 #, c-format

4772 msgid "cannot %s: Your index contains uncommitted changes."

4773 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

@@ -4788,123 +4781,127 @@ msgstr "fallo al desvincular '%s'"

4781 msgid "git add [<options>] [--] <pathspec>..."

4782 msgstr "git add [<opción>] [--] <especificación-de-ruta>..."

4783

4791 -#: builtin/add.c:82

4784 +#: builtin/add.c:83

4785 #, c-format

4786 msgid "unexpected diff status %c"

4787 msgstr "diff status inesperado %c"

4788

4796 -#: builtin/add.c:87 builtin/commit.c:291

4789 +#: builtin/add.c:88 builtin/commit.c:291

4790 msgid "updating files failed"

4791 msgstr "fallo la actualización de carpetas"

4792

4800 -#: builtin/add.c:97

4793 +#: builtin/add.c:98

4794 #, c-format

4795 msgid "remove '%s'\n"

4796 msgstr "remover '%s'\n"

4797

4805 -#: builtin/add.c:153

4798 +#: builtin/add.c:173

4799 msgid "Unstaged changes after refreshing the index:"

4800 msgstr "Cambios fuera del área de stage tras refrescar el índice:"

4801

4809 -#: builtin/add.c:213 builtin/rev-parse.c:888

4802 +#: builtin/add.c:233 builtin/rev-parse.c:888

4803 msgid "Could not read the index"

4804 msgstr "No se pudo leer el indice"

4805

4813 -#: builtin/add.c:224

4806 +#: builtin/add.c:244

4807 #, c-format

4808 msgid "Could not open '%s' for writing."

4809 msgstr "No se pudo abrir '%s' para escritura."

4810

4818 -#: builtin/add.c:228

4811 +#: builtin/add.c:248

4812 msgid "Could not write patch"

4813 msgstr "No se puede escribir el parche"

4814

4822 -#: builtin/add.c:231

4815 +#: builtin/add.c:251

4816 msgid "editing patch failed"

4817 msgstr "fallo la edición del parche"

4818

4826 -#: builtin/add.c:234

4819 +#: builtin/add.c:254

4820 #, c-format

4821 msgid "Could not stat '%s'"

4822 msgstr "No se pudo definir '%s'"

4823

4831 -#: builtin/add.c:236

4824 +#: builtin/add.c:256

4825 msgid "Empty patch. Aborted."

4826 msgstr "Parche vacío. Abortado."

4827

4835 -#: builtin/add.c:241

4828 +#: builtin/add.c:261

4829 #, c-format

4830 msgid "Could not apply '%s'"

4831 msgstr "No se pudo aplicar '%s'"

4832

4840 -#: builtin/add.c:251

4833 +#: builtin/add.c:271

4834 msgid "The following paths are ignored by one of your .gitignore files:\n"

4835 msgstr ""

4836 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"

4837

4845 -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4846 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4838 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4839 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4840 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4841 msgid "dry run"

4842 msgstr "dry run ( ejecución en seco)"

4843

4851 -#: builtin/add.c:274

4844 +#: builtin/add.c:294

4845 msgid "interactive picking"

4846 msgstr "selección interactiva"

4847

4855 -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4848 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4849 msgid "select hunks interactively"

4850 msgstr "elegir hunks de forma interactiva"

4851

4859 -#: builtin/add.c:276

4852 +#: builtin/add.c:296

4853 msgid "edit current diff and apply"

4854 msgstr "editar diff actual y aplicar"

4855

4863 -#: builtin/add.c:277

4856 +#: builtin/add.c:297

4857 msgid "allow adding otherwise ignored files"

4858 msgstr "permitir agregar caso contrario ignorar archivos"

4859

4867 -#: builtin/add.c:278

4860 +#: builtin/add.c:298

4861 msgid "update tracked files"

4862 msgstr "actualizado las carpetas rastreadas"

4863

4871 -#: builtin/add.c:279

4864 +#: builtin/add.c:299

4865 +msgid "renormalize EOL of tracked files (implies -u)"

4866 +msgstr "renormalizar EOL de los archivos rastreados (implica -u)"

4867 +

4868 +#: builtin/add.c:300

4869 msgid "record only the fact that the path will be added later"

4870 msgstr "grabar solo el hecho de que la ruta será agregada después"

4871

4875 -#: builtin/add.c:280

4872 +#: builtin/add.c:301

4873 msgid "add changes from all tracked and untracked files"

4874 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"

4875

4879 -#: builtin/add.c:283

4876 +#: builtin/add.c:304

4877 msgid "ignore paths removed in the working tree (same as --no-all)"

4878 msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"

4879

4883 -#: builtin/add.c:285

4880 +#: builtin/add.c:306

4881 msgid "don't add, only refresh the index"

4882 msgstr "no agregar, solo actualizar el indice"

4883

4887 -#: builtin/add.c:286

4884 +#: builtin/add.c:307

4885 msgid "just skip files which cannot be added because of errors"

4886 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"

4887

4891 -#: builtin/add.c:287

4888 +#: builtin/add.c:308

4889 msgid "check if - even missing - files are ignored in dry run"

4890 msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"

4891

4895 -#: builtin/add.c:288 builtin/update-index.c:954

4892 +#: builtin/add.c:309 builtin/update-index.c:964

4893 msgid "(+/-)x"

4894 msgstr "(+/-)x"

4895

4899 -#: builtin/add.c:288 builtin/update-index.c:955

4896 +#: builtin/add.c:309 builtin/update-index.c:965

4897 msgid "override the executable bit of the listed files"

4898 msgstr "sobrescribir el bit ejecutable de los archivos listados"

4899

4903 -#: builtin/add.c:290

4900 +#: builtin/add.c:311

4901 msgid "warn when adding an embedded repository"

4902 msgstr "avisar cuando se agrega un repositorio incrustado"

4903

4907 -#: builtin/add.c:305

4904 +#: builtin/add.c:326

4905 #, c-format

4906 msgid ""

4907 "You've added another git repository inside your current repository.\n"

@@ -4935,47 +4932,47 @@ msgstr ""

4932 "\n"

4933 "Vea \"git help submodule\" para mas información."

4934

4938 -#: builtin/add.c:333

4935 +#: builtin/add.c:354

4936 #, c-format

4937 msgid "adding embedded git repository: %s"

4938 msgstr "agregando repositorio embebido: %s"

4939

4943 -#: builtin/add.c:351

4940 +#: builtin/add.c:372

4941 #, c-format

4942 msgid "Use -f if you really want to add them.\n"

4943 msgstr "Use -f si realmente quiere agregarlos.\n"

4944

4948 -#: builtin/add.c:359

4945 +#: builtin/add.c:380

4946 msgid "adding files failed"

4947 msgstr "fallo al agregar archivos"

4948

4952 -#: builtin/add.c:396

4949 +#: builtin/add.c:417

4950 msgid "-A and -u are mutually incompatible"

4951 msgstr "-A y -u son mutuamente incompatibles"

4952

4956 -#: builtin/add.c:403

4953 +#: builtin/add.c:424

4954 msgid "Option --ignore-missing can only be used together with --dry-run"

4955 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"

4956

4960 -#: builtin/add.c:407

4957 +#: builtin/add.c:428

4958 #, c-format

4959 msgid "--chmod param '%s' must be either -x or +x"

4960 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"

4961

4965 -#: builtin/add.c:422

4962 +#: builtin/add.c:443

4963 #, c-format

4964 msgid "Nothing specified, nothing added.\n"

4965 msgstr "Nada especificado, nada agregado.\n"

4966

4970 -#: builtin/add.c:423

4967 +#: builtin/add.c:444

4968 #, c-format

4969 msgid "Maybe you wanted to say 'git add .'?\n"

4970 msgstr "Tal vez quiso decir 'git add .'?\n"

4971

4975 -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4976 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4977 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4978 -#: builtin/submodule--helper.c:243

4972 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4973 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4974 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4975 +#: builtin/rm.c:271 builtin/submodule--helper.c:311

4976 msgid "index file corrupt"

4977 msgstr "archivo índice corrompido"

4978

@@ -5002,86 +4999,86 @@ msgstr "Fallo al copiar notas de '%s' a '%s'"

4999 msgid "fseek failed"

5000 msgstr "fall de fseek"

5001

5005 -#: builtin/am.c:786

5002 +#: builtin/am.c:790

5003 #, c-format

5004 msgid "could not parse patch '%s'"

5005 msgstr "no se pudo analizar el parche '%s'"

5006

5010 -#: builtin/am.c:851

5007 +#: builtin/am.c:855

5008 msgid "Only one StGIT patch series can be applied at once"

5009 msgstr "Solo un parche StGIT puede ser aplicado de una vez "

5010

5014 -#: builtin/am.c:899

5011 +#: builtin/am.c:903

5012 msgid "invalid timestamp"

5013 msgstr "timestamp invalido"

5014

5018 -#: builtin/am.c:904 builtin/am.c:916

5015 +#: builtin/am.c:908 builtin/am.c:920

5016 msgid "invalid Date line"

5017 msgstr "línea Date invalida"

5018

5022 -#: builtin/am.c:911

5019 +#: builtin/am.c:915

5020 msgid "invalid timezone offset"

5021 msgstr "offset de zona horaria inválido"

5022

5026 -#: builtin/am.c:1004

5023 +#: builtin/am.c:1008

5024 msgid "Patch format detection failed."

5025 msgstr "Falló al detectar el formato del parche."

5026

5030 -#: builtin/am.c:1009 builtin/clone.c:402

5027 +#: builtin/am.c:1013 builtin/clone.c:402

5028 #, c-format

5029 msgid "failed to create directory '%s'"

5030 msgstr "fallo al crear el directorio '%s'"

5031

5035 -#: builtin/am.c:1013

5032 +#: builtin/am.c:1017

5033 msgid "Failed to split patches."

5034 msgstr "Fallo al dividir parches"

5035

5039 -#: builtin/am.c:1142 builtin/commit.c:376

5036 +#: builtin/am.c:1146 builtin/commit.c:376

5037 msgid "unable to write index file"

5038 msgstr "no es posible escribir en el archivo indice"

5039

5043 -#: builtin/am.c:1193

5040 +#: builtin/am.c:1197

5041 #, c-format

5042 msgid "When you have resolved this problem, run \"%s --continue\"."

5043 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."

5044

5048 -#: builtin/am.c:1194

5045 +#: builtin/am.c:1198

5046 #, c-format

5047 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5048 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."

5049

5053 -#: builtin/am.c:1195

5050 +#: builtin/am.c:1199

5051 #, c-format

5052 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5053 msgstr ""

5054 "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"

5055 "\"."

5056

5060 -#: builtin/am.c:1302

5057 +#: builtin/am.c:1306

5058 msgid "Patch is empty."

5059 msgstr "El parche esta vacío."

5060

5064 -#: builtin/am.c:1368

5061 +#: builtin/am.c:1372

5062 #, c-format

5063 msgid "invalid ident line: %.*s"

5064 msgstr "sangría no válida: %.*s"

5065

5069 -#: builtin/am.c:1390

5066 +#: builtin/am.c:1394

5067 #, c-format

5068 msgid "unable to parse commit %s"

5069 msgstr "no es posible analizar el commit %s"

5070

5074 -#: builtin/am.c:1584

5071 +#: builtin/am.c:1587

5072 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5073 msgstr ""

5074 "Repositorio carece de los blobs necesarios para retroceder en una fusión de "

5075 "3-vías"

5076

5080 -#: builtin/am.c:1586

5077 +#: builtin/am.c:1589

5078 msgid "Using index info to reconstruct a base tree..."

5079 msgstr "Usando la información del índice para reconstruir un árbol base..."

5080

5084 -#: builtin/am.c:1605

5081 +#: builtin/am.c:1608

5082 msgid ""

5083 "Did you hand edit your patch?\n"

5084 "It does not apply to blobs recorded in its index."

@@ -5089,37 +5086,37 @@ msgstr ""

5086 "Editaste el parche a mano?\n"

5087 "No aplica a blobs guardados en su índice."

5088

5092 -#: builtin/am.c:1611

5089 +#: builtin/am.c:1614

5090 msgid "Falling back to patching base and 3-way merge..."

5091 msgstr "Retrocediento para parchar base y fusión de 3-vías..."

5092

5096 -#: builtin/am.c:1636

5093 +#: builtin/am.c:1639

5094 msgid "Failed to merge in the changes."

5095 msgstr "Falló al fusionar en los cambios."

5096

5100 -#: builtin/am.c:1660 builtin/merge.c:641

5097 +#: builtin/am.c:1663 builtin/merge.c:642

5098 msgid "git write-tree failed to write a tree"

5099 msgstr "git write-tree falló al escribir el árbol"

5100

5104 -#: builtin/am.c:1667

5101 +#: builtin/am.c:1670

5102 msgid "applying to an empty history"

5103 msgstr "aplicando a un historial vacio"

5104

5108 -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5109 -#: builtin/merge.c:849

5105 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

5106 +#: builtin/merge.c:850

5107 msgid "failed to write commit object"

5108 msgstr "fallo al escribir el objeto commit"

5109

5113 -#: builtin/am.c:1713 builtin/am.c:1717

5110 +#: builtin/am.c:1716 builtin/am.c:1720

5111 #, c-format

5112 msgid "cannot resume: %s does not exist."

5113 msgstr "no se puede continuar: %s no existe"

5114

5118 -#: builtin/am.c:1733

5115 +#: builtin/am.c:1736

5116 msgid "cannot be interactive without stdin connected to a terminal."

5117 msgstr "no se puede ser interactivo sin stdin conectado a un terminal"

5118

5122 -#: builtin/am.c:1738

5119 +#: builtin/am.c:1741

5120 msgid "Commit Body is:"

5121 msgstr "Cuerpo de commit es:"

5122

@@ -5127,35 +5124,35 @@ msgstr "Cuerpo de commit es:"

5124 #. in your translation. The program will only accept English

5125 #. input at this point.

5126 #.

5130 -#: builtin/am.c:1748

5127 +#: builtin/am.c:1751

5128 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5129 msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5130

5134 -#: builtin/am.c:1798

5131 +#: builtin/am.c:1801

5132 #, c-format

5133 msgid "Dirty index: cannot apply patches (dirty: %s)"

5134 msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"

5135

5139 -#: builtin/am.c:1838 builtin/am.c:1910

5136 +#: builtin/am.c:1841 builtin/am.c:1913

5137 #, c-format

5138 msgid "Applying: %.*s"

5139 msgstr "Aplicando: %.*s"

5140

5144 -#: builtin/am.c:1854

5141 +#: builtin/am.c:1857

5142 msgid "No changes -- Patch already applied."

5143 msgstr "Sin cambios -- parche ya aplicado."

5144

5148 -#: builtin/am.c:1862

5145 +#: builtin/am.c:1865

5146 #, c-format

5147 msgid "Patch failed at %s %.*s"

5148 msgstr "El parche fallo en %s %.*s"

5149

5153 -#: builtin/am.c:1868

5150 +#: builtin/am.c:1871

5151 #, c-format

5152 msgid "The copy of the patch that failed is found in: %s"

5153 msgstr "La copia del parche que fallido se encuentra en: %s"

5154

5158 -#: builtin/am.c:1913

5155 +#: builtin/am.c:1916

5156 msgid ""

5157 "No changes - did you forget to use 'git add'?\n"

5158 "If there is nothing left to stage, chances are that something else\n"

@@ -5165,7 +5162,7 @@ msgstr ""

5162 "Si no hay nada en el área de stage, las posibilidad es que algo mas\n"

5163 "ya haya introducido el mismo cambio; tal vez quieras omitir este parche."

5164

5168 -#: builtin/am.c:1920

5165 +#: builtin/am.c:1923

5166 msgid ""

5167 "You still have unmerged paths in your index.\n"

5168 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5178,17 +5175,17 @@ msgstr ""

5175 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "

5176 "él."

5177

5181 -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5178 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

5179 #: builtin/reset.c:340

5180 #, c-format

5181 msgid "Could not parse object '%s'."

5182 msgstr "No se pudo analizar el objeto '%s'."

5183

5187 -#: builtin/am.c:2081

5184 +#: builtin/am.c:2082

5185 msgid "failed to clean index"

5186 msgstr "fallo al limpiar el indice"

5187

5191 -#: builtin/am.c:2116

5188 +#: builtin/am.c:2117

5189 msgid ""

5190 "You seem to have moved HEAD since the last 'am' failure.\n"

5191 "Not rewinding to ORIG_HEAD"

@@ -5196,134 +5193,134 @@ msgstr ""

5193 "Parece haber movido HEAD desde el último fallo 'am'.\n"

5194 "No rebobinando a ORIG_HEAD "

5195

5199 -#: builtin/am.c:2179

5196 +#: builtin/am.c:2180

5197 #, c-format

5198 msgid "Invalid value for --patch-format: %s"

5199 msgstr "valor invalido para --patch-format: %s"

5200

5204 -#: builtin/am.c:2212

5201 +#: builtin/am.c:2213

5202 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5203 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"

5204

5208 -#: builtin/am.c:2213

5205 +#: builtin/am.c:2214

5206 msgid "git am [<options>] (--continue | --skip | --abort)"

5207 msgstr "git am [<opciones>] (--continue | --skip | --abort)"

5208

5212 -#: builtin/am.c:2219

5209 +#: builtin/am.c:2220

5210 msgid "run interactively"

5211 msgstr "ejecutar de manera interactiva"

5212

5216 -#: builtin/am.c:2221

5213 +#: builtin/am.c:2222

5214 msgid "historical option -- no-op"

5215 msgstr "opción histórica -- no-op"

5216

5220 -#: builtin/am.c:2223

5217 +#: builtin/am.c:2224

5218 msgid "allow fall back on 3way merging if needed"

5219 msgstr "permitir retroceso en fusión de 3-vías si es necesario"

5220

5224 -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5221 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5222 #: builtin/repack.c:180

5223 msgid "be quiet"

5224 msgstr "ser silencioso"

5225

5229 -#: builtin/am.c:2226

5226 +#: builtin/am.c:2227

5227 msgid "add a Signed-off-by line to the commit message"

5228 msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"

5229

5233 -#: builtin/am.c:2229

5230 +#: builtin/am.c:2230

5231 msgid "recode into utf8 (default)"

5232 msgstr "recodificar en utf8 (default)"

5233

5237 -#: builtin/am.c:2231

5234 +#: builtin/am.c:2232

5235 msgid "pass -k flag to git-mailinfo"

5236 msgstr "pasar flag -k a git-mailinfo"

5237

5241 -#: builtin/am.c:2233

5238 +#: builtin/am.c:2234

5239 msgid "pass -b flag to git-mailinfo"

5240 msgstr "pasar flag -b a git-mailinfo"

5241

5245 -#: builtin/am.c:2235

5242 +#: builtin/am.c:2236

5243 msgid "pass -m flag to git-mailinfo"

5244 msgstr "pasar flag -m a git-mailinfo"

5245

5249 -#: builtin/am.c:2237

5246 +#: builtin/am.c:2238

5247 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5248 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"

5249

5253 -#: builtin/am.c:2240

5250 +#: builtin/am.c:2241

5251 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5252 msgstr ""

5253 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"

5254

5258 -#: builtin/am.c:2243

5255 +#: builtin/am.c:2244

5256 msgid "strip everything before a scissors line"

5257 msgstr "descubrir todo antes de una línea de tijeras"

5258

5262 -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5263 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5264 -#: builtin/am.c:2272

5259 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5260 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5261 +#: builtin/am.c:2273

5262 msgid "pass it through git-apply"

5263 msgstr "pasarlo a través de git-apply"

5264

5268 -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5269 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5265 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5266 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5267 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5268 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5269 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5270 msgid "n"

5271 msgstr "n"

5272

5276 -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5273 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

5274 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5275 msgid "format"

5276 msgstr "formato"

5277

5281 -#: builtin/am.c:2269

5278 +#: builtin/am.c:2270

5279 msgid "format the patch(es) are in"

5280 msgstr "formatear el parche(s)"

5281

5285 -#: builtin/am.c:2275

5282 +#: builtin/am.c:2276

5283 msgid "override error message when patch failure occurs"

5284 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"

5285

5289 -#: builtin/am.c:2277

5286 +#: builtin/am.c:2278

5287 msgid "continue applying patches after resolving a conflict"

5288 msgstr "continuar aplicando los parches tras resolver conflictos"

5289

5293 -#: builtin/am.c:2280

5290 +#: builtin/am.c:2281

5291 msgid "synonyms for --continue"

5292 msgstr "sinónimos para --continue"

5293

5297 -#: builtin/am.c:2283

5294 +#: builtin/am.c:2284

5295 msgid "skip the current patch"

5296 msgstr "saltar el parche actual"

5297

5301 -#: builtin/am.c:2286

5298 +#: builtin/am.c:2287

5299 msgid "restore the original branch and abort the patching operation."

5300 msgstr "restaurar la rama original y abortar la operación de parchado."

5301

5305 -#: builtin/am.c:2290

5302 +#: builtin/am.c:2291

5303 msgid "lie about committer date"

5304 msgstr "mentir sobre la fecha del committer"

5305

5309 -#: builtin/am.c:2292

5306 +#: builtin/am.c:2293

5307 msgid "use current timestamp for author date"

5308 msgstr "usar el timestamp actual para la fecha del autor"

5309

5313 -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5314 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5310 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

5311 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5312 msgid "key-id"

5313 msgstr "key-id"

5314

5318 -#: builtin/am.c:2295

5315 +#: builtin/am.c:2296

5316 msgid "GPG-sign commits"

5317 msgstr "commits con firma GPG"

5318

5322 -#: builtin/am.c:2298

5319 +#: builtin/am.c:2299

5320 msgid "(internal use for git-rebase)"

5321 msgstr "(uso interno para git-rebase)"

5322

5326 -#: builtin/am.c:2316

5323 +#: builtin/am.c:2317

5324 msgid ""

5325 "The -b/--binary option has been a no-op for long time, and\n"

5326 "it will be removed. Please do not use it anymore."

@@ -5331,16 +5328,16 @@ msgstr ""

5328 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"

5329 "será removida. Por favor no la use más."

5330

5334 -#: builtin/am.c:2323

5331 +#: builtin/am.c:2324

5332 msgid "failed to read the index"

5333 msgstr "fallo al leer el indice"

5334

5338 -#: builtin/am.c:2338

5335 +#: builtin/am.c:2339

5336 #, c-format

5337 msgid "previous rebase directory %s still exists but mbox given."

5338 msgstr "directorio de rebase previo %s todavía existe en el mbox dado."

5339

5343 -#: builtin/am.c:2362

5340 +#: builtin/am.c:2363

5341 #, c-format

5342 msgid ""

5343 "Stray %s directory found.\n"

@@ -5349,7 +5346,7 @@ msgstr ""

5346 "Directorio extraviado %s encontrado.\n"

5347 "Use \"git am --abort\" para borrarlo."

5348

5352 -#: builtin/am.c:2368

5349 +#: builtin/am.c:2369

5350 msgid "Resolve operation not in progress, we are not resuming."

5351 msgstr "Operación de resolución no está en progreso, no vamos a continuar."

5352

@@ -5387,18 +5384,69 @@ msgstr "git archive: error de protocolo"

5384 msgid "git archive: expected a flush"

5385 msgstr "git archive: se esperaba un flush"

5386

5390 -#: builtin/bisect--helper.c:7

5387 +#: builtin/bisect--helper.c:12

5388 msgid "git bisect--helper --next-all [--no-checkout]"

5389 msgstr "git bisect--helper --next-all [--no-checkout]"

5390

5394 -#: builtin/bisect--helper.c:17

5391 +#: builtin/bisect--helper.c:13

5392 +msgid "git bisect--helper --write-terms <bad_term> <good_term>"

5393 +msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"

5394 +

5395 +#: builtin/bisect--helper.c:14

5396 +msgid "git bisect--helper --bisect-clean-state"

5397 +msgstr "git bisect--helper --bisect-clean-state"

5398 +

5399 +#: builtin/bisect--helper.c:46

5400 +#, c-format

5401 +msgid "'%s' is not a valid term"

5402 +msgstr "'%s' no es un término válido."

5403 +

5404 +#: builtin/bisect--helper.c:50

5405 +#, c-format

5406 +msgid "can't use the builtin command '%s' as a term"

5407 +msgstr "no se puede usar el comando nativo '%s' como un término"

5408 +

5409 +#: builtin/bisect--helper.c:60

5410 +#, c-format

5411 +msgid "can't change the meaning of the term '%s'"

5412 +msgstr "no se puede cambiar el significado del término '%s'"

5413 +

5414 +#: builtin/bisect--helper.c:71

5415 +msgid "please use two different terms"

5416 +msgstr "por favor use dos términos diferentes"

5417 +

5418 +#: builtin/bisect--helper.c:78

5419 +msgid "could not open the file BISECT_TERMS"

5420 +msgstr "no se pudo abrir el archivo BISECT_TERMS"

5421 +

5422 +#: builtin/bisect--helper.c:120

5423 msgid "perform 'git bisect next'"

5424 msgstr "realiza 'git bisect next'"

5425

5398 -#: builtin/bisect--helper.c:19

5426 +#: builtin/bisect--helper.c:122

5427 +msgid "write the terms to .git/BISECT_TERMS"

5428 +msgstr "escribe los términos a .git/BISECT_TERMS"

5429 +

5430 +#: builtin/bisect--helper.c:124

5431 +msgid "cleanup the bisection state"

5432 +msgstr "limpiar el estado de bisección"

5433 +

5434 +#: builtin/bisect--helper.c:126

5435 +msgid "check for expected revs"

5436 +msgstr "revisar por revs esperados"

5437 +

5438 +#: builtin/bisect--helper.c:128

5439 msgid "update BISECT_HEAD instead of checking out the current commit"

5440 msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"

5441

5442 +#: builtin/bisect--helper.c:143

5443 +msgid "--write-terms requires two arguments"

5444 +msgstr "--write-terms requiere dos argumentos"

5445 +

5446 +#: builtin/bisect--helper.c:147

5447 +msgid "--bisect-clean-state requires no arguments"

5448 +msgstr "--bisect-clean-state no requiere argumentos"

5449 +

5450 #: builtin/blame.c:27

5451 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5452 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"

@@ -5655,55 +5703,55 @@ msgstr "Rama %s está siendo rebasada en %s"

5703 msgid "Branch %s is being bisected at %s"

5704 msgstr "Rama %s está siendo bisecada en %s"

5705

5658 -#: builtin/branch.c:470

5706 +#: builtin/branch.c:471

5707 msgid "cannot copy the current branch while not on any."

5708 msgstr "no se puede copiar la rama actual mientras no se está en ninguna."

5709

5662 -#: builtin/branch.c:472

5710 +#: builtin/branch.c:473

5711 msgid "cannot rename the current branch while not on any."

5712 msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."

5713

5666 -#: builtin/branch.c:483

5714 +#: builtin/branch.c:484

5715 #, c-format

5716 msgid "Invalid branch name: '%s'"

5717 msgstr "Nombre de rama invalido: '%s'"

5718

5671 -#: builtin/branch.c:504

5719 +#: builtin/branch.c:511

5720 msgid "Branch rename failed"

5721 msgstr "Cambio de nombre de rama fallido"

5722

5675 -#: builtin/branch.c:506

5723 +#: builtin/branch.c:513

5724 msgid "Branch copy failed"

5725 msgstr "Copiado de rama fallido"

5726

5679 -#: builtin/branch.c:510

5727 +#: builtin/branch.c:517

5728 #, c-format

5681 -msgid "Copied a misnamed branch '%s' away"

5682 -msgstr "Copiada una rama mal llamada '%s' afuera"

5729 +msgid "Created a copy of a misnamed branch '%s'"

5730 +msgstr "Copia creada de la rama malnombrada '%s' "

5731

5684 -#: builtin/branch.c:513

5732 +#: builtin/branch.c:520

5733 #, c-format

5734 msgid "Renamed a misnamed branch '%s' away"

5735 msgstr "Rama mal llamada '%s' renombrada"

5736

5689 -#: builtin/branch.c:519

5737 +#: builtin/branch.c:526

5738 #, c-format

5739 msgid "Branch renamed to %s, but HEAD is not updated!"

5740 msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"

5741

5694 -#: builtin/branch.c:528

5742 +#: builtin/branch.c:535

5743 msgid "Branch is renamed, but update of config-file failed"

5744 msgstr ""

5745 "La rama está renombrada, pero falló la actualización del archivo de "

5746 "configuración"

5747

5700 -#: builtin/branch.c:530

5748 +#: builtin/branch.c:537

5749 msgid "Branch is copied, but update of config-file failed"

5750 msgstr ""

5751 "La rama está copiada, pero falló la actualización del archivo de "

5752 "configuración"

5753

5706 -#: builtin/branch.c:546

5754 +#: builtin/branch.c:553

5755 #, c-format

5756 msgid ""

5757 "Please edit the description for the branch\n"

@@ -5714,184 +5762,184 @@ msgstr ""

5762 "%s\n"

5763 "Las líneas que comiencen con '%c' serán removidas.\n"

5764

5717 -#: builtin/branch.c:579

5765 +#: builtin/branch.c:586

5766 msgid "Generic options"

5767 msgstr "Opciones genericas"

5768

5721 -#: builtin/branch.c:581

5769 +#: builtin/branch.c:588

5770 msgid "show hash and subject, give twice for upstream branch"

5771 msgstr "mostrar hash y tema, dar dos veces para rama upstream"

5772

5725 -#: builtin/branch.c:582

5773 +#: builtin/branch.c:589

5774 msgid "suppress informational messages"

5775 msgstr "Suprimir mensajes informativos"

5776

5729 -#: builtin/branch.c:583

5777 +#: builtin/branch.c:590

5778 msgid "set up tracking mode (see git-pull(1))"

5779 msgstr "configurando modo tracking (mirar git-pull(1))"

5780

5733 -#: builtin/branch.c:585

5781 +#: builtin/branch.c:592

5782 msgid "do not use"

5783 msgstr "no usar"

5784

5737 -#: builtin/branch.c:587

5785 +#: builtin/branch.c:594

5786 msgid "upstream"

5787 msgstr "upstream"

5788

5741 -#: builtin/branch.c:587

5789 +#: builtin/branch.c:594

5790 msgid "change the upstream info"

5791 msgstr "cambiar info de upstream"

5792

5745 -#: builtin/branch.c:588

5793 +#: builtin/branch.c:595

5794 msgid "Unset the upstream info"

5795 msgstr "Desconfigurando la info de upstream"

5796

5749 -#: builtin/branch.c:589

5797 +#: builtin/branch.c:596

5798 msgid "use colored output"

5799 msgstr "usar salida con colores"

5800

5753 -#: builtin/branch.c:590

5801 +#: builtin/branch.c:597

5802 msgid "act on remote-tracking branches"

5803 msgstr "actuar en ramas de traqueo remoto"

5804

5757 -#: builtin/branch.c:592 builtin/branch.c:594

5805 +#: builtin/branch.c:599 builtin/branch.c:601

5806 msgid "print only branches that contain the commit"

5807 msgstr "mostrar solo ramas que contienen el commit"

5808

5761 -#: builtin/branch.c:593 builtin/branch.c:595

5809 +#: builtin/branch.c:600 builtin/branch.c:602

5810 msgid "print only branches that don't contain the commit"

5811 msgstr "mostrar solo ramas que no contienen el commit"

5812

5765 -#: builtin/branch.c:598

5813 +#: builtin/branch.c:605

5814 msgid "Specific git-branch actions:"

5815 msgstr "Acciones específicas de git-branch:"

5816

5769 -#: builtin/branch.c:599

5817 +#: builtin/branch.c:606

5818 msgid "list both remote-tracking and local branches"

5819 msgstr "listar ramas de remote-tracking y locales"

5820

5773 -#: builtin/branch.c:601

5821 +#: builtin/branch.c:608

5822 msgid "delete fully merged branch"

5823 msgstr "borrar ramas totalmente fusionadas"

5824

5777 -#: builtin/branch.c:602

5825 +#: builtin/branch.c:609

5826 msgid "delete branch (even if not merged)"

5827 msgstr "borar rama (incluso si no esta fusionada)"

5828

5781 -#: builtin/branch.c:603

5829 +#: builtin/branch.c:610

5830 msgid "move/rename a branch and its reflog"

5831 msgstr "mover/renombrar una rama y su reflog"

5832

5785 -#: builtin/branch.c:604

5833 +#: builtin/branch.c:611

5834 msgid "move/rename a branch, even if target exists"

5835 msgstr "mover/renombrar una rama, incluso si el destino existe"

5836

5789 -#: builtin/branch.c:605

5837 +#: builtin/branch.c:612

5838 msgid "copy a branch and its reflog"

5839 msgstr "copiar una rama y su reflog"

5840

5793 -#: builtin/branch.c:606

5841 +#: builtin/branch.c:613

5842 msgid "copy a branch, even if target exists"

5843 msgstr "copiar una rama, incluso si el objetivo existe"

5844

5797 -#: builtin/branch.c:607

5845 +#: builtin/branch.c:614

5846 msgid "list branch names"

5847 msgstr "listar nombres de ramas"

5848

5801 -#: builtin/branch.c:608

5849 +#: builtin/branch.c:615

5850 msgid "create the branch's reflog"

5851 msgstr "crea el reflog de la rama"

5852

5805 -#: builtin/branch.c:610

5853 +#: builtin/branch.c:617

5854 msgid "edit the description for the branch"

5855 msgstr "edita la descripción de la rama"

5856

5809 -#: builtin/branch.c:611

5857 +#: builtin/branch.c:618

5858 msgid "force creation, move/rename, deletion"

5859 msgstr "fuerza la creación,movimiento/renombrado,borrado"

5860

5813 -#: builtin/branch.c:612

5861 +#: builtin/branch.c:619

5862 msgid "print only branches that are merged"

5863 msgstr "muestra solo ramas que han sido fusionadas"

5864

5817 -#: builtin/branch.c:613

5865 +#: builtin/branch.c:620

5866 msgid "print only branches that are not merged"

5867 msgstr "muestra solo ramas que no han sido fusionadas"

5868

5821 -#: builtin/branch.c:614

5869 +#: builtin/branch.c:621

5870 msgid "list branches in columns"

5871 msgstr "muestra las ramas en columnas"

5872

5825 -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405

5873 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5874 msgid "key"

5875 msgstr "clave"

5876

5829 -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406

5877 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5878 msgid "field name to sort on"

5879 msgstr "nombre del campo por el cuál ordenar"

5880

5833 -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408

5881 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5882 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5883 #: builtin/tag.c:408

5884 msgid "object"

5885 msgstr "objeto"

5886

5839 -#: builtin/branch.c:619

5887 +#: builtin/branch.c:626

5888 msgid "print only branches of the object"

5889 msgstr "imprimir sólo las ramas del objeto"

5890

5843 -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415

5891 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

5892 msgid "sorting and filtering are case insensitive"

5893 msgstr "ordenamiento y filtrado son case-insensitive"

5894

5847 -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413

5895 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

5896 #: builtin/verify-tag.c:39

5897 msgid "format to use for the output"

5898 msgstr "formato para usar para el output"

5899

5852 -#: builtin/branch.c:645 builtin/clone.c:729

5900 +#: builtin/branch.c:652 builtin/clone.c:730

5901 msgid "HEAD not found below refs/heads!"

5902 msgstr "HEAD no encontrado abajo de refs/heads!"

5903

5856 -#: builtin/branch.c:668

5904 +#: builtin/branch.c:675

5905 msgid "--column and --verbose are incompatible"

5906 msgstr "--column y --verbose son incompatibles"

5907

5860 -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741

5908 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

5909 msgid "branch name required"

5910 msgstr "se necesita el nombre de la rama"

5911

5864 -#: builtin/branch.c:708

5912 +#: builtin/branch.c:718

5913 msgid "Cannot give description to detached HEAD"

5914 msgstr "No se puede dar descripción al HEAD desacoplado"

5915

5868 -#: builtin/branch.c:713

5916 +#: builtin/branch.c:723

5917 msgid "cannot edit description of more than one branch"

5918 msgstr "no se puede editar la descripción de más de una rama"

5919

5872 -#: builtin/branch.c:720

5920 +#: builtin/branch.c:730

5921 #, c-format

5922 msgid "No commit on branch '%s' yet."

5923 msgstr "Aún no hay commits en la rama '%s'."

5924

5877 -#: builtin/branch.c:723

5925 +#: builtin/branch.c:733

5926 #, c-format

5927 msgid "No branch named '%s'."

5928 msgstr "No hay ninguna rama llamada '%s'."

5929

5882 -#: builtin/branch.c:738

5930 +#: builtin/branch.c:748

5931 msgid "too many branches for a copy operation"

5932 msgstr "demasiadas ramas para una operación de copiado"

5933

5886 -#: builtin/branch.c:747

5934 +#: builtin/branch.c:757

5935 msgid "too many arguments for a rename operation"

5936 msgstr "demasiados argumentos para una operación de renombrado"

5937

5890 -#: builtin/branch.c:752

5938 +#: builtin/branch.c:762

5939 msgid "too many arguments to set new upstream"

5940 msgstr "demasiados argumentos para configurar un nuevo upstream"

5941

5894 -#: builtin/branch.c:756

5942 +#: builtin/branch.c:766

5943 #, c-format

5944 msgid ""

5945 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -5899,41 +5947,37 @@ msgstr ""

5947 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "

5948 "rama."

5949

5902 -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800

5950 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

5951 #, c-format

5952 msgid "no such branch '%s'"

5953 msgstr "no hay tal rama '%s'"

5954

5907 -#: builtin/branch.c:763

5955 +#: builtin/branch.c:773

5956 #, c-format

5957 msgid "branch '%s' does not exist"

5958 msgstr "la rama '%s' no existe"

5959

5912 -#: builtin/branch.c:775

5960 +#: builtin/branch.c:785

5961 msgid "too many arguments to unset upstream"

5962 msgstr "demasiados argumentos para desconfigurar upstream"

5963

5916 -#: builtin/branch.c:779

5964 +#: builtin/branch.c:789

5965 msgid "could not unset upstream of HEAD when it does not point to any branch."

5966 msgstr ""

5967 "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "

5968 "rama."

5969

5922 -#: builtin/branch.c:785

5970 +#: builtin/branch.c:795

5971 #, c-format

5972 msgid "Branch '%s' has no upstream information"

5973 msgstr "Rama '%s' no tiene información de upstream"

5974

5927 -#: builtin/branch.c:797

5928 -msgid "it does not make sense to create 'HEAD' manually"

5929 -msgstr "No tiene sentido crear 'HEAD' manualmente"

5930 -

5931 -#: builtin/branch.c:803

5975 +#: builtin/branch.c:810

5976 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5977 msgstr ""

5978 "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"

5979

5936 -#: builtin/branch.c:806

5980 +#: builtin/branch.c:813

5981 msgid ""

5982 "the '--set-upstream' option is no longer supported. Please use '--track' or "

5983 "'--set-upstream-to' instead."

@@ -5998,7 +6042,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"

6042 msgid "for blob objects, run filters on object's content"

6043 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"

6044

6001 -#: builtin/cat-file.c:569 git-submodule.sh:943

6045 +#: builtin/cat-file.c:569 git-submodule.sh:931

6046 msgid "blob"

6047 msgstr "blob"

6048

@@ -6055,7 +6099,7 @@ msgstr "leer nombres de archivos de stdin"

6099 msgid "terminate input and output records by a NUL character"

6100 msgstr "terminar registros de entrada y salida con un carácter NUL"

6101

6058 -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358

6102 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6103 msgid "suppress progress reporting"

6104 msgstr "suprimir el reporte de progreso"

6105

@@ -6112,162 +6156,162 @@ msgstr "contactos no especificados"

6156 msgid "git checkout-index [<options>] [--] [<file>...]"

6157 msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"

6158

6115 -#: builtin/checkout-index.c:145

6159 +#: builtin/checkout-index.c:143

6160 msgid "stage should be between 1 and 3 or all"

6161 msgstr "stage tiene que estar entre 1 y 3 o all"

6162

6119 -#: builtin/checkout-index.c:161

6163 +#: builtin/checkout-index.c:159

6164 msgid "check out all files in the index"

6165 msgstr "revisar todos los archivos en el indice"

6166

6123 -#: builtin/checkout-index.c:162

6167 +#: builtin/checkout-index.c:160

6168 msgid "force overwrite of existing files"

6169 msgstr "forzar sobreescritura de los archivos existentes"

6170

6127 -#: builtin/checkout-index.c:164

6171 +#: builtin/checkout-index.c:162

6172 msgid "no warning for existing files and files not in index"

6173 msgstr ""

6174 "no hay advertencias para los archivos existentes y los archivos no están en "

6175 "el índice"

6176

6133 -#: builtin/checkout-index.c:166

6177 +#: builtin/checkout-index.c:164

6178 msgid "don't checkout new files"

6179 msgstr "no revisar archivos nuevos"

6180

6137 -#: builtin/checkout-index.c:168

6181 +#: builtin/checkout-index.c:166

6182 msgid "update stat information in the index file"

6183 msgstr "actualizar información de estado en el archivo índice"

6184

6141 -#: builtin/checkout-index.c:172

6185 +#: builtin/checkout-index.c:170

6186 msgid "read list of paths from the standard input"

6187 msgstr "leer lista de rutas desde standard input"

6188

6145 -#: builtin/checkout-index.c:174

6189 +#: builtin/checkout-index.c:172

6190 msgid "write the content to temporary files"

6191 msgstr "escribir el contenido en un archivo temporal"

6192

6149 -#: builtin/checkout-index.c:175 builtin/column.c:31

6150 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631

6151 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999

6152 -#: builtin/worktree.c:498

6193 +#: builtin/checkout-index.c:173 builtin/column.c:31

6194 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6195 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6196 +#: builtin/worktree.c:552

6197 msgid "string"

6198 msgstr "string"

6199

6156 -#: builtin/checkout-index.c:176

6200 +#: builtin/checkout-index.c:174

6201 msgid "when creating files, prepend <string>"

6202 msgstr "cuando cree archivos, anteponer <string>"

6203

6160 -#: builtin/checkout-index.c:178

6204 +#: builtin/checkout-index.c:176

6205 msgid "copy out the files from named stage"

6206 msgstr "copiar los archivos del stage nombrado"

6207

6164 -#: builtin/checkout.c:26

6208 +#: builtin/checkout.c:27

6209 msgid "git checkout [<options>] <branch>"

6210 msgstr "git checkout [<opciones>] <rama>"

6211

6168 -#: builtin/checkout.c:27

6212 +#: builtin/checkout.c:28

6213 msgid "git checkout [<options>] [<branch>] -- <file>..."

6214 msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."

6215

6172 -#: builtin/checkout.c:135 builtin/checkout.c:168

6216 +#: builtin/checkout.c:136 builtin/checkout.c:169

6217 #, c-format

l10n: es.po: Update Spanish Translation v2.16.0