7fdc5f296f · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2019-10-28 13:19+0800\n"

11 -"PO-Revision-Date: 2019-10-28 19:20-0500\n"

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

11 +"PO-Revision-Date: 2020-01-06 09:12-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,468 @@ msgstr ""

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

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

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

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

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

20

21 -#: advice.c:109

21 +#: add-interactive.c:347

22 +#, c-format

23 +msgid "Huh (%s)?"

24 +msgstr "¿Ahh (%s)?"

25 +

26 +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216

27 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643

28 +#: builtin/rebase.c:2019 builtin/rebase.c:2063

29 +msgid "could not read index"

30 +msgstr "no se pudo leer índice"

31 +

32 +#: add-interactive.c:555 git-add--interactive.perl:269

33 +#: git-add--interactive.perl:294

34 +msgid "binary"

35 +msgstr "binario"

36 +

37 +#: add-interactive.c:613 git-add--interactive.perl:278

38 +#: git-add--interactive.perl:332

39 +msgid "nothing"

40 +msgstr "nada"

41 +

42 +#: add-interactive.c:614 git-add--interactive.perl:314

43 +#: git-add--interactive.perl:329

44 +msgid "unchanged"

45 +msgstr "sin cambios"

46 +

47 +#: add-interactive.c:651 git-add--interactive.perl:643

48 +msgid "Update"

49 +msgstr "Actualizar"

50 +

51 +#: add-interactive.c:668 add-interactive.c:856

52 +#, c-format

53 +msgid "could not stage '%s'"

54 +msgstr "no se pudo poner en stage '%s'"

55 +

56 +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409

57 +#: builtin/rebase.c:895

58 +msgid "could not write index"

59 +msgstr "no se pudo escribir índice"

60 +

61 +#: add-interactive.c:677 git-add--interactive.perl:628

62 +#, c-format, perl-format

63 +msgid "updated %d path\n"

64 +msgid_plural "updated %d paths\n"

65 +msgstr[0] "actualizada %d ruta\n"

66 +msgstr[1] "actualizadas %d rutas\n"

67 +

68 +#: add-interactive.c:695 git-add--interactive.perl:678

69 +#, c-format, perl-format

70 +msgid "note: %s is untracked now.\n"

71 +msgstr "nota: %s no es rastreado ahora.\n"

72 +

73 +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281

74 +#: builtin/reset.c:144

75 +#, c-format

76 +msgid "make_cache_entry failed for path '%s'"

77 +msgstr "make_cache_entry falló para la ruta '%s'"

78 +

79 +#: add-interactive.c:730 git-add--interactive.perl:655

80 +msgid "Revert"

81 +msgstr "Revertir"

82 +

83 +#: add-interactive.c:746

84 +msgid "Could not parse HEAD^{tree}"

85 +msgstr "no se pudo analizar HEAD^{tree}"

86 +

87 +#: add-interactive.c:784 git-add--interactive.perl:631

88 +#, c-format, perl-format

89 +msgid "reverted %d path\n"

90 +msgid_plural "reverted %d paths\n"

91 +msgstr[0] "revertida %d ruta\n"

92 +msgstr[1] "revertidas %d rutas\n"

93 +

94 +#: add-interactive.c:835 git-add--interactive.perl:695

95 +#, c-format

96 +msgid "No untracked files.\n"

97 +msgstr "No hay archivos sin rastrear.\n"

98 +

99 +#: add-interactive.c:839 git-add--interactive.perl:689

100 +msgid "Add untracked"

101 +msgstr "Agregar no rastreados"

102 +

103 +#: add-interactive.c:866 git-add--interactive.perl:625

104 +#, c-format, perl-format

105 +msgid "added %d path\n"

106 +msgid_plural "added %d paths\n"

107 +msgstr[0] "agregada %d ruta\n"

108 +msgstr[1] "agregadas %d rutas\n"

109 +

110 +#: add-interactive.c:896

111 +#, c-format

112 +msgid "ignoring unmerged: %s"

113 +msgstr "ignorando lo no fusionado: %s"

114 +

115 +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366

116 +#, c-format

117 +msgid "Only binary files changed.\n"

118 +msgstr "Solo cambiaron archivos binarios.\n"

119 +

120 +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368

121 +#, c-format

122 +msgid "No changes.\n"

123 +msgstr "Sin cambios.\n"

124 +

125 +#: add-interactive.c:914 git-add--interactive.perl:1376

126 +msgid "Patch update"

127 +msgstr "Actualización del parche"

128 +

129 +#: add-interactive.c:953 git-add--interactive.perl:1754

130 +msgid "Review diff"

131 +msgstr "Revisión de diff"

132 +

133 +#: add-interactive.c:981

134 +msgid "show paths with changes"

135 +msgstr "mostrar rutas con cambios"

136 +

137 +#: add-interactive.c:983

138 +msgid "add working tree state to the staged set of changes"

139 +msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage"

140 +

141 +#: add-interactive.c:985

142 +msgid "revert staged set of changes back to the HEAD version"

143 +msgstr "revertir conjunto de cambios en stage a la versión de HEAD"

144 +

145 +#: add-interactive.c:987

146 +msgid "pick hunks and update selectively"

147 +msgstr "elegir hunks y actualizar de forma selectiva"

148 +

149 +#: add-interactive.c:989

150 +msgid "view diff between HEAD and index"

151 +msgstr "ver diff entre HEAD e index"

152 +

153 +#: add-interactive.c:991

154 +msgid "add contents of untracked files to the staged set of changes"

155 +msgstr ""

156 +"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"

157 +

158 +#: add-interactive.c:999 add-interactive.c:1048

159 +msgid "Prompt help:"

160 +msgstr "Mostrar ayuda:"

161 +

162 +#: add-interactive.c:1001

163 +msgid "select a single item"

164 +msgstr "selecciona un único objeto"

165 +

166 +#: add-interactive.c:1003

167 +msgid "select a range of items"

168 +msgstr "selecciona un rango de objetos"

169 +

170 +#: add-interactive.c:1005

171 +msgid "select multiple ranges"

172 +msgstr "selecciona multiples rangos"

173 +

174 +#: add-interactive.c:1007 add-interactive.c:1052

175 +msgid "select item based on unique prefix"

176 +msgstr "seleccionar objeto basado en prefijo único"

177 +

178 +#: add-interactive.c:1009

179 +msgid "unselect specified items"

180 +msgstr "quitar objetos especificados"

181 +

182 +#: add-interactive.c:1011

183 +msgid "choose all items"

184 +msgstr "escoger todos los objetos"

185 +

186 +#: add-interactive.c:1013

187 +msgid "(empty) finish selecting"

188 +msgstr "(vacío) finalizar selección"

189 +

190 +#: add-interactive.c:1050

191 +msgid "select a numbered item"

192 +msgstr "selecciona un objeto numerado"

193 +

194 +#: add-interactive.c:1054

195 +msgid "(empty) select nothing"

196 +msgstr "(vacío) selecciona nada"

197 +

198 +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851

199 +msgid "*** Commands ***"

200 +msgstr "*** Comandos ***"

201 +

202 +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848

203 +msgid "What now"

204 +msgstr "Ahora que"

205 +

206 +#: add-interactive.c:1115 git-add--interactive.perl:213

207 +msgid "staged"

208 +msgstr "rastreado"

209 +

210 +#: add-interactive.c:1115 git-add--interactive.perl:213

211 +msgid "unstaged"

212 +msgstr "no rastreado"

213 +

214 +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197

215 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

216 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409

217 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

218 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

219 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213

220 +msgid "path"

221 +msgstr "ruta"

222 +

223 +#: add-interactive.c:1122

224 +msgid "could not refresh index"

225 +msgstr "no se pudo refrescar el index"

226 +

227 +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765

228 +#, c-format

229 +msgid "Bye.\n"

230 +msgstr "Adiós.\n"

231 +

232 +#: add-patch.c:15

233 +#, c-format

234 +msgid "Stage mode change [y,n,a,q,d%s,?]? "

235 +msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? "

236 +

237 +#: add-patch.c:16

238 +#, c-format

239 +msgid "Stage deletion [y,n,a,q,d%s,?]? "

240 +msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? "

241 +

242 +#: add-patch.c:17

243 +#, c-format

244 +msgid "Stage this hunk [y,n,a,q,d%s,?]? "

245 +msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? "

246 +

247 +#: add-patch.c:111

248 +#, c-format

249 +msgid "could not parse hunk header '%.*s'"

250 +msgstr "no se puede analizar hunk header '%.*s'"

251 +

252 +#: add-patch.c:130 add-patch.c:134

253 +#, c-format

254 +msgid "could not parse colored hunk header '%.*s'"

255 +msgstr "no se puede analizar hunk header '%.*s'"

256 +

257 +#: add-patch.c:176

258 +msgid "could not parse diff"

259 +msgstr "no se puede analizar diff"

260 +

261 +#: add-patch.c:194

262 +msgid "could not parse colored diff"

263 +msgstr "no se pudo analizar diff a colores"

264 +

265 +#: add-patch.c:508

266 +#, c-format

267 +msgid ""

268 +"expected context line #%d in\n"

269 +"%.*s"

270 +msgstr ""

271 +"se esperaba línea de contexto #%d en\n"

272 +"%.*s"

273 +

274 +#: add-patch.c:523

275 +#, c-format

276 +msgid ""

277 +"hunks do not overlap:\n"

278 +"%.*s\n"

279 +"\tdoes not end with:\n"

280 +"%.*s"

281 +msgstr ""

282 +"hunks no hacen overlap:\n"

283 +"%.*s\n"

284 +"\tno acaba con:\n"

285 +"%.*s"

286 +

287 +#: add-patch.c:799 git-add--interactive.perl:1112

288 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

289 +msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"

290 +

291 +#: add-patch.c:803

292 +#, c-format

293 +msgid ""

294 +"---\n"

295 +"To remove '%c' lines, make them ' ' lines (context).\n"

296 +"To remove '%c' lines, delete them.\n"

297 +"Lines starting with %c will be removed.\n"

298 +msgstr ""

299 +"---\n"

300 +"Para eliminar '%c' líneas, haga de ellas líneas ' ' (contexto).\n"

301 +"Para eliminar '%c' líneas, bórrelas.\n"

302 +"Lineas comenzando con %c serán eliminadas.\n"

303 +

304 +#: add-patch.c:810

305 +msgid ""

306 +"If the patch applies cleanly, the edited hunk will immediately be\n"

307 +"marked for staging.\n"

308 +msgstr ""

309 +"Si el parche aplica limpiamente, el hunk editado sera marcado\n"

310 +"inmediatamente para el área de stage.\n"

311 +

312 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

313 +#: add-patch.c:818 git-add--interactive.perl:1126

314 +msgid ""

315 +"If it does not apply cleanly, you will be given an opportunity to\n"

316 +"edit again. If all lines of the hunk are removed, then the edit is\n"

317 +"aborted and the hunk is left unchanged.\n"

318 +msgstr ""

319 +"Si esto no aplica de manera limpia, se te da la oportunidad de \n"

320 +"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n"

321 +"la edición es abortada y el hunk queda sin cambios.\n"

322 +

323 +#: add-patch.c:851

324 +msgid "could not parse hunk header"

325 +msgstr "no se puede analizar hunk header"

326 +

327 +#: add-patch.c:895 add-patch.c:1294

328 +msgid "'git apply --cached' failed"

329 +msgstr "falló 'git apply --cached'"

330 +

331 +#. TRANSLATORS: do not translate [y/n]

332 +#. The program will only accept that input at this point.

333 +#. Consider translating (saying "no" discards!) as

334 +#. (saying "n" for "no" discards!) if the translation

335 +#. of the word "no" does not start with n.

336 +#.

337 +#. TRANSLATORS: do not translate [y/n]

338 +#. The program will only accept that input

339 +#. at this point.

340 +#. Consider translating (saying "no" discards!) as

341 +#. (saying "n" for "no" discards!) if the translation

342 +#. of the word "no" does not start with n.

343 +#: add-patch.c:952 git-add--interactive.perl:1239

344 +msgid ""

345 +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

346 +msgstr ""

347 +"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"

348 +"n]? "

349 +

350 +#: add-patch.c:1009

351 +msgid ""

352 +"y - stage this hunk\n"

353 +"n - do not stage this hunk\n"

354 +"q - quit; do not stage this hunk or any of the remaining ones\n"

355 +"a - stage this and all the remaining hunks\n"

356 +"d - do not stage this hunk nor any of the remaining hunks\n"

357 +msgstr ""

358 +"y - aplicar stage a este hunk\n"

359 +"n - no aplicar stage a este hunk\n"

360 +"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"

361 +"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"

362 +"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "

363 +"archivo\n"

364 +

365 +#: add-patch.c:1016

366 +msgid ""

367 +"j - leave this hunk undecided, see next undecided hunk\n"

368 +"J - leave this hunk undecided, see next hunk\n"

369 +"k - leave this hunk undecided, see previous undecided hunk\n"

370 +"K - leave this hunk undecided, see previous hunk\n"

371 +"g - select a hunk to go to\n"

372 +"/ - search for a hunk matching the given regex\n"

373 +"s - split the current hunk into smaller hunks\n"

374 +"e - manually edit the current hunk\n"

375 +"? - print help\n"

376 +msgstr ""

377 +"j - deja este hunk sin decidir, ver el siguiente hunk sin decisión\n"

378 +"J - deja este hunk sin decidir, ver siguiente hunk\n"

379 +"k - deja este hunk sin decidir, ver hunk previo sin decidir\n"

380 +"K - deja este hunk sin decidir, ver hunk anterior\n"

381 +"g - selecciona un hunk a dónde ir\n"

382 +"/ - buscar un hunk que cumpla con el regex dado\n"

383 +"s - separar el hunk actual en más pequeños\n"

384 +"e - editar manualmente el hunk actual\n"

385 +"? - imprimir ayuda\n"

386 +

387 +#: add-patch.c:1137 add-patch.c:1147

388 +msgid "No previous hunk"

389 +msgstr "No el anterior hunk"

390 +

391 +#: add-patch.c:1142 add-patch.c:1152

392 +msgid "No next hunk"

393 +msgstr "No el siguiente hunk"

394 +

395 +#: add-patch.c:1158

396 +msgid "No other hunks to goto"

397 +msgstr "No hay más pedazos para el ir"

398 +

399 +#: add-patch.c:1169 git-add--interactive.perl:1577

400 +msgid "go to which hunk (<ret> to see more)? "

401 +msgstr "¿a que hunk ir (<enter> para ver más)? "

402 +

403 +#: add-patch.c:1170 git-add--interactive.perl:1579

404 +msgid "go to which hunk? "

405 +msgstr "¿a que hunk ir? "

406 +

407 +#: add-patch.c:1181

408 +#, c-format

409 +msgid "Invalid number: '%s'"

410 +msgstr "Numero inválido: '%s'"

411 +

412 +#: add-patch.c:1186

413 +#, c-format

414 +msgid "Sorry, only %d hunk available."

415 +msgid_plural "Sorry, only %d hunks available."

416 +msgstr[0] "Lo siento, solo %d hunk disponible."

417 +msgstr[1] "Lo siento, solo %d hunks disponibles."

418 +

419 +#: add-patch.c:1195

420 +msgid "No other hunks to search"

421 +msgstr "No hay más pedazos para buscar"

422 +

423 +#: add-patch.c:1201 git-add--interactive.perl:1623

424 +msgid "search for regex? "

425 +msgstr "¿buscar para regexp? "

426 +

427 +#: add-patch.c:1216

428 +#, c-format

429 +msgid "Malformed search regexp %s: %s"

430 +msgstr "Regexp para la búsqueda mal formado %s: %s"

431 +

432 +#: add-patch.c:1233

433 +msgid "No hunk matches the given pattern"

434 +msgstr "No hay hunks que concuerden con el patrón entregado."

435 +

436 +#: add-patch.c:1240

437 +msgid "Sorry, cannot split this hunk"

438 +msgstr "Perdón, no se puede dividir este pedazo"

439 +

440 +#: add-patch.c:1244

441 +#, c-format

442 +msgid "Split into %d hunks."

443 +msgstr "Cortar en %d hunk."

444 +

445 +#: add-patch.c:1248

446 +msgid "Sorry, cannot edit this hunk"

447 +msgstr "Perdón, no se puede editar este pedazo"

448 +

449 +#: advice.c:111

450 #, c-format

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

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

453

26 -#: advice.c:162

454 +#: advice.c:164

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

456 msgstr ""

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

458

31 -#: advice.c:164

459 +#: advice.c:166

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

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

462

35 -#: advice.c:166

463 +#: advice.c:168

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

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

466

39 -#: advice.c:168

467 +#: advice.c:170

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

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

470

43 -#: advice.c:170

471 +#: advice.c:172

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

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

474

47 -#: advice.c:172

475 +#: advice.c:174

476 #, c-format

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

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

479

52 -#: advice.c:180

480 +#: advice.c:182

481 msgid ""

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

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

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

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

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

487

60 -#: advice.c:188

488 +#: advice.c:190

489 msgid "Exiting because of an unresolved conflict."

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

491

64 -#: advice.c:193 builtin/merge.c:1332

492 +#: advice.c:195 builtin/merge.c:1332

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

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

495

68 -#: advice.c:195

496 +#: advice.c:197

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

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

499

72 -#: advice.c:196

500 +#: advice.c:198

501 msgid "Exiting because of unfinished merge."

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

503

76 -#: advice.c:202

504 +#: advice.c:204

505 #, c-format

506 msgid ""

507 "Note: switching to '%s'.\n"

@@ -112,7 +540,7 @@ msgstr ""

540 "\n"

541 " git switch -\n"

542 "\n"

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

543 +"Desactiva este aviso poniendo la variable de config advice.detachedHead en "

544 "false\n"

545 "\n"

546

@@ -225,7 +653,7 @@ msgstr[1] ""

653 #, c-format

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

655 msgstr ""

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

656 +"la cabecera de git diff carece de información del nombre del archivo (línea %d)"

657

658 #: apply.c:1481

659 #, c-format

@@ -290,24 +718,24 @@ msgstr "no es posible leer el enlace simbólico %s"

718 msgid "unable to open or read %s"

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

720

293 -#: apply.c:2926

721 +#: apply.c:2936

722 #, c-format

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

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

725

298 -#: apply.c:3047

726 +#: apply.c:3057

727 #, c-format

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

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

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

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

732

305 -#: apply.c:3059

733 +#: apply.c:3069

734 #, c-format

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

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

737

310 -#: apply.c:3065

738 +#: apply.c:3075

739 #, c-format

740 msgid ""

741 "while searching for:\n"

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

744 "mientras se busca:\n"

745 "%.*s"

746

319 -#: apply.c:3087

747 +#: apply.c:3097

748 #, c-format

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

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

751

324 -#: apply.c:3095

752 +#: apply.c:3105

753 #, c-format

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

755 msgstr ""

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

757

330 -#: apply.c:3142

758 +#: apply.c:3152

759 #, c-format

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

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

762

335 -#: apply.c:3152

763 +#: apply.c:3162

764 #, c-format

765 msgid ""

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

@@ -340,289 +768,284 @@ msgstr ""

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

769 "actuales."

770

343 -#: apply.c:3160

771 +#: apply.c:3170

772 #, c-format

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

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

775

348 -#: apply.c:3178

776 +#: apply.c:3188

777 #, c-format

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

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

780

353 -#: apply.c:3191

781 +#: apply.c:3201

782 #, c-format

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

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

785

358 -#: apply.c:3197

786 +#: apply.c:3207

787 #, c-format

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

789 msgstr ""

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

791 "obtuvo %s)"

792

365 -#: apply.c:3218

793 +#: apply.c:3228

794 #, c-format

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

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

797

370 -#: apply.c:3341

798 +#: apply.c:3351

799 #, c-format

800 msgid "cannot checkout %s"

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

802

375 -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

803 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280

804 #, c-format

805 msgid "failed to read %s"

806 msgstr "no se pudo leer %s"

807

380 -#: apply.c:3401

808 +#: apply.c:3411

809 #, c-format

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

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

812

385 -#: apply.c:3430 apply.c:3673

813 +#: apply.c:3440 apply.c:3683

814 #, c-format

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

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

817

390 -#: apply.c:3516 apply.c:3688

818 +#: apply.c:3526 apply.c:3698

819 #, c-format

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

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

822

395 -#: apply.c:3525 apply.c:3696

823 +#: apply.c:3535 apply.c:3706

824 #, c-format

825 msgid "%s: does not match index"

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

827

400 -#: apply.c:3560

828 +#: apply.c:3570

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

830 msgstr ""

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

832 "vías."

833

406 -#: apply.c:3563

834 +#: apply.c:3573

835 #, c-format

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

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

838

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

839 +#: apply.c:3589 apply.c:3593

840 #, c-format

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

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

843

416 -#: apply.c:3595

844 +#: apply.c:3605

845 #, c-format

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

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

848

421 -#: apply.c:3609

849 +#: apply.c:3619

850 #, c-format

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

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

853

426 -#: apply.c:3614

854 +#: apply.c:3624

855 #, c-format

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

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

858

431 -#: apply.c:3640

859 +#: apply.c:3650

860 msgid "removal patch leaves file contents"

861 msgstr "parche de eliminación deja contenidos en el archivo"

862

435 -#: apply.c:3713

863 +#: apply.c:3723

864 #, c-format

865 msgid "%s: wrong type"

866 msgstr "%s: tipo incorrecto"

867

440 -#: apply.c:3715

868 +#: apply.c:3725

869 #, c-format

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

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

872

445 -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

446 -#: read-cache.c:1309

873 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856

874 +#: read-cache.c:1320

875 #, c-format

876 msgid "invalid path '%s'"

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

878

451 -#: apply.c:3924

879 +#: apply.c:3934

880 #, c-format

881 msgid "%s: already exists in index"

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

883

456 -#: apply.c:3927

884 +#: apply.c:3937

885 #, c-format

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

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

888

461 -#: apply.c:3947

889 +#: apply.c:3957

890 #, c-format

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

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

893

466 -#: apply.c:3952

894 +#: apply.c:3962

895 #, c-format

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

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

898

471 -#: apply.c:3972

899 +#: apply.c:3982

900 #, c-format

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

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

903

476 -#: apply.c:3976

904 +#: apply.c:3986

905 #, c-format

906 msgid "%s: patch does not apply"

907 msgstr "%s: el parche no aplica"

908

481 -#: apply.c:3991

909 +#: apply.c:4001

910 #, c-format

911 msgid "Checking patch %s..."

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

913

486 -#: apply.c:4083

914 +#: apply.c:4093

915 #, c-format

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

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

918

491 -#: apply.c:4090

919 +#: apply.c:4100

920 #, c-format

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

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

923

496 -#: apply.c:4093

924 +#: apply.c:4103

925 #, c-format

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

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

928

501 -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

502 -#, c-format

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

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

505 -

506 -#: apply.c:4102

929 +#: apply.c:4112

930 #, c-format

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

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

933

511 -#: apply.c:4112

934 +#: apply.c:4122

935 #, c-format

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

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

938

516 -#: apply.c:4250

939 +#: apply.c:4260

940 #, c-format

941 msgid "unable to remove %s from index"

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

943

521 -#: apply.c:4284

944 +#: apply.c:4294

945 #, c-format

946 msgid "corrupt patch for submodule %s"

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

948

526 -#: apply.c:4290

949 +#: apply.c:4300

950 #, c-format

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

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

953

531 -#: apply.c:4298

954 +#: apply.c:4308

955 #, c-format

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

957 msgstr ""

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

959

537 -#: apply.c:4304 apply.c:4449

960 +#: apply.c:4314 apply.c:4459

961 #, c-format

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

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

964

542 -#: apply.c:4347

965 +#: apply.c:4357

966 #, c-format

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

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

969

547 -#: apply.c:4351

970 +#: apply.c:4361

971 #, c-format

972 msgid "closing file '%s'"

973 msgstr "cerrando archivo '%s'"

974

552 -#: apply.c:4421

975 +#: apply.c:4431

976 #, c-format

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

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

979

557 -#: apply.c:4519

980 +#: apply.c:4529

981 #, c-format

982 msgid "Applied patch %s cleanly."

983 msgstr "Parche %s aplicado limpiamente."

984

562 -#: apply.c:4527

985 +#: apply.c:4537

986 msgid "internal error"

987 msgstr "error interno"

988

566 -#: apply.c:4530

989 +#: apply.c:4540

990 #, c-format

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

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

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

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

995

573 -#: apply.c:4541

996 +#: apply.c:4551

997 #, c-format

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

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

1000

578 -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

1001 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192

1002 #, c-format

1003 msgid "cannot open %s"

1004 msgstr "no se puede abrir %s"

1005

583 -#: apply.c:4563

1006 +#: apply.c:4573

1007 #, c-format

1008 msgid "Hunk #%d applied cleanly."

1009 msgstr "Hunk #%d aplicado limpiamente."

1010

588 -#: apply.c:4567

1011 +#: apply.c:4577

1012 #, c-format

1013 msgid "Rejected hunk #%d."

1014 msgstr "Hunk #%d rechazado."

1015

593 -#: apply.c:4686

1016 +#: apply.c:4696

1017 #, c-format

1018 msgid "Skipped patch '%s'."

1019 msgstr "Parche '%s' saltado."

1020

598 -#: apply.c:4694

1021 +#: apply.c:4704

1022 msgid "unrecognized input"

1023 msgstr "input no reconocido"

1024

602 -#: apply.c:4714

1025 +#: apply.c:4724

1026 msgid "unable to read index file"

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

1028

606 -#: apply.c:4871

1029 +#: apply.c:4881

1030 #, c-format

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

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

1033

611 -#: apply.c:4898

1034 +#: apply.c:4908

1035 #, c-format

1036 msgid "squelched %d whitespace error"

1037 msgid_plural "squelched %d whitespace errors"

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

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

1040

618 -#: apply.c:4904 apply.c:4919

1041 +#: apply.c:4914 apply.c:4929

1042 #, c-format

1043 msgid "%d line adds whitespace errors."

1044 msgid_plural "%d lines add whitespace errors."

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

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

1047

625 -#: apply.c:4912

1048 +#: apply.c:4922

1049 #, c-format

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

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

@@ -631,146 +1054,137 @@ msgstr[0] ""

1054 msgstr[1] ""

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

1056

634 -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

1057 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390

1058 msgid "Unable to write new index file"

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

1060

638 -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

639 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

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

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

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

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

644 -msgid "path"

645 -msgstr "ruta"

646 -

647 -#: apply.c:4956

1061 +#: apply.c:4966

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

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

1064

651 -#: apply.c:4959

1065 +#: apply.c:4969

1066 msgid "apply changes matching the given path"

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

1068

655 -#: apply.c:4961 builtin/am.c:2206

1069 +#: apply.c:4971 builtin/am.c:2206

1070 msgid "num"

1071 msgstr "num"

1072

659 -#: apply.c:4962

1073 +#: apply.c:4972

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

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

1076

663 -#: apply.c:4965

1077 +#: apply.c:4975

1078 msgid "ignore additions made by the patch"

1079 msgstr "ignorar adiciones hechas por el parche"

1080

667 -#: apply.c:4967

1081 +#: apply.c:4977

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

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

1084

671 -#: apply.c:4971

1085 +#: apply.c:4981

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

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

1088

675 -#: apply.c:4973

1089 +#: apply.c:4983

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

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

1092

679 -#: apply.c:4975

1093 +#: apply.c:4985

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

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

1096

683 -#: apply.c:4977

1097 +#: apply.c:4987

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

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

1100

687 -#: apply.c:4979

1101 +#: apply.c:4989

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

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

1104

691 -#: apply.c:4981

1105 +#: apply.c:4991

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

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

1108

695 -#: apply.c:4983

1109 +#: apply.c:4993

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

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

1112

699 -#: apply.c:4986

1113 +#: apply.c:4996

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

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

1116

703 -#: apply.c:4988

1117 +#: apply.c:4998

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

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

1120

707 -#: apply.c:4990

1121 +#: apply.c:5000

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

1123 msgstr ""

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

1125

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

1126 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524

1127 msgid "paths are separated with NUL character"

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

1129

716 -#: apply.c:4995

1130 +#: apply.c:5005

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

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

1132 +msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"

1133

720 -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

1134 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98

1135 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

722 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

1136 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474

1137 msgid "action"

1138 msgstr "acción"

1139

726 -#: apply.c:4997

1140 +#: apply.c:5007

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

1142 msgstr ""

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

1144 "blanco"

1145

732 -#: apply.c:5000 apply.c:5003

1146 +#: apply.c:5010 apply.c:5013

1147 msgid "ignore changes in whitespace when finding context"

1148 msgstr ""

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

1150

737 -#: apply.c:5006

1151 +#: apply.c:5016

1152 msgid "apply the patch in reverse"

1153 msgstr "aplicar el parche en reversa"

1154

741 -#: apply.c:5008

1155 +#: apply.c:5018

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

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

1158

745 -#: apply.c:5010

1159 +#: apply.c:5020

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

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

1162

749 -#: apply.c:5012

1163 +#: apply.c:5022

1164 msgid "allow overlapping hunks"

1165 msgstr "permitir solapamiento de hunks"

1166

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

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

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

1167 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22

1168 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774

1169 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1170 msgid "be verbose"

1171 msgstr "ser verboso"

1172

759 -#: apply.c:5015

1173 +#: apply.c:5025

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

1175 msgstr ""

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

1177 "archivo"

1178

765 -#: apply.c:5018

1179 +#: apply.c:5028

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

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

1182

769 -#: apply.c:5020 builtin/am.c:2194

1183 +#: apply.c:5030 builtin/am.c:2194

1184 msgid "root"

1185 msgstr "raíz"

1186

773 -#: apply.c:5021

1187 +#: apply.c:5031

1188 msgid "prepend <root> to all filenames"

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

1190

@@ -793,7 +1207,7 @@ msgstr ""

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

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

1209

796 -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

1210 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299

1211 #, c-format

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

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

@@ -825,7 +1239,7 @@ msgstr "fmt"

1239 msgid "archive format"

1240 msgstr "formato del archivo"

1241

828 -#: archive.c:458 builtin/log.c:1581

1242 +#: archive.c:458 builtin/log.c:1653

1243 msgid "prefix"

1244 msgstr "prefijo"

1245

@@ -833,12 +1247,12 @@ msgstr "prefijo"

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

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

1249

836 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

1250 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1251 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

1252 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

841 -#: parse-options.h:186

1255 +#: parse-options.h:190

1256 msgid "file"

1257 msgstr "carpeta"

1258

@@ -870,8 +1284,8 @@ msgstr "comprimir mejor"

1284 msgid "list supported archive formats"

1285 msgstr "listar los formatos de carpeta soportados"

1286

873 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

874 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

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

1288 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

1289 msgid "repo"

1290 msgstr "repo"

1291

@@ -910,17 +1324,17 @@ msgstr "Formato de carpeta desconocido '%s'"

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

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

1326

913 -#: archive-tar.c:125 archive-zip.c:345

1327 +#: archive-tar.c:125 archive-zip.c:350

1328 #, c-format

1329 msgid "cannot stream blob %s"

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

1331

918 -#: archive-tar.c:266 archive-zip.c:363

1332 +#: archive-tar.c:266 archive-zip.c:368

1333 #, c-format

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

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

1336

923 -#: archive-tar.c:293 archive-zip.c:353

1337 +#: archive-tar.c:293 archive-zip.c:358

1338 #, c-format

1339 msgid "cannot read %s"

1340 msgstr "no se puede leer %s"

@@ -939,37 +1353,37 @@ msgstr "incapaz de redirigir descriptor"

1353 msgid "'%s' filter reported error"

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

1355

942 -#: archive-zip.c:314

1356 +#: archive-zip.c:319

1357 #, c-format

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

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

1360

947 -#: archive-zip.c:318

1361 +#: archive-zip.c:323

1362 #, c-format

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

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

1365

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

1366 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1367 #, c-format

1368 msgid "deflate error (%d)"

1369 msgstr "error al desinflar (%d)"

1370

957 -#: archive-zip.c:609

1371 +#: archive-zip.c:614

1372 #, c-format

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

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

1375

962 -#: attr.c:213

1376 +#: attr.c:212

1377 #, c-format

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

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

1380

967 -#: attr.c:370

1381 +#: attr.c:369

1382 #, c-format

1383 msgid "%s not allowed: %s:%d"

1384 msgstr "%s no permitido: %s:%d"

1385

972 -#: attr.c:410

1386 +#: attr.c:409

1387 msgid ""

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

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

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

1523 msgstr ""

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

1525

1112 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1113 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1114 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1526 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093

1527 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1528 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

1529 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1530 #: builtin/shortlog.c:192

1531 msgid "revision walk setup failed"

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

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

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

1709

1296 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1297 -#: builtin/commit.c:791

1710 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108

1711 +#: builtin/commit.c:811

1712 #, c-format

1713 msgid "could not open '%s'"

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

@@ -1325,42 +1739,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1741

1328 -#: bundle.c:272

1742 +#: bundle.c:273

1743 msgid "unable to dup bundle descriptor"

1744 msgstr "incapaz de duplicar bundle descriptor"

1745

1332 -#: bundle.c:279

1746 +#: bundle.c:280

1747 msgid "Could not spawn pack-objects"

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

1749

1336 -#: bundle.c:290

1750 +#: bundle.c:291

1751 msgid "pack-objects died"

1752 msgstr "pack-objects murió"

1753

1340 -#: bundle.c:332

1754 +#: bundle.c:333

1755 msgid "rev-list died"

1756 msgstr "rev-list murió"

1757

1344 -#: bundle.c:381

1758 +#: bundle.c:382

1759 #, c-format

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

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

1762

1349 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1763 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

1764 #, c-format

1765 msgid "unrecognized argument: %s"

1766 msgstr "argumento no reconocido: %s"

1767

1354 -#: bundle.c:468

1768 +#: bundle.c:469

1769 msgid "Refusing to create empty bundle."

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

1771

1358 -#: bundle.c:478

1772 +#: bundle.c:479

1773 #, c-format

1774 msgid "cannot create '%s'"

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

1776

1363 -#: bundle.c:503

1777 +#: bundle.c:504

1778 msgid "index-pack died"

1779 msgstr "index-pack murió"

1780

@@ -1369,18 +1783,18 @@ msgstr "index-pack murió"

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

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

1785

1372 -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1786 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1787 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1788 #, c-format

1789 msgid "could not parse %s"

1790 msgstr "no se puede analizar %s"

1791

1378 -#: commit.c:52

1792 +#: commit.c:53

1793 #, c-format

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

1795 msgstr "¡%s %s no es un commit!"

1796

1383 -#: commit.c:192

1797 +#: commit.c:193

1798 msgid ""

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

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

@@ -1400,27 +1814,27 @@ msgstr ""

1814 "Apapa este mensaje ejecutando\n"

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

1816

1403 -#: commit.c:1128

1817 +#: commit.c:1152

1818 #, c-format

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

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

1821

1408 -#: commit.c:1131

1822 +#: commit.c:1155

1823 #, c-format

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

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

1826

1413 -#: commit.c:1134

1827 +#: commit.c:1158

1828 #, c-format

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

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

1831

1418 -#: commit.c:1137

1832 +#: commit.c:1161

1833 #, c-format

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

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

1836

1423 -#: commit.c:1391

1837 +#: commit.c:1415

1838 msgid ""

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

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

@@ -1431,77 +1845,72 @@ msgstr ""

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

1846 "tu proyecto.\n"

1847

1434 -#: commit-graph.c:127

1848 +#: commit-graph.c:130

1849 msgid "commit-graph file is too small"

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

1851

1438 -#: commit-graph.c:192

1852 +#: commit-graph.c:195

1853 #, c-format

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

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

1856

1443 -#: commit-graph.c:199

1857 +#: commit-graph.c:202

1858 #, c-format

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

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

1861

1448 -#: commit-graph.c:206

1862 +#: commit-graph.c:209

1863 #, c-format

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

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

1866

1453 -#: commit-graph.c:229

1867 +#: commit-graph.c:232

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

1869 msgstr ""

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

1871 "incompleto"

1872

1459 -#: commit-graph.c:240

1873 +#: commit-graph.c:243

1874 #, c-format

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

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

1877

1464 -#: commit-graph.c:283

1878 +#: commit-graph.c:286

1879 #, c-format

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

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

1882

1469 -#: commit-graph.c:347

1883 +#: commit-graph.c:350

1884 msgid "commit-graph has no base graphs chunk"

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

1886

1473 -#: commit-graph.c:357

1887 +#: commit-graph.c:360

1888 msgid "commit-graph chain does not match"

1889 msgstr "cadena commit-graph no concuerda"

1890

1477 -#: commit-graph.c:404

1891 +#: commit-graph.c:407

1892 #, c-format

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

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

1895

1482 -#: commit-graph.c:430

1896 +#: commit-graph.c:433

1897 msgid "unable to find all commit-graph files"

1898 msgstr "no es posible encontrar los archivos commit-graph"

1899

1486 -#: commit-graph.c:561 commit-graph.c:621

1900 +#: commit-graph.c:564 commit-graph.c:624

1901 msgid "invalid commit position. commit-graph is likely corrupt"

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

1903

1490 -#: commit-graph.c:582

1904 +#: commit-graph.c:585

1905 #, c-format

1906 msgid "could not find commit %s"

1907 msgstr "no se pudo encontrar commit %s"

1908

1495 -#: commit-graph.c:855 builtin/am.c:1287

1909 +#: commit-graph.c:858 builtin/am.c:1287

1910 #, c-format

1911 msgid "unable to parse commit %s"

1912 msgstr "no es posible analizar el commit %s"

1913

1500 -#: commit-graph.c:859

1501 -#, c-format

1502 -msgid "unable to get tree for %s"

1503 -msgstr "no se pudo obtener árbol para %s"

1504 -

1914 #: commit-graph.c:1017 builtin/pack-objects.c:2641

1915 #, c-format

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

@@ -1568,12 +1977,12 @@ msgstr "Encontrando esquinas extra en commit graph"

1977 msgid "failed to write correct number of base graph ids"

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

1979

1571 -#: commit-graph.c:1379 midx.c:810

1980 +#: commit-graph.c:1379 midx.c:814

1981 #, c-format

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

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

1984

1576 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1985 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248

1986 #, c-format

1987 msgid "unable to create '%s'"

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

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

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

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

2150

1742 -#: config.c:406 sequencer.c:2401

2151 +#: config.c:406 sequencer.c:2530

2152 #, c-format

2153 msgid "invalid key: %s"

2154 msgstr "llave inválida: %s"

@@ -1863,145 +2272,145 @@ msgstr "core.commentChar debería tener solo un caracter"

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

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

2274

1866 -#: config.c:1425

2275 +#: config.c:1430

2276 #, c-format

2277 msgid "malformed value for %s"

2278 msgstr "valor malformado para %s"

2279

1871 -#: config.c:1451

2280 +#: config.c:1456

2281 #, c-format

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

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

2284

1876 -#: config.c:1452

2285 +#: config.c:1457

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

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

2288

1880 -#: config.c:1513 builtin/pack-objects.c:3394

2289 +#: config.c:1518 builtin/pack-objects.c:3394

2290 #, c-format

2291 msgid "bad pack compression level %d"

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

2293

1885 -#: config.c:1634

2294 +#: config.c:1639

2295 #, c-format

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

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

2298

1890 -#: config.c:1637

2299 +#: config.c:1642

2300 #, c-format

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

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

2303

1895 -#: config.c:1654

2304 +#: config.c:1659

2305 #, c-format

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

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

2308

1900 -#: config.c:1684

2309 +#: config.c:1689

2310 #, c-format

2311 msgid "failed to parse %s"

2312 msgstr "no se pudo analizar %s"

2313

1905 -#: config.c:1740

2314 +#: config.c:1745

2315 msgid "unable to parse command-line config"

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

2317

1909 -#: config.c:2091

2318 +#: config.c:2096

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

2320 msgstr ""

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

2322

1914 -#: config.c:2261

2323 +#: config.c:2266

2324 #, c-format

2325 msgid "Invalid %s: '%s'"

2326 msgstr "Inválido %s: '%s'"

2327

1919 -#: config.c:2306

2328 +#: config.c:2311

2329 #, c-format

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

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

2332

1924 -#: config.c:2352

2333 +#: config.c:2357

2334 #, c-format

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

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

2337

1929 -#: config.c:2354

2338 +#: config.c:2359

2339 #, c-format

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

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

2342

1934 -#: config.c:2435

2343 +#: config.c:2440

2344 #, c-format

2345 msgid "invalid section name '%s'"

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

2347

1939 -#: config.c:2467

2348 +#: config.c:2472

2349 #, c-format

2350 msgid "%s has multiple values"

2351 msgstr "%s tiene múltiples valores"

2352

1944 -#: config.c:2496

2353 +#: config.c:2501

2354 #, c-format

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

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

2357

1949 -#: config.c:2748 config.c:3072

2358 +#: config.c:2753 config.c:3077

2359 #, c-format

2360 msgid "could not lock config file %s"

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

2362

1954 -#: config.c:2759

2363 +#: config.c:2764

2364 #, c-format

2365 msgid "opening %s"

2366 msgstr "abriendo %s"

2367

1959 -#: config.c:2794 builtin/config.c:328

2368 +#: config.c:2799 builtin/config.c:328

2369 #, c-format

2370 msgid "invalid pattern: %s"

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

2372

1964 -#: config.c:2819

2373 +#: config.c:2824

2374 #, c-format

2375 msgid "invalid config file %s"

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

2377

1969 -#: config.c:2832 config.c:3085

2378 +#: config.c:2837 config.c:3090

2379 #, c-format

2380 msgid "fstat on %s failed"

2381 msgstr "fstat en %s falló"

2382

1974 -#: config.c:2843

2383 +#: config.c:2848

2384 #, c-format

2385 msgid "unable to mmap '%s'"

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

2387

1979 -#: config.c:2852 config.c:3090

2388 +#: config.c:2857 config.c:3095

2389 #, c-format

2390 msgid "chmod on %s failed"

2391 msgstr "chmod en %s falló"

2392

1984 -#: config.c:2937 config.c:3187

2393 +#: config.c:2942 config.c:3192

2394 #, c-format

2395 msgid "could not write config file %s"

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

2397

1989 -#: config.c:2971

2398 +#: config.c:2976

2399 #, c-format

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

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

2402

1994 -#: config.c:2973 builtin/remote.c:782

2403 +#: config.c:2978 builtin/remote.c:781

2404 #, c-format

2405 msgid "could not unset '%s'"

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

2407

1999 -#: config.c:3063

2408 +#: config.c:3068

2409 #, c-format

2410 msgid "invalid section name: %s"

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

2412

2004 -#: config.c:3230

2413 +#: config.c:3235

2414 #, c-format

2415 msgid "missing value for '%s'"

2416 msgstr "valor faltante para '%s'"

@@ -2166,19 +2575,19 @@ msgstr "ruta extraña '%s' bloqueada"

2575 msgid "unable to fork"

2576 msgstr "no es posible hacer fork"

2577

2169 -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2578 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43

2579 msgid "Checking connectivity"

2580 msgstr "Verificando conectividad"

2581

2173 -#: connected.c:100

2582 +#: connected.c:101

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

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

2585

2177 -#: connected.c:120

2586 +#: connected.c:121

2587 msgid "failed write to rev-list"

2588 msgstr "falló escribir a rev-list"

2589

2181 -#: connected.c:127

2590 +#: connected.c:128

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

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

2593

@@ -2215,26 +2624,26 @@ msgstr ""

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

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

2626

2218 -#: convert.c:280

2627 +#: convert.c:284

2628 #, c-format

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

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

2631

2223 -#: convert.c:287

2632 +#: convert.c:291

2633 #, c-format

2634 msgid ""

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

2227 -"tree-encoding."

2228 -msgstr ""

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

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

2636 "working-tree-encoding."

2637 +msgstr ""

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

2639 +"como working-tree-encoding."

2640

2232 -#: convert.c:305

2641 +#: convert.c:304

2642 #, c-format

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

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

2645

2237 -#: convert.c:307

2646 +#: convert.c:306

2647 #, c-format

2648 msgid ""

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

@@ -2243,50 +2652,50 @@ msgstr ""

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

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

2654

2246 -#: convert.c:425 convert.c:496

2655 +#: convert.c:419 convert.c:490

2656 #, c-format

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

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

2659

2251 -#: convert.c:468

2660 +#: convert.c:462

2661 #, c-format

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

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

2664

2256 -#: convert.c:674

2665 +#: convert.c:668

2666 #, c-format

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

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

2669

2261 -#: convert.c:694

2670 +#: convert.c:688

2671 #, c-format

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

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

2674

2266 -#: convert.c:701

2675 +#: convert.c:695

2676 #, c-format

2677 msgid "external filter '%s' failed %d"

2678 msgstr "filtro externo '%s' falló %d"

2679

2271 -#: convert.c:736 convert.c:739

2680 +#: convert.c:730 convert.c:733

2681 #, c-format

2682 msgid "read from external filter '%s' failed"

2683 msgstr "lectura de filtro externo '%s' falló"

2684

2276 -#: convert.c:742 convert.c:797

2685 +#: convert.c:736 convert.c:791

2686 #, c-format

2687 msgid "external filter '%s' failed"

2688 msgstr "filtro externo '%s' falló"

2689

2281 -#: convert.c:845

2690 +#: convert.c:839

2691 msgid "unexpected filter type"

2692 msgstr "tipo de filtro inesperado"

2693

2285 -#: convert.c:856

2694 +#: convert.c:850

2695 msgid "path name too long for external filter"

2696 msgstr "nombre de ruta muy largo para filtro externo"

2697

2289 -#: convert.c:930

2698 +#: convert.c:924

2699 #, c-format

2700 msgid ""

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

@@ -2295,16 +2704,16 @@ msgstr ""

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

2705 "filtradas"

2706

2298 -#: convert.c:1229

2707 +#: convert.c:1223

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

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

2710

2302 -#: convert.c:1417 convert.c:1451

2711 +#: convert.c:1411 convert.c:1445

2712 #, c-format

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

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

2715

2307 -#: convert.c:1495

2716 +#: convert.c:1489

2717 #, c-format

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

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

@@ -2473,35 +2882,35 @@ msgstr ""

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

2883 "%s"

2884

2476 -#: diff.c:4218

2885 +#: diff.c:4202

2886 #, c-format

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

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

2889

2481 -#: diff.c:4563

2890 +#: diff.c:4547

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

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

2893

2485 -#: diff.c:4566

2894 +#: diff.c:4550

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

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

2897

2489 -#: diff.c:4644

2898 +#: diff.c:4628

2899 msgid "--follow requires exactly one pathspec"

2900 msgstr "--follow requiere exactamente un pathspec"

2901

2493 -#: diff.c:4692

2902 +#: diff.c:4676

2903 #, c-format

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

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

2906

2498 -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2907 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

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

2909 #, c-format

2910 msgid "%s expects a numerical value"

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

2912

2504 -#: diff.c:4729

2913 +#: diff.c:4713

2914 #, c-format

2915 msgid ""

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

@@ -2510,42 +2919,42 @@ msgstr ""

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

2920 "%s"

2921

2513 -#: diff.c:4814

2922 +#: diff.c:4798

2923 #, c-format

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

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

2926

2518 -#: diff.c:4838

2927 +#: diff.c:4822

2928 #, c-format

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

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

2931

2523 -#: diff.c:4852

2932 +#: diff.c:4836

2933 #, c-format

2934 msgid "unable to resolve '%s'"

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

2936

2528 -#: diff.c:4902 diff.c:4908

2937 +#: diff.c:4886 diff.c:4892

2938 #, c-format

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

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

2941

2533 -#: diff.c:4920

2942 +#: diff.c:4904

2943 #, c-format

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

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

2946

2538 -#: diff.c:4941

2947 +#: diff.c:4925

2948 #, c-format

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

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

2951

2543 -#: diff.c:4960

2952 +#: diff.c:4944

2953 #, c-format

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

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

2956

2548 -#: diff.c:5000

2957 +#: diff.c:4984

2958 msgid ""

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

2960 "\"histogram\""

@@ -2553,154 +2962,154 @@ msgstr ""

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

2963 "\"histogram\""

2964

2556 -#: diff.c:5036 diff.c:5056

2965 +#: diff.c:5020 diff.c:5040

2966 #, c-format

2967 msgid "invalid argument to %s"

2968 msgstr "argumento inválido para %s"

2969

2561 -#: diff.c:5194

2970 +#: diff.c:5178

2971 #, c-format

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

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

2974

2566 -#: diff.c:5250

2975 +#: diff.c:5234

2976 #, c-format

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

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

2979

2571 -#: diff.c:5273

2980 +#: diff.c:5257

2981 msgid "Diff output format options"

2982 msgstr "Opciones de formato de salida para diff"

2983

2575 -#: diff.c:5275 diff.c:5281

2984 +#: diff.c:5259 diff.c:5265

2985 msgid "generate patch"

2986 msgstr "generar parche"

2987

2579 -#: diff.c:5278 builtin/log.c:172

2988 +#: diff.c:5262 builtin/log.c:173

2989 msgid "suppress diff output"

2990 msgstr "suprimir salida de diff"

2991

2583 -#: diff.c:5283 diff.c:5397 diff.c:5404

2992 +#: diff.c:5267 diff.c:5381 diff.c:5388

2993 msgid "<n>"

2994 msgstr "<n>"

2995

2587 -#: diff.c:5284 diff.c:5287

2996 +#: diff.c:5268 diff.c:5271

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

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

2999

2591 -#: diff.c:5289

3000 +#: diff.c:5273

3001 msgid "generate the diff in raw format"

3002 msgstr "genera el diff en formato raw"

3003

2595 -#: diff.c:5292

3004 +#: diff.c:5276

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

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

3007

2599 -#: diff.c:5296

3008 +#: diff.c:5280

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

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

3011

2603 -#: diff.c:5300

3012 +#: diff.c:5284

3013 msgid "machine friendly --stat"

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

3015

2607 -#: diff.c:5303

3016 +#: diff.c:5287

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

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

3019

2611 -#: diff.c:5305 diff.c:5313

3020 +#: diff.c:5289 diff.c:5297

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

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

3023

2615 -#: diff.c:5306

3024 +#: diff.c:5290

3025 msgid ""

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

3027 msgstr ""

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

3029 "subdirectorio"

3030

2622 -#: diff.c:5310

3031 +#: diff.c:5294

3032 msgid "synonym for --dirstat=cumulative"

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

3034

2626 -#: diff.c:5314

3035 +#: diff.c:5298

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

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

3038

2630 -#: diff.c:5318

3039 +#: diff.c:5302

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

3041 msgstr ""

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

3043 "en blanco"

3044

2636 -#: diff.c:5321

3045 +#: diff.c:5305

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

3047 msgstr ""

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

3049

2641 -#: diff.c:5324

3050 +#: diff.c:5308

3051 msgid "show only names of changed files"

3052 msgstr "mostrar solo nombres de archivos cambiados"

3053

2645 -#: diff.c:5327

3054 +#: diff.c:5311

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

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

3057

2649 -#: diff.c:5329

3058 +#: diff.c:5313

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

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

3061

2653 -#: diff.c:5330

3062 +#: diff.c:5314

3063 msgid "generate diffstat"

3064 msgstr "generar diffstat"

3065

2657 -#: diff.c:5332 diff.c:5335 diff.c:5338

3066 +#: diff.c:5316 diff.c:5319 diff.c:5322

3067 msgid "<width>"

3068 msgstr "<ancho>"

3069

2661 -#: diff.c:5333

3070 +#: diff.c:5317

3071 msgid "generate diffstat with a given width"

3072 msgstr "genera diffstat con un ancho dado"

3073

2665 -#: diff.c:5336

3074 +#: diff.c:5320

3075 msgid "generate diffstat with a given name width"

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

3077

2669 -#: diff.c:5339

3078 +#: diff.c:5323

3079 msgid "generate diffstat with a given graph width"

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

3081

2673 -#: diff.c:5341

3082 +#: diff.c:5325

3083 msgid "<count>"

3084 msgstr "<cantidad>"

3085

2677 -#: diff.c:5342

3086 +#: diff.c:5326

3087 msgid "generate diffstat with limited lines"

3088 msgstr "genera diffstat con líneas limitadas"

3089

2681 -#: diff.c:5345

3090 +#: diff.c:5329

3091 msgid "generate compact summary in diffstat"

3092 msgstr "genera un resumen compacto de diffstat"

3093

2685 -#: diff.c:5348

3094 +#: diff.c:5332

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

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

3097

2689 -#: diff.c:5351

3098 +#: diff.c:5335

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

3100 msgstr ""

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

3102 "\""

3103

2695 -#: diff.c:5353

3104 +#: diff.c:5337

3105 msgid "show colored diff"

3106 msgstr "mostrar diff colorido"

3107

2699 -#: diff.c:5354

3108 +#: diff.c:5338

3109 msgid "<kind>"

3110 msgstr "<tipo>"

3111

2703 -#: diff.c:5355

3112 +#: diff.c:5339

3113 msgid ""

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

3115 "diff"

@@ -2708,7 +3117,7 @@ msgstr ""

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

3118 "'new' del diff"

3119

2711 -#: diff.c:5358

3120 +#: diff.c:5342

3121 msgid ""

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

3123 "--numstat"

@@ -2716,89 +3125,89 @@ msgstr ""

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

3126 "o --numstat"

3127

2719 -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

3128 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3129 msgid "<prefix>"

3130 msgstr "<prefijo>"

3131

2723 -#: diff.c:5362

3132 +#: diff.c:5346

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

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

3135

2727 -#: diff.c:5365

3136 +#: diff.c:5349

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

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

3139

2731 -#: diff.c:5368

3140 +#: diff.c:5352

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

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

3143

2735 -#: diff.c:5371

3144 +#: diff.c:5355

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

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

3147

2739 -#: diff.c:5374

3148 +#: diff.c:5358

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

3150 msgstr ""

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

3152 "líneas"

3153

2745 -#: diff.c:5378 diff.c:5383 diff.c:5388

3154 +#: diff.c:5362 diff.c:5367 diff.c:5372

3155 msgid "<char>"

3156 msgstr "<char>"

3157

2749 -#: diff.c:5379

3158 +#: diff.c:5363

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

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

3161

2753 -#: diff.c:5384

3162 +#: diff.c:5368

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

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

3165

2757 -#: diff.c:5389

3166 +#: diff.c:5373

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

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

3169

2761 -#: diff.c:5392

3170 +#: diff.c:5376

3171 msgid "Diff rename options"

3172 msgstr "Opciones de diff rename"

3173

2765 -#: diff.c:5393

3174 +#: diff.c:5377

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

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

3177

2769 -#: diff.c:5394

3178 +#: diff.c:5378

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

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

3181

2773 -#: diff.c:5398

3182 +#: diff.c:5382

3183 msgid "detect renames"

3184 msgstr "detectar renombrados"

3185

2777 -#: diff.c:5402

3186 +#: diff.c:5386

3187 msgid "omit the preimage for deletes"

3188 msgstr "omite la preimage para borrados"

3189

2781 -#: diff.c:5405

3190 +#: diff.c:5389

3191 msgid "detect copies"

3192 msgstr "detectar copias"

3193

2785 -#: diff.c:5409

3194 +#: diff.c:5393

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

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

3197

2789 -#: diff.c:5411

3198 +#: diff.c:5395

3199 msgid "disable rename detection"

3200 msgstr "deshabilita detección de renombres"

3201

2793 -#: diff.c:5414

3202 +#: diff.c:5398

3203 msgid "use empty blobs as rename source"

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

3205

2797 -#: diff.c:5416

3206 +#: diff.c:5400

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

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

3209

2801 -#: diff.c:5419

3210 +#: diff.c:5403

3211 msgid ""

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

3213 "given limit"

@@ -2806,155 +3215,155 @@ msgstr ""

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

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

3217

2809 -#: diff.c:5421

3218 +#: diff.c:5405

3219 msgid "Diff algorithm options"

3220 msgstr "Opciones de algoritmos de diff"

3221

2813 -#: diff.c:5423

3222 +#: diff.c:5407

3223 msgid "produce the smallest possible diff"

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

3225

2817 -#: diff.c:5426

3226 +#: diff.c:5410

3227 msgid "ignore whitespace when comparing lines"

3228 msgstr "ignorar espacios en blanco cuando comparando líneas"

3229

2821 -#: diff.c:5429

3230 +#: diff.c:5413

3231 msgid "ignore changes in amount of whitespace"

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

3233

2825 -#: diff.c:5432

3234 +#: diff.c:5416

3235 msgid "ignore changes in whitespace at EOL"

3236 msgstr "ignorar cambios en espacios en blanco en EOL"

3237

2829 -#: diff.c:5435

3238 +#: diff.c:5419

3239 msgid "ignore carrier-return at the end of line"

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

3241

2833 -#: diff.c:5438

3242 +#: diff.c:5422

3243 msgid "ignore changes whose lines are all blank"

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

3245

2837 -#: diff.c:5441

3246 +#: diff.c:5425

3247 msgid "heuristic to shift diff hunk boundaries for easy reading"

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

3249

2841 -#: diff.c:5444

3250 +#: diff.c:5428

3251 msgid "generate diff using the \"patience diff\" algorithm"

3252 msgstr "genera un diff usando algoritmo \"patience diff\""

3253

2845 -#: diff.c:5448

3254 +#: diff.c:5432

3255 msgid "generate diff using the \"histogram diff\" algorithm"

3256 msgstr "genera un diff usando algoritmo \"histogram diff\""

3257

2849 -#: diff.c:5450

3258 +#: diff.c:5434

3259 msgid "<algorithm>"

3260 msgstr "<algoritmo>"

3261

2853 -#: diff.c:5451

3262 +#: diff.c:5435

3263 msgid "choose a diff algorithm"

3264 msgstr "escoge un algoritmo para diff"

3265

2857 -#: diff.c:5453

3266 +#: diff.c:5437

3267 msgid "<text>"

3268 msgstr "<texto>"

3269

2861 -#: diff.c:5454

3270 +#: diff.c:5438

3271 msgid "generate diff using the \"anchored diff\" algorithm"

3272 msgstr "genera un diff usando algoritmo \"anchored diff\""

3273

2865 -#: diff.c:5456 diff.c:5465 diff.c:5468

3274 +#: diff.c:5440 diff.c:5449 diff.c:5452

3275 msgid "<mode>"

3276 msgstr "<modo>"

3277

2869 -#: diff.c:5457

3278 +#: diff.c:5441

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

3280 msgstr ""

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

3282

2874 -#: diff.c:5459 diff.c:5462 diff.c:5507

3283 +#: diff.c:5443 diff.c:5446 diff.c:5491

3284 msgid "<regex>"

3285 msgstr "<regex>"

3286

2878 -#: diff.c:5460

3287 +#: diff.c:5444

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

3289 msgstr "usa <regex> para decidir que palabra es"

3290

2882 -#: diff.c:5463

3291 +#: diff.c:5447

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

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

3294

2886 -#: diff.c:5466

3295 +#: diff.c:5450

3296 msgid "moved lines of code are colored differently"

3297 msgstr "líneas movidas de código están coloreadas diferente"

3298

2890 -#: diff.c:5469

3299 +#: diff.c:5453

3300 msgid "how white spaces are ignored in --color-moved"

3301 msgstr "como espacios en blanco son ignorados en --color-moved"

3302

2894 -#: diff.c:5472

3303 +#: diff.c:5456

3304 msgid "Other diff options"

3305 msgstr "Otras opciones de diff"

3306

2898 -#: diff.c:5474

3307 +#: diff.c:5458

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

3309 msgstr ""

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

3311 "paths relativos"

3312

2904 -#: diff.c:5478

3313 +#: diff.c:5462

3314 msgid "treat all files as text"

3315 msgstr "tratar todos los archivos como texto"

3316

2908 -#: diff.c:5480

3317 +#: diff.c:5464

3318 msgid "swap two inputs, reverse the diff"

3319 msgstr "cambia dos inputs, invierte el diff"

3320

2912 -#: diff.c:5482

3321 +#: diff.c:5466

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

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

3324

2916 -#: diff.c:5484

3325 +#: diff.c:5468

3326 msgid "disable all output of the program"

3327 msgstr "deshabilita todo el output del programa"

3328

2920 -#: diff.c:5486

3329 +#: diff.c:5470

3330 msgid "allow an external diff helper to be executed"

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

3332

2924 -#: diff.c:5488

3333 +#: diff.c:5472

3334 msgid "run external text conversion filters when comparing binary files"

3335 msgstr ""

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

3337

2929 -#: diff.c:5490

3338 +#: diff.c:5474

3339 msgid "<when>"

3340 msgstr "<cuando>"

3341

2933 -#: diff.c:5491

3342 +#: diff.c:5475

3343 msgid "ignore changes to submodules in the diff generation"

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

3345

2937 -#: diff.c:5494

3346 +#: diff.c:5478

3347 msgid "<format>"

3348 msgstr "<formato>"

3349

2941 -#: diff.c:5495

3350 +#: diff.c:5479

3351 msgid "specify how differences in submodules are shown"

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

3353

2945 -#: diff.c:5499

3354 +#: diff.c:5483

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

3356 msgstr "ocultar entradas 'git add -N' del index"

3357

2949 -#: diff.c:5502

3358 +#: diff.c:5486

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

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

3361

2953 -#: diff.c:5504

3362 +#: diff.c:5488

3363 msgid "<string>"

3364 msgstr "<string>"

3365

2957 -#: diff.c:5505

3366 +#: diff.c:5489

3367 msgid ""

3368 "look for differences that change the number of occurrences of the specified "

3369 "string"

@@ -2962,7 +3371,7 @@ msgstr ""

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

3372 "especificado"

3373

2965 -#: diff.c:5508

3374 +#: diff.c:5492

3375 msgid ""

3376 "look for differences that change the number of occurrences of the specified "

3377 "regex"

@@ -2970,23 +3379,23 @@ msgstr ""

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

3380 "especificado"

3381

2973 -#: diff.c:5511

3382 +#: diff.c:5495

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

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

3385

2977 -#: diff.c:5514

3386 +#: diff.c:5498

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

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

3389

2981 -#: diff.c:5517

3390 +#: diff.c:5501

3391 msgid "control the order in which files appear in the output"

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

3393

2985 -#: diff.c:5518

3394 +#: diff.c:5502

3395 msgid "<object-id>"

3396 msgstr "<id-objeto>"

3397

2989 -#: diff.c:5519

3398 +#: diff.c:5503

3399 msgid ""

3400 "look for differences that change the number of occurrences of the specified "

3401 "object"

@@ -2994,33 +3403,33 @@ msgstr ""

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

3404 "especificado"

3405

2997 -#: diff.c:5521

3406 +#: diff.c:5505

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

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

3409

3001 -#: diff.c:5522

3410 +#: diff.c:5506

3411 msgid "select files by diff type"

3412 msgstr "selecciona archivos por tipo de diff"

3413

3005 -#: diff.c:5524

3414 +#: diff.c:5508

3415 msgid "<file>"

3416 msgstr "<archivo>"

3417

3009 -#: diff.c:5525

3418 +#: diff.c:5509

3419 msgid "Output to a specific file"

3420 msgstr "Output a un archivo específico"

3421

3013 -#: diff.c:6180

3422 +#: diff.c:6164

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

3424 msgstr ""

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

3426

3018 -#: diff.c:6183

3427 +#: diff.c:6167

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

3429 msgstr ""

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

3431

3023 -#: diff.c:6186

3432 +#: diff.c:6170

3433 #, c-format

3434 msgid ""

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

@@ -3028,41 +3437,61 @@ msgstr ""

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

3438 "intentar el comando."

3439

3031 -#: dir.c:549

3440 +#: dir.c:554

3441 #, c-format

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

3443 msgstr ""

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

3445

3037 -#: dir.c:938

3446 +#: dir.c:664

3447 +#, c-format

3448 +msgid "unrecognized pattern: '%s'"

3449 +msgstr "patrón desconocido: '%s'"

3450 +

3451 +#: dir.c:682 dir.c:696

3452 +#, c-format

3453 +msgid "unrecognized negative pattern: '%s'"

3454 +msgstr "patrón negativo no reconocido: '%s'"

3455 +

3456 +#: dir.c:714

3457 +#, c-format

3458 +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3459 +msgstr ""

3460 +"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"

3461 +

3462 +#: dir.c:724

3463 +msgid "disabling cone pattern matching"

3464 +msgstr "deshabilitar coincidencia de patrónes cono"

3465 +

3466 +#: dir.c:1101

3467 #, c-format

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

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

3470

3042 -#: dir.c:1877

3471 +#: dir.c:2078

3472 #, c-format

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

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

3475

3047 -#: dir.c:2128

3476 +#: dir.c:2415

3477 msgid "failed to get kernel name and information"

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

3479

3051 -#: dir.c:2252

3480 +#: dir.c:2539

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

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

3483

3055 -#: dir.c:3056

3484 +#: dir.c:3343

3485 #, c-format

3486 msgid "index file corrupt in repo %s"

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

3488

3060 -#: dir.c:3101 dir.c:3106

3489 +#: dir.c:3388 dir.c:3393

3490 #, c-format

3491 msgid "could not create directories for %s"

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

3493

3065 -#: dir.c:3135

3494 +#: dir.c:3422

3495 #, c-format

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

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

@@ -3081,12 +3510,12 @@ msgstr "Filtrando contenido"

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

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

3512

3084 -#: environment.c:148

3513 +#: environment.c:149

3514 #, c-format

3515 msgid "bad git namespace path \"%s\""

3516 msgstr "ruta de namespace de git mala \"%s\""

3517

3089 -#: environment.c:330

3518 +#: environment.c:331

3519 #, c-format

3520 msgid "could not set GIT_DIR to '%s'"

3521 msgstr "no se pudo configurar GIT_DIR a '%s'"

@@ -3122,32 +3551,32 @@ msgstr "no se puede escribir al remoto"

3551 msgid "--stateless-rpc requires multi_ack_detailed"

3552 msgstr "--stateless-rpc requiere multi_ack_detailed"

3553

3125 -#: fetch-pack.c:356 fetch-pack.c:1280

3554 +#: fetch-pack.c:356 fetch-pack.c:1340

3555 #, c-format

3556 msgid "invalid shallow line: %s"

3557 msgstr "línea poco profunda inválida: %s"

3558

3130 -#: fetch-pack.c:362 fetch-pack.c:1286

3559 +#: fetch-pack.c:362 fetch-pack.c:1346

3560 #, c-format

3561 msgid "invalid unshallow line: %s"

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

3563

3135 -#: fetch-pack.c:364 fetch-pack.c:1288

3564 +#: fetch-pack.c:364 fetch-pack.c:1348

3565 #, c-format

3566 msgid "object not found: %s"

3567 msgstr "objeto no encontrado: %s"

3568

3140 -#: fetch-pack.c:367 fetch-pack.c:1291

3569 +#: fetch-pack.c:367 fetch-pack.c:1351

3570 #, c-format

3571 msgid "error in object: %s"

3572 msgstr "error en objeto: %s"

3573

3145 -#: fetch-pack.c:369 fetch-pack.c:1293

3574 +#: fetch-pack.c:369 fetch-pack.c:1353

3575 #, c-format

3576 msgid "no shallow found: %s"

3577 msgstr "superficie no encontrada: %s"

3578

3150 -#: fetch-pack.c:372 fetch-pack.c:1297

3579 +#: fetch-pack.c:372 fetch-pack.c:1357

3580 #, c-format

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

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

@@ -3166,7 +3595,7 @@ msgstr "commit inválido %s"

3595 msgid "giving up"

3596 msgstr "rindiéndose"

3597

3169 -#: fetch-pack.c:475 progress.c:312

3598 +#: fetch-pack.c:475 progress.c:323

3599 msgid "done"

3600 msgstr "listo"

3601

@@ -3180,162 +3609,162 @@ msgstr "se obtuvo %s (%d) %s"

3609 msgid "Marking %s as complete"

3610 msgstr "Marcando %s como completa"

3611

3183 -#: fetch-pack.c:742

3612 +#: fetch-pack.c:754

3613 #, c-format

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

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

3616

3188 -#: fetch-pack.c:781

3617 +#: fetch-pack.c:818

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

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

3620

3192 -#: fetch-pack.c:789

3621 +#: fetch-pack.c:826

3622 msgid "protocol error: bad pack header"

3623 msgstr "error de protocolo: paquete de header erróneo"

3624

3196 -#: fetch-pack.c:857

3625 +#: fetch-pack.c:900

3626 #, c-format

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

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

3629

3201 -#: fetch-pack.c:873

3630 +#: fetch-pack.c:916

3631 #, c-format

3632 msgid "%s failed"

3633 msgstr "%s falló"

3634

3206 -#: fetch-pack.c:875

3635 +#: fetch-pack.c:918

3636 msgid "error in sideband demultiplexer"

3637 msgstr "error en demultiplexor de banda lateral"

3638

3210 -#: fetch-pack.c:907

3639 +#: fetch-pack.c:965

3640 #, c-format

3641 msgid "Server version is %.*s"

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

3643

3215 -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3216 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3217 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3218 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3644 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3645 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3646 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3647 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3648 #, c-format

3649 msgid "Server supports %s"

3650 msgstr "El servidor soporta %s"

3651

3223 -#: fetch-pack.c:914

3652 +#: fetch-pack.c:972

3653 msgid "Server does not support shallow clients"

3654 msgstr "El servidor no soporta clientes superficiales"

3655

3227 -#: fetch-pack.c:974

3656 +#: fetch-pack.c:1032

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

3658 msgstr "El servidor no soporta --shalow-since"

3659

3231 -#: fetch-pack.c:979

3660 +#: fetch-pack.c:1037

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

3662 msgstr "El servidor no soporta --shalow-exclude"

3663

3235 -#: fetch-pack.c:983

3664 +#: fetch-pack.c:1041

3665 msgid "Server does not support --deepen"

3666 msgstr "El servidor no soporta --deepen"

3667

3239 -#: fetch-pack.c:1000

3668 +#: fetch-pack.c:1058

3669 msgid "no common commits"

3670 msgstr "no hay commits comunes"

3671

3243 -#: fetch-pack.c:1012 fetch-pack.c:1468

3672 +#: fetch-pack.c:1070 fetch-pack.c:1536

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

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

3675

3247 -#: fetch-pack.c:1150

3676 +#: fetch-pack.c:1209

3677 msgid "Server does not support shallow requests"

3678 msgstr "El servidor no soporta peticiones superficiales"

3679

3251 -#: fetch-pack.c:1157

3680 +#: fetch-pack.c:1216

3681 msgid "Server supports filter"

3682 msgstr "El servidor soporta filtro"

3683

3255 -#: fetch-pack.c:1180

3684 +#: fetch-pack.c:1239

3685 msgid "unable to write request to remote"

3686 msgstr "no se puede escribir request al remoto"

3687

3259 -#: fetch-pack.c:1198

3688 +#: fetch-pack.c:1257

3689 #, c-format

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

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

3692

3264 -#: fetch-pack.c:1204

3693 +#: fetch-pack.c:1263

3694 #, c-format

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

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

3697

3269 -#: fetch-pack.c:1243

3698 +#: fetch-pack.c:1303

3699 #, c-format

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

3701 msgstr "línea de confirmación inesperada: '%s'"

3702

3274 -#: fetch-pack.c:1248

3703 +#: fetch-pack.c:1308

3704 #, c-format

3705 msgid "error processing acks: %d"

3706 msgstr "error procesando acks: %d"

3707

3279 -#: fetch-pack.c:1258

3708 +#: fetch-pack.c:1318

3709 msgid "expected packfile to be sent after 'ready'"

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

3711

3283 -#: fetch-pack.c:1260

3712 +#: fetch-pack.c:1320

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

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

3715

3287 -#: fetch-pack.c:1302

3716 +#: fetch-pack.c:1362

3717 #, c-format

3718 msgid "error processing shallow info: %d"

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

3720

3292 -#: fetch-pack.c:1349

3721 +#: fetch-pack.c:1409

3722 #, c-format

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

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

3725

3297 -#: fetch-pack.c:1354

3726 +#: fetch-pack.c:1414

3727 #, c-format

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

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

3730

3302 -#: fetch-pack.c:1359

3731 +#: fetch-pack.c:1419

3732 #, c-format

3733 msgid "error processing wanted refs: %d"

3734 msgstr "error procesando refs deseadas: %d"

3735

3307 -#: fetch-pack.c:1693

3736 +#: fetch-pack.c:1762

3737 msgid "no matching remote head"

3738 msgstr "no concuerda el head remoto"

3739

3311 -#: fetch-pack.c:1716 builtin/clone.c:685

3740 +#: fetch-pack.c:1785 builtin/clone.c:688

3741 msgid "remote did not send all necessary objects"

3742 msgstr "remoto no mando todos los objetos necesarios"

3743

3315 -#: fetch-pack.c:1743

3744 +#: fetch-pack.c:1812

3745 #, c-format

3746 msgid "no such remote ref %s"

3747 msgstr "no existe ref remota %s"

3748

3320 -#: fetch-pack.c:1746

3749 +#: fetch-pack.c:1815

3750 #, c-format

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

3752 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"

3753

3325 -#: gpg-interface.c:321

3326 -msgid "gpg failed to sign the data"

3327 -msgstr "gpg falló al firmar la data"

3328 -

3329 -#: gpg-interface.c:347

3754 +#: gpg-interface.c:223

3755 msgid "could not create temporary file"

3756 msgstr "no se pudo crear archivo temporal"

3757

3333 -#: gpg-interface.c:350

3758 +#: gpg-interface.c:226

3759 #, c-format

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

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

3762

3338 -#: graph.c:97

3763 +#: gpg-interface.c:390

3764 +msgid "gpg failed to sign the data"

3765 +msgstr "gpg falló al firmar la data"

3766 +

3767 +#: graph.c:98

3768 #, c-format

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

3770 msgstr "ignora color inválido '%.*s' en log.graphColors"

@@ -3353,7 +3782,7 @@ msgstr ""

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

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

3784

3356 -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3785 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

3786 #: builtin/rm.c:135

3787 #, c-format

3788 msgid "failed to stat '%s'"

@@ -3409,7 +3838,7 @@ msgid "Low-level Commands / Interrogators"

3838 msgstr "Comandos de bajo nivel / Interrogadores"

3839

3840 #: help.c:37

3412 -msgid "Low-level Commands / Synching Repositories"

3841 +msgid "Low-level Commands / Syncing Repositories"

3842 msgstr "Comandos de bajo nivel / Sincronización de repositorios"

3843

3844 #: help.c:38

@@ -3574,7 +4003,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

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

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

4005

3577 -#: ident.c:436 builtin/commit.c:611

4006 +#: ident.c:436 builtin/commit.c:631

4007 #, c-format

4008 msgid "invalid date format: %s"

4009 msgstr "formato de fecha inválido: %s"

@@ -3660,7 +4089,7 @@ msgid "failed to read the cache"

4089 msgstr "falló al leer la cache"

4090

4091 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3663 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

4092 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4093 #: builtin/stash.c:264

4094 msgid "unable to write new index file"

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

@@ -3850,7 +4279,7 @@ msgstr "renombrar"

4279 msgid "renamed"

4280 msgstr "renombrado"

4281

3853 -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

4282 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4283 #, c-format

4284 msgid "Refusing to lose dirty file at %s"

4285 msgstr "Rehusando perder el archivo sucio en %s"

@@ -3899,7 +4328,7 @@ msgstr ""

4328 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

4329 "%s"

4330

3902 -#: merge-recursive.c:2056

4331 +#: merge-recursive.c:2114

4332 #, c-format

4333 msgid ""

4334 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3910,7 +4339,7 @@ msgstr ""

4339 "colocar %s porque el directorio %s fue renombrado a otros múltiples "

4340 "directorios, sin ningún que contenga la mayoría de archivos."

4341

3913 -#: merge-recursive.c:2088

4342 +#: merge-recursive.c:2146

4343 #, c-format

4344 msgid ""

4345 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3920,7 +4349,7 @@ msgstr ""

4349 "existente en %s se interpone con el cambio de nombres implícito, poniendo "

4350 "la(s) siguiente(s) ruta(s) aquí: %s."

4351

3923 -#: merge-recursive.c:2098

4352 +#: merge-recursive.c:2156

4353 #, c-format

4354 msgid ""

4355 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3929,7 +4358,7 @@ msgstr ""

4358 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

4359 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"

4360

3932 -#: merge-recursive.c:2190

4361 +#: merge-recursive.c:2248

4362 #, c-format

4363 msgid ""

4364 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3938,7 +4367,7 @@ msgstr ""

4367 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

4368 "Renombrar directorio %s->%s en %s"

4369

3941 -#: merge-recursive.c:2435

4370 +#: merge-recursive.c:2493

4371 #, c-format

4372 msgid ""

4373 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3947,52 +4376,52 @@ msgstr ""

4376 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

4377 "renombrado."

4378

3950 -#: merge-recursive.c:2961

4379 +#: merge-recursive.c:3019

4380 #, c-format

4381 msgid "cannot read object %s"

4382 msgstr "no se pudo leer el objeto %s"

4383

3955 -#: merge-recursive.c:2964

4384 +#: merge-recursive.c:3022

4385 #, c-format

4386 msgid "object %s is not a blob"

4387 msgstr "objeto %s no es un blob"

4388

3960 -#: merge-recursive.c:3028

4389 +#: merge-recursive.c:3086

4390 msgid "modify"

4391 msgstr "modificar"

4392

3964 -#: merge-recursive.c:3028

4393 +#: merge-recursive.c:3086

4394 msgid "modified"

4395 msgstr "modificado"

4396

3968 -#: merge-recursive.c:3040

4397 +#: merge-recursive.c:3098

4398 msgid "content"

4399 msgstr "contenido"

4400

3972 -#: merge-recursive.c:3044

4401 +#: merge-recursive.c:3102

4402 msgid "add/add"

4403 msgstr "agregar/agregar"

4404

3976 -#: merge-recursive.c:3067

4405 +#: merge-recursive.c:3125

4406 #, c-format

4407 msgid "Skipped %s (merged same as existing)"

4408 msgstr "Saltado %s (fusionado como existente)"

4409

3981 -#: merge-recursive.c:3089 git-submodule.sh:937

4410 +#: merge-recursive.c:3147 git-submodule.sh:993

4411 msgid "submodule"

4412 msgstr "submódulo"

4413

3985 -#: merge-recursive.c:3090

4414 +#: merge-recursive.c:3148

4415 #, c-format

4416 msgid "CONFLICT (%s): Merge conflict in %s"

4417 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

4418

3990 -#: merge-recursive.c:3120

4419 +#: merge-recursive.c:3178

4420 #, c-format

4421 msgid "Adding as %s instead"

4422 msgstr "Agregando más bien como %s"

4423

3995 -#: merge-recursive.c:3203

4424 +#: merge-recursive.c:3261

4425 #, c-format

4426 msgid ""

4427 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4001,7 +4430,7 @@ msgstr ""

4430 "Path actualizado: %s agregado en %s dentro de un directorio que fue "

4431 "renombrado en %s; moviéndolo a %s."

4432

4004 -#: merge-recursive.c:3206

4433 +#: merge-recursive.c:3264

4434 #, c-format

4435 msgid ""

4436 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4010,7 +4439,7 @@ msgstr ""

4439 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

4440 "que fue renombrado en %s, sugerimos que debería ser movido a %s."

4441

4013 -#: merge-recursive.c:3210

4442 +#: merge-recursive.c:3268

4443 #, c-format

4444 msgid ""

4445 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4019,7 +4448,7 @@ msgstr ""

4448 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

4449 "renombrado en %s; moviéndolo a %s."

4450

4022 -#: merge-recursive.c:3213

4451 +#: merge-recursive.c:3271

4452 #, c-format

4453 msgid ""

4454 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4029,61 +4458,61 @@ msgstr ""

4458 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

4459 "movido a %s."

4460

4032 -#: merge-recursive.c:3327

4461 +#: merge-recursive.c:3385

4462 #, c-format

4463 msgid "Removing %s"

4464 msgstr "Eliminando %s"

4465

4037 -#: merge-recursive.c:3350

4466 +#: merge-recursive.c:3408

4467 msgid "file/directory"

4468 msgstr "archivo/directorio"

4469

4041 -#: merge-recursive.c:3355

4470 +#: merge-recursive.c:3413

4471 msgid "directory/file"

4472 msgstr "directorio/archivo"

4473

4045 -#: merge-recursive.c:3362

4474 +#: merge-recursive.c:3420

4475 #, c-format

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

4477 msgstr ""

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

4479 "%s"

4480

4052 -#: merge-recursive.c:3371

4481 +#: merge-recursive.c:3429

4482 #, c-format

4483 msgid "Adding %s"

4484 msgstr "Agregando %s"

4485

4057 -#: merge-recursive.c:3380

4486 +#: merge-recursive.c:3438

4487 #, c-format

4488 msgid "CONFLICT (add/add): Merge conflict in %s"

4489 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

4490

4062 -#: merge-recursive.c:3424

4491 +#: merge-recursive.c:3482

4492 msgid "Already up to date!"

4493 msgstr "¡Ya está actualizado!"

4494

4066 -#: merge-recursive.c:3433

4495 +#: merge-recursive.c:3491

4496 #, c-format

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

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

4499

4071 -#: merge-recursive.c:3537

4500 +#: merge-recursive.c:3595

4501 msgid "Merging:"

4502 msgstr "Fusionando:"

4503

4075 -#: merge-recursive.c:3550

4504 +#: merge-recursive.c:3608

4505 #, c-format

4506 msgid "found %u common ancestor:"

4507 msgid_plural "found %u common ancestors:"

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

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

4510

4082 -#: merge-recursive.c:3600

4511 +#: merge-recursive.c:3658

4512 msgid "merge returned no commit"

4513 msgstr "la fusión no devolvió ningún commit"

4514

4086 -#: merge-recursive.c:3659

4515 +#: merge-recursive.c:3717

4516 #, c-format

4517 msgid ""

4518 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4093,12 +4522,12 @@ msgstr ""

4522 "merge:\n"

4523 " %s"

4524

4096 -#: merge-recursive.c:3756

4525 +#: merge-recursive.c:3814

4526 #, c-format

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

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

4529

4101 -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4530 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4531 msgid "Unable to write index."

4532 msgstr "Incapaz de escribir el índice."

4533

@@ -4166,79 +4595,95 @@ msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"

4595 msgid "error preparing packfile from multi-pack-index"

4596 msgstr "error preparando packfile de multi-pack-index"

4597

4169 -#: midx.c:469

4598 +#: midx.c:472

4599 #, c-format

4600 msgid "failed to add packfile '%s'"

4601 msgstr "falló al agregar packfile '%s'"

4602

4174 -#: midx.c:475

4603 +#: midx.c:478

4604 #, c-format

4605 msgid "failed to open pack-index '%s'"

4606 msgstr "falló al abrir pack-index '%s'"

4607

4179 -#: midx.c:535

4608 +#: midx.c:538

4609 #, c-format

4610 msgid "failed to locate object %d in packfile"

4611 msgstr "falló al ubicar objeto %d en packfile"

4612

4184 -#: midx.c:864

4613 +#: midx.c:842

4614 +msgid "Adding packfiles to multi-pack-index"

4615 +msgstr "Agregando packfiles a multi-pack-index"

4616 +

4617 +#: midx.c:875

4618 #, c-format

4619 msgid "did not see pack-file %s to drop"

4620 msgstr "no se vió pack-file %s caer"

4621

4189 -#: midx.c:1035

4622 +#: midx.c:973

4623 +msgid "Writing chunks to multi-pack-index"

4624 +msgstr "Escribiendo chunks a multi-pack-index"

4625 +

4626 +#: midx.c:1052

4627 #, c-format

4628 msgid "failed to clear multi-pack-index at %s"

4629 msgstr "falló al limpiar multi-pack-index en %s"

4630

4194 -#: midx.c:1090

4631 +#: midx.c:1108

4632 msgid "Looking for referenced packfiles"

4633 msgstr "Buscando por packfiles referidos"

4634

4198 -#: midx.c:1105

4635 +#: midx.c:1123

4636 #, c-format

4637 msgid ""

4638 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4639 msgstr ""

4640 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4641

4205 -#: midx.c:1109

4206 -msgid "Verifying OID order in MIDX"

4207 -msgstr "Verificando orden de OID en MIDX"

4642 +#: midx.c:1128

4643 +msgid "Verifying OID order in multi-pack-index"

4644 +msgstr "Verificando orden de OID en multi-pack-index"

4645

4209 -#: midx.c:1118

4646 +#: midx.c:1137

4647 #, c-format

4648 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4649 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"

4650

4214 -#: midx.c:1137

4651 +#: midx.c:1157

4652 msgid "Sorting objects by packfile"

4653 msgstr "Ordenando objetos por packfile"

4654

4218 -#: midx.c:1143

4655 +#: midx.c:1164

4656 msgid "Verifying object offsets"

4657 msgstr "Verificando offsets de objetos"

4658

4222 -#: midx.c:1159

4659 +#: midx.c:1180

4660 #, c-format

4661 msgid "failed to load pack entry for oid[%d] = %s"

4662 msgstr "fallo al cargar entrada pack para oid[%d] = %s"

4663

4227 -#: midx.c:1165

4664 +#: midx.c:1186

4665 #, c-format

4666 msgid "failed to load pack-index for packfile %s"

4667 msgstr "falló al cargar el pack-index para packfile %s"

4668

4232 -#: midx.c:1174

4669 +#: midx.c:1195

4670 #, c-format

4671 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4672 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4673

4237 -#: midx.c:1349

4674 +#: midx.c:1220

4675 +msgid "Counting referenced objects"

4676 +msgstr "Contando objetos no referenciados"

4677 +

4678 +#: midx.c:1230

4679 +msgid "Finding and deleting unreferenced packfiles"

4680 +msgstr "Encontrando y borrando packfiles sin referencias"

4681 +

4682 +#: midx.c:1388

4683 msgid "could not start pack-objects"

4684 msgstr "no se pudo empezar los pack-objetcts"

4685

4241 -#: midx.c:1368

4686 +#: midx.c:1407

4687 msgid "could not finish pack-objects"

4688 msgstr "no se pudo finalizar pack-objetcts"

4689

@@ -4328,13 +4773,13 @@ msgstr "hash no concuerda %s"

4773 msgid "offset before end of packfile (broken .idx?)"

4774 msgstr "offset antes del final del paquete (broken .idx?)"

4775

4331 -#: packfile.c:1887

4776 +#: packfile.c:1888

4777 #, c-format

4778 msgid "offset before start of pack index for %s (corrupt index?)"

4779 msgstr ""

4780 "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"

4781

4337 -#: packfile.c:1891

4782 +#: packfile.c:1892

4783 #, c-format

4784 msgid "offset beyond end of pack index for %s (truncated index?)"

4785 msgstr ""

@@ -4446,35 +4891,35 @@ msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""

4891 msgid "malformed object name '%s'"

4892 msgstr "nombre de objeto mal formado '%s'"

4893

4449 -#: path.c:897

4894 +#: path.c:915

4895 #, c-format

4896 msgid "Could not make %s writable by group"

4897 msgstr "No se pudo hacer que %s fuera escribible por el grupo"

4898

4454 -#: pathspec.c:128

4899 +#: pathspec.c:130

4900 msgid "Escape character '\\' not allowed as last character in attr value"

4901 msgstr ""

4902 "Carácter de escape '\\' no permitido como último carácter en el valor attr"

4903

4459 -#: pathspec.c:146

4904 +#: pathspec.c:148

4905 msgid "Only one 'attr:' specification is allowed."

4906 msgstr "Solo una especificación 'attr' es permitida."

4907

4463 -#: pathspec.c:149

4908 +#: pathspec.c:151

4909 msgid "attr spec must not be empty"

4910 msgstr "especificación attr no puede estar vacía"

4911

4467 -#: pathspec.c:192

4912 +#: pathspec.c:194

4913 #, c-format

4914 msgid "invalid attribute name %s"

4915 msgstr "nombre de atributo %s inválido"

4916

4472 -#: pathspec.c:257

4917 +#: pathspec.c:259

4918 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

4919 msgstr ""

4920 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"

4921

4477 -#: pathspec.c:264

4922 +#: pathspec.c:266

4923 msgid ""

4924 "global 'literal' pathspec setting is incompatible with all other global "

4925 "pathspec settings"

@@ -4482,50 +4927,55 @@ msgstr ""

4927 "la configuración global de 'literal' para patrones de ruta es incompatible "

4928 "con las demás configuraciones globales de patrones de ruta"

4929

4485 -#: pathspec.c:304

4930 +#: pathspec.c:306

4931 msgid "invalid parameter for pathspec magic 'prefix'"

4932 msgstr "parámetro no válido para el prefijo 'magic pathspec'"

4933

4489 -#: pathspec.c:325

4934 +#: pathspec.c:327

4935 #, c-format

4936 msgid "Invalid pathspec magic '%.*s' in '%s'"

4937 msgstr "Magic pathspec inválido '%.*s' en '%s'"

4938

4494 -#: pathspec.c:330

4939 +#: pathspec.c:332

4940 #, c-format

4941 msgid "Missing ')' at the end of pathspec magic in '%s'"

4942 msgstr "Falta ')' al final del magic pathspec en '%s'"

4943

4499 -#: pathspec.c:368

4944 +#: pathspec.c:370

4945 #, c-format

4946 msgid "Unimplemented pathspec magic '%c' in '%s'"

4947 msgstr "Magic pathspec '%c' no implementado en '%s'"

4948

4504 -#: pathspec.c:427

4949 +#: pathspec.c:429

4950 #, c-format

4951 msgid "%s: 'literal' and 'glob' are incompatible"

4952 msgstr "%s: 'literal' y 'glob' son incompatibles"

4953

4509 -#: pathspec.c:440

4954 +#: pathspec.c:442

4955 #, c-format

4956 msgid "%s: '%s' is outside repository"

4957 msgstr "%s: '%s' está fuera del repositorio"

4958

4514 -#: pathspec.c:514

4959 +#: pathspec.c:516

4960 #, c-format

4961 msgid "'%s' (mnemonic: '%c')"

4962 msgstr "'%s' (nemotécnico: '%c')"

4963

4519 -#: pathspec.c:524

4964 +#: pathspec.c:526

4965 #, c-format

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

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

4968

4524 -#: pathspec.c:591

4969 +#: pathspec.c:593

4970 #, c-format

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

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

4973

4974 +#: pathspec.c:638

4975 +#, c-format

4976 +msgid "line is badly quoted: %s"

4977 +msgstr "la línea está mál citada: %s"

4978 +

4979 #: pkt-line.c:92

4980 msgid "unable to write flush packet"

4981 msgstr "no es posible escribir flush packet"

@@ -4586,42 +5036,42 @@ msgstr "Refrescando index"

5036 msgid "unable to create threaded lstat: %s"

5037 msgstr "no es posible crear lstat hilado: %s"

5038

4589 -#: pretty.c:966

5039 +#: pretty.c:981

5040 msgid "unable to parse --pretty format"

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

5042

4593 -#: promisor-remote.c:25

5043 +#: promisor-remote.c:23

5044 msgid "Remote with no URL"

5045 msgstr "Remoto sin URL"

5046

4597 -#: promisor-remote.c:61

5047 +#: promisor-remote.c:58

5048 #, c-format

5049 msgid "promisor remote name cannot begin with '/': %s"

5050 msgstr "nombre remoto promisor no puede comenzar con '/': %s"

5051

4602 -#: range-diff.c:71

5052 +#: range-diff.c:75

5053 msgid "could not start `log`"

5054 msgstr "no se pudo comenzar `log`"

5055

4606 -#: range-diff.c:73

5056 +#: range-diff.c:77

5057 msgid "could not read `log` output"

5058 msgstr "no se pudo leer output de `log`"

5059

4610 -#: range-diff.c:92 sequencer.c:4985

5060 +#: range-diff.c:96 sequencer.c:5163

5061 #, c-format

5062 msgid "could not parse commit '%s'"

5063 msgstr "no se pudo analizar commit '%s'"

5064

4615 -#: range-diff.c:118

5065 +#: range-diff.c:122

5066 #, c-format

5067 msgid "could not parse git header '%.*s'"

5068 msgstr "no se puede analizar git header '%.*s'"

5069

4620 -#: range-diff.c:275

5070 +#: range-diff.c:285

5071 msgid "failed to generate diff"

5072 msgstr "falló al generar diff"

5073

4624 -#: range-diff.c:507 range-diff.c:509

5074 +#: range-diff.c:518 range-diff.c:520

5075 #, c-format

5076 msgid "could not parse log for '%s'"

5077 msgstr "no se pudo leer el log para '%s'"

@@ -4661,16 +5111,16 @@ msgstr "no es posible agregar '%s' al index"

5111 msgid "unable to stat '%s'"

5112 msgstr "incapaz de correr stat en '%s'"

5113

4664 -#: read-cache.c:1314

5114 +#: read-cache.c:1325

5115 #, c-format

5116 msgid "'%s' appears as both a file and as a directory"

5117 msgstr "'%s' parece ser un directorio y un archivo a la vez"

5118

4669 -#: read-cache.c:1520

5119 +#: read-cache.c:1531

5120 msgid "Refresh index"

5121 msgstr "Refrescar index"

5122

4673 -#: read-cache.c:1635

5123 +#: read-cache.c:1646

5124 #, c-format

5125 msgid ""

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

@@ -4679,7 +5129,7 @@ msgstr ""

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

5130 "Usando versión %i"

5131

4682 -#: read-cache.c:1645

5132 +#: read-cache.c:1656

5133 #, c-format

5134 msgid ""

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

@@ -4688,138 +5138,138 @@ msgstr ""

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

5139 "Usando versión %i"

5140

4691 -#: read-cache.c:1701

5141 +#: read-cache.c:1712

5142 #, c-format

5143 msgid "bad signature 0x%08x"

5144 msgstr "mala firma 0x%08x"

5145

4696 -#: read-cache.c:1704

5146 +#: read-cache.c:1715

5147 #, c-format

5148 msgid "bad index version %d"

5149 msgstr "mala versión del índice %d"

5150

4701 -#: read-cache.c:1713

5151 +#: read-cache.c:1724

5152 msgid "bad index file sha1 signature"

5153 msgstr "mala firma sha1 del archivo index"

5154

4705 -#: read-cache.c:1743

5155 +#: read-cache.c:1754

5156 #, c-format

5157 msgid "index uses %.4s extension, which we do not understand"

5158 msgstr "index usa %.4s extensiones, cosa que no entendemos"

5159

4710 -#: read-cache.c:1745

5160 +#: read-cache.c:1756

5161 #, c-format

5162 msgid "ignoring %.4s extension"

5163 msgstr "ignorando extensión %.4s"

5164

4715 -#: read-cache.c:1782

5165 +#: read-cache.c:1793

5166 #, c-format

5167 msgid "unknown index entry format 0x%08x"

5168 msgstr "formato de index desconocido 0x%08x"

5169

4720 -#: read-cache.c:1798

5170 +#: read-cache.c:1809

5171 #, c-format

5172 msgid "malformed name field in the index, near path '%s'"

5173 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

5174

4725 -#: read-cache.c:1855

5175 +#: read-cache.c:1866

5176 msgid "unordered stage entries in index"

5177 msgstr "entradas en stage desordenadas en index"

5178

4729 -#: read-cache.c:1858

5179 +#: read-cache.c:1869

5180 #, c-format

5181 msgid "multiple stage entries for merged file '%s'"

5182 msgstr "múltiples entradas extrañas para archivo fusionado '%s'"

5183

4734 -#: read-cache.c:1861

5184 +#: read-cache.c:1872

5185 #, c-format

5186 msgid "unordered stage entries for '%s'"

5187 msgstr "entradas de stage desordenadas para '%s'"

5188

4739 -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4740 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4741 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

5189 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5190 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5191 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5192 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4743 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

5193 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5194 msgid "index file corrupt"

5195 msgstr "archivo índice corrompido"

5196

4747 -#: read-cache.c:2108

5197 +#: read-cache.c:2119

5198 #, c-format

5199 msgid "unable to create load_cache_entries thread: %s"

5200 msgstr "no es posible crear hilo load_cache_entries: %s"

5201

4752 -#: read-cache.c:2121

5202 +#: read-cache.c:2132

5203 #, c-format

5204 msgid "unable to join load_cache_entries thread: %s"

5205 msgstr "no es posible unir hilo load_cache_entires: %s"

5206

4757 -#: read-cache.c:2154

5207 +#: read-cache.c:2165

5208 #, c-format

5209 msgid "%s: index file open failed"

5210 msgstr "%s: falló al abrir el archivo index"

5211

4762 -#: read-cache.c:2158

5212 +#: read-cache.c:2169

5213 #, c-format

5214 msgid "%s: cannot stat the open index"

5215 msgstr "%s: no se puede hacer stat del index abierto"

5216

4767 -#: read-cache.c:2162

5217 +#: read-cache.c:2173

5218 #, c-format

5219 msgid "%s: index file smaller than expected"

5220 msgstr "%s: archivo index más pequeño de lo esperado"

5221

4772 -#: read-cache.c:2166

5222 +#: read-cache.c:2177

5223 #, c-format

5224 msgid "%s: unable to map index file"

5225 msgstr "%s: no se pudo mapear el archivo index"

5226

4777 -#: read-cache.c:2208

5227 +#: read-cache.c:2219

5228 #, c-format

5229 msgid "unable to create load_index_extensions thread: %s"

5230 msgstr "no es posible crear hilo load_index_extensions: %s"

5231

4782 -#: read-cache.c:2235

5232 +#: read-cache.c:2246

5233 #, c-format

5234 msgid "unable to join load_index_extensions thread: %s"

5235 msgstr "no es posible unir hilo load_index_extensions: %s"

5236

4787 -#: read-cache.c:2267

5237 +#: read-cache.c:2278

5238 #, c-format

5239 msgid "could not freshen shared index '%s'"

5240 msgstr "no se pudo refrescar el index compartido '%s'"

5241

4792 -#: read-cache.c:2314

5242 +#: read-cache.c:2325

5243 #, c-format

5244 msgid "broken index, expect %s in %s, got %s"

5245 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

5246

4797 -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

5247 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5248 #, c-format

5249 msgid "could not close '%s'"

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

5251

4802 -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

5252 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5253 #, c-format

5254 msgid "could not stat '%s'"

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

5256

4807 -#: read-cache.c:3126

5257 +#: read-cache.c:3137

5258 #, c-format

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

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

5261

4812 -#: read-cache.c:3138

5262 +#: read-cache.c:3149

5263 #, c-format

5264 msgid "unable to unlink: %s"

5265 msgstr "no es posible eliminar el vinculo: %s"

5266

4817 -#: read-cache.c:3163

5267 +#: read-cache.c:3174

5268 #, c-format

5269 msgid "cannot fix permission bits on '%s'"

5270 msgstr "no se pudo arreglar bits de permisos en '%s'"

5271

4822 -#: read-cache.c:3312

5272 +#: read-cache.c:3323

5273 #, c-format

5274 msgid "%s: cannot drop to stage #0"

5275 msgstr "%s: no se puede eliminar a stage #0"

@@ -4924,8 +5374,8 @@ msgstr ""

5374 msgid "Note that empty commits are commented out"

5375 msgstr "Tenga en cuenta que los commits vacíos están comentados"

5376

4927 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4928 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

5377 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5378 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5379 #, c-format

5380 msgid "could not write '%s'"

5381 msgstr "no se pudo escribir '%s'"

@@ -4995,16 +5445,17 @@ msgstr "ref '%s' ya existe"

5445 #: refs.c:825

5446 #, c-format

5447 msgid "unexpected object ID when writing '%s'"

4998 -msgstr "ID de objecto inesperado cuando se escribía '%s'"

5448 +msgstr "ID de objecto inesperado al escribir '%s'"

5449

5000 -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

5001 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

5450 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5451 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5452 +#: wrapper.c:620

5453 #, c-format

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

5455 msgstr "no se pudo escribir en '%s'"

5456

5006 -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5007 -#: builtin/rebase.c:1004

5457 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5458 +#: builtin/rebase.c:1031

5459 #, c-format

5460 msgid "could not open '%s' for writing"

5461 msgstr "no se pudo abrir '%s' para escritura"

@@ -5012,7 +5463,7 @@ msgstr "no se pudo abrir '%s' para escritura"

5463 #: refs.c:867

5464 #, c-format

5465 msgid "unexpected object ID when deleting '%s'"

5015 -msgstr "ID de objecto inesperado cuando se borraba '%s'"

5466 +msgstr "ID de objecto inesperado al borrar '%s'"

5467

5468 #: refs.c:998

5469 #, c-format

@@ -5668,8 +6119,8 @@ msgstr "no se puede desvincular stray '%s'"

6119 msgid "Recorded preimage for '%s'"

6120 msgstr "Resolución precargada para '%s'"

6121

5671 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5672 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

6122 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6123 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6124 #, c-format

6125 msgid "could not create directory '%s'"

6126 msgstr "no se pudo crear el directorio '%s'"

@@ -5703,33 +6154,33 @@ msgstr "Se olvidó resolución para '%s'\n"

6154 msgid "unable to open rr-cache directory"

6155 msgstr "no es posible abrir directorio rr-cache"

6156

5706 -#: revision.c:2509

6157 +#: revision.c:2497

6158 msgid "your current branch appears to be broken"

6159 msgstr "tu rama actual parece estar rota"

6160

5710 -#: revision.c:2512

6161 +#: revision.c:2500

6162 #, c-format

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

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

6165

5715 -#: revision.c:2720

6166 +#: revision.c:2708

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

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

6169

5719 -#: revision.c:2724

6170 +#: revision.c:2712

6171 msgid "-L does not yet support diff formats besides -p and -s"

6172 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

6173

5723 -#: run-command.c:763

6174 +#: run-command.c:762

6175 msgid "open /dev/null failed"

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

6177

5727 -#: run-command.c:1269

6178 +#: run-command.c:1268

6179 #, c-format

6180 msgid "cannot create async thread: %s"

6181 msgstr "no es posible crear hilo async: %s"

6182

5732 -#: run-command.c:1333

6183 +#: run-command.c:1332

6184 #, c-format

6185 msgid ""

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

@@ -5739,30 +6190,30 @@ msgstr ""

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

6191 "false`."

6192

5742 -#: send-pack.c:142

6193 +#: send-pack.c:144

6194 msgid "unexpected flush packet while reading remote unpack status"

6195 msgstr ""

6196 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"

6197

5747 -#: send-pack.c:144

6198 +#: send-pack.c:146

6199 #, c-format

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

6201 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"

6202

5752 -#: send-pack.c:146

6203 +#: send-pack.c:148

6204 #, c-format

6205 msgid "remote unpack failed: %s"

6206 msgstr "desempaquetado remoto falló: %s"

6207

5757 -#: send-pack.c:307

6208 +#: send-pack.c:309

6209 msgid "failed to sign the push certificate"

6210 msgstr "falló al firmar el certificado de push"

6211

5761 -#: send-pack.c:421

6212 +#: send-pack.c:423

6213 msgid "the receiving end does not support --signed push"

6214 msgstr "el final receptor no soporta --signed push"

6215

5765 -#: send-pack.c:423

6216 +#: send-pack.c:425

6217 msgid ""

6218 "not sending a push certificate since the receiving end does not support --"

6219 "signed push"

@@ -5770,47 +6221,47 @@ msgstr ""

6221 "no se manda un certificado de push ya que el destino no soporta push firmado "

6222 "(--signed )"

6223

5773 -#: send-pack.c:435

6224 +#: send-pack.c:437

6225 msgid "the receiving end does not support --atomic push"

6226 msgstr "el destino no soporta push atómicos (--atomic)"

6227

5777 -#: send-pack.c:440

6228 +#: send-pack.c:442

6229 msgid "the receiving end does not support push options"

6230 msgstr "el destino no soporta opciones de push"

6231

5781 -#: sequencer.c:187

6232 +#: sequencer.c:189

6233 #, c-format

6234 msgid "invalid commit message cleanup mode '%s'"

6235 msgstr "mensaje de commit inválido, modo cleanup '%s'"

6236

5786 -#: sequencer.c:292

6237 +#: sequencer.c:294

6238 #, c-format

6239 msgid "could not delete '%s'"

6240 msgstr "no se pudo borrar '%s'"

6241

5791 -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

6242 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6243 #, c-format

6244 msgid "could not remove '%s'"

6245 msgstr "no se pudo eliminar'%s'"

6246

5796 -#: sequencer.c:321

6247 +#: sequencer.c:323

6248 msgid "revert"

6249 msgstr "revertir"

6250

5800 -#: sequencer.c:323

6251 +#: sequencer.c:325

6252 msgid "cherry-pick"

6253 msgstr "cherry-pick"

6254

5804 -#: sequencer.c:325

6255 +#: sequencer.c:327

6256 msgid "rebase -i"

6257 msgstr "rebase -i"

6258

5808 -#: sequencer.c:327

6259 +#: sequencer.c:329

6260 #, c-format

6261 msgid "unknown action: %d"

6262 msgstr "acción desconocida: %d"

6263

5813 -#: sequencer.c:385

6264 +#: sequencer.c:387

6265 msgid ""

6266 "after resolving the conflicts, mark the corrected paths\n"

6267 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5818,7 +6269,7 @@ msgstr ""

6269 "después de resolver los conflictos, marca las rutas corregidas\n"

6270 "con 'git add <rutas>' o 'git rm <rutas>'"

6271

5821 -#: sequencer.c:388

6272 +#: sequencer.c:390

6273 msgid ""

6274 "after resolving the conflicts, mark the corrected paths\n"

6275 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5828,44 +6279,44 @@ msgstr ""

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

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

6281

5831 -#: sequencer.c:401 sequencer.c:2847

6282 +#: sequencer.c:403 sequencer.c:2993

6283 #, c-format

6284 msgid "could not lock '%s'"

6285 msgstr "no se pudo bloquear '%s'"

6286

5836 -#: sequencer.c:408

6287 +#: sequencer.c:410

6288 #, c-format

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

6290 msgstr "no se pudo escribir EOL en '%s'"

6291

5841 -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5842 -#: sequencer.c:3130

6292 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6293 +#: sequencer.c:3277

6294 #, c-format

6295 msgid "failed to finalize '%s'"

6296 msgstr "falló al finalizar '%s'"

6297

5847 -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5848 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5849 -#: builtin/rebase.c:568

6298 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6299 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6300 +#: builtin/rebase.c:589

6301 #, c-format

6302 msgid "could not read '%s'"

6303 msgstr "no se pudo leer '%s'"

6304

5854 -#: sequencer.c:462

6305 +#: sequencer.c:464

6306 #, c-format

6307 msgid "your local changes would be overwritten by %s."

6308 msgstr "tus cambios locales serán sobreescritos por %s."

6309

5859 -#: sequencer.c:466

6310 +#: sequencer.c:468

6311 msgid "commit your changes or stash them to proceed."

6312 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

6313

5863 -#: sequencer.c:498

6314 +#: sequencer.c:500

6315 #, c-format

6316 msgid "%s: fast-forward"

6317 msgstr "%s: avance rápido"

6318

5868 -#: sequencer.c:537 builtin/tag.c:565

6319 +#: sequencer.c:539 builtin/tag.c:565

6320 #, c-format

6321 msgid "Invalid cleanup mode %s"

6322 msgstr "Modo cleanup inválido %s"

@@ -5873,65 +6324,69 @@ msgstr "Modo cleanup inválido %s"

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

6325 #. "rebase -i".

6326 #.

5876 -#: sequencer.c:631

6327 +#: sequencer.c:633

6328 #, c-format

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

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

6331

5881 -#: sequencer.c:648

6332 +#: sequencer.c:650

6333 msgid "unable to update cache tree"

6334 msgstr "no es posible actualizar el árbol de la caché"

6335

5885 -#: sequencer.c:662

6336 +#: sequencer.c:664

6337 msgid "could not resolve HEAD commit"

6338 msgstr "no se pudo resolver el commit de HEAD"

6339

5889 -#: sequencer.c:742

6340 +#: sequencer.c:744

6341 #, c-format

6342 msgid "no key present in '%.*s'"

6343 msgstr "no hay llave presente en '%.*s'"

6344

5894 -#: sequencer.c:753

6345 +#: sequencer.c:755

6346 #, c-format

6347 msgid "unable to dequote value of '%s'"

6348 msgstr "no es posible dequote para '%s'"

6349

5899 -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5900 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

6350 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6351 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6352 #, c-format

6353 msgid "could not open '%s' for reading"

6354 msgstr "no se pudo abrir '%s' para lectura"

6355

5905 -#: sequencer.c:800

6356 +#: sequencer.c:802

6357 msgid "'GIT_AUTHOR_NAME' already given"

6358 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

6359

5909 -#: sequencer.c:805

6360 +#: sequencer.c:807

6361 msgid "'GIT_AUTHOR_EMAIL' already given"

6362 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

6363

5913 -#: sequencer.c:810

6364 +#: sequencer.c:812

6365 msgid "'GIT_AUTHOR_DATE' already given"

6366 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

6367

5917 -#: sequencer.c:814

6368 +#: sequencer.c:816

6369 #, c-format

6370 msgid "unknown variable '%s'"

6371 msgstr "variable desconocida '%s'"

6372

5922 -#: sequencer.c:819

6373 +#: sequencer.c:821

6374 msgid "missing 'GIT_AUTHOR_NAME'"

6375 msgstr "falta 'GIT_AUTHOR_NAME'"

6376

5926 -#: sequencer.c:821

6377 +#: sequencer.c:823

6378 msgid "missing 'GIT_AUTHOR_EMAIL'"

6379 msgstr "falta 'GIT_AUTHOR_EMAIL'"

6380

5930 -#: sequencer.c:823

6381 +#: sequencer.c:825

6382 msgid "missing 'GIT_AUTHOR_DATE'"

6383 msgstr "falta 'GIT_AUTHOR_DATE'"

6384

5934 -#: sequencer.c:872

6385 +#: sequencer.c:902 sequencer.c:1427

6386 +msgid "malformed ident line"

6387 +msgstr "línea de entrada mal formada"

6388 +

6389 +#: sequencer.c:925

6390 #, c-format

6391 msgid ""

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

@@ -5961,11 +6416,11 @@ msgstr ""

6416 "\n"

6417 " git rebase --continue\n"

6418

5964 -#: sequencer.c:1146

6419 +#: sequencer.c:1218

6420 msgid "'prepare-commit-msg' hook failed"

6421 msgstr "hook 'prepare-commit-msg' falló"

6422

5968 -#: sequencer.c:1153

6423 +#: sequencer.c:1224

6424 msgid ""

6425 "Your name and email address were configured automatically based\n"

6426 "on your username and hostname. Please check that they are accurate.\n"

@@ -5992,7 +6447,7 @@ msgstr ""

6447 "\n"

6448 " git commit --amend --reset-author\n"

6449

5995 -#: sequencer.c:1166

6450 +#: sequencer.c:1237

6451 msgid ""

6452 "Your name and email address were configured automatically based\n"

6453 "on your username and hostname. Please check that they are accurate.\n"

@@ -6016,325 +6471,329 @@ msgstr ""

6471 "\n"

6472 " git commit --amend --reset-author\n"

6473

6019 -#: sequencer.c:1208

6474 +#: sequencer.c:1279

6475 msgid "couldn't look up newly created commit"

6476 msgstr "no se pudo revisar el commit recién creado"

6477

6023 -#: sequencer.c:1210

6478 +#: sequencer.c:1281

6479 msgid "could not parse newly created commit"

6480 msgstr "no se pudo analizar el commit recién creado"

6481

6027 -#: sequencer.c:1256

6482 +#: sequencer.c:1327

6483 msgid "unable to resolve HEAD after creating commit"

6484 msgstr "no se pudo resolver HEAD tras crear el commit"

6485

6031 -#: sequencer.c:1258

6486 +#: sequencer.c:1329

6487 msgid "detached HEAD"

6488 msgstr "HEAD desacoplado"

6489

6035 -#: sequencer.c:1262

6490 +#: sequencer.c:1333

6491 msgid " (root-commit)"

6492 msgstr " (commit-raíz)"

6493

6039 -#: sequencer.c:1283

6494 +#: sequencer.c:1354

6495 msgid "could not parse HEAD"

6496 msgstr "no se pudo analizar HEAD"

6497

6043 -#: sequencer.c:1285

6498 +#: sequencer.c:1356

6499 #, c-format

6500 msgid "HEAD %s is not a commit!"

6501 msgstr "¡HEAD %s no es un commit!"

6502

6048 -#: sequencer.c:1289 builtin/commit.c:1571

6503 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6504 msgid "could not parse HEAD commit"

6505 msgstr "no se pudo analizar el commit de HEAD"

6506

6052 -#: sequencer.c:1341 sequencer.c:1933

6507 +#: sequencer.c:1411 sequencer.c:2055

6508 msgid "unable to parse commit author"

6509 msgstr "no es posible analizar el autor del commit"

6510

6056 -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6511 +#: sequencer.c:1431

6512 +msgid "corrupted author without date information"

6513 +msgstr "autor corrupto sin información de fecha"

6514 +

6515 +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6516 msgid "git write-tree failed to write a tree"

6517 msgstr "git write-tree falló al escribir el árbol"

6518

6060 -#: sequencer.c:1369 sequencer.c:1429

6519 +#: sequencer.c:1480 sequencer.c:1550

6520 #, c-format

6521 msgid "unable to read commit message from '%s'"

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

6523

6065 -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6524 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6525 #: builtin/merge.c:908

6526 msgid "failed to write commit object"

6527 msgstr "falló al escribir el objeto commit"

6528

6070 -#: sequencer.c:1456

6529 +#: sequencer.c:1577

6530 #, c-format

6531 msgid "could not parse commit %s"

6532 msgstr "no se pudo analizar commit %s"

6533

6075 -#: sequencer.c:1461

6534 +#: sequencer.c:1582

6535 #, c-format

6536 msgid "could not parse parent commit %s"

6537 msgstr "no se pudo analizar el commit padre %s"

6538

6080 -#: sequencer.c:1535 sequencer.c:1645

6539 +#: sequencer.c:1656 sequencer.c:1767

6540 #, c-format

6541 msgid "unknown command: %d"

6542 msgstr "comando desconocido: %d"

6543

6085 -#: sequencer.c:1592 sequencer.c:1617

6544 +#: sequencer.c:1714 sequencer.c:1739

6545 #, c-format

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

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

6548

6090 -#: sequencer.c:1602

6549 +#: sequencer.c:1724

6550 msgid "need a HEAD to fixup"

6551 msgstr "se necesita un HEAD para arreglar"

6552

6094 -#: sequencer.c:1604 sequencer.c:3157

6553 +#: sequencer.c:1726 sequencer.c:3304

6554 msgid "could not read HEAD"

6555 msgstr "no se pudo leer HEAD"

6556

6098 -#: sequencer.c:1606

6557 +#: sequencer.c:1728

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

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

6560

6102 -#: sequencer.c:1612

6561 +#: sequencer.c:1734

6562 #, c-format

6563 msgid "cannot write '%s'"

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

6565

6107 -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6566 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

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

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

6569

6111 -#: sequencer.c:1627

6570 +#: sequencer.c:1749

6571 #, c-format

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

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

6574

6116 -#: sequencer.c:1634

6575 +#: sequencer.c:1756

6576 #, c-format

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

6578 msgstr "Este es el mensaje del commit #%d:"

6579

6121 -#: sequencer.c:1640

6580 +#: sequencer.c:1762

6581 #, c-format

6582 msgid "The commit message #%d will be skipped:"

6583 msgstr "El mensaje del commit #%d será saltado:"

6584

6126 -#: sequencer.c:1728

6585 +#: sequencer.c:1850

6586 msgid "your index file is unmerged."

6587 msgstr "tu archivo índice no está fusionado."

6588

6130 -#: sequencer.c:1735

6589 +#: sequencer.c:1857

6590 msgid "cannot fixup root commit"

6591 msgstr "no se puede arreglar el commit raíz"

6592

6134 -#: sequencer.c:1754

6593 +#: sequencer.c:1876

6594 #, c-format

6595 msgid "commit %s is a merge but no -m option was given."

6596 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."

6597

6139 -#: sequencer.c:1762 sequencer.c:1770

6598 +#: sequencer.c:1884 sequencer.c:1892

6599 #, c-format

6600 msgid "commit %s does not have parent %d"

6601 msgstr "el commit %s no tiene un padre %d"

6602

6144 -#: sequencer.c:1776

6603 +#: sequencer.c:1898

6604 #, c-format

6605 msgid "cannot get commit message for %s"

6606 msgstr "no se puede obtener el mensaje de commit para %s"

6607

6608 #. TRANSLATORS: The first %s will be a "todo" command like

6609 #. "revert" or "pick", the second %s a SHA1.

6151 -#: sequencer.c:1795

6610 +#: sequencer.c:1917

6611 #, c-format

6612 msgid "%s: cannot parse parent commit %s"

6613 msgstr "%s: no se puede analizar el commit padre %s"

6614

6156 -#: sequencer.c:1860

6615 +#: sequencer.c:1982

6616 #, c-format

6617 msgid "could not rename '%s' to '%s'"

6618 msgstr "no se puede renombrar '%s' a '%s'"

6619

6161 -#: sequencer.c:1915

6620 +#: sequencer.c:2037

6621 #, c-format

6622 msgid "could not revert %s... %s"

6623 msgstr "no se pudo revertir %s... %s"

6624

6166 -#: sequencer.c:1916

6625 +#: sequencer.c:2038

6626 #, c-format

6627 msgid "could not apply %s... %s"

6628 msgstr "no se pudo aplicar %s... %s"

6629

6171 -#: sequencer.c:1983

6630 +#: sequencer.c:2105

6631 #, c-format

6632 msgid "git %s: failed to read the index"

6633 msgstr "git %s: falló al leer el índice"

6634

6176 -#: sequencer.c:1990

6635 +#: sequencer.c:2112

6636 #, c-format

6637 msgid "git %s: failed to refresh the index"

6638 msgstr "git %s: falló al refrescar el índice"

6639

6181 -#: sequencer.c:2066

6640 +#: sequencer.c:2189

6641 #, c-format

6642 msgid "%s does not accept arguments: '%s'"

6643 msgstr "%s no acepta los argumentos: '%s'"

6644

6186 -#: sequencer.c:2075

6645 +#: sequencer.c:2198

6646 #, c-format

6647 msgid "missing arguments for %s"

6648 msgstr "faltan argumentos para para %s"

6649

6191 -#: sequencer.c:2112

6650 +#: sequencer.c:2235

6651 #, c-format

6652 msgid "could not parse '%.*s'"

6653 msgstr "no se puede analizar '%.*s'"

6654

6196 -#: sequencer.c:2166

6655 +#: sequencer.c:2289

6656 #, c-format

6657 msgid "invalid line %d: %.*s"

6658 msgstr "línea inválida %d: %.*s"

6659

6201 -#: sequencer.c:2177

6660 +#: sequencer.c:2300

6661 #, c-format

6662 msgid "cannot '%s' without a previous commit"

6663 msgstr "no se puede '%s' sin un commit previo"

6664

6206 -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6207 -#: builtin/rebase.c:204 builtin/rebase.c:229

6665 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6666 +#: builtin/rebase.c:223 builtin/rebase.c:248

6667 #, c-format

6668 msgid "could not read '%s'."

6669 msgstr "no se puede leer '%s'."

6670

6212 -#: sequencer.c:2261

6671 +#: sequencer.c:2384

6672 msgid "cancelling a cherry picking in progress"

6673 msgstr "cancelando cherry-pick en progreso"

6674

6216 -#: sequencer.c:2268

6675 +#: sequencer.c:2391

6676 msgid "cancelling a revert in progress"

6677 msgstr "cancelando revert en progreso"

6678

6220 -#: sequencer.c:2302

6679 +#: sequencer.c:2435

6680 msgid "please fix this using 'git rebase --edit-todo'."

6681 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

6682

6224 -#: sequencer.c:2304

6683 +#: sequencer.c:2437

6684 #, c-format

6685 msgid "unusable instruction sheet: '%s'"

6686 msgstr "hoja de instrucciones inutilizable: '%s'"

6687

6229 -#: sequencer.c:2309

6688 +#: sequencer.c:2442

6689 msgid "no commits parsed."

6690 msgstr "ningún commit analizado."

6691

6233 -#: sequencer.c:2320

6692 +#: sequencer.c:2453

6693 msgid "cannot cherry-pick during a revert."

6694 msgstr "no se puede realizar cherry-pick durante un revert."

6695

6237 -#: sequencer.c:2322

6696 +#: sequencer.c:2455

6697 msgid "cannot revert during a cherry-pick."

6698 msgstr "no se puede realizar un revert durante un cherry-pick."

6699

6241 -#: sequencer.c:2404

6700 +#: sequencer.c:2533

6701 #, c-format

6702 msgid "invalid value for %s: %s"

6703 msgstr "valor inválido para %s: %s"

6704

6246 -#: sequencer.c:2491

6705 +#: sequencer.c:2630

6706 msgid "unusable squash-onto"

6707 msgstr "squash-onto inservible"

6708

6250 -#: sequencer.c:2507

6709 +#: sequencer.c:2646

6710 #, c-format

6711 msgid "malformed options sheet: '%s'"

6712 msgstr "hoja de opciones mal formada: '%s'"

6713

6255 -#: sequencer.c:2590 sequencer.c:4308

6714 +#: sequencer.c:2736 sequencer.c:4463

6715 msgid "empty commit set passed"

6716 msgstr "conjunto de commits vacío entregado"

6717

6259 -#: sequencer.c:2606

6718 +#: sequencer.c:2752

6719 msgid "revert is already in progress"

6720 msgstr "revert ya está en progreso"

6721

6263 -#: sequencer.c:2608

6722 +#: sequencer.c:2754

6723 #, c-format

6724 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6725 msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""

6726

6268 -#: sequencer.c:2611

6727 +#: sequencer.c:2757

6728 msgid "cherry-pick is already in progress"

6729 msgstr "cherry-pick ya está en progreso"

6730

6272 -#: sequencer.c:2613

6731 +#: sequencer.c:2759

6732 #, c-format

6733 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6734 msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""

6735

6277 -#: sequencer.c:2627

6736 +#: sequencer.c:2773

6737 #, c-format

6738 msgid "could not create sequencer directory '%s'"

6739 msgstr "no se pudo crear un directorio secuenciador '%s'"

6740

6282 -#: sequencer.c:2642

6741 +#: sequencer.c:2788

6742 msgid "could not lock HEAD"

6743 msgstr "no se pudo bloquear HEAD"

6744

6286 -#: sequencer.c:2702 sequencer.c:4057

6745 +#: sequencer.c:2848 sequencer.c:4209

6746 msgid "no cherry-pick or revert in progress"

6747 msgstr "ningún cherry-pick o revert en progreso"

6748

6290 -#: sequencer.c:2704 sequencer.c:2715

6749 +#: sequencer.c:2850 sequencer.c:2861

6750 msgid "cannot resolve HEAD"

6751 msgstr "no se puede resolver HEAD"

6752

6294 -#: sequencer.c:2706 sequencer.c:2750

6753 +#: sequencer.c:2852 sequencer.c:2896

6754 msgid "cannot abort from a branch yet to be born"

6755 msgstr "no se puede abortar de una rama por nacer"

6756

6298 -#: sequencer.c:2736 builtin/grep.c:736

6757 +#: sequencer.c:2882 builtin/grep.c:736

6758 #, c-format

6759 msgid "cannot open '%s'"

6760 msgstr "no se puede abrir '%s'"

6761

6303 -#: sequencer.c:2738

6762 +#: sequencer.c:2884

6763 #, c-format

6764 msgid "cannot read '%s': %s"

6765 msgstr "no se puede leer '%s': %s"

6766

6308 -#: sequencer.c:2739

6767 +#: sequencer.c:2885

6768 msgid "unexpected end of file"

6769 msgstr "final de archivo inesperado"

6770

6312 -#: sequencer.c:2745

6771 +#: sequencer.c:2891

6772 #, c-format

6773 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6774 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"

6775

6317 -#: sequencer.c:2756

6776 +#: sequencer.c:2902

6777 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6778 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"

6779

6321 -#: sequencer.c:2797

6780 +#: sequencer.c:2943

6781 msgid "no revert in progress"

6782 msgstr "no hay revert en progreso"

6783

6325 -#: sequencer.c:2805

6784 +#: sequencer.c:2951

6785 msgid "no cherry-pick in progress"

6786 msgstr "ningún cherry-pick en progreso"

6787

6329 -#: sequencer.c:2815

6788 +#: sequencer.c:2961

6789 msgid "failed to skip the commit"

6790 msgstr "falló al escribir el commit"

6791

6333 -#: sequencer.c:2822

6792 +#: sequencer.c:2968

6793 msgid "there is nothing to skip"

6794 msgstr "no hay nada que saltar"

6795

6337 -#: sequencer.c:2825

6796 +#: sequencer.c:2971

6797 #, c-format

6798 msgid ""

6799 "have you committed already?\n"

@@ -6343,21 +6802,21 @@ msgstr ""

6802 "¿ya has hecho el commit?\n"

6803 "intenta \"git %s --continue\""

6804

6346 -#: sequencer.c:2949 sequencer.c:3969

6805 +#: sequencer.c:3095 sequencer.c:4121

6806 #, c-format

6807 msgid "could not update %s"

6808 msgstr "no se puede actualizar %s"

6809

6351 -#: sequencer.c:2987 sequencer.c:3949

6810 +#: sequencer.c:3134 sequencer.c:4101

6811 msgid "cannot read HEAD"

6812 msgstr "no se puede leer HEAD"

6813

6355 -#: sequencer.c:3004

6814 +#: sequencer.c:3151

6815 #, c-format

6816 msgid "unable to copy '%s' to '%s'"

6817 msgstr "no se pudo copiar '%s' a '%s'"

6818

6360 -#: sequencer.c:3012

6819 +#: sequencer.c:3159

6820 #, c-format

6821 msgid ""

6822 "You can amend the commit now, with\n"

@@ -6376,27 +6835,22 @@ msgstr ""

6835 "\n"

6836 "\tgit rebase --continue\n"

6837

6379 -#: sequencer.c:3022

6838 +#: sequencer.c:3169

6839 #, c-format

6840 msgid "Could not apply %s... %.*s"

6841 msgstr "No se pudo aplicar %s... %.*s"

6842

6384 -#: sequencer.c:3029

6843 +#: sequencer.c:3176

6844 #, c-format

6845 msgid "Could not merge %.*s"

6846 msgstr "No se pudo fusionar %.*s"

6847

6389 -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641

6848 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

6849 #, c-format

6850 msgid "could not copy '%s' to '%s'"

6851 msgstr "no se pudo copiar '%s' a '%s'"

6852

6394 -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613

6395 -#: builtin/rebase.c:1987 builtin/rebase.c:2031

6396 -msgid "could not read index"

6397 -msgstr "no se pudo leer índice"

6398 -

6399 -#: sequencer.c:3074

6853 +#: sequencer.c:3221

6854 #, c-format

6855 msgid ""

6856 "execution failed: %s\n"

@@ -6411,11 +6865,11 @@ msgstr ""

6865 " git rebase --continue\n"

6866 "\n"

6867

6414 -#: sequencer.c:3080

6868 +#: sequencer.c:3227

6869 msgid "and made changes to the index and/or the working tree\n"

6870 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

6871

6418 -#: sequencer.c:3086

6872 +#: sequencer.c:3233

6873 #, c-format

6874 msgid ""

6875 "execution succeeded: %s\n"

@@ -6432,76 +6886,72 @@ msgstr ""

6886 " git rebase --continue\n"

6887 "\n"

6888

6435 -#: sequencer.c:3147

6889 +#: sequencer.c:3294

6890 #, c-format

6891 msgid "illegal label name: '%.*s'"

6892 msgstr "nombre de label ilegal: '%.*s'"

6893

6440 -#: sequencer.c:3201

6894 +#: sequencer.c:3348

6895 msgid "writing fake root commit"

6896 msgstr "escribiendo commit raíz falso"

6897

6444 -#: sequencer.c:3206

6898 +#: sequencer.c:3353

6899 msgid "writing squash-onto"

6900 msgstr "escribiendo squash-onto"

6901

6448 -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861

6902 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

6903 #, c-format

6904 msgid "failed to find tree of %s"

6905 msgstr "falló al encontrar árbol de %s"

6906

6453 -#: sequencer.c:3262 builtin/rebase.c:874

6454 -msgid "could not write index"

6455 -msgstr "no se pudo escribir índice"

6456 -

6457 -#: sequencer.c:3289

6907 +#: sequencer.c:3436

6908 #, c-format

6909 msgid "could not resolve '%s'"

6910 msgstr "no se pudo resolver '%s'"

6911

6462 -#: sequencer.c:3320

6912 +#: sequencer.c:3467

6913 msgid "cannot merge without a current revision"

6914 msgstr "no se puede fusionar sin una versión actual"

6915

6466 -#: sequencer.c:3342

6916 +#: sequencer.c:3489

6917 #, c-format

6918 msgid "unable to parse '%.*s'"

6919 msgstr "no se puede analizar '%.*s'"

6920

6471 -#: sequencer.c:3351

6921 +#: sequencer.c:3498

6922 #, c-format

6923 msgid "nothing to merge: '%.*s'"

6924 msgstr "nada para fusionar: '%.*s'"

6925

6476 -#: sequencer.c:3363

6926 +#: sequencer.c:3510

6927 msgid "octopus merge cannot be executed on top of a [new root]"

6928 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"

6929

6480 -#: sequencer.c:3378

6930 +#: sequencer.c:3526

6931 #, c-format

6932 msgid "could not get commit message of '%s'"

6933 msgstr "no se puede leer el mensaje del commit '%s'"

6934

6485 -#: sequencer.c:3538

6935 +#: sequencer.c:3688

6936 #, c-format

6937 msgid "could not even attempt to merge '%.*s'"

6938 msgstr "no se pudo intentar fusionar '%.*s'"

6939

6490 -#: sequencer.c:3554

6940 +#: sequencer.c:3704

6941 msgid "merge: Unable to write new index file"

6942 msgstr "fusión: No se puede escribir el nuevo archivo índice"

6943

6494 -#: sequencer.c:3623 builtin/rebase.c:712

6944 +#: sequencer.c:3773 builtin/rebase.c:733

6945 #, c-format

6946 msgid "Applied autostash.\n"

6947 msgstr "Autostash aplicado.\n"

6948

6499 -#: sequencer.c:3635

6949 +#: sequencer.c:3785

6950 #, c-format

6951 msgid "cannot store %s"

6952 msgstr "no se puede guardar %s"

6953

6504 -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113

6954 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

6955 #, c-format

6956 msgid ""

6957 "Applying autostash resulted in conflicts.\n"

@@ -6513,31 +6963,31 @@ msgstr ""

6963 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

6964 "momento.\n"

6965

6516 -#: sequencer.c:3699

6966 +#: sequencer.c:3849

6967 #, c-format

6968 msgid "could not checkout %s"

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

6970

6521 -#: sequencer.c:3713

6971 +#: sequencer.c:3863

6972 #, c-format

6973 msgid "%s: not a valid OID"

6974 msgstr "%s no es OID válido"

6975

6526 -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779

6976 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

6977 msgid "could not detach HEAD"

6978 msgstr "no se puede desacoplar HEAD"

6979

6530 -#: sequencer.c:3733

6980 +#: sequencer.c:3883

6981 #, c-format

6982 msgid "Stopped at HEAD\n"

6983 msgstr "Detenido en HEAD\n"

6984

6535 -#: sequencer.c:3735

6985 +#: sequencer.c:3885

6986 #, c-format

6987 msgid "Stopped at %s\n"

6988 msgstr "Detenido en %s\n"

6989

6540 -#: sequencer.c:3743

6990 +#: sequencer.c:3893

6991 #, c-format

6992 msgid ""

6993 "Could not execute the todo command\n"

@@ -6558,48 +7008,48 @@ msgstr ""

7008 " git rebase --edit-todo\n"

7009 " git rebase --continue\n"

7010

6561 -#: sequencer.c:3827

7011 +#: sequencer.c:3979

7012 #, c-format

7013 msgid "Stopped at %s... %.*s\n"

7014 msgstr "Detenido en %s... %.*s\n"

7015

6566 -#: sequencer.c:3898

7016 +#: sequencer.c:4050

7017 #, c-format

7018 msgid "unknown command %d"

7019 msgstr "comando desconocido %d"

7020

6571 -#: sequencer.c:3957

7021 +#: sequencer.c:4109

7022 msgid "could not read orig-head"

7023 msgstr "no se puede leer orig-head"

7024

6575 -#: sequencer.c:3962

7025 +#: sequencer.c:4114

7026 msgid "could not read 'onto'"

7027 msgstr "no se puede leer 'onto'"

7028

6579 -#: sequencer.c:3976

7029 +#: sequencer.c:4128

7030 #, c-format

7031 msgid "could not update HEAD to %s"

7032 msgstr "no se puede actualizar HEAD a %s"

7033

6584 -#: sequencer.c:4069

7034 +#: sequencer.c:4221

7035 msgid "cannot rebase: You have unstaged changes."

7036 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

7037

6588 -#: sequencer.c:4078

7038 +#: sequencer.c:4230

7039 msgid "cannot amend non-existing commit"

7040 msgstr "no se puede arreglar un commit no existente"

7041

6592 -#: sequencer.c:4080

7042 +#: sequencer.c:4232

7043 #, c-format

7044 msgid "invalid file: '%s'"

7045 msgstr "archivo inválido: '%s'"

7046

6597 -#: sequencer.c:4082

7047 +#: sequencer.c:4234

7048 #, c-format

7049 msgid "invalid contents: '%s'"

7050 msgstr "contenido inválido: '%s'"

7051

6602 -#: sequencer.c:4085

7052 +#: sequencer.c:4237

7053 msgid ""

7054 "\n"

7055 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -6610,42 +7060,42 @@ msgstr ""

7060 "un commit con estos\n"

7061 "primero y luego ejecuta 'git rebase --continue' de nuevo."

7062

6613 -#: sequencer.c:4121 sequencer.c:4159

7063 +#: sequencer.c:4273 sequencer.c:4312

7064 #, c-format

7065 msgid "could not write file: '%s'"

7066 msgstr "no se pudo escribir el archivo: '%s'"

7067

6618 -#: sequencer.c:4174

7068 +#: sequencer.c:4327

7069 msgid "could not remove CHERRY_PICK_HEAD"

7070 msgstr "no se puede eliminar CHERRY_PICK_HEAD"

7071

6622 -#: sequencer.c:4181

7072 +#: sequencer.c:4334

7073 msgid "could not commit staged changes."

7074 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

7075

6626 -#: sequencer.c:4285

7076 +#: sequencer.c:4440

7077 #, c-format

7078 msgid "%s: can't cherry-pick a %s"

7079 msgstr "%s: no se puede aplicar cherry-pick a un %s"

7080

6631 -#: sequencer.c:4289

7081 +#: sequencer.c:4444

7082 #, c-format

7083 msgid "%s: bad revision"

7084 msgstr "%s: revisión errónea"

7085

6636 -#: sequencer.c:4324

7086 +#: sequencer.c:4479

7087 msgid "can't revert as initial commit"

7088 msgstr "no se puede revertir como commit inicial"

7089

6640 -#: sequencer.c:4774

7090 +#: sequencer.c:4952

7091 msgid "make_script: unhandled options"

7092 msgstr "make_script: opciones desconocidas"

7093

6644 -#: sequencer.c:4777

7094 +#: sequencer.c:4955

7095 msgid "make_script: error preparing revisions"

7096 msgstr "make_script: error preparando revisiones"

7097

6648 -#: sequencer.c:4935

7098 +#: sequencer.c:5113

7099 msgid ""

7100 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7101 "continue'.\n"

@@ -6655,15 +7105,15 @@ msgstr ""

7105 "rebase --continue'.\n"

7106 "O se puede abortar el rebase con 'git rebase --abort'.\n"

7107

6658 -#: sequencer.c:5047 sequencer.c:5064

7108 +#: sequencer.c:5226 sequencer.c:5243

7109 msgid "nothing to do"

7110 msgstr "nada que hacer"

7111

6662 -#: sequencer.c:5078

7112 +#: sequencer.c:5257

7113 msgid "could not skip unnecessary pick commands"

7114 msgstr "no se pudo saltar los comandos pick innecesarios"

7115

6666 -#: sequencer.c:5166

7116 +#: sequencer.c:5351

7117 msgid "the script was already rearranged."

7118 msgstr "este script ya fue reorganizado."

7119

@@ -7171,6 +7621,11 @@ msgid_plural "%u bytes/s"

7621 msgstr[0] "%u bytes/s"

7622 msgstr[1] "%u bytes/s"

7623

7624 +#: strbuf.c:1149

7625 +#, c-format

7626 +msgid "could not edit '%s'"

7627 +msgstr "no se pudo editar '%s'"

7628 +

7629 #: submodule.c:114 submodule.c:143

7630 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

7631 msgstr ""

@@ -7205,14 +7660,14 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"

7660 msgid "submodule entry '%s' (%s) is a %s, not a commit"

7661 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"

7662

7208 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989

7663 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

7664 msgid "Failed to resolve HEAD as a valid ref."

7665 msgstr "Falló al resolver HEAD como un ref válido."

7666

7667 #: submodule.c:1481

7668 #, c-format

7669 msgid "Could not access submodule '%s'"

7215 -msgstr "no pudo acceder al submódulo '%s'"

7670 +msgstr "No pudo acceder al submódulo '%s'"

7671

7672 #: submodule.c:1651

7673 #, c-format

@@ -7244,7 +7699,12 @@ msgstr "submódulo '%s' tiene un índice corrupto"

7699 msgid "Submodule '%s' could not be updated."

7700 msgstr "Submódulo '%s' no pudo ser actualizado."

7701

7247 -#: submodule.c:2007

7702 +#: submodule.c:2027

7703 +#, c-format

7704 +msgid "submodule git dir '%s' is inside git dir '%.*s'"

7705 +msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'"

7706 +

7707 +#: submodule.c:2048

7708 #, c-format

7709 msgid ""

7710 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -7252,12 +7712,17 @@ msgstr ""

7712 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "

7713 "soportado"

7714

7255 -#: submodule.c:2019 submodule.c:2074

7715 +#: submodule.c:2060 submodule.c:2119

7716 #, c-format

7717 msgid "could not lookup name for submodule '%s'"

7718 msgstr "no se pudo resolver el nombre para el submódulo '%s'"

7719

7260 -#: submodule.c:2026

7720 +#: submodule.c:2064

7721 +#, c-format

7722 +msgid "refusing to move '%s' into an existing git dir"

7723 +msgstr "rechazando mover '%s' dentro de un directorio git existente"

7724 +

7725 +#: submodule.c:2071

7726 #, c-format

7727 msgid ""

7728 "Migrating git directory of '%s%s' from\n"

@@ -7268,16 +7733,16 @@ msgstr ""

7733 "'%s' hacia\n"

7734 "'%s'\n"

7735

7271 -#: submodule.c:2109

7736 +#: submodule.c:2154

7737 #, c-format

7738 msgid "could not recurse into submodule '%s'"

7739 msgstr "no pudo recursar en el submódulo '%s'"

7740

7276 -#: submodule.c:2153

7741 +#: submodule.c:2198

7742 msgid "could not start ls-files in .."

7743 msgstr "no se pudo comenzar ls-files en .."

7744

7280 -#: submodule.c:2192

7745 +#: submodule.c:2237

7746 #, c-format

7747 msgid "ls-tree returned unexpected return code %d"

7748 msgstr "ls-tree devolvió un código %d inesperado"

@@ -7298,12 +7763,12 @@ msgstr ""

7763 "ignorando '%s' ya que puede ser interpretado como una opción de línea de "

7764 "comando: %s"

7765

7301 -#: submodule-config.c:490

7766 +#: submodule-config.c:498

7767 #, c-format

7768 msgid "invalid value for %s"

7769 msgstr "valor inválido para %s"

7770

7306 -#: submodule-config.c:761

7771 +#: submodule-config.c:769

7772 #, c-format

7773 msgid "Could not update .gitmodules entry %s"

7774 msgstr "No se pudo actualizar la entrada %s de .gitmodules"

@@ -7451,7 +7916,7 @@ msgstr "Abortando."

7916 msgid "failed to push all needed submodules"

7917 msgstr "falló al hacer push a todos los submódulos necesarios"

7918

7454 -#: transport.c:1345 transport-helper.c:655

7919 +#: transport.c:1345 transport-helper.c:656

7920 msgid "operation not supported by protocol"

7921 msgstr "operación no soportada por protocolo"

7922

@@ -7464,7 +7929,7 @@ msgstr "escritura total al helper remoto falló"

7929 msgid "unable to find remote helper for '%s'"

7930 msgstr "no es posible encontrar helper remoto para '%s'"

7931

7467 -#: transport-helper.c:160 transport-helper.c:569

7932 +#: transport-helper.c:160 transport-helper.c:570

7933 msgid "can't dup helper output fd"

7934 msgstr "no se puede duplicar output de fd del helper"

7935

@@ -7491,90 +7956,90 @@ msgstr "%s dijo inesperadamente: '%s'"

7956 msgid "%s also locked %s"

7957 msgstr "%s también bloqueó %s"

7958

7494 -#: transport-helper.c:491

7959 +#: transport-helper.c:492

7960 msgid "couldn't run fast-import"

7961 msgstr "no se pudo ejecutar fast-import"

7962

7498 -#: transport-helper.c:514

7963 +#: transport-helper.c:515

7964 msgid "error while running fast-import"

7965 msgstr "error al ejecutar fast-import"

7966

7502 -#: transport-helper.c:543 transport-helper.c:1132

7967 +#: transport-helper.c:544 transport-helper.c:1133

7968 #, c-format

7969 msgid "could not read ref %s"

7970 msgstr "no se pudo leer la referencia %s"

7971

7507 -#: transport-helper.c:588

7972 +#: transport-helper.c:589

7973 #, c-format

7974 msgid "unknown response to connect: %s"

7975 msgstr "respuesta para conectar desconocida: %s"

7976

7512 -#: transport-helper.c:610

7977 +#: transport-helper.c:611

7978 msgid "setting remote service path not supported by protocol"

7979 msgstr "configurando servicio de ruta remota no soportado por el protocolo"

7980

7516 -#: transport-helper.c:612

7981 +#: transport-helper.c:613

7982 msgid "invalid remote service path"

7983 msgstr "ruta de servicio remoto inválida"

7984

7520 -#: transport-helper.c:658

7985 +#: transport-helper.c:659

7986 #, c-format

7987 msgid "can't connect to subservice %s"

7988 msgstr "no se puede conectar al subservicio %s"

7989

7525 -#: transport-helper.c:734

7990 +#: transport-helper.c:735

7991 #, c-format

7992 msgid "expected ok/error, helper said '%s'"

7993 msgstr "se esperaba ok/error, helper dijo '%s'"

7994

7530 -#: transport-helper.c:787

7995 +#: transport-helper.c:788

7996 #, c-format

7997 msgid "helper reported unexpected status of %s"

7998 msgstr "helper reportó estado inesperado de %s"

7999

7535 -#: transport-helper.c:848

8000 +#: transport-helper.c:849

8001 #, c-format

8002 msgid "helper %s does not support dry-run"

8003 msgstr "helper %s no soporta dry-run"

8004

7540 -#: transport-helper.c:851

8005 +#: transport-helper.c:852

8006 #, c-format

8007 msgid "helper %s does not support --signed"

8008 msgstr "helper %s no soporta --signed"

8009

7545 -#: transport-helper.c:854

8010 +#: transport-helper.c:855

8011 #, c-format

8012 msgid "helper %s does not support --signed=if-asked"

8013 msgstr "helper %s no soporta --signed=if-asked"

8014

7550 -#: transport-helper.c:859

8015 +#: transport-helper.c:860

8016 #, c-format

8017 msgid "helper %s does not support --atomic"

8018 msgstr "helper %s no soporta --atomic"

8019

7555 -#: transport-helper.c:865

8020 +#: transport-helper.c:866

8021 #, c-format

8022 msgid "helper %s does not support 'push-option'"

8023 msgstr "helper %s no soporta 'push-option'"

8024

7560 -#: transport-helper.c:963

8025 +#: transport-helper.c:964

8026 msgid "remote-helper doesn't support push; refspec needed"

8027 msgstr "remote-helper no soporta push; se necesita refspec"

8028

7564 -#: transport-helper.c:968

8029 +#: transport-helper.c:969

8030 #, c-format

8031 msgid "helper %s does not support 'force'"

8032 msgstr "helper %s no soporta 'force'"

8033

7569 -#: transport-helper.c:1015

8034 +#: transport-helper.c:1016

8035 msgid "couldn't run fast-export"

8036 msgstr "no se pudo ejecutar fast-export"

8037

7573 -#: transport-helper.c:1020

8038 +#: transport-helper.c:1021

8039 msgid "error while running fast-export"

8040 msgstr "error al ejecutar fast-export"

8041

7577 -#: transport-helper.c:1045

8042 +#: transport-helper.c:1046

8043 #, c-format

8044 msgid ""

8045 "No refs in common and none specified; doing nothing.\n"

@@ -7583,47 +8048,47 @@ msgstr ""

8048 "No hay refs comunes y ninguno especificado; no se hace nada.\n"

8049 "Tal vez deberías especificar un branch como 'master'.\n"

8050

7586 -#: transport-helper.c:1118

8051 +#: transport-helper.c:1119

8052 #, c-format

8053 msgid "malformed response in ref list: %s"

8054 msgstr "respuesta malformada en lista de refs: %s"

8055

7591 -#: transport-helper.c:1270

8056 +#: transport-helper.c:1271

8057 #, c-format

8058 msgid "read(%s) failed"

8059 msgstr "leer(%s) falló"

8060

7596 -#: transport-helper.c:1297

8061 +#: transport-helper.c:1298

8062 #, c-format

8063 msgid "write(%s) failed"

8064 msgstr "escribir(%s) falló"

8065

7601 -#: transport-helper.c:1346

8066 +#: transport-helper.c:1347

8067 #, c-format

8068 msgid "%s thread failed"

8069 msgstr "hilo %s falló"

8070

7606 -#: transport-helper.c:1350

8071 +#: transport-helper.c:1351

8072 #, c-format

8073 msgid "%s thread failed to join: %s"

8074 msgstr "hilo %s falló al unirse: %s"

8075

7611 -#: transport-helper.c:1369 transport-helper.c:1373

8076 +#: transport-helper.c:1370 transport-helper.c:1374

8077 #, c-format

8078 msgid "can't start thread for copying data: %s"

8079 msgstr "no se puede iniciar el hilo para copiar data: %s"

8080

7616 -#: transport-helper.c:1410

8081 +#: transport-helper.c:1411

8082 #, c-format

8083 msgid "%s process failed to wait"

8084 msgstr "proceso %s falló al esperar"

8085

7621 -#: transport-helper.c:1414

8086 +#: transport-helper.c:1415

8087 #, c-format

8088 msgid "%s process failed"

8089 msgstr "proceso %s falló"

8090

7626 -#: transport-helper.c:1432 transport-helper.c:1441

8091 +#: transport-helper.c:1433 transport-helper.c:1442

8092 msgid "can't start thread for copying data"

8093 msgstr "no se puede iniciar hilo para copiar data"

8094

@@ -7639,7 +8104,12 @@ msgstr "modo mal formado en la entrada de árbol"

8104 msgid "empty filename in tree entry"

8105 msgstr "nombre de archivo vacío en la entrada de árbol"

8106

7642 -#: tree-walk.c:118

8107 +#: tree-walk.c:48

8108 +#, c-format

8109 +msgid "filename in tree entry contains backslash: '%s'"

8110 +msgstr "nombre de archivo en el árbol contiene un backslash: '%s'"

8111 +

8112 +#: tree-walk.c:124

8113 msgid "too-short tree file"

8114 msgstr "archivo de árbol muy corto"

8115

@@ -7899,6 +8369,10 @@ msgstr ""

8369 "en un filesystem case-insensitive) y solo una del grupo\n"

8370 "colisionando está en el árbol de trabajo:\n"

8371

8372 +#: unpack-trees.c:1441

8373 +msgid "Updating index flags"

8374 +msgstr "Actualizando flags del index"

8375 +

8376 #: urlmatch.c:163

8377 msgid "invalid URL scheme name or missing '://' suffix"

8378 msgstr "nombre de URL inválido o sufijo '://' faltante"

@@ -8507,133 +8981,133 @@ msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."

8981 msgid "cannot %s: Your index contains uncommitted changes."

8982 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."

8983

8510 -#: compat/precompose_utf8.c:58 builtin/clone.c:452

8984 +#: compat/precompose_utf8.c:58 builtin/clone.c:455

8985 #, c-format

8986 msgid "failed to unlink '%s'"

8987 msgstr "falló al desvincular '%s'"

8988

8515 -#: builtin/add.c:25

8989 +#: builtin/add.c:26

8990 msgid "git add [<options>] [--] <pathspec>..."

8991 msgstr "git add [<opción>] [--] <especificación-de-ruta>..."

8992

8519 -#: builtin/add.c:84

8993 +#: builtin/add.c:87

8994 #, c-format

8995 msgid "unexpected diff status %c"

8996 msgstr "diff status inesperado %c"

8997

8524 -#: builtin/add.c:89 builtin/commit.c:288

8998 +#: builtin/add.c:92 builtin/commit.c:288

8999 msgid "updating files failed"

9000 msgstr "falló la actualización de carpetas"

9001

8528 -#: builtin/add.c:99

9002 +#: builtin/add.c:102

9003 #, c-format

9004 msgid "remove '%s'\n"

9005 msgstr "eliminar '%s'\n"

l10n: es: 2.25.0 round #1