1afe18a3bb · 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-12-30 08:48+0800\n"

11 -"PO-Revision-Date: 2020-01-06 09:12-0500\n"

10 +"POT-Creation-Date: 2020-03-11 15:26+0800\n"

11 +"PO-Revision-Date: 2020-03-11 23:18-0500\n"

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

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

14 "Language: es\n"

@@ -16,253 +16,521 @@ 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.4\n"

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

20

21 -#: add-interactive.c:347

21 +#: add-interactive.c:368

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

26 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

27 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

28 +#: builtin/rebase.c:2086 builtin/rebase.c:2130

29 msgid "could not read index"

30 msgstr "no se pudo leer índice"

31

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

32 +#: add-interactive.c:576 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

37 +#: add-interactive.c:634 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

42 +#: add-interactive.c:635 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

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

48 msgid "Update"

49 msgstr "Actualizar"

50

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

51 +#: add-interactive.c:689 add-interactive.c:877

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

56 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

57 +#: builtin/rebase.c:899

58 msgid "could not write index"

59 msgstr "no se pudo escribir índice"

60

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

61 +#: add-interactive.c:698 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

68 +#: add-interactive.c:716 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

73 +#: add-interactive.c:721 apply.c:4110 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

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

80 msgid "Revert"

81 msgstr "Revertir"

82

83 -#: add-interactive.c:746

83 +#: add-interactive.c:767

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

87 +#: add-interactive.c:805 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

94 +#: add-interactive.c:856 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

99 +#: add-interactive.c:860 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

103 +#: add-interactive.c:887 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

110 +#: add-interactive.c:917

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

115 +#: add-interactive.c:929 add-patch.c:1675 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

120 +#: add-interactive.c:931 add-patch.c:1673 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

125 +#: add-interactive.c:935 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

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

130 msgid "Review diff"

131 msgstr "Revisión de diff"

132

133 -#: add-interactive.c:981

133 +#: add-interactive.c:1002

134 msgid "show paths with changes"

135 msgstr "mostrar rutas con cambios"

136

137 -#: add-interactive.c:983

137 +#: add-interactive.c:1004

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

141 +#: add-interactive.c:1006

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

145 +#: add-interactive.c:1008

146 msgid "pick hunks and update selectively"

147 msgstr "elegir hunks y actualizar de forma selectiva"

148

149 -#: add-interactive.c:989

149 +#: add-interactive.c:1010

150 msgid "view diff between HEAD and index"

151 msgstr "ver diff entre HEAD e index"

152

153 -#: add-interactive.c:991

153 +#: add-interactive.c:1012

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

158 +#: add-interactive.c:1020 add-interactive.c:1069

159 msgid "Prompt help:"

160 msgstr "Mostrar ayuda:"

161

162 -#: add-interactive.c:1001

162 +#: add-interactive.c:1022

163 msgid "select a single item"

164 msgstr "selecciona un único objeto"

165

166 -#: add-interactive.c:1003

166 +#: add-interactive.c:1024

167 msgid "select a range of items"

168 msgstr "selecciona un rango de objetos"

169

170 -#: add-interactive.c:1005

170 +#: add-interactive.c:1026

171 msgid "select multiple ranges"

172 msgstr "selecciona multiples rangos"

173

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

174 +#: add-interactive.c:1028 add-interactive.c:1073

175 msgid "select item based on unique prefix"

176 msgstr "seleccionar objeto basado en prefijo único"

177

178 -#: add-interactive.c:1009

178 +#: add-interactive.c:1030

179 msgid "unselect specified items"

180 msgstr "quitar objetos especificados"

181

182 -#: add-interactive.c:1011

182 +#: add-interactive.c:1032

183 msgid "choose all items"

184 msgstr "escoger todos los objetos"

185

186 -#: add-interactive.c:1013

186 +#: add-interactive.c:1034

187 msgid "(empty) finish selecting"

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

189

190 -#: add-interactive.c:1050

190 +#: add-interactive.c:1071

191 msgid "select a numbered item"

192 msgstr "selecciona un objeto numerado"

193

194 -#: add-interactive.c:1054

194 +#: add-interactive.c:1075

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

198 +#: add-interactive.c:1083 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

202 +#: add-interactive.c:1084 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

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

207 msgid "staged"

208 msgstr "rastreado"

209

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

210 +#: add-interactive.c:1136 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

214 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

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

216 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

217 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

218 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

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

220 msgid "path"

221 msgstr "ruta"

222

223 -#: add-interactive.c:1122

223 +#: add-interactive.c:1143

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

227 +#: add-interactive.c:1157 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,?]? "

232 +#: add-patch.c:33 git-add--interactive.perl:1428

233 +#, c-format, perl-format

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

235 +msgstr "¿Cambio de modo de stage [y,n,q,a,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,?]? "

237 +#: add-patch.c:34 git-add--interactive.perl:1429

238 +#, c-format, perl-format

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

240 +msgstr "¿Aplicar stage al borrado [y,n,q,a,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,?]? "

242 +#: add-patch.c:35 git-add--interactive.perl:1430

243 +#, c-format, perl-format

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

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

246 +

247 +#: add-patch.c:37

248 +msgid ""

249 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

250 +"staging."

251 +msgstr ""

252 +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

253 +"para el área de stage."

254 +

255 +#: add-patch.c:40

256 +msgid ""

257 +"y - stage this hunk\n"

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

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

260 +"a - stage this hunk and all later hunks in the file\n"

261 +"d - do not stage this hunk or any of the later hunks in the file\n"

262 +msgstr ""

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

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

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

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

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

268 +"archivo\n"

269 +

270 +#: add-patch.c:54 git-add--interactive.perl:1433

271 +#, c-format, perl-format

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

273 +msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "

274 +

275 +#: add-patch.c:55 git-add--interactive.perl:1434

276 +#, c-format, perl-format

277 +msgid "Stash deletion [y,n,q,a,d%s,?]? "

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

279 +

280 +#: add-patch.c:56 git-add--interactive.perl:1435

281 +#, c-format, perl-format

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

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

284 +

285 +#: add-patch.c:58

286 +msgid ""

287 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

288 +"stashing."

289 +msgstr ""

290 +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

291 +"para aplicar stash."

292 +

293 +#: add-patch.c:61

294 +msgid ""

295 +"y - stash this hunk\n"

296 +"n - do not stash this hunk\n"

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

298 +"a - stash this hunk and all later hunks in the file\n"

299 +"d - do not stash this hunk or any of the later hunks in the file\n"

300 +msgstr ""

301 +"y - aplicar stash a este hunk\n"

302 +"n - no aplicar stash a este hunk\n"

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

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

305 +"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n"

306 +

307 +#: add-patch.c:77 git-add--interactive.perl:1438

308 +#, c-format, perl-format

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

310 +msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "

311 +

312 +#: add-patch.c:78 git-add--interactive.perl:1439

313 +#, c-format, perl-format

314 +msgid "Unstage deletion [y,n,q,a,d%s,?]? "

315 +msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "

316 +

317 +#: add-patch.c:79 git-add--interactive.perl:1440

318 +#, c-format, perl-format

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

320 +msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "

321 +

322 +#: add-patch.c:81

323 +msgid ""

324 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

325 +"unstaging."

326 +msgstr ""

327 +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "

328 +"para sacar del área de stage."

329 +

330 +#: add-patch.c:84

331 +msgid ""

332 +"y - unstage this hunk\n"

333 +"n - do not unstage this hunk\n"

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

335 +"a - unstage this hunk and all later hunks in the file\n"

336 +"d - do not unstage this hunk or any of the later hunks in the file\n"

337 +msgstr ""

338 +"y - sacar desde hunk del área de stage\n"

339 +"n - no sacar este hunk del area de stage\n"

340 +"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n"

341 +"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"

342 +"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "

343 +"archivo\n"

344 +

345 +#: add-patch.c:99 git-add--interactive.perl:1443

346 +#, c-format, perl-format

347 +msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

348 +msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "

349 +

350 +#: add-patch.c:100 git-add--interactive.perl:1444

351 +#, c-format, perl-format

352 +msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

353 +msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "

354 +

355 +#: add-patch.c:101 git-add--interactive.perl:1445

356 +#, c-format, perl-format

357 +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

358 +msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? "

359 +

360 +#: add-patch.c:103 add-patch.c:168 add-patch.c:211

361 +msgid ""

362 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

363 +"applying."

364 +msgstr ""

365 +"Si el parche aplica de forma limpia, el hunk editado sera marcado "

366 +"inmediatamente para aplicar."

367 +

368 +#: add-patch.c:106

369 +msgid ""

370 +"y - apply this hunk to index\n"

371 +"n - do not apply this hunk to index\n"

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

373 +"a - apply this hunk and all later hunks in the file\n"

374 +"d - do not apply this hunk or any of the later hunks in the file\n"

375 +msgstr ""

376 +"y - aplicar este hunk al índice\n"

377 +"n - no aplicar este hunk al índice\n"

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

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

380 +"d - no aplicar este hunko ninguno de los posteriores en el archivo\n"

381 +

382 +#: add-patch.c:121 git-add--interactive.perl:1448

383 +#: git-add--interactive.perl:1463

384 +#, c-format, perl-format

385 +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

386 +msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "

387 +

388 +#: add-patch.c:122 git-add--interactive.perl:1449

389 +#: git-add--interactive.perl:1464

390 +#, c-format, perl-format

391 +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

392 +msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "

393 +

394 +#: add-patch.c:123 git-add--interactive.perl:1450

395 +#: git-add--interactive.perl:1465

396 +#, c-format, perl-format

397 +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

398 +msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "

399 +

400 +#: add-patch.c:125 add-patch.c:147 add-patch.c:190

401 +msgid ""

402 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

403 +"discarding."

404 +msgstr ""

405 +"Si el parche aplica de forma limpia, el hunk editado sera marcado "

406 +"inmediatamente para descarte."

407 +

408 +#: add-patch.c:128 add-patch.c:193

409 +msgid ""

410 +"y - discard this hunk from worktree\n"

411 +"n - do not discard this hunk from worktree\n"

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

413 +"a - discard this hunk and all later hunks in the file\n"

414 +"d - do not discard this hunk or any of the later hunks in the file\n"

415 +msgstr ""

416 +"y - descartar este hunk del árbol de trabajo\n"

417 +"n - no descartar este hunk del árbol de trabajo\n"

418 +"q - quit; no descartar este hunk o ninguno de los que restantes\n"

419 +"a - descartar este hunk y todos los posteriores en este archivo\n"

420 +"d - no descartar este hunk o ninguno de los posteriores en el archivo\n"

421 +

422 +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

423 +#, c-format, perl-format

424 +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

425 +msgstr ""

426 +"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

427 +

428 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

429 +#, c-format, perl-format

430 +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

431 +msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

432 +

433 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

434 +#, c-format, perl-format

435 +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

436 +msgstr ""

437 +"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "

438 +

439 +#: add-patch.c:150

440 +msgid ""

441 +"y - discard this hunk from index and worktree\n"

442 +"n - do not discard this hunk from index and worktree\n"

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

444 +"a - discard this hunk and all later hunks in the file\n"

445 +"d - do not discard this hunk or any of the later hunks in the file\n"

446 +msgstr ""

447 +"y - descartar este hunk del índice y el árbol de trabajo\n"

448 +"n - no descartar este hunk del índice ni el árbol de trabajo\n"

449 +"q - quit; no descartar este hunk o ninguno de los que quedan\n"

450 +"a - descartar este hunk y todos los posteriores en este archivo\n"

451 +"d - no descartar este hunk o ninguno posterior en el archivo\n"

452 +

453 +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

454 +#, c-format, perl-format

455 +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

456 +msgstr ""

457 +"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"

458 +"%s,?]? "

459 +

460 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

461 +#, c-format, perl-format

462 +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

463 +msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "

464 +

465 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

466 +#, c-format, perl-format

467 +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

468 +msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "

469 +

470 +#: add-patch.c:171

471 +msgid ""

472 +"y - apply this hunk to index and worktree\n"

473 +"n - do not apply this hunk to index and worktree\n"

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

475 +"a - apply this hunk and all later hunks in the file\n"

476 +"d - do not apply this hunk or any of the later hunks in the file\n"

477 +msgstr ""

478 +"y - aplicar este hunk al índice y al árbol de trabajo\n"

479 +"n - no aplicar este hunk al índice y al árbol de trabajo\n"

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

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

482 +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"

483 +

484 +#: add-patch.c:214

485 +msgid ""

486 +"y - apply this hunk to worktree\n"

487 +"n - do not apply this hunk to worktree\n"

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

489 +"a - apply this hunk and all later hunks in the file\n"

490 +"d - do not apply this hunk or any of the later hunks in the file\n"

491 +msgstr ""

492 +"y - aplicar este hunk al índice y al árbol de trabajo\n"

493 +"n - no aplicar este hunk al índice y al árbol de trabajo\n"

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

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

496 +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"

497

247 -#: add-patch.c:111

498 +#: add-patch.c:318

499 #, c-format

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

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

502

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

503 +#: add-patch.c:337 add-patch.c:341

504 #, c-format

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

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

507

257 -#: add-patch.c:176

508 +#: add-patch.c:395

509 msgid "could not parse diff"

510 msgstr "no se puede analizar diff"

511

261 -#: add-patch.c:194

512 +#: add-patch.c:414

513 msgid "could not parse colored diff"

514 msgstr "no se pudo analizar diff a colores"

515

265 -#: add-patch.c:508

516 +#: add-patch.c:428

517 +#, c-format

518 +msgid "failed to run '%s'"

519 +msgstr "falló al ejecutar '%s'"

520 +

521 +#: add-patch.c:587

522 +msgid "mismatched output from interactive.diffFilter"

523 +msgstr "output de interactive.diffFilter no concuerda"

524 +

525 +#: add-patch.c:588

526 +msgid ""

527 +"Your filter must maintain a one-to-one correspondence\n"

528 +"between its input and output lines."

529 +msgstr ""

530 +"Tu filtro tiene que mantener correspondencia de uno a uno\n"

531 +"entre las líneas de entrada y salida."

532 +

533 +#: add-patch.c:761

534 #, c-format

535 msgid ""

536 "expected context line #%d in\n"

@@ -271,7 +539,7 @@ msgstr ""

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

540 "%.*s"

541

274 -#: add-patch.c:523

542 +#: add-patch.c:776

543 #, c-format

544 msgid ""

545 "hunks do not overlap:\n"

@@ -284,11 +552,11 @@ msgstr ""

552 "\tno acaba con:\n"

553 "%.*s"

554

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

555 +#: add-patch.c:1052 git-add--interactive.perl:1112

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

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

558

291 -#: add-patch.c:803

559 +#: add-patch.c:1056

560 #, c-format

561 msgid ""

562 "---\n"

@@ -301,16 +569,8 @@ msgstr ""

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

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

571

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 -

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

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

573 +#: add-patch.c:1070 git-add--interactive.perl:1126

574 msgid ""

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

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

@@ -320,11 +580,11 @@ msgstr ""

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

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

582

323 -#: add-patch.c:851

583 +#: add-patch.c:1103

584 msgid "could not parse hunk header"

585 msgstr "no se puede analizar hunk header"

586

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

587 +#: add-patch.c:1148

588 msgid "'git apply --cached' failed"

589 msgstr "falló 'git apply --cached'"

590

@@ -340,29 +600,26 @@ msgstr "falló 'git apply --cached'"

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

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

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

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

603 +#: add-patch.c:1218 git-add--interactive.perl:1239

604 msgid ""

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

606 msgstr ""

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

608 "n]? "

609

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"

610 +#: add-patch.c:1261

611 +msgid "The selected hunks do not apply to the index!"

612 +msgstr "¡Los hunks seleccionados no aplican al índice!"

613 +

614 +#: add-patch.c:1262 git-add--interactive.perl:1343

615 +msgid "Apply them to the worktree anyway? "

616 +msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "

617 +

618 +#: add-patch.c:1269 git-add--interactive.perl:1346

619 +msgid "Nothing was applied.\n"

620 +msgstr "Nada fue aplicado.\n"

621

365 -#: add-patch.c:1016

622 +#: add-patch.c:1326

623 msgid ""

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

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

@@ -384,100 +641,104 @@ msgstr ""

641 "e - editar manualmente el hunk actual\n"

642 "? - imprimir ayuda\n"

643

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

644 +#: add-patch.c:1447 add-patch.c:1457

645 msgid "No previous hunk"

646 msgstr "No el anterior hunk"

647

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

648 +#: add-patch.c:1452 add-patch.c:1462

649 msgid "No next hunk"

650 msgstr "No el siguiente hunk"

651

395 -#: add-patch.c:1158

652 +#: add-patch.c:1468

653 msgid "No other hunks to goto"

654 msgstr "No hay más pedazos para el ir"

655

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

656 +#: add-patch.c:1479 git-add--interactive.perl:1577

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

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

659

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

660 +#: add-patch.c:1480 git-add--interactive.perl:1579

661 msgid "go to which hunk? "

662 msgstr "¿a que hunk ir? "

663

407 -#: add-patch.c:1181

664 +#: add-patch.c:1491

665 #, c-format

666 msgid "Invalid number: '%s'"

667 msgstr "Numero inválido: '%s'"

668

412 -#: add-patch.c:1186

669 +#: add-patch.c:1496

670 #, c-format

671 msgid "Sorry, only %d hunk available."

672 msgid_plural "Sorry, only %d hunks available."

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

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

675

419 -#: add-patch.c:1195

676 +#: add-patch.c:1505

677 msgid "No other hunks to search"

678 msgstr "No hay más pedazos para buscar"

679

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

680 +#: add-patch.c:1511 git-add--interactive.perl:1623

681 msgid "search for regex? "

682 msgstr "¿buscar para regexp? "

683

427 -#: add-patch.c:1216

684 +#: add-patch.c:1526

685 #, c-format

686 msgid "Malformed search regexp %s: %s"

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

688

432 -#: add-patch.c:1233

689 +#: add-patch.c:1543

690 msgid "No hunk matches the given pattern"

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

692

436 -#: add-patch.c:1240

693 +#: add-patch.c:1550

694 msgid "Sorry, cannot split this hunk"

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

696

440 -#: add-patch.c:1244

697 +#: add-patch.c:1554

698 #, c-format

699 msgid "Split into %d hunks."

700 msgstr "Cortar en %d hunk."

701

445 -#: add-patch.c:1248

702 +#: add-patch.c:1558

703 msgid "Sorry, cannot edit this hunk"

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

705

449 -#: advice.c:111

706 +#: add-patch.c:1609

707 +msgid "'git apply' failed"

708 +msgstr "falló 'git apply'"

709 +

710 +#: advice.c:115

711 #, c-format

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

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

714

454 -#: advice.c:164

715 +#: advice.c:168

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

717 msgstr ""

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

719

459 -#: advice.c:166

720 +#: advice.c:170

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

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

723

463 -#: advice.c:168

724 +#: advice.c:172

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

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

727

467 -#: advice.c:170

728 +#: advice.c:174

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

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

731

471 -#: advice.c:172

732 +#: advice.c:176

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

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

735

475 -#: advice.c:174

736 +#: advice.c:178

737 #, c-format

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

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

740

480 -#: advice.c:182

741 +#: advice.c:186

742 msgid ""

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

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

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

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

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

748

488 -#: advice.c:190

749 +#: advice.c:194

750 msgid "Exiting because of an unresolved conflict."

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

752

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

753 +#: advice.c:199 builtin/merge.c:1335

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

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

756

496 -#: advice.c:197

757 +#: advice.c:201

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

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

760

500 -#: advice.c:198

761 +#: advice.c:202

762 msgid "Exiting because of unfinished merge."

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

764

504 -#: advice.c:204

765 +#: advice.c:208

766 #, c-format

767 msgid ""

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

@@ -653,7 +914,8 @@ msgstr[1] ""

914 #, c-format

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

916 msgstr ""

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

917 +"la cabecera de git diff carece de información del nombre del archivo (línea "

918 +"%d)"

919

920 #: apply.c:1481

921 #, c-format

@@ -760,7 +1022,7 @@ msgstr ""

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

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

1024

763 -#: apply.c:3162

1025 +#: apply.c:3163

1026 #, c-format

1027 msgid ""

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

@@ -768,284 +1030,284 @@ msgstr ""

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

1031 "actuales."

1032

771 -#: apply.c:3170

1033 +#: apply.c:3171

1034 #, c-format

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

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

1037

776 -#: apply.c:3188

1038 +#: apply.c:3189

1039 #, c-format

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

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

1042

781 -#: apply.c:3201

1043 +#: apply.c:3202

1044 #, c-format

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

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

1047

786 -#: apply.c:3207

1048 +#: apply.c:3209

1049 #, c-format

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

1051 msgstr ""

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

1053 "obtuvo %s)"

1054

793 -#: apply.c:3228

1055 +#: apply.c:3230

1056 #, c-format

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

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

1059

798 -#: apply.c:3351

1060 +#: apply.c:3353

1061 #, c-format

1062 msgid "cannot checkout %s"

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

1064

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

1065 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1066 #, c-format

1067 msgid "failed to read %s"

1068 msgstr "no se pudo leer %s"

1069

808 -#: apply.c:3411

1070 +#: apply.c:3413

1071 #, c-format

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

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

1074

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

1075 +#: apply.c:3442 apply.c:3685

1076 #, c-format

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

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

1079

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

1080 +#: apply.c:3528 apply.c:3700

1081 #, c-format

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

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

1084

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

1085 +#: apply.c:3537 apply.c:3708

1086 #, c-format

1087 msgid "%s: does not match index"

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

1089

828 -#: apply.c:3570

1090 +#: apply.c:3572

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

1092 msgstr ""

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

1094 "vías."

1095

834 -#: apply.c:3573

1096 +#: apply.c:3575

1097 #, c-format

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

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

1100

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

1101 +#: apply.c:3591 apply.c:3595

1102 #, c-format

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

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

1105

844 -#: apply.c:3605

1106 +#: apply.c:3607

1107 #, c-format

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

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

1110

849 -#: apply.c:3619

1111 +#: apply.c:3621

1112 #, c-format

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

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

1115

854 -#: apply.c:3624

1116 +#: apply.c:3626

1117 #, c-format

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

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

1120

859 -#: apply.c:3650

1121 +#: apply.c:3652

1122 msgid "removal patch leaves file contents"

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

1124

863 -#: apply.c:3723

1125 +#: apply.c:3725

1126 #, c-format

1127 msgid "%s: wrong type"

1128 msgstr "%s: tipo incorrecto"

1129

868 -#: apply.c:3725

1130 +#: apply.c:3727

1131 #, c-format

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

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

1134

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

874 -#: read-cache.c:1320

1135 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1136 +#: read-cache.c:1325

1137 #, c-format

1138 msgid "invalid path '%s'"

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

1140

879 -#: apply.c:3934

1141 +#: apply.c:3936

1142 #, c-format

1143 msgid "%s: already exists in index"

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

1145

884 -#: apply.c:3937

1146 +#: apply.c:3939

1147 #, c-format

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

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

1150

889 -#: apply.c:3957

1151 +#: apply.c:3959

1152 #, c-format

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

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

1155

894 -#: apply.c:3962

1156 +#: apply.c:3964

1157 #, c-format

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

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

1160

899 -#: apply.c:3982

1161 +#: apply.c:3984

1162 #, c-format

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

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

1165

904 -#: apply.c:3986

1166 +#: apply.c:3988

1167 #, c-format

1168 msgid "%s: patch does not apply"

1169 msgstr "%s: el parche no aplica"

1170

909 -#: apply.c:4001

1171 +#: apply.c:4003

1172 #, c-format

1173 msgid "Checking patch %s..."

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

1175

914 -#: apply.c:4093

1176 +#: apply.c:4095

1177 #, c-format

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

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

1180

919 -#: apply.c:4100

1181 +#: apply.c:4102

1182 #, c-format

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

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

1185

924 -#: apply.c:4103

1186 +#: apply.c:4105

1187 #, c-format

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

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

1190

929 -#: apply.c:4112

1191 +#: apply.c:4114

1192 #, c-format

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

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

1195

934 -#: apply.c:4122

1196 +#: apply.c:4124

1197 #, c-format

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

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

1200

939 -#: apply.c:4260

1201 +#: apply.c:4262

1202 #, c-format

1203 msgid "unable to remove %s from index"

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

1205

944 -#: apply.c:4294

1206 +#: apply.c:4296

1207 #, c-format

1208 msgid "corrupt patch for submodule %s"

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

1210

949 -#: apply.c:4300

1211 +#: apply.c:4302

1212 #, c-format

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

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

1215

954 -#: apply.c:4308

1216 +#: apply.c:4310

1217 #, c-format

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

1219 msgstr ""

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

1221

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

1222 +#: apply.c:4316 apply.c:4461

1223 #, c-format

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

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

1226

965 -#: apply.c:4357

1227 +#: apply.c:4359

1228 #, c-format

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

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

1231

970 -#: apply.c:4361

1232 +#: apply.c:4363

1233 #, c-format

1234 msgid "closing file '%s'"

1235 msgstr "cerrando archivo '%s'"

1236

975 -#: apply.c:4431

1237 +#: apply.c:4433

1238 #, c-format

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

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

1241

980 -#: apply.c:4529

1242 +#: apply.c:4531

1243 #, c-format

1244 msgid "Applied patch %s cleanly."

1245 msgstr "Parche %s aplicado limpiamente."

1246

985 -#: apply.c:4537

1247 +#: apply.c:4539

1248 msgid "internal error"

1249 msgstr "error interno"

1250

989 -#: apply.c:4540

1251 +#: apply.c:4542

1252 #, c-format

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

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

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

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

1257

996 -#: apply.c:4551

1258 +#: apply.c:4553

1259 #, c-format

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

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

1262

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

1263 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1264 #, c-format

1265 msgid "cannot open %s"

1266 msgstr "no se puede abrir %s"

1267

1006 -#: apply.c:4573

1268 +#: apply.c:4575

1269 #, c-format

1270 msgid "Hunk #%d applied cleanly."

1271 msgstr "Hunk #%d aplicado limpiamente."

1272

1011 -#: apply.c:4577

1273 +#: apply.c:4579

1274 #, c-format

1275 msgid "Rejected hunk #%d."

1276 msgstr "Hunk #%d rechazado."

1277

1016 -#: apply.c:4696

1278 +#: apply.c:4698

1279 #, c-format

1280 msgid "Skipped patch '%s'."

1281 msgstr "Parche '%s' saltado."

1282

1021 -#: apply.c:4704

1283 +#: apply.c:4706

1284 msgid "unrecognized input"

1285 msgstr "input no reconocido"

1286

1025 -#: apply.c:4724

1287 +#: apply.c:4726

1288 msgid "unable to read index file"

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

1290

1029 -#: apply.c:4881

1291 +#: apply.c:4883

1292 #, c-format

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

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

1295

1034 -#: apply.c:4908

1296 +#: apply.c:4910

1297 #, c-format

1298 msgid "squelched %d whitespace error"

1299 msgid_plural "squelched %d whitespace errors"

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

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

1302

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

1303 +#: apply.c:4916 apply.c:4931

1304 #, c-format

1305 msgid "%d line adds whitespace errors."

1306 msgid_plural "%d lines add whitespace errors."

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

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

1309

1048 -#: apply.c:4922

1310 +#: apply.c:4924

1311 #, c-format

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

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

@@ -1054,137 +1316,137 @@ msgstr[0] ""

1316 msgstr[1] ""

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

1318

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

1319 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1320 msgid "Unable to write new index file"

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

1322

1061 -#: apply.c:4966

1323 +#: apply.c:4968

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

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

1326

1065 -#: apply.c:4969

1327 +#: apply.c:4971

1328 msgid "apply changes matching the given path"

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

1330

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

1331 +#: apply.c:4973 builtin/am.c:2260

1332 msgid "num"

1333 msgstr "num"

1334

1073 -#: apply.c:4972

1335 +#: apply.c:4974

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

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

1338

1077 -#: apply.c:4975

1339 +#: apply.c:4977

1340 msgid "ignore additions made by the patch"

1341 msgstr "ignorar adiciones hechas por el parche"

1342

1081 -#: apply.c:4977

1343 +#: apply.c:4979

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

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

1346

1085 -#: apply.c:4981

1347 +#: apply.c:4983

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

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

1350

1089 -#: apply.c:4983

1351 +#: apply.c:4985

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

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

1354

1093 -#: apply.c:4985

1355 +#: apply.c:4987

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

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

1358

1097 -#: apply.c:4987

1359 +#: apply.c:4989

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

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

1362

1101 -#: apply.c:4989

1363 +#: apply.c:4991

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

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

1366

1105 -#: apply.c:4991

1367 +#: apply.c:4993

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

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

1370

1109 -#: apply.c:4993

1371 +#: apply.c:4995

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

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

1374

1113 -#: apply.c:4996

1375 +#: apply.c:4998

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

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

1378

1117 -#: apply.c:4998

1379 +#: apply.c:5000

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

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

1382

1121 -#: apply.c:5000

1383 +#: apply.c:5002

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

1385 msgstr ""

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

1387

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

1388 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1389 msgid "paths are separated with NUL character"

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

1391

1130 -#: apply.c:5005

1392 +#: apply.c:5007

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

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

1395

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

1396 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

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

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

1398 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1399 msgid "action"

1400 msgstr "acción"

1401

1140 -#: apply.c:5007

1402 +#: apply.c:5009

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

1404 msgstr ""

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

1406 "blanco"

1407

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

1408 +#: apply.c:5012 apply.c:5015

1409 msgid "ignore changes in whitespace when finding context"

1410 msgstr ""

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

1412

1151 -#: apply.c:5016

1413 +#: apply.c:5018

1414 msgid "apply the patch in reverse"

1415 msgstr "aplicar el parche en reversa"

1416

1155 -#: apply.c:5018

1417 +#: apply.c:5020

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

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

1420

1159 -#: apply.c:5020

1421 +#: apply.c:5022

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

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

1424

1163 -#: apply.c:5022

1425 +#: apply.c:5024

1426 msgid "allow overlapping hunks"

1427 msgstr "permitir solapamiento de hunks"

1428

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

1429 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1430 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

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

1432 msgid "be verbose"

1433 msgstr "ser verboso"

1434

1173 -#: apply.c:5025

1435 +#: apply.c:5027

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

1437 msgstr ""

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

1439 "archivo"

1440

1179 -#: apply.c:5028

1441 +#: apply.c:5030

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

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

1444

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

1445 +#: apply.c:5032 builtin/am.c:2248

1446 msgid "root"

1447 msgstr "raíz"

1448

1187 -#: apply.c:5031

1449 +#: apply.c:5033

1450 msgid "prepend <root> to all filenames"

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

1452

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

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

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

1471

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

1472 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1473 #, c-format

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

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

@@ -1248,8 +1510,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1511

1512 #: 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

1513 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1514 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

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

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

1517 #: parse-options.h:190

@@ -1285,7 +1547,7 @@ msgid "list supported archive formats"

1547 msgstr "listar los formatos de carpeta soportados"

1548

1549 #: 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

1550 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1551 msgid "repo"

1552 msgstr "repo"

1553

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

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

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

1588

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

1589 +#: archive-tar.c:125 archive-zip.c:351

1590 #, c-format

1591 msgid "cannot stream blob %s"

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

1593

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

1594 +#: archive-tar.c:266 archive-zip.c:369

1595 #, c-format

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

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

1598

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

1599 +#: archive-tar.c:293 archive-zip.c:359

1600 #, c-format

1601 msgid "cannot read %s"

1602 msgstr "no se puede leer %s"

@@ -1363,12 +1625,12 @@ msgstr "ruta no válida UTF-8: %s"

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

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

1627

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

1628 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1629 #, c-format

1630 msgid "deflate error (%d)"

1631 msgstr "error al desinflar (%d)"

1632

1371 -#: archive-zip.c:614

1633 +#: archive-zip.c:615

1634 #, c-format

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

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

@@ -1401,12 +1663,12 @@ msgstr "Revisa las comillas en el archivo '%s': %s"

1663 msgid "We cannot bisect more!\n"

1664 msgstr "¡No podemos biseccionar más!\n"

1665

1404 -#: bisect.c:733

1666 +#: bisect.c:745

1667 #, c-format

1668 msgid "Not a valid commit name %s"

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

1670

1409 -#: bisect.c:758

1671 +#: bisect.c:770

1672 #, c-format

1673 msgid ""

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

@@ -1415,7 +1677,7 @@ msgstr ""

1677 "La base de fisión %s está mal.\n"

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

1679

1418 -#: bisect.c:763

1680 +#: bisect.c:775

1681 #, c-format

1682 msgid ""

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

@@ -1424,7 +1686,7 @@ msgstr ""

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

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

1688

1427 -#: bisect.c:768

1689 +#: bisect.c:780

1690 #, c-format

1691 msgid ""

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

@@ -1433,7 +1695,7 @@ msgstr ""

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

1696 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"

1697

1436 -#: bisect.c:776

1698 +#: bisect.c:788

1699 #, c-format

1700 msgid ""

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

@@ -1444,7 +1706,7 @@ msgstr ""

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

1707 "¿Tal vez confundiste la revisión %s y %s?\n"

1708

1447 -#: bisect.c:789

1709 +#: bisect.c:801

1710 #, c-format

1711 msgid ""

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

@@ -1455,36 +1717,36 @@ msgstr ""

1717 "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"

1718 "Vamos a continuar de todas maneras."

1719

1458 -#: bisect.c:822

1720 +#: bisect.c:840

1721 #, c-format

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

1723 msgstr "Biseccionando: una base de fisión debe ser probada\n"

1724

1463 -#: bisect.c:865

1725 +#: bisect.c:890

1726 #, c-format

1727 msgid "a %s revision is needed"

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

1729

1468 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1730 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1731 #, c-format

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

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

1734

1473 -#: bisect.c:928 builtin/merge.c:148

1735 +#: bisect.c:966 builtin/merge.c:149

1736 #, c-format

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

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

1739

1478 -#: bisect.c:958

1740 +#: bisect.c:997

1741 msgid "reading bisect refs failed"

1742 msgstr "falló leer las refs de bisect"

1743

1482 -#: bisect.c:977

1744 +#: bisect.c:1019

1745 #, c-format

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

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

1748

1487 -#: bisect.c:985

1749 +#: bisect.c:1028

1750 #, c-format

1751 msgid ""

1752 "No testable commit found.\n"

@@ -1493,7 +1755,7 @@ msgstr ""

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

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

1757

1496 -#: bisect.c:1004

1758 +#: bisect.c:1057

1759 #, c-format

1760 msgid "(roughly %d step)"

1761 msgid_plural "(roughly %d steps)"

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

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

1766 #. steps)" translation.

1767 #.

1506 -#: bisect.c:1010

1768 +#: bisect.c:1063

1769 #, c-format

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

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

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

1785 msgstr ""

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

1787

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

1788 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1789 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1790 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1791 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1792 #: builtin/shortlog.c:192

1793 msgid "revision walk setup failed"

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

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

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

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

1971

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

1711 -#: builtin/commit.c:811

1972 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

1973 +#: builtin/commit.c:815

1974 #, c-format

1975 msgid "could not open '%s'"

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

@@ -1778,13 +2040,13 @@ msgstr "no se puede crear '%s'"

2040 msgid "index-pack died"

2041 msgstr "index-pack murió"

2042

1781 -#: color.c:296

2043 +#: color.c:329

2044 #, c-format

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

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

2047

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

2048 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2049 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2050 #, c-format

2051 msgid "could not parse %s"

2052 msgstr "no se puede analizar %s"

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

2076 "Apapa este mensaje ejecutando\n"

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

2078

1817 -#: commit.c:1152

2079 +#: commit.c:1153

2080 #, c-format

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

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

2083

1822 -#: commit.c:1155

2084 +#: commit.c:1157

2085 #, c-format

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

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

2088

1827 -#: commit.c:1158

2089 +#: commit.c:1160

2090 #, c-format

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

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

2093

1832 -#: commit.c:1161

2094 +#: commit.c:1163

2095 #, c-format

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

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

2098

1837 -#: commit.c:1415

2099 +#: commit.c:1417

2100 msgid ""

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

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

@@ -1845,261 +2107,261 @@ msgstr ""

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

2108 "tu proyecto.\n"

2109

1848 -#: commit-graph.c:130

2110 +#: commit-graph.c:122

2111 msgid "commit-graph file is too small"

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

2113

1852 -#: commit-graph.c:195

2114 +#: commit-graph.c:189

2115 #, c-format

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

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

2118

1857 -#: commit-graph.c:202

2119 +#: commit-graph.c:196

2120 #, c-format

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

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

2123

1862 -#: commit-graph.c:209

2124 +#: commit-graph.c:203

2125 #, c-format

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

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

2128

1867 -#: commit-graph.c:232

2129 +#: commit-graph.c:226

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

2131 msgstr ""

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

2133 "incompleto"

2134

1873 -#: commit-graph.c:243

2135 +#: commit-graph.c:237

2136 #, c-format

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

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

2139

1878 -#: commit-graph.c:286

2140 +#: commit-graph.c:280

2141 #, c-format

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

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

2144

1883 -#: commit-graph.c:350

2145 +#: commit-graph.c:343

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

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

2148

1887 -#: commit-graph.c:360

2149 +#: commit-graph.c:353

2150 msgid "commit-graph chain does not match"

2151 msgstr "cadena commit-graph no concuerda"

2152

1891 -#: commit-graph.c:407

2153 +#: commit-graph.c:401

2154 #, c-format

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

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

2157

1896 -#: commit-graph.c:433

2158 +#: commit-graph.c:425

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

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

2161

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

2162 +#: commit-graph.c:558 commit-graph.c:618

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

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

2165

1904 -#: commit-graph.c:585

2166 +#: commit-graph.c:579

2167 #, c-format

2168 msgid "could not find commit %s"

2169 msgstr "no se pudo encontrar commit %s"

2170

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

2171 +#: commit-graph.c:852 builtin/am.c:1292

2172 #, c-format

2173 msgid "unable to parse commit %s"

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

2175

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

2176 +#: commit-graph.c:1011 builtin/pack-objects.c:2782

2177 #, c-format

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

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

2180

1919 -#: commit-graph.c:1049

2181 +#: commit-graph.c:1043

2182 msgid "Loading known commits in commit graph"

2183 msgstr "Cargando commits conocidos en commit graph"

2184

1923 -#: commit-graph.c:1066

2185 +#: commit-graph.c:1060

2186 msgid "Expanding reachable commits in commit graph"

2187 msgstr "Expandiendo commits alcanzables en commit graph"

2188

1927 -#: commit-graph.c:1085

2189 +#: commit-graph.c:1079

2190 msgid "Clearing commit marks in commit graph"

2191 msgstr "Limpiando marcas de commits en commit graph"

2192

1931 -#: commit-graph.c:1104

2193 +#: commit-graph.c:1098

2194 msgid "Computing commit graph generation numbers"

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

2196

1935 -#: commit-graph.c:1179

2197 +#: commit-graph.c:1173

2198 #, c-format

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

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

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

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

2203

1942 -#: commit-graph.c:1192

2204 +#: commit-graph.c:1186

2205 #, c-format

2206 msgid "error adding pack %s"

2207 msgstr "error agregando pack %s"

2208

1947 -#: commit-graph.c:1196

2209 +#: commit-graph.c:1190

2210 #, c-format

2211 msgid "error opening index for %s"

2212 msgstr "error abriendo index para %s"

2213

1952 -#: commit-graph.c:1220

2214 +#: commit-graph.c:1214

2215 #, c-format

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

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

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

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

2220

1959 -#: commit-graph.c:1240

2221 +#: commit-graph.c:1234

2222 #, c-format

2223 msgid "invalid commit object id: %s"

2224 msgstr "id de objeto commit: %s inválido"

2225

1964 -#: commit-graph.c:1255

2226 +#: commit-graph.c:1249

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

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

2229

1968 -#: commit-graph.c:1270

2230 +#: commit-graph.c:1264

2231 msgid "Counting distinct commits in commit graph"

2232 msgstr "Contando commits distintos en commit graph"

2233

1972 -#: commit-graph.c:1300

2234 +#: commit-graph.c:1294

2235 msgid "Finding extra edges in commit graph"

2236 msgstr "Encontrando esquinas extra en commit graph"

2237

1976 -#: commit-graph.c:1346

2238 +#: commit-graph.c:1340

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

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

2241

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

2242 +#: commit-graph.c:1373 midx.c:814

2243 #, c-format

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

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

2246

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

2247 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2248 #, c-format

2249 msgid "unable to create '%s'"

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

2251

1990 -#: commit-graph.c:1451

2252 +#: commit-graph.c:1445

2253 #, c-format

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

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

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

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

2258

1997 -#: commit-graph.c:1492

2259 +#: commit-graph.c:1486

2260 msgid "unable to open commit-graph chain file"

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

2262

2001 -#: commit-graph.c:1504

2263 +#: commit-graph.c:1498

2264 msgid "failed to rename base commit-graph file"

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

2266

2005 -#: commit-graph.c:1524

2267 +#: commit-graph.c:1518

2268 msgid "failed to rename temporary commit-graph file"

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

2270

2009 -#: commit-graph.c:1635

2271 +#: commit-graph.c:1631

2272 msgid "Scanning merged commits"

2273 msgstr "Escaneando commits fusionados"

2274

2013 -#: commit-graph.c:1646

2275 +#: commit-graph.c:1642

2276 #, c-format

2277 msgid "unexpected duplicate commit id %s"

2278 msgstr "id de commit duplicado inesperado %s"

2279

2018 -#: commit-graph.c:1670

2280 +#: commit-graph.c:1665

2281 msgid "Merging commit-graph"

2282 msgstr "Fusionando commit-graph"

2283

2022 -#: commit-graph.c:1860

2284 +#: commit-graph.c:1844

2285 #, c-format

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

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

2288

2027 -#: commit-graph.c:1871

2289 +#: commit-graph.c:1855

2290 msgid "too many commits to write graph"

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

2292

2031 -#: commit-graph.c:1961

2293 +#: commit-graph.c:1944

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

2295 msgstr ""

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

2297 "corrupto"

2298

2037 -#: commit-graph.c:1971

2299 +#: commit-graph.c:1954

2300 #, c-format

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

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

2303

2042 -#: commit-graph.c:1981 commit-graph.c:1996

2304 +#: commit-graph.c:1964 commit-graph.c:1979

2305 #, c-format

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

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

2308

2047 -#: commit-graph.c:1988

2309 +#: commit-graph.c:1971

2310 #, c-format

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

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

2313

2052 -#: commit-graph.c:2006

2314 +#: commit-graph.c:1989

2315 msgid "Verifying commits in commit graph"

2316 msgstr "Verificando commits en commit graph"

2317

2056 -#: commit-graph.c:2020

2318 +#: commit-graph.c:2003

2319 #, c-format

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

2321 msgstr ""

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

2323 "graph"

2324

2063 -#: commit-graph.c:2027

2325 +#: commit-graph.c:2010

2326 #, c-format

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

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

2329

2068 -#: commit-graph.c:2037

2330 +#: commit-graph.c:2020

2331 #, c-format

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

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

2334

2073 -#: commit-graph.c:2046

2335 +#: commit-graph.c:2029

2336 #, c-format

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

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

2339

2078 -#: commit-graph.c:2059

2340 +#: commit-graph.c:2042

2341 #, c-format

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

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

2344

2083 -#: commit-graph.c:2064

2345 +#: commit-graph.c:2047

2346 #, c-format

2347 msgid ""

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

2349 msgstr ""

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

2351

2090 -#: commit-graph.c:2068

2352 +#: commit-graph.c:2051

2353 #, c-format

2354 msgid ""

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

2356 msgstr ""

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

2358

2097 -#: commit-graph.c:2083

2359 +#: commit-graph.c:2066

2360 #, c-format

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

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

2363

2102 -#: commit-graph.c:2089

2364 +#: commit-graph.c:2072

2365 #, c-format

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

2367 msgstr ""

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

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

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

2412

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

2413 +#: config.c:406 sequencer.c:2444

2414 #, c-format

2415 msgid "invalid key: %s"

2416 msgstr "llave inválida: %s"

@@ -2286,7 +2548,7 @@ msgstr "valor malformado para %s: %s"

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

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

2550

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

2551 +#: config.c:1518 builtin/pack-objects.c:3541

2552 #, c-format

2553 msgid "bad pack compression level %d"

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

@@ -2311,106 +2573,106 @@ msgstr "no se posible resolver configuración de blob '%s'"

2573 msgid "failed to parse %s"

2574 msgstr "no se pudo analizar %s"

2575

2314 -#: config.c:1745

2576 +#: config.c:1743

2577 msgid "unable to parse command-line config"

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

2579

2318 -#: config.c:2096

2580 +#: config.c:2097

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

2582 msgstr ""

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

2584

2323 -#: config.c:2266

2585 +#: config.c:2267

2586 #, c-format

2587 msgid "Invalid %s: '%s'"

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

2589

2328 -#: config.c:2311

2590 +#: config.c:2312

2591 #, c-format

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

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

2594

2333 -#: config.c:2357

2595 +#: config.c:2358

2596 #, c-format

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

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

2599

2338 -#: config.c:2359

2600 +#: config.c:2360

2601 #, c-format

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

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

2604

2343 -#: config.c:2440

2605 +#: config.c:2441

2606 #, c-format

2607 msgid "invalid section name '%s'"

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

2609

2348 -#: config.c:2472

2610 +#: config.c:2473

2611 #, c-format

2612 msgid "%s has multiple values"

2613 msgstr "%s tiene múltiples valores"

2614

2353 -#: config.c:2501

2615 +#: config.c:2502

2616 #, c-format

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

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

2619

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

2620 +#: config.c:2754 config.c:3078

2621 #, c-format

2622 msgid "could not lock config file %s"

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

2624

2363 -#: config.c:2764

2625 +#: config.c:2765

2626 #, c-format

2627 msgid "opening %s"

2628 msgstr "abriendo %s"

2629

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

2630 +#: config.c:2800 builtin/config.c:344

2631 #, c-format

2632 msgid "invalid pattern: %s"

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

2634

2373 -#: config.c:2824

2635 +#: config.c:2825

2636 #, c-format

2637 msgid "invalid config file %s"

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

2639

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

2640 +#: config.c:2838 config.c:3091

2641 #, c-format

2642 msgid "fstat on %s failed"

2643 msgstr "fstat en %s falló"

2644

2383 -#: config.c:2848

2645 +#: config.c:2849

2646 #, c-format

2647 msgid "unable to mmap '%s'"

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

2649

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

2650 +#: config.c:2858 config.c:3096

2651 #, c-format

2652 msgid "chmod on %s failed"

2653 msgstr "chmod en %s falló"

2654

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

2655 +#: config.c:2943 config.c:3193

2656 #, c-format

2657 msgid "could not write config file %s"

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

2659

2398 -#: config.c:2976

2660 +#: config.c:2977

2661 #, c-format

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

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

2664

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

2665 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2666 #, c-format

2667 msgid "could not unset '%s'"

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

2669

2408 -#: config.c:3068

2670 +#: config.c:3069

2671 #, c-format

2672 msgid "invalid section name: %s"

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

2674

2413 -#: config.c:3235

2675 +#: config.c:3236

2676 #, c-format

2677 msgid "missing value for '%s'"

2678 msgstr "valor faltante para '%s'"

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

2837 msgid "unable to fork"

2838 msgstr "no es posible hacer fork"

2839

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

2840 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2841 msgid "Checking connectivity"

2842 msgstr "Verificando conectividad"

2843

2582 -#: connected.c:101

2844 +#: connected.c:110

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

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

2847

2586 -#: connected.c:121

2848 +#: connected.c:130

2849 msgid "failed write to rev-list"

2850 msgstr "falló escribir a rev-list"

2851

2590 -#: connected.c:128

2852 +#: connected.c:137

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

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

2855

@@ -2905,7 +3167,7 @@ msgid "invalid --stat value: %s"

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

3168

3169 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

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

3170 +#: parse-options.c:197 parse-options.c:201

3171 #, c-format

3172 msgid "%s expects a numerical value"

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

@@ -3437,61 +3699,61 @@ msgstr ""

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

3700 "intentar el comando."

3701

3440 -#: dir.c:554

3702 +#: dir.c:555

3703 #, c-format

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

3705 msgstr ""

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

3707

3446 -#: dir.c:664

3708 +#: dir.c:695 dir.c:724 dir.c:737

3709 #, c-format

3710 msgid "unrecognized pattern: '%s'"

3711 msgstr "patrón desconocido: '%s'"

3712

3451 -#: dir.c:682 dir.c:696

3713 +#: dir.c:754 dir.c:768

3714 #, c-format

3715 msgid "unrecognized negative pattern: '%s'"

3716 msgstr "patrón negativo no reconocido: '%s'"

3717

3456 -#: dir.c:714

3718 +#: dir.c:786

3719 #, c-format

3720 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3721 msgstr ""

3722 "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"

3723

3462 -#: dir.c:724

3724 +#: dir.c:796

3725 msgid "disabling cone pattern matching"

3726 msgstr "deshabilitar coincidencia de patrónes cono"

3727

3466 -#: dir.c:1101

3728 +#: dir.c:1173

3729 #, c-format

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

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

3732

3471 -#: dir.c:2078

3733 +#: dir.c:2144

3734 #, c-format

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

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

3737

3476 -#: dir.c:2415

3738 +#: dir.c:2479

3739 msgid "failed to get kernel name and information"

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

3741

3480 -#: dir.c:2539

3742 +#: dir.c:2603

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

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

3745

3484 -#: dir.c:3343

3746 +#: dir.c:3407

3747 #, c-format

3748 msgid "index file corrupt in repo %s"

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

3750

3489 -#: dir.c:3388 dir.c:3393

3751 +#: dir.c:3452 dir.c:3457

3752 #, c-format

3753 msgid "could not create directories for %s"

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

3755

3494 -#: dir.c:3422

3756 +#: dir.c:3486

3757 #, c-format

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

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

@@ -3737,7 +3999,7 @@ msgstr "error procesando refs deseadas: %d"

3999 msgid "no matching remote head"

4000 msgstr "no concuerda el head remoto"

4001

3740 -#: fetch-pack.c:1785 builtin/clone.c:688

4002 +#: fetch-pack.c:1785 builtin/clone.c:689

4003 msgid "remote did not send all necessary objects"

4004 msgstr "remoto no mando todos los objetos necesarios"

4005

@@ -3751,19 +4013,19 @@ msgstr "no existe ref remota %s"

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

4014 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"

4015

3754 -#: gpg-interface.c:223

4016 +#: gpg-interface.c:408

4017 +msgid "gpg failed to sign the data"

4018 +msgstr "gpg falló al firmar la data"

4019 +

4020 +#: gpg-interface.c:434

4021 msgid "could not create temporary file"

4022 msgstr "no se pudo crear archivo temporal"

4023

3758 -#: gpg-interface.c:226

4024 +#: gpg-interface.c:437

4025 #, c-format

4026 msgid "failed writing detached signature to '%s'"

4027 msgstr "falló al escribir la firma separada para '%s'"

4028

3763 -#: gpg-interface.c:390

3764 -msgid "gpg failed to sign the data"

3765 -msgstr "gpg falló al firmar la data"

3766 -

4029 #: graph.c:98

4030 #, c-format

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

@@ -3777,18 +4039,18 @@ msgstr ""

4039 "el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es "

4040 "soportado con -P bajo PCRE v2"

4041

3780 -#: grep.c:2124

4042 +#: grep.c:2128

4043 #, c-format

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

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

4046

3785 -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

4047 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4048 #: builtin/rm.c:135

4049 #, c-format

4050 msgid "failed to stat '%s'"

4051 msgstr "falló al marcar '%s'"

4052

3791 -#: grep.c:2152

4053 +#: grep.c:2156

4054 #, c-format

4055 msgid "'%s': short read"

4056 msgstr "'%s': lectura corta"

@@ -4003,7 +4265,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"

4265 msgid "name consists only of disallowed characters: %s"

4266 msgstr "el nombre consiste solo de caracteres no permitidos: %s"

4267

4006 -#: ident.c:436 builtin/commit.c:631

4268 +#: ident.c:436 builtin/commit.c:635

4269 #, c-format

4270 msgid "invalid date format: %s"

4271 msgstr "formato de fecha inválido: %s"

@@ -4088,111 +4350,111 @@ msgstr "No se pudo crear '%s.lock': %s"

4350 msgid "failed to read the cache"

4351 msgstr "falló al leer la cache"

4352

4091 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

4092 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4093 -#: builtin/stash.c:264

4353 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4354 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4355 +#: builtin/stash.c:265

4356 msgid "unable to write new index file"

4357 msgstr "no es posible escribir el archivo índice"

4358

4097 -#: merge-recursive.c:367

4359 +#: merge-recursive.c:356

4360 msgid "(bad commit)\n"

4361 msgstr "(commit erróneo)\n"

4362

4101 -#: merge-recursive.c:390

4363 +#: merge-recursive.c:379

4364 #, c-format

4365 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4366 msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."

4367

4106 -#: merge-recursive.c:399

4368 +#: merge-recursive.c:388

4369 #, c-format

4370 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4371 msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."

4372

4111 -#: merge-recursive.c:885

4373 +#: merge-recursive.c:874

4374 #, c-format

4375 msgid "failed to create path '%s'%s"

4376 msgstr "falló al crear la ruta '%s'%s"

4377

4116 -#: merge-recursive.c:896

4378 +#: merge-recursive.c:885

4379 #, c-format

4380 msgid "Removing %s to make room for subdirectory\n"

4381 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"

4382

4121 -#: merge-recursive.c:910 merge-recursive.c:929

4383 +#: merge-recursive.c:899 merge-recursive.c:918

4384 msgid ": perhaps a D/F conflict?"

4385 msgstr ": ¿tal vez un conflicto D/F?"

4386

4125 -#: merge-recursive.c:919

4387 +#: merge-recursive.c:908

4388 #, c-format

4389 msgid "refusing to lose untracked file at '%s'"

4390 msgstr "rehusando perder el archivo rastreado en '%s'"

4391

4130 -#: merge-recursive.c:960 builtin/cat-file.c:41

4392 +#: merge-recursive.c:949 builtin/cat-file.c:41

4393 #, c-format

4394 msgid "cannot read object %s '%s'"

4395 msgstr "no se puede leer el objeto %s '%s'"

4396

4135 -#: merge-recursive.c:965

4397 +#: merge-recursive.c:954

4398 #, c-format

4399 msgid "blob expected for %s '%s'"

4400 msgstr "se esperaba blob para %s '%s'"

4401

4140 -#: merge-recursive.c:990

4402 +#: merge-recursive.c:979

4403 #, c-format

4404 msgid "failed to open '%s': %s"

4405 msgstr "falló al abrir '%s': %s"

4406

4145 -#: merge-recursive.c:1001

4407 +#: merge-recursive.c:990

4408 #, c-format

4409 msgid "failed to symlink '%s': %s"

4410 msgstr "falló al crear el enlace simbólico '%s': %s"

4411

4150 -#: merge-recursive.c:1006

4412 +#: merge-recursive.c:995

4413 #, c-format

4414 msgid "do not know what to do with %06o %s '%s'"

4415 msgstr "no se que hacer con %06o %s '%s'"

4416

4155 -#: merge-recursive.c:1199

4417 +#: merge-recursive.c:1191

4418 #, c-format

4419 msgid "Failed to merge submodule %s (not checked out)"

4420 msgstr "Falló al fusionar el submódulo %s (no revisado)"

4421

4160 -#: merge-recursive.c:1206

4422 +#: merge-recursive.c:1198

4423 #, c-format

4424 msgid "Failed to merge submodule %s (commits not present)"

4425 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"

4426

4165 -#: merge-recursive.c:1213

4427 +#: merge-recursive.c:1205

4428 #, c-format

4429 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4430 msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"

4431

4170 -#: merge-recursive.c:1221 merge-recursive.c:1233

4432 +#: merge-recursive.c:1213 merge-recursive.c:1225

4433 #, c-format

4434 msgid "Fast-forwarding submodule %s to the following commit:"

4435 msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"

4436

4175 -#: merge-recursive.c:1224 merge-recursive.c:1236

4437 +#: merge-recursive.c:1216 merge-recursive.c:1228

4438 #, c-format

4439 msgid "Fast-forwarding submodule %s"

4440 msgstr "Avance rápido en submódulo %s"

4441

4180 -#: merge-recursive.c:1259

4442 +#: merge-recursive.c:1251

4443 #, c-format

4444 msgid "Failed to merge submodule %s (merge following commits not found)"

4445 msgstr ""

4446 "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"

4447

4186 -#: merge-recursive.c:1263

4448 +#: merge-recursive.c:1255

4449 #, c-format

4450 msgid "Failed to merge submodule %s (not fast-forward)"

4451 msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"

4452

4191 -#: merge-recursive.c:1264

4453 +#: merge-recursive.c:1256

4454 msgid "Found a possible merge resolution for the submodule:\n"

4455 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"

4456

4195 -#: merge-recursive.c:1267

4457 +#: merge-recursive.c:1259

4458 #, c-format

4459 msgid ""

4460 "If this is correct simply add it to the index for example\n"

@@ -4209,33 +4471,33 @@ msgstr ""

4471 "\n"

4472 "el cual aceptará esta sugerencia.\n"

4473

4212 -#: merge-recursive.c:1276

4474 +#: merge-recursive.c:1268

4475 #, c-format

4476 msgid "Failed to merge submodule %s (multiple merges found)"

4477 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"

4478

4217 -#: merge-recursive.c:1349

4479 +#: merge-recursive.c:1341

4480 msgid "Failed to execute internal merge"

4481 msgstr "Falló al ejecutar la fusión interna"

4482

4221 -#: merge-recursive.c:1354

4483 +#: merge-recursive.c:1346

4484 #, c-format

4485 msgid "Unable to add %s to database"

4486 msgstr "No es posible agregar %s a la base de datos"

4487

4226 -#: merge-recursive.c:1386

4488 +#: merge-recursive.c:1378

4489 #, c-format

4490 msgid "Auto-merging %s"

4491 msgstr "Auto-fusionando %s"

4492

4231 -#: merge-recursive.c:1410

4493 +#: merge-recursive.c:1402

4494 #, c-format

4495 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4496 msgstr ""

4497 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "

4498 "cambio."

4499

4238 -#: merge-recursive.c:1482

4500 +#: merge-recursive.c:1474

4501 #, c-format

4502 msgid ""

4503 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4244,7 +4506,7 @@ msgstr ""

4506 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "

4507 "en el árbol."

4508

4247 -#: merge-recursive.c:1487

4509 +#: merge-recursive.c:1479

4510 #, c-format

4511 msgid ""

4512 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4253,7 +4515,7 @@ msgstr ""

4515 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

4516 "permanece en el árbol."

4517

4256 -#: merge-recursive.c:1494

4518 +#: merge-recursive.c:1486

4519 #, c-format

4520 msgid ""

4521 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4262,7 +4524,7 @@ msgstr ""

4524 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "

4525 "dejada en el árbol, en %s."

4526

4265 -#: merge-recursive.c:1499

4527 +#: merge-recursive.c:1491

4528 #, c-format

4529 msgid ""

4530 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4271,44 +4533,44 @@ msgstr ""

4533 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "

4534 "permanece en el árbol en %s."

4535

4274 -#: merge-recursive.c:1534

4536 +#: merge-recursive.c:1526

4537 msgid "rename"

4538 msgstr "renombrar"

4539

4278 -#: merge-recursive.c:1534

4540 +#: merge-recursive.c:1526

4541 msgid "renamed"

4542 msgstr "renombrado"

4543

4282 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4544 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4545 #, c-format

4546 msgid "Refusing to lose dirty file at %s"

4547 msgstr "Rehusando perder el archivo sucio en %s"

4548

4287 -#: merge-recursive.c:1624

4549 +#: merge-recursive.c:1587

4550 #, c-format

4551 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4552 msgstr ""

4553 "Rehusando perder el archivo no rastreado en %s, incluso aunque se está "

4554 "interponiendo."

4555

4294 -#: merge-recursive.c:1682

4556 +#: merge-recursive.c:1645

4557 #, c-format

4558 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4559 msgstr ""

4560 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"

4561

4300 -#: merge-recursive.c:1713

4562 +#: merge-recursive.c:1676

4563 #, c-format

4564 msgid "%s is a directory in %s adding as %s instead"

4565 msgstr "%s es un directorio en %s agregando como %s más bien"

4566

4305 -#: merge-recursive.c:1718

4567 +#: merge-recursive.c:1681

4568 #, c-format

4569 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4570 msgstr ""

4571 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"

4572

4311 -#: merge-recursive.c:1737

4573 +#: merge-recursive.c:1708

4574 #, c-format

4575 msgid ""

4576 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -4317,18 +4579,18 @@ msgstr ""

4579 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "

4580 "renombrar \"%s\"->\"%s\" en \"%s\"%s"

4581

4320 -#: merge-recursive.c:1742

4582 +#: merge-recursive.c:1713

4583 msgid " (left unresolved)"

4584 msgstr " (dejado sin resolver)"

4585

4324 -#: merge-recursive.c:1851

4586 +#: merge-recursive.c:1793

4587 #, c-format

4588 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4589 msgstr ""

4590 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "

4591 "%s"

4592

4331 -#: merge-recursive.c:2114

4593 +#: merge-recursive.c:2056

4594 #, c-format

4595 msgid ""

4596 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4339,7 +4601,7 @@ msgstr ""

4601 "colocar %s porque el directorio %s fue renombrado a otros múltiples "

4602 "directorios, sin ningún que contenga la mayoría de archivos."

4603

4342 -#: merge-recursive.c:2146

4604 +#: merge-recursive.c:2088

4605 #, c-format

4606 msgid ""

4607 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4349,7 +4611,7 @@ msgstr ""

4611 "existente en %s se interpone con el cambio de nombres implícito, poniendo "

4612 "la(s) siguiente(s) ruta(s) aquí: %s."

4613

4352 -#: merge-recursive.c:2156

4614 +#: merge-recursive.c:2098

4615 #, c-format

4616 msgid ""

4617 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4358,7 +4620,7 @@ msgstr ""

4620 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "

4621 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"

4622

4361 -#: merge-recursive.c:2248

4623 +#: merge-recursive.c:2190

4624 #, c-format

4625 msgid ""

4626 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4367,7 +4629,7 @@ msgstr ""

4629 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "

4630 "Renombrar directorio %s->%s en %s"

4631

4370 -#: merge-recursive.c:2493

4632 +#: merge-recursive.c:2435

4633 #, c-format

4634 msgid ""

4635 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -4376,52 +4638,52 @@ msgstr ""

4638 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "

4639 "renombrado."

4640

4379 -#: merge-recursive.c:3019

4641 +#: merge-recursive.c:2961

4642 #, c-format

4643 msgid "cannot read object %s"

4644 msgstr "no se pudo leer el objeto %s"

4645

4384 -#: merge-recursive.c:3022

4646 +#: merge-recursive.c:2964

4647 #, c-format

4648 msgid "object %s is not a blob"

4649 msgstr "objeto %s no es un blob"

4650

4389 -#: merge-recursive.c:3086

4651 +#: merge-recursive.c:3028

4652 msgid "modify"

4653 msgstr "modificar"

4654

4393 -#: merge-recursive.c:3086

4655 +#: merge-recursive.c:3028

4656 msgid "modified"

4657 msgstr "modificado"

4658

4397 -#: merge-recursive.c:3098

4659 +#: merge-recursive.c:3040

4660 msgid "content"

4661 msgstr "contenido"

4662

4401 -#: merge-recursive.c:3102

4663 +#: merge-recursive.c:3044

4664 msgid "add/add"

4665 msgstr "agregar/agregar"

4666

4405 -#: merge-recursive.c:3125

4667 +#: merge-recursive.c:3067

4668 #, c-format

4669 msgid "Skipped %s (merged same as existing)"

4670 msgstr "Saltado %s (fusionado como existente)"

4671

4410 -#: merge-recursive.c:3147 git-submodule.sh:993

4672 +#: merge-recursive.c:3089 git-submodule.sh:1003

4673 msgid "submodule"

4674 msgstr "submódulo"

4675

4414 -#: merge-recursive.c:3148

4676 +#: merge-recursive.c:3090

4677 #, c-format

4678 msgid "CONFLICT (%s): Merge conflict in %s"

4679 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"

4680

4419 -#: merge-recursive.c:3178

4681 +#: merge-recursive.c:3120

4682 #, c-format

4683 msgid "Adding as %s instead"

4684 msgstr "Agregando más bien como %s"

4685

4424 -#: merge-recursive.c:3261

4686 +#: merge-recursive.c:3203

4687 #, c-format

4688 msgid ""

4689 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4430,7 +4692,7 @@ msgstr ""

4692 "Path actualizado: %s agregado en %s dentro de un directorio que fue "

4693 "renombrado en %s; moviéndolo a %s."

4694

4433 -#: merge-recursive.c:3264

4695 +#: merge-recursive.c:3206

4696 #, c-format

4697 msgid ""

4698 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4439,7 +4701,7 @@ msgstr ""

4701 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "

4702 "que fue renombrado en %s, sugerimos que debería ser movido a %s."

4703

4442 -#: merge-recursive.c:3268

4704 +#: merge-recursive.c:3210

4705 #, c-format

4706 msgid ""

4707 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4448,7 +4710,7 @@ msgstr ""

4710 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "

4711 "renombrado en %s; moviéndolo a %s."

4712

4451 -#: merge-recursive.c:3271

4713 +#: merge-recursive.c:3213

4714 #, c-format

4715 msgid ""

4716 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4458,61 +4720,61 @@ msgstr ""

4720 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "

4721 "movido a %s."

4722

4461 -#: merge-recursive.c:3385

4723 +#: merge-recursive.c:3327

4724 #, c-format

4725 msgid "Removing %s"

4726 msgstr "Eliminando %s"

4727

4466 -#: merge-recursive.c:3408

4728 +#: merge-recursive.c:3350

4729 msgid "file/directory"

4730 msgstr "archivo/directorio"

4731

4470 -#: merge-recursive.c:3413

4732 +#: merge-recursive.c:3355

4733 msgid "directory/file"

4734 msgstr "directorio/archivo"

4735

4474 -#: merge-recursive.c:3420

4736 +#: merge-recursive.c:3362

4737 #, c-format

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

4739 msgstr ""

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

4741 "%s"

4742

4481 -#: merge-recursive.c:3429

4743 +#: merge-recursive.c:3371

4744 #, c-format

4745 msgid "Adding %s"

4746 msgstr "Agregando %s"

4747

4486 -#: merge-recursive.c:3438

4748 +#: merge-recursive.c:3380

4749 #, c-format

4750 msgid "CONFLICT (add/add): Merge conflict in %s"

4751 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"

4752

4491 -#: merge-recursive.c:3482

4753 +#: merge-recursive.c:3424

4754 msgid "Already up to date!"

4755 msgstr "¡Ya está actualizado!"

4756

4495 -#: merge-recursive.c:3491

4757 +#: merge-recursive.c:3433

4758 #, c-format

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

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

4761

4500 -#: merge-recursive.c:3595

4762 +#: merge-recursive.c:3537

4763 msgid "Merging:"

4764 msgstr "Fusionando:"

4765

4504 -#: merge-recursive.c:3608

4766 +#: merge-recursive.c:3550

4767 #, c-format

4768 msgid "found %u common ancestor:"

4769 msgid_plural "found %u common ancestors:"

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

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

4772

4511 -#: merge-recursive.c:3658

4773 +#: merge-recursive.c:3600

4774 msgid "merge returned no commit"

4775 msgstr "la fusión no devolvió ningún commit"

4776

4515 -#: merge-recursive.c:3717

4777 +#: merge-recursive.c:3659

4778 #, c-format

4779 msgid ""

4780 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4522,12 +4784,12 @@ msgstr ""

4784 "merge:\n"

4785 " %s"

4786

4525 -#: merge-recursive.c:3814

4787 +#: merge-recursive.c:3756

4788 #, c-format

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

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

4791

4530 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4792 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4793 msgid "Unable to write index."

4794 msgstr "Incapaz de escribir el índice."

4795

@@ -4764,27 +5026,32 @@ msgstr "el objeto %s tiene un id de tipo desconocido %d"

5026 msgid "unable to parse object: %s"

5027 msgstr "incapaz de analizar objeto: %s"

5028

4767 -#: object.c:266 object.c:277

5029 +#: object.c:266 object.c:278

5030 #, c-format

5031 msgid "hash mismatch %s"

5032 msgstr "hash no concuerda %s"

5033

4772 -#: packfile.c:641

5034 +#: packfile.c:629

5035 msgid "offset before end of packfile (broken .idx?)"

5036 msgstr "offset antes del final del paquete (broken .idx?)"

5037

4776 -#: packfile.c:1888

5038 +#: packfile.c:1899

5039 #, c-format

5040 msgid "offset before start of pack index for %s (corrupt index?)"

5041 msgstr ""

5042 "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"

5043

4782 -#: packfile.c:1892

5044 +#: packfile.c:1903

5045 #, c-format

5046 msgid "offset beyond end of pack index for %s (truncated index?)"

5047 msgstr ""

5048 "offset más allá del índice de fin de paquete para %s (¿índice truncado?)"

5049

5050 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5051 +#, c-format

5052 +msgid "unable to get size of %s"

5053 +msgstr "no se pudo obtener el tamaño de %s"

5054 +

5055 #: parse-options.c:38

5056 #, c-format

5057 msgid "%s requires a value"

@@ -4800,7 +5067,7 @@ msgstr "%s es incompatible con %s"

5067 msgid "%s : incompatible with something else"

5068 msgstr "%s : incompatible con otra cosa"

5069

4803 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319

5070 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5071 #, c-format

5072 msgid "%s takes no value"

5073 msgstr "%s no toma valores"

@@ -4810,41 +5077,41 @@ msgstr "%s no toma valores"

5077 msgid "%s isn't available"

5078 msgstr "%s no está disponible"

5079

4813 -#: parse-options.c:219

5080 +#: parse-options.c:217

5081 #, c-format

5082 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5083 msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"

5084

4818 -#: parse-options.c:389

5085 +#: parse-options.c:386

5086 #, c-format

5087 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5088 msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"

5089

4823 -#: parse-options.c:423 parse-options.c:431

5090 +#: parse-options.c:420 parse-options.c:428

5091 #, c-format

4825 -msgid "did you mean `--%s` (with two dashes ?)"

5092 +msgid "did you mean `--%s` (with two dashes)?"

5093 msgstr "¿quisiste decir `--%s` (con dos guiones)?"

5094

4828 -#: parse-options.c:860

5095 +#: parse-options.c:857

5096 #, c-format

5097 msgid "unknown option `%s'"

5098 msgstr "opción `%s' desconocida"

5099

4833 -#: parse-options.c:862

5100 +#: parse-options.c:859

5101 #, c-format

5102 msgid "unknown switch `%c'"

5103 msgstr "switch desconocido `%c'"

5104

4838 -#: parse-options.c:864

5105 +#: parse-options.c:861

5106 #, c-format

5107 msgid "unknown non-ascii option in string: `%s'"

5108 msgstr "opción desconocida en string no ascii: `%s'"

5109

4843 -#: parse-options.c:888

5110 +#: parse-options.c:885

5111 msgid "..."

5112 msgstr "..."

5113

4847 -#: parse-options.c:907

5114 +#: parse-options.c:904

5115 #, c-format

5116 msgid "usage: %s"

5117 msgstr "uso: %s"

@@ -4852,21 +5119,21 @@ msgstr "uso: %s"

5119 #. TRANSLATORS: the colon here should align with the

5120 #. one in "usage: %s" translation.

5121 #.

4855 -#: parse-options.c:913

5122 +#: parse-options.c:910

5123 #, c-format

5124 msgid " or: %s"

5125 msgstr " o: %s"

5126

4860 -#: parse-options.c:916

5127 +#: parse-options.c:913

5128 #, c-format

5129 msgid " %s"

5130 msgstr " %s"

5131

4865 -#: parse-options.c:955

5132 +#: parse-options.c:952

5133 msgid "-NUM"

5134 msgstr "-NUM"

5135

4869 -#: parse-options.c:969

5136 +#: parse-options.c:966

5137 #, c-format

5138 msgid "alias of --%s"

5139 msgstr "alias de --%s"

@@ -4953,25 +5220,25 @@ msgstr "%s: 'literal' y 'glob' son incompatibles"

5220

5221 #: pathspec.c:442

5222 #, c-format

4956 -msgid "%s: '%s' is outside repository"

4957 -msgstr "%s: '%s' está fuera del repositorio"

5223 +msgid "%s: '%s' is outside repository at '%s'"

5224 +msgstr "%s: '%s' está fuera del repositorio en '%s'"

5225

4959 -#: pathspec.c:516

5226 +#: pathspec.c:517

5227 #, c-format

5228 msgid "'%s' (mnemonic: '%c')"

5229 msgstr "'%s' (nemotécnico: '%c')"

5230

4964 -#: pathspec.c:526

5231 +#: pathspec.c:527

5232 #, c-format

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

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

5235

4969 -#: pathspec.c:593

5236 +#: pathspec.c:594

5237 #, c-format

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

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

5240

4974 -#: pathspec.c:638

5241 +#: pathspec.c:639

5242 #, c-format

5243 msgid "line is badly quoted: %s"

5244 msgstr "la línea está mál citada: %s"

@@ -5057,7 +5324,7 @@ msgstr "no se pudo comenzar `log`"

5324 msgid "could not read `log` output"

5325 msgstr "no se pudo leer output de `log`"

5326

5060 -#: range-diff.c:96 sequencer.c:5163

5327 +#: range-diff.c:96 sequencer.c:5020

5328 #, c-format

5329 msgid "could not parse commit '%s'"

5330 msgstr "no se pudo analizar commit '%s'"

@@ -5111,16 +5378,16 @@ msgstr "no es posible agregar '%s' al index"

5378 msgid "unable to stat '%s'"

5379 msgstr "incapaz de correr stat en '%s'"

5380

5114 -#: read-cache.c:1325

5381 +#: read-cache.c:1330

5382 #, c-format

5383 msgid "'%s' appears as both a file and as a directory"

5384 msgstr "'%s' parece ser un directorio y un archivo a la vez"

5385

5119 -#: read-cache.c:1531

5386 +#: read-cache.c:1536

5387 msgid "Refresh index"

5388 msgstr "Refrescar index"

5389

5123 -#: read-cache.c:1646

5390 +#: read-cache.c:1651

5391 #, c-format

5392 msgid ""

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

@@ -5129,7 +5396,7 @@ msgstr ""

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

5397 "Usando versión %i"

5398

5132 -#: read-cache.c:1656

5399 +#: read-cache.c:1661

5400 #, c-format

5401 msgid ""

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

@@ -5138,150 +5405,161 @@ msgstr ""

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

5406 "Usando versión %i"

5407

5141 -#: read-cache.c:1712

5408 +#: read-cache.c:1717

5409 #, c-format

5410 msgid "bad signature 0x%08x"

5411 msgstr "mala firma 0x%08x"

5412

5146 -#: read-cache.c:1715

5413 +#: read-cache.c:1720

5414 #, c-format

5415 msgid "bad index version %d"

5416 msgstr "mala versión del índice %d"

5417

5151 -#: read-cache.c:1724

5418 +#: read-cache.c:1729

5419 msgid "bad index file sha1 signature"

5420 msgstr "mala firma sha1 del archivo index"

5421

5155 -#: read-cache.c:1754

5422 +#: read-cache.c:1759

5423 #, c-format

5424 msgid "index uses %.4s extension, which we do not understand"

5425 msgstr "index usa %.4s extensiones, cosa que no entendemos"

5426

5160 -#: read-cache.c:1756

5427 +#: read-cache.c:1761

5428 #, c-format

5429 msgid "ignoring %.4s extension"

5430 msgstr "ignorando extensión %.4s"

5431

5165 -#: read-cache.c:1793

5432 +#: read-cache.c:1798

5433 #, c-format

5434 msgid "unknown index entry format 0x%08x"

5435 msgstr "formato de index desconocido 0x%08x"

5436

5170 -#: read-cache.c:1809

5437 +#: read-cache.c:1814

5438 #, c-format

5439 msgid "malformed name field in the index, near path '%s'"

5440 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"

5441

5175 -#: read-cache.c:1866

5442 +#: read-cache.c:1871

5443 msgid "unordered stage entries in index"

5444 msgstr "entradas en stage desordenadas en index"

5445

5179 -#: read-cache.c:1869

5446 +#: read-cache.c:1874

5447 #, c-format

5448 msgid "multiple stage entries for merged file '%s'"

5449 msgstr "múltiples entradas extrañas para archivo fusionado '%s'"

5450

5184 -#: read-cache.c:1872

5451 +#: read-cache.c:1877

5452 #, c-format

5453 msgid "unordered stage entries for '%s'"

5454 msgstr "entradas de stage desordenadas para '%s'"

5455

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

5193 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5456 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5457 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5458 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5459 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5460 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5461 +#: builtin/submodule--helper.c:332

5462 msgid "index file corrupt"

5463 msgstr "archivo índice corrompido"

5464

5197 -#: read-cache.c:2119

5465 +#: read-cache.c:2124

5466 #, c-format

5467 msgid "unable to create load_cache_entries thread: %s"

5468 msgstr "no es posible crear hilo load_cache_entries: %s"

5469

5202 -#: read-cache.c:2132

5470 +#: read-cache.c:2137

5471 #, c-format

5472 msgid "unable to join load_cache_entries thread: %s"

5473 msgstr "no es posible unir hilo load_cache_entires: %s"

5474

5207 -#: read-cache.c:2165

5475 +#: read-cache.c:2170

5476 #, c-format

5477 msgid "%s: index file open failed"

5478 msgstr "%s: falló al abrir el archivo index"

5479

5212 -#: read-cache.c:2169

5480 +#: read-cache.c:2174

5481 #, c-format

5482 msgid "%s: cannot stat the open index"

5483 msgstr "%s: no se puede hacer stat del index abierto"

5484

5217 -#: read-cache.c:2173

5485 +#: read-cache.c:2178

5486 #, c-format

5487 msgid "%s: index file smaller than expected"

5488 msgstr "%s: archivo index más pequeño de lo esperado"

5489

5222 -#: read-cache.c:2177

5490 +#: read-cache.c:2182

5491 #, c-format

5492 msgid "%s: unable to map index file"

5493 msgstr "%s: no se pudo mapear el archivo index"

5494

5227 -#: read-cache.c:2219

5495 +#: read-cache.c:2224

5496 #, c-format

5497 msgid "unable to create load_index_extensions thread: %s"

5498 msgstr "no es posible crear hilo load_index_extensions: %s"

5499

5232 -#: read-cache.c:2246

5500 +#: read-cache.c:2251

5501 #, c-format

5502 msgid "unable to join load_index_extensions thread: %s"

5503 msgstr "no es posible unir hilo load_index_extensions: %s"

5504

5237 -#: read-cache.c:2278

5505 +#: read-cache.c:2283

5506 #, c-format

5507 msgid "could not freshen shared index '%s'"

5508 msgstr "no se pudo refrescar el index compartido '%s'"

5509

5242 -#: read-cache.c:2325

5510 +#: read-cache.c:2330

5511 #, c-format

5512 msgid "broken index, expect %s in %s, got %s"

5513 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"

5514

5247 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5515 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5516 #, c-format

5517 msgid "could not close '%s'"

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

5519

5252 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5520 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5521 #, c-format

5522 msgid "could not stat '%s'"

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

5524

5257 -#: read-cache.c:3137

5525 +#: read-cache.c:3142

5526 #, c-format

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

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

5529

5262 -#: read-cache.c:3149

5530 +#: read-cache.c:3154

5531 #, c-format

5532 msgid "unable to unlink: %s"

5533 msgstr "no es posible eliminar el vinculo: %s"

5534

5267 -#: read-cache.c:3174

5535 +#: read-cache.c:3179

5536 #, c-format

5537 msgid "cannot fix permission bits on '%s'"

5538 msgstr "no se pudo arreglar bits de permisos en '%s'"

5539

5272 -#: read-cache.c:3323

5540 +#: read-cache.c:3328

5541 #, c-format

5542 msgid "%s: cannot drop to stage #0"

5543 msgstr "%s: no se puede eliminar a stage #0"

5544

5277 -#: rebase-interactive.c:26

5545 +#: rebase-interactive.c:11

5546 +msgid ""

5547 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5548 +"continue'.\n"

5549 +"Or you can abort the rebase with 'git rebase --abort'.\n"

5550 +msgstr ""

5551 +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "

5552 +"rebase --continue'.\n"

5553 +"O se puede abortar el rebase con 'git rebase --abort'.\n"

5554 +

5555 +#: rebase-interactive.c:33

5556 #, c-format

5557 msgid ""

5558 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5559 msgstr ""

5560 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."

5561

5284 -#: rebase-interactive.c:35

5562 +#: rebase-interactive.c:42

5563 msgid ""

5564 "\n"

5565 "Commands:\n"

@@ -5323,14 +5601,14 @@ msgstr ""

5601 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "

5602 "abajo.\n"

5603

5326 -#: rebase-interactive.c:56

5604 +#: rebase-interactive.c:63

5605 #, c-format

5606 msgid "Rebase %s onto %s (%d command)"

5607 msgid_plural "Rebase %s onto %s (%d commands)"

5608 msgstr[0] "Rebase %s en %s (%d comando)"

5609 msgstr[1] "Rebase %s en %s (%d comandos)"

5610

5333 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

5611 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5612 msgid ""

5613 "\n"

5614 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5338,7 +5616,7 @@ msgstr ""

5616 "\n"

5617 "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"

5618

5341 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

5619 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5620 msgid ""

5621 "\n"

5622 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5346,7 +5624,7 @@ msgstr ""

5624 "\n"

5625 "Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"

5626

5349 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

5627 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5628 msgid ""

5629 "\n"

5630 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5360,7 +5638,7 @@ msgstr ""

5638 " git rebase --continue\n"

5639 "\n"

5640

5363 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

5641 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5642 msgid ""

5643 "\n"

5644 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5370,22 +5648,19 @@ msgstr ""

5648 "Como sea, si quieres borrar todo, el rebase será abortado.\n"

5649 "\n"

5650

5373 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

5374 -msgid "Note that empty commits are commented out"

5375 -msgstr "Tenga en cuenta que los commits vacíos están comentados"

5376 -

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

5651 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5652 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5653 #, c-format

5654 msgid "could not write '%s'"

5655 msgstr "no se pudo escribir '%s'"

5656

5383 -#: rebase-interactive.c:108

5657 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5658 +#: builtin/rebase.c:234

5659 #, c-format

5385 -msgid "could not copy '%s' to '%s'."

5386 -msgstr "no se pudo copiar '%s' a '%s'."

5660 +msgid "could not write '%s'."

5661 +msgstr "no se pudo escribir '%s'."

5662

5388 -#: rebase-interactive.c:173

5663 +#: rebase-interactive.c:193

5664 #, c-format

5665 msgid ""

5666 "Warning: some commits may have been dropped accidentally.\n"

@@ -5394,7 +5669,7 @@ msgstr ""

5669 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"

5670 "Commits botados (empezando con el más nuevo):\n"

5671

5397 -#: rebase-interactive.c:180

5672 +#: rebase-interactive.c:200

5673 #, c-format

5674 msgid ""

5675 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5412,6 +5687,13 @@ msgstr ""

5687 "Los posibles comportamientos son: ignore,warn,error.\n"

5688 "\n"

5689

5690 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5691 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5692 +#: builtin/rebase.c:246

5693 +#, c-format

5694 +msgid "could not read '%s'."

5695 +msgstr "no se puede leer '%s'."

5696 +

5697 #: refs.c:262

5698 #, c-format

5699 msgid "%s does not point to a valid object!"

@@ -5447,15 +5729,15 @@ msgstr "ref '%s' ya existe"

5729 msgid "unexpected object ID when writing '%s'"

5730 msgstr "ID de objecto inesperado al escribir '%s'"

5731

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

5732 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5733 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5734 #: wrapper.c:620

5735 #, c-format

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

5737 msgstr "no se pudo escribir en '%s'"

5738

5457 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5458 -#: builtin/rebase.c:1031

5739 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5740 +#: builtin/rebase.c:1029

5741 #, c-format

5742 msgid "could not open '%s' for writing"

5743 msgstr "no se pudo abrir '%s' para escritura"

@@ -5509,18 +5791,18 @@ msgstr "'%s' existe; no se puede crear '%s'"

5791 msgid "cannot process '%s' and '%s' at the same time"

5792 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"

5793

5512 -#: refs/files-backend.c:1234

5794 +#: refs/files-backend.c:1233

5795 #, c-format

5796 msgid "could not remove reference %s"

5797 msgstr "no se pudo eliminar la referencia %s"

5798

5517 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5799 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5800 #: refs/packed-backend.c:1551

5801 #, c-format

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

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

5804

5523 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5805 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5806 #, c-format

5807 msgid "could not delete references: %s"

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

@@ -5785,45 +6067,45 @@ msgstr "opción '%s' debe apuntar a un commit"

6067 msgid "config remote shorthand cannot begin with '/': %s"

6068 msgstr "config remote shorthand no puede comenzar con '/': %s"

6069

5788 -#: remote.c:413

6070 +#: remote.c:414

6071 msgid "more than one receivepack given, using the first"

6072 msgstr "más de un receivepack dado, usando el primero"

6073

5792 -#: remote.c:421

6074 +#: remote.c:422

6075 msgid "more than one uploadpack given, using the first"

6076 msgstr "más de un uploadpack dado, usando el primero"

6077

5796 -#: remote.c:611

6078 +#: remote.c:612

6079 #, c-format

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

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

6082

5801 -#: remote.c:615

6083 +#: remote.c:616

6084 #, c-format

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

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

6087

5806 -#: remote.c:619

6088 +#: remote.c:620

6089 #, c-format

6090 msgid "%s tracks both %s and %s"

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

6092

5811 -#: remote.c:687

6093 +#: remote.c:688

6094 #, c-format

6095 msgid "key '%s' of pattern had no '*'"

6096 msgstr "llave '%s' de patrón no tuvo '*'"

6097

5816 -#: remote.c:697

6098 +#: remote.c:698

6099 #, c-format

6100 msgid "value '%s' of pattern has no '*'"

6101 msgstr "valor '%s' del patrón no tiene '*'"

6102

5821 -#: remote.c:1003

6103 +#: remote.c:1004

6104 #, c-format

6105 msgid "src refspec %s does not match any"

6106 msgstr "src refsoec %s: no concuerda con ninguno"

6107

5826 -#: remote.c:1008

6108 +#: remote.c:1009

6109 #, c-format

6110 msgid "src refspec %s matches more than one"

6111 msgstr "src refspec %s concuerda con más de uno"

@@ -5832,7 +6114,7 @@ msgstr "src refspec %s concuerda con más de uno"

6114 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6115 #. the <src>.

6116 #.

5835 -#: remote.c:1023

6117 +#: remote.c:1024

6118 #, c-format

6119 msgid ""

6120 "The destination you provided is not a full refname (i.e.,\n"

@@ -5856,7 +6138,7 @@ msgstr ""

6138 "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "

6139 "full ref."

6140

5859 -#: remote.c:1043

6141 +#: remote.c:1044

6142 #, c-format

6143 msgid ""

6144 "The <src> part of the refspec is a commit object.\n"

@@ -5867,7 +6149,7 @@ msgstr ""

6149 "¿Quisiste crear un branch nuevo mediante un push a\n"

6150 "'%s:refs/heads/%s'?"

6151

5870 -#: remote.c:1048

6152 +#: remote.c:1049

6153 #, c-format

6154 msgid ""

6155 "The <src> part of the refspec is a tag object.\n"

@@ -5878,7 +6160,7 @@ msgstr ""

6160 "Did you mean to create a new tag by pushing to\n"

6161 "'%s:refs/tags/%s'?"

6162

5881 -#: remote.c:1053

6163 +#: remote.c:1054

6164 #, c-format

6165 msgid ""

6166 "The <src> part of the refspec is a tree object.\n"

@@ -5889,7 +6171,7 @@ msgstr ""

6171 "¿Quisiste crear un tag nuevo mediante un push a\n"

6172 "'%s:refs/heads/%s'?"

6173

5892 -#: remote.c:1058

6174 +#: remote.c:1059

6175 #, c-format

6176 msgid ""

6177 "The <src> part of the refspec is a blob object.\n"

@@ -5900,115 +6182,115 @@ msgstr ""

6182 "¿Quisiste crear un tag nuevo mediante un push a\n"

6183 "'%s:refs/heads/%s'?"

6184

5903 -#: remote.c:1094

6185 +#: remote.c:1095

6186 #, c-format

6187 msgid "%s cannot be resolved to branch"

6188 msgstr "%s no puede ser resolver a un branch"

6189

5908 -#: remote.c:1105

6190 +#: remote.c:1106

6191 #, c-format

6192 msgid "unable to delete '%s': remote ref does not exist"

6193 msgstr "no es posible borrar '%s': ref remoto no existe"

6194

5913 -#: remote.c:1117

6195 +#: remote.c:1118

6196 #, c-format

6197 msgid "dst refspec %s matches more than one"

6198 msgstr "dst refspec %s concuerda con más de uno"

6199

5918 -#: remote.c:1124

6200 +#: remote.c:1125

6201 #, c-format

6202 msgid "dst ref %s receives from more than one src"

6203 msgstr "dst ref %s recibe de más de un src"

6204

5923 -#: remote.c:1627 remote.c:1728

6205 +#: remote.c:1628 remote.c:1729

6206 msgid "HEAD does not point to a branch"

6207 msgstr "HEAD no apunta a ninguna rama"

6208

5927 -#: remote.c:1636

6209 +#: remote.c:1637

6210 #, c-format

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

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

6213

5932 -#: remote.c:1639

6214 +#: remote.c:1640

6215 #, c-format

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

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

6218

5937 -#: remote.c:1645

6219 +#: remote.c:1646

6220 #, c-format

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

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

6223

5942 -#: remote.c:1660

6224 +#: remote.c:1661

6225 #, c-format

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

6227 msgstr ""

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

6229

5948 -#: remote.c:1672

6230 +#: remote.c:1673

6231 #, c-format

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

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

6234

5953 -#: remote.c:1682

6235 +#: remote.c:1683

6236 #, c-format

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

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

6239

5958 -#: remote.c:1695

6240 +#: remote.c:1696

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

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

6243

5962 -#: remote.c:1717

6244 +#: remote.c:1718

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

6246 msgstr "no se puede resolver push 'simple' para un destino único"

6247

5966 -#: remote.c:1843

6248 +#: remote.c:1844

6249 #, c-format

6250 msgid "couldn't find remote ref %s"

6251 msgstr "no se puedo encontrar ref remota %s"

6252

5971 -#: remote.c:1856

6253 +#: remote.c:1857

6254 #, c-format

6255 msgid "* Ignoring funny ref '%s' locally"

6256 msgstr "* Ignorando ref graciosa '%s' localmente"

6257

5976 -#: remote.c:2019

6258 +#: remote.c:2020

6259 #, c-format

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

6261 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"

6262

5981 -#: remote.c:2023

6263 +#: remote.c:2024

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

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

6266

5985 -#: remote.c:2026

6267 +#: remote.c:2027

6268 #, c-format

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

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

6271

5990 -#: remote.c:2030

6272 +#: remote.c:2031

6273 #, c-format

6274 msgid "Your branch and '%s' refer to different commits.\n"

6275 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"

6276

5995 -#: remote.c:2033

6277 +#: remote.c:2034

6278 #, c-format

6279 msgid " (use \"%s\" for details)\n"

6280 msgstr " (usa \"%s\" para detalles)\n"

6281

6000 -#: remote.c:2037

6282 +#: remote.c:2038

6283 #, c-format

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

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

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

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

6288

6007 -#: remote.c:2043

6289 +#: remote.c:2044

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

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

6292

6011 -#: remote.c:2046

6293 +#: remote.c:2047

6294 #, c-format

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

6296 msgid_plural ""

@@ -6018,11 +6300,11 @@ msgstr[0] ""

6300 msgstr[1] ""

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

6302

6021 -#: remote.c:2054

6303 +#: remote.c:2055

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

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

6306

6025 -#: remote.c:2057

6307 +#: remote.c:2058

6308 #, c-format

6309 msgid ""

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

@@ -6037,11 +6319,11 @@ msgstr[1] ""

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

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

6321

6040 -#: remote.c:2067

6322 +#: remote.c:2068

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

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

6325

6044 -#: remote.c:2250

6326 +#: remote.c:2251

6327 #, c-format

6328 msgid "cannot parse expected object name '%s'"

6329 msgstr "no se puede leer el nombre de objeto '%s'"

@@ -6056,7 +6338,7 @@ msgstr "mal nombre de ref de reemplazo: %s"

6338 msgid "duplicate replace ref: %s"

6339 msgstr "duplicar ref de reemplazo: %s"

6340

6059 -#: replace-object.c:73

6341 +#: replace-object.c:82

6342 #, c-format

6343 msgid "replace depth too high for object %s"

6344 msgstr "remplazar profundiad muy elevada para objeto %s"

@@ -6119,8 +6401,8 @@ msgstr "no se puede desvincular stray '%s'"

6401 msgid "Recorded preimage for '%s'"

6402 msgstr "Resolución precargada para '%s'"

6403

6122 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6123 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6404 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6405 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6406 #, c-format

6407 msgid "could not create directory '%s'"

6408 msgstr "no se pudo crear el directorio '%s'"

@@ -6171,16 +6453,16 @@ msgstr "--first-parent es incompatible con --bisect"

6453 msgid "-L does not yet support diff formats besides -p and -s"

6454 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"

6455

6174 -#: run-command.c:762

6456 +#: run-command.c:763

6457 msgid "open /dev/null failed"

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

6459

6178 -#: run-command.c:1268

6460 +#: run-command.c:1269

6461 #, c-format

6462 msgid "cannot create async thread: %s"

6463 msgstr "no es posible crear hilo async: %s"

6464

6183 -#: run-command.c:1332

6465 +#: run-command.c:1333

6466 #, c-format

6467 msgid ""

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

@@ -6229,39 +6511,39 @@ msgstr "el destino no soporta push atómicos (--atomic)"

6511 msgid "the receiving end does not support push options"

6512 msgstr "el destino no soporta opciones de push"

6513

6232 -#: sequencer.c:189

6514 +#: sequencer.c:191

6515 #, c-format

6516 msgid "invalid commit message cleanup mode '%s'"

6517 msgstr "mensaje de commit inválido, modo cleanup '%s'"

6518

6237 -#: sequencer.c:294

6519 +#: sequencer.c:296

6520 #, c-format

6521 msgid "could not delete '%s'"

6522 msgstr "no se pudo borrar '%s'"

6523

6242 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6524 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6525 #, c-format

6526 msgid "could not remove '%s'"

6527 msgstr "no se pudo eliminar'%s'"

6528

6247 -#: sequencer.c:323

6529 +#: sequencer.c:325

6530 msgid "revert"

6531 msgstr "revertir"

6532

6251 -#: sequencer.c:325

6533 +#: sequencer.c:327

6534 msgid "cherry-pick"

6535 msgstr "cherry-pick"

6536

6255 -#: sequencer.c:327

6256 -msgid "rebase -i"

6257 -msgstr "rebase -i"

6258 -

6537 #: sequencer.c:329

6538 +msgid "rebase"

6539 +msgstr "rebase"

6540 +

6541 +#: sequencer.c:331

6542 #, c-format

6543 msgid "unknown action: %d"

6544 msgstr "acción desconocida: %d"

6545

6264 -#: sequencer.c:387

6546 +#: sequencer.c:389

6547 msgid ""

6548 "after resolving the conflicts, mark the corrected paths\n"

6549 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6269,7 +6551,7 @@ msgstr ""

6551 "después de resolver los conflictos, marca las rutas corregidas\n"

6552 "con 'git add <rutas>' o 'git rm <rutas>'"

6553

6272 -#: sequencer.c:390

6554 +#: sequencer.c:392

6555 msgid ""

6556 "after resolving the conflicts, mark the corrected paths\n"

6557 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6279,114 +6561,110 @@ msgstr ""

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

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

6563

6282 -#: sequencer.c:403 sequencer.c:2993

6564 +#: sequencer.c:405 sequencer.c:2901

6565 #, c-format

6566 msgid "could not lock '%s'"

6567 msgstr "no se pudo bloquear '%s'"

6568

6287 -#: sequencer.c:410

6569 +#: sequencer.c:412

6570 #, c-format

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

6572 msgstr "no se pudo escribir EOL en '%s'"

6573

6292 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6293 -#: sequencer.c:3277

6574 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6575 +#: sequencer.c:3185

6576 #, c-format

6577 msgid "failed to finalize '%s'"

6578 msgstr "falló al finalizar '%s'"

6579

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

6580 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6581 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6582 +#: builtin/rebase.c:593

6583 #, c-format

6584 msgid "could not read '%s'"

6585 msgstr "no se pudo leer '%s'"

6586

6305 -#: sequencer.c:464

6587 +#: sequencer.c:466

6588 #, c-format

6589 msgid "your local changes would be overwritten by %s."

6590 msgstr "tus cambios locales serán sobreescritos por %s."

6591

6310 -#: sequencer.c:468

6592 +#: sequencer.c:470

6593 msgid "commit your changes or stash them to proceed."

6594 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."

6595

6314 -#: sequencer.c:500

6596 +#: sequencer.c:502

6597 #, c-format

6598 msgid "%s: fast-forward"

6599 msgstr "%s: avance rápido"

6600

6319 -#: sequencer.c:539 builtin/tag.c:565

6601 +#: sequencer.c:541 builtin/tag.c:565

6602 #, c-format

6603 msgid "Invalid cleanup mode %s"

6604 msgstr "Modo cleanup inválido %s"

6605

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

6325 -#. "rebase -i".

6607 +#. "rebase".

6608 #.

6327 -#: sequencer.c:633

6609 +#: sequencer.c:635

6610 #, c-format

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

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

6613

6332 -#: sequencer.c:650

6614 +#: sequencer.c:652

6615 msgid "unable to update cache tree"

6616 msgstr "no es posible actualizar el árbol de la caché"

6617

6336 -#: sequencer.c:664

6618 +#: sequencer.c:666

6619 msgid "could not resolve HEAD commit"

6620 msgstr "no se pudo resolver el commit de HEAD"

6621

6340 -#: sequencer.c:744

6622 +#: sequencer.c:746

6623 #, c-format

6624 msgid "no key present in '%.*s'"

6625 msgstr "no hay llave presente en '%.*s'"

6626

6345 -#: sequencer.c:755

6627 +#: sequencer.c:757

6628 #, c-format

6629 msgid "unable to dequote value of '%s'"

6630 msgstr "no es posible dequote para '%s'"

6631

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

6632 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6633 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6634 #, c-format

6635 msgid "could not open '%s' for reading"

6636 msgstr "no se pudo abrir '%s' para lectura"

6637

6356 -#: sequencer.c:802

6638 +#: sequencer.c:804

6639 msgid "'GIT_AUTHOR_NAME' already given"

6640 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"

6641

6360 -#: sequencer.c:807

6642 +#: sequencer.c:809

6643 msgid "'GIT_AUTHOR_EMAIL' already given"

6644 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"

6645

6364 -#: sequencer.c:812

6646 +#: sequencer.c:814

6647 msgid "'GIT_AUTHOR_DATE' already given"

6648 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"

6649

6368 -#: sequencer.c:816

6650 +#: sequencer.c:818

6651 #, c-format

6652 msgid "unknown variable '%s'"

6653 msgstr "variable desconocida '%s'"

6654

6373 -#: sequencer.c:821

6655 +#: sequencer.c:823

6656 msgid "missing 'GIT_AUTHOR_NAME'"

6657 msgstr "falta 'GIT_AUTHOR_NAME'"

6658

6377 -#: sequencer.c:823

6659 +#: sequencer.c:825

6660 msgid "missing 'GIT_AUTHOR_EMAIL'"

6661 msgstr "falta 'GIT_AUTHOR_EMAIL'"

6662

6381 -#: sequencer.c:825

6663 +#: sequencer.c:827

6664 msgid "missing 'GIT_AUTHOR_DATE'"

6665 msgstr "falta 'GIT_AUTHOR_DATE'"

6666

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

6667 +#: sequencer.c:876

6668 #, c-format

6669 msgid ""

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

@@ -6416,11 +6694,11 @@ msgstr ""

6694 "\n"

6695 " git rebase --continue\n"

6696

6419 -#: sequencer.c:1218

6697 +#: sequencer.c:1148

6698 msgid "'prepare-commit-msg' hook failed"

6699 msgstr "hook 'prepare-commit-msg' falló"

6700

6423 -#: sequencer.c:1224

6701 +#: sequencer.c:1154

6702 msgid ""

6703 "Your name and email address were configured automatically based\n"

6704 "on your username and hostname. Please check that they are accurate.\n"

@@ -6447,7 +6725,7 @@ msgstr ""

6725 "\n"

6726 " git commit --amend --reset-author\n"

6727

6450 -#: sequencer.c:1237

6728 +#: sequencer.c:1167

6729 msgid ""

6730 "Your name and email address were configured automatically based\n"

6731 "on your username and hostname. Please check that they are accurate.\n"

@@ -6471,329 +6749,324 @@ msgstr ""

6749 "\n"

6750 " git commit --amend --reset-author\n"

6751

6474 -#: sequencer.c:1279

6752 +#: sequencer.c:1209

6753 msgid "couldn't look up newly created commit"

6754 msgstr "no se pudo revisar el commit recién creado"

6755

6478 -#: sequencer.c:1281

6756 +#: sequencer.c:1211

6757 msgid "could not parse newly created commit"

6758 msgstr "no se pudo analizar el commit recién creado"

6759

6482 -#: sequencer.c:1327

6760 +#: sequencer.c:1257

6761 msgid "unable to resolve HEAD after creating commit"

6762 msgstr "no se pudo resolver HEAD tras crear el commit"

6763

6486 -#: sequencer.c:1329

6764 +#: sequencer.c:1259

6765 msgid "detached HEAD"

6766 msgstr "HEAD desacoplado"

6767

6490 -#: sequencer.c:1333

6768 +#: sequencer.c:1263

6769 msgid " (root-commit)"

6770 msgstr " (commit-raíz)"

6771

6494 -#: sequencer.c:1354

6772 +#: sequencer.c:1284

6773 msgid "could not parse HEAD"

6774 msgstr "no se pudo analizar HEAD"

6775

6498 -#: sequencer.c:1356

6776 +#: sequencer.c:1286

6777 #, c-format

6778 msgid "HEAD %s is not a commit!"

6779 msgstr "¡HEAD %s no es un commit!"

6780

6503 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6781 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6782 msgid "could not parse HEAD commit"

6783 msgstr "no se pudo analizar el commit de HEAD"

6784

6507 -#: sequencer.c:1411 sequencer.c:2055

6785 +#: sequencer.c:1342 sequencer.c:1968

6786 msgid "unable to parse commit author"

6787 msgstr "no es posible analizar el autor del commit"

6788

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

6789 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6790 msgid "git write-tree failed to write a tree"

6791 msgstr "git write-tree falló al escribir el árbol"

6792

6519 -#: sequencer.c:1480 sequencer.c:1550

6793 +#: sequencer.c:1386 sequencer.c:1447

6794 #, c-format

6795 msgid "unable to read commit message from '%s'"

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

6797

6524 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6525 -#: builtin/merge.c:908

6798 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6799 +#: builtin/merge.c:911

6800 msgid "failed to write commit object"

6801 msgstr "falló al escribir el objeto commit"

6802

6529 -#: sequencer.c:1577

6803 +#: sequencer.c:1474

6804 #, c-format

6805 msgid "could not parse commit %s"

6806 msgstr "no se pudo analizar commit %s"

6807

6534 -#: sequencer.c:1582

6808 +#: sequencer.c:1479

6809 #, c-format

6810 msgid "could not parse parent commit %s"

6811 msgstr "no se pudo analizar el commit padre %s"

6812

6539 -#: sequencer.c:1656 sequencer.c:1767

6813 +#: sequencer.c:1562 sequencer.c:1673

6814 #, c-format

6815 msgid "unknown command: %d"

6816 msgstr "comando desconocido: %d"

6817

6544 -#: sequencer.c:1714 sequencer.c:1739

6818 +#: sequencer.c:1620 sequencer.c:1645

6819 #, c-format

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

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

6822

6549 -#: sequencer.c:1724

6823 +#: sequencer.c:1630

6824 msgid "need a HEAD to fixup"

6825 msgstr "se necesita un HEAD para arreglar"

6826

6553 -#: sequencer.c:1726 sequencer.c:3304

6827 +#: sequencer.c:1632 sequencer.c:3212

6828 msgid "could not read HEAD"

6829 msgstr "no se pudo leer HEAD"

6830

6557 -#: sequencer.c:1728

6831 +#: sequencer.c:1634

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

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

6834

6561 -#: sequencer.c:1734

6835 +#: sequencer.c:1640

6836 #, c-format

6837 msgid "cannot write '%s'"

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

6839

6566 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6840 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

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

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

6843

6570 -#: sequencer.c:1749

6844 +#: sequencer.c:1655

6845 #, c-format

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

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

6848

6575 -#: sequencer.c:1756

6849 +#: sequencer.c:1662

6850 #, c-format

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

6852 msgstr "Este es el mensaje del commit #%d:"

6853

6580 -#: sequencer.c:1762

6854 +#: sequencer.c:1668

6855 #, c-format

6856 msgid "The commit message #%d will be skipped:"

6857 msgstr "El mensaje del commit #%d será saltado:"

6858

6585 -#: sequencer.c:1850

6859 +#: sequencer.c:1756

6860 msgid "your index file is unmerged."

6861 msgstr "tu archivo índice no está fusionado."

6862

6589 -#: sequencer.c:1857

6863 +#: sequencer.c:1763

6864 msgid "cannot fixup root commit"

6865 msgstr "no se puede arreglar el commit raíz"

6866

6593 -#: sequencer.c:1876

6867 +#: sequencer.c:1782

6868 #, c-format

6869 msgid "commit %s is a merge but no -m option was given."

6870 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."

6871

6598 -#: sequencer.c:1884 sequencer.c:1892

6872 +#: sequencer.c:1790 sequencer.c:1798

6873 #, c-format

6874 msgid "commit %s does not have parent %d"

6875 msgstr "el commit %s no tiene un padre %d"

6876

6603 -#: sequencer.c:1898

6877 +#: sequencer.c:1804

6878 #, c-format

6879 msgid "cannot get commit message for %s"

6880 msgstr "no se puede obtener el mensaje de commit para %s"

6881

6882 #. TRANSLATORS: The first %s will be a "todo" command like

6883 #. "revert" or "pick", the second %s a SHA1.

6610 -#: sequencer.c:1917

6884 +#: sequencer.c:1823

6885 #, c-format

6886 msgid "%s: cannot parse parent commit %s"

6887 msgstr "%s: no se puede analizar el commit padre %s"

6888

6615 -#: sequencer.c:1982

6889 +#: sequencer.c:1888

6890 #, c-format

6891 msgid "could not rename '%s' to '%s'"

6892 msgstr "no se puede renombrar '%s' a '%s'"

6893

6620 -#: sequencer.c:2037

6894 +#: sequencer.c:1943

6895 #, c-format

6896 msgid "could not revert %s... %s"

6897 msgstr "no se pudo revertir %s... %s"

6898

6625 -#: sequencer.c:2038

6899 +#: sequencer.c:1944

6900 #, c-format

6901 msgid "could not apply %s... %s"

6902 msgstr "no se pudo aplicar %s... %s"

6903

6630 -#: sequencer.c:2105

6904 +#: sequencer.c:1961

6905 +#, c-format

6906 +msgid "dropping %s %s -- patch contents already upstream\n"

6907 +msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n"

6908 +

6909 +#: sequencer.c:2018

6910 #, c-format

6911 msgid "git %s: failed to read the index"

6912 msgstr "git %s: falló al leer el índice"

6913

6635 -#: sequencer.c:2112

6914 +#: sequencer.c:2025

6915 #, c-format

6916 msgid "git %s: failed to refresh the index"

6917 msgstr "git %s: falló al refrescar el índice"

6918

6640 -#: sequencer.c:2189

6919 +#: sequencer.c:2102

6920 #, c-format

6921 msgid "%s does not accept arguments: '%s'"

6922 msgstr "%s no acepta los argumentos: '%s'"

6923

6645 -#: sequencer.c:2198

6924 +#: sequencer.c:2111

6925 #, c-format

6926 msgid "missing arguments for %s"

6927 msgstr "faltan argumentos para para %s"

6928

6650 -#: sequencer.c:2235

6929 +#: sequencer.c:2142

6930 #, c-format

6652 -msgid "could not parse '%.*s'"

6653 -msgstr "no se puede analizar '%.*s'"

6931 +msgid "could not parse '%s'"

6932 +msgstr "no se puede analizar '%s'"

6933

6655 -#: sequencer.c:2289

6934 +#: sequencer.c:2203

6935 #, c-format

6936 msgid "invalid line %d: %.*s"

6937 msgstr "línea inválida %d: %.*s"

6938

6660 -#: sequencer.c:2300

6939 +#: sequencer.c:2214

6940 #, c-format

6941 msgid "cannot '%s' without a previous commit"

6942 msgstr "no se puede '%s' sin un commit previo"

6943

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 -

6671 -#: sequencer.c:2384

6944 +#: sequencer.c:2298

6945 msgid "cancelling a cherry picking in progress"

6946 msgstr "cancelando cherry-pick en progreso"

6947

6675 -#: sequencer.c:2391

6948 +#: sequencer.c:2305

6949 msgid "cancelling a revert in progress"

6950 msgstr "cancelando revert en progreso"

6951

6679 -#: sequencer.c:2435

6952 +#: sequencer.c:2349

6953 msgid "please fix this using 'git rebase --edit-todo'."

6954 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."

6955

6683 -#: sequencer.c:2437

6956 +#: sequencer.c:2351

6957 #, c-format

6958 msgid "unusable instruction sheet: '%s'"

6959 msgstr "hoja de instrucciones inutilizable: '%s'"

6960

6688 -#: sequencer.c:2442

6961 +#: sequencer.c:2356

6962 msgid "no commits parsed."

6963 msgstr "ningún commit analizado."

6964

6692 -#: sequencer.c:2453

6965 +#: sequencer.c:2367

6966 msgid "cannot cherry-pick during a revert."

6967 msgstr "no se puede realizar cherry-pick durante un revert."

6968

6696 -#: sequencer.c:2455

6969 +#: sequencer.c:2369

6970 msgid "cannot revert during a cherry-pick."

6971 msgstr "no se puede realizar un revert durante un cherry-pick."

6972

6700 -#: sequencer.c:2533

6973 +#: sequencer.c:2447

6974 #, c-format

6975 msgid "invalid value for %s: %s"

6976 msgstr "valor inválido para %s: %s"

6977

6705 -#: sequencer.c:2630

6978 +#: sequencer.c:2540

6979 msgid "unusable squash-onto"

6980 msgstr "squash-onto inservible"

6981

6709 -#: sequencer.c:2646

6982 +#: sequencer.c:2556

6983 #, c-format

6984 msgid "malformed options sheet: '%s'"

6985 msgstr "hoja de opciones mal formada: '%s'"

6986

6714 -#: sequencer.c:2736 sequencer.c:4463

6987 +#: sequencer.c:2644 sequencer.c:4361

6988 msgid "empty commit set passed"

6989 msgstr "conjunto de commits vacío entregado"

6990

6718 -#: sequencer.c:2752

6991 +#: sequencer.c:2660

6992 msgid "revert is already in progress"

6993 msgstr "revert ya está en progreso"

6994

6722 -#: sequencer.c:2754

6995 +#: sequencer.c:2662

6996 #, c-format

6997 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6998 msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""

6999

6727 -#: sequencer.c:2757

7000 +#: sequencer.c:2665

7001 msgid "cherry-pick is already in progress"

7002 msgstr "cherry-pick ya está en progreso"

7003

6731 -#: sequencer.c:2759

7004 +#: sequencer.c:2667

7005 #, c-format

7006 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7007 msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""

7008

6736 -#: sequencer.c:2773

7009 +#: sequencer.c:2681

7010 #, c-format

7011 msgid "could not create sequencer directory '%s'"

7012 msgstr "no se pudo crear un directorio secuenciador '%s'"

7013

6741 -#: sequencer.c:2788

7014 +#: sequencer.c:2696

7015 msgid "could not lock HEAD"

7016 msgstr "no se pudo bloquear HEAD"

7017

6745 -#: sequencer.c:2848 sequencer.c:4209

7018 +#: sequencer.c:2756 sequencer.c:4099

7019 msgid "no cherry-pick or revert in progress"

7020 msgstr "ningún cherry-pick o revert en progreso"

7021

6749 -#: sequencer.c:2850 sequencer.c:2861

7022 +#: sequencer.c:2758 sequencer.c:2769

7023 msgid "cannot resolve HEAD"

7024 msgstr "no se puede resolver HEAD"

7025

6753 -#: sequencer.c:2852 sequencer.c:2896

7026 +#: sequencer.c:2760 sequencer.c:2804

7027 msgid "cannot abort from a branch yet to be born"

7028 msgstr "no se puede abortar de una rama por nacer"

7029

6757 -#: sequencer.c:2882 builtin/grep.c:736

7030 +#: sequencer.c:2790 builtin/grep.c:724

7031 #, c-format

7032 msgid "cannot open '%s'"

7033 msgstr "no se puede abrir '%s'"

7034

6762 -#: sequencer.c:2884

7035 +#: sequencer.c:2792

7036 #, c-format

7037 msgid "cannot read '%s': %s"

7038 msgstr "no se puede leer '%s': %s"

7039

6767 -#: sequencer.c:2885

7040 +#: sequencer.c:2793

7041 msgid "unexpected end of file"

7042 msgstr "final de archivo inesperado"

7043

6771 -#: sequencer.c:2891

7044 +#: sequencer.c:2799

7045 #, c-format

7046 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

7047 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"

7048

6776 -#: sequencer.c:2902

7049 +#: sequencer.c:2810

7050 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

7051 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"

7052

6780 -#: sequencer.c:2943

7053 +#: sequencer.c:2851

7054 msgid "no revert in progress"

7055 msgstr "no hay revert en progreso"

7056

6784 -#: sequencer.c:2951

7057 +#: sequencer.c:2859

7058 msgid "no cherry-pick in progress"

7059 msgstr "ningún cherry-pick en progreso"

7060

6788 -#: sequencer.c:2961

7061 +#: sequencer.c:2869

7062 msgid "failed to skip the commit"

7063 msgstr "falló al escribir el commit"

7064

6792 -#: sequencer.c:2968

7065 +#: sequencer.c:2876

7066 msgid "there is nothing to skip"

7067 msgstr "no hay nada que saltar"

7068

6796 -#: sequencer.c:2971

7069 +#: sequencer.c:2879

7070 #, c-format

7071 msgid ""

7072 "have you committed already?\n"

@@ -6802,21 +7075,21 @@ msgstr ""

7075 "¿ya has hecho el commit?\n"

7076 "intenta \"git %s --continue\""

7077

6805 -#: sequencer.c:3095 sequencer.c:4121

7078 +#: sequencer.c:3003 sequencer.c:4011

7079 #, c-format

7080 msgid "could not update %s"

7081 msgstr "no se puede actualizar %s"

7082

6810 -#: sequencer.c:3134 sequencer.c:4101

7083 +#: sequencer.c:3042 sequencer.c:3991

7084 msgid "cannot read HEAD"

7085 msgstr "no se puede leer HEAD"

7086

6814 -#: sequencer.c:3151

7087 +#: sequencer.c:3059

7088 #, c-format

7089 msgid "unable to copy '%s' to '%s'"

7090 msgstr "no se pudo copiar '%s' a '%s'"

7091

6819 -#: sequencer.c:3159

7092 +#: sequencer.c:3067

7093 #, c-format

7094 msgid ""

7095 "You can amend the commit now, with\n"

@@ -6835,22 +7108,22 @@ msgstr ""

7108 "\n"

7109 "\tgit rebase --continue\n"

7110

6838 -#: sequencer.c:3169

7111 +#: sequencer.c:3077

7112 #, c-format

7113 msgid "Could not apply %s... %.*s"

7114 msgstr "No se pudo aplicar %s... %.*s"

7115

6843 -#: sequencer.c:3176

7116 +#: sequencer.c:3084

7117 #, c-format

7118 msgid "Could not merge %.*s"

7119 msgstr "No se pudo fusionar %.*s"

7120

6848 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

7121 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641

7122 #, c-format

7123 msgid "could not copy '%s' to '%s'"

7124 msgstr "no se pudo copiar '%s' a '%s'"

7125

6853 -#: sequencer.c:3221

7126 +#: sequencer.c:3129

7127 #, c-format

7128 msgid ""

7129 "execution failed: %s\n"

@@ -6865,11 +7138,11 @@ msgstr ""

7138 " git rebase --continue\n"

7139 "\n"

7140

6868 -#: sequencer.c:3227

7141 +#: sequencer.c:3135

7142 msgid "and made changes to the index and/or the working tree\n"

7143 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"

7144

6872 -#: sequencer.c:3233

7145 +#: sequencer.c:3141

7146 #, c-format

7147 msgid ""

7148 "execution succeeded: %s\n"

@@ -6886,72 +7159,72 @@ msgstr ""

7159 " git rebase --continue\n"

7160 "\n"

7161

6889 -#: sequencer.c:3294

7162 +#: sequencer.c:3202

7163 #, c-format

7164 msgid "illegal label name: '%.*s'"

7165 msgstr "nombre de label ilegal: '%.*s'"

7166

6894 -#: sequencer.c:3348

7167 +#: sequencer.c:3256

7168 msgid "writing fake root commit"

7169 msgstr "escribiendo commit raíz falso"

7170

6898 -#: sequencer.c:3353

7171 +#: sequencer.c:3261

7172 msgid "writing squash-onto"

7173 msgstr "escribiendo squash-onto"

7174

6902 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

7175 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886

7176 #, c-format

7177 msgid "failed to find tree of %s"

7178 msgstr "falló al encontrar árbol de %s"

7179

6907 -#: sequencer.c:3436

7180 +#: sequencer.c:3344

7181 #, c-format

7182 msgid "could not resolve '%s'"

7183 msgstr "no se pudo resolver '%s'"

7184

6912 -#: sequencer.c:3467

7185 +#: sequencer.c:3375

7186 msgid "cannot merge without a current revision"

7187 msgstr "no se puede fusionar sin una versión actual"

7188

6916 -#: sequencer.c:3489

7189 +#: sequencer.c:3397

7190 #, c-format

7191 msgid "unable to parse '%.*s'"

7192 msgstr "no se puede analizar '%.*s'"

7193

6921 -#: sequencer.c:3498

7194 +#: sequencer.c:3406

7195 #, c-format

7196 msgid "nothing to merge: '%.*s'"

7197 msgstr "nada para fusionar: '%.*s'"

7198

6926 -#: sequencer.c:3510

7199 +#: sequencer.c:3418

7200 msgid "octopus merge cannot be executed on top of a [new root]"

7201 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"

7202

6930 -#: sequencer.c:3526

7203 +#: sequencer.c:3434

7204 #, c-format

7205 msgid "could not get commit message of '%s'"

7206 msgstr "no se puede leer el mensaje del commit '%s'"

7207

6935 -#: sequencer.c:3688

7208 +#: sequencer.c:3594

7209 #, c-format

7210 msgid "could not even attempt to merge '%.*s'"

7211 msgstr "no se pudo intentar fusionar '%.*s'"

7212

6940 -#: sequencer.c:3704

7213 +#: sequencer.c:3610

7214 msgid "merge: Unable to write new index file"

7215 msgstr "fusión: No se puede escribir el nuevo archivo índice"

7216

6944 -#: sequencer.c:3773 builtin/rebase.c:733

7217 +#: sequencer.c:3679 builtin/rebase.c:737

7218 #, c-format

7219 msgid "Applied autostash.\n"

7220 msgstr "Autostash aplicado.\n"

7221

6949 -#: sequencer.c:3785

7222 +#: sequencer.c:3691

7223 #, c-format

7224 msgid "cannot store %s"

7225 msgstr "no se puede guardar %s"

7226

6954 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

7227 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113

7228 #, c-format

7229 msgid ""

7230 "Applying autostash resulted in conflicts.\n"

@@ -6963,31 +7236,26 @@ msgstr ""

7236 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "

7237 "momento.\n"

7238

6966 -#: sequencer.c:3849

6967 -#, c-format

6968 -msgid "could not checkout %s"

6969 -msgstr "no se puede hacer checkout a %s"

6970 -

6971 -#: sequencer.c:3863

7239 +#: sequencer.c:3755

7240 #, c-format

7241 msgid "%s: not a valid OID"

7242 msgstr "%s no es OID válido"

7243

6976 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

7244 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779

7245 msgid "could not detach HEAD"

7246 msgstr "no se puede desacoplar HEAD"

7247

6980 -#: sequencer.c:3883

7248 +#: sequencer.c:3775

7249 #, c-format

7250 msgid "Stopped at HEAD\n"

7251 msgstr "Detenido en HEAD\n"

7252

6985 -#: sequencer.c:3885

7253 +#: sequencer.c:3777

7254 #, c-format

7255 msgid "Stopped at %s\n"

7256 msgstr "Detenido en %s\n"

7257

6990 -#: sequencer.c:3893

7258 +#: sequencer.c:3785

7259 #, c-format

7260 msgid ""

7261 "Could not execute the todo command\n"

@@ -7008,48 +7276,48 @@ msgstr ""

7276 " git rebase --edit-todo\n"

7277 " git rebase --continue\n"

7278

7011 -#: sequencer.c:3979

7279 +#: sequencer.c:3869

7280 #, c-format

7281 msgid "Stopped at %s... %.*s\n"

7282 msgstr "Detenido en %s... %.*s\n"

7283

7016 -#: sequencer.c:4050

7284 +#: sequencer.c:3940

7285 #, c-format

7286 msgid "unknown command %d"

7287 msgstr "comando desconocido %d"

7288

7021 -#: sequencer.c:4109

7289 +#: sequencer.c:3999

7290 msgid "could not read orig-head"

7291 msgstr "no se puede leer orig-head"

7292

7025 -#: sequencer.c:4114

7293 +#: sequencer.c:4004

7294 msgid "could not read 'onto'"

7295 msgstr "no se puede leer 'onto'"

7296

7029 -#: sequencer.c:4128

7297 +#: sequencer.c:4018

7298 #, c-format

7299 msgid "could not update HEAD to %s"

7300 msgstr "no se puede actualizar HEAD a %s"

7301

7034 -#: sequencer.c:4221

7302 +#: sequencer.c:4111

7303 msgid "cannot rebase: You have unstaged changes."

7304 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."

7305

7038 -#: sequencer.c:4230

7306 +#: sequencer.c:4120

7307 msgid "cannot amend non-existing commit"

7308 msgstr "no se puede arreglar un commit no existente"

7309

7042 -#: sequencer.c:4232

7310 +#: sequencer.c:4122

7311 #, c-format

7312 msgid "invalid file: '%s'"

7313 msgstr "archivo inválido: '%s'"

7314

7047 -#: sequencer.c:4234

7315 +#: sequencer.c:4124

7316 #, c-format

7317 msgid "invalid contents: '%s'"

7318 msgstr "contenido inválido: '%s'"

7319

7052 -#: sequencer.c:4237

7320 +#: sequencer.c:4127

7321 msgid ""

7322 "\n"

7323 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -7060,69 +7328,59 @@ msgstr ""

7328 "un commit con estos\n"

7329 "primero y luego ejecuta 'git rebase --continue' de nuevo."

7330

7063 -#: sequencer.c:4273 sequencer.c:4312

7331 +#: sequencer.c:4163 sequencer.c:4202

7332 #, c-format

7333 msgid "could not write file: '%s'"

7334 msgstr "no se pudo escribir el archivo: '%s'"

7335

7068 -#: sequencer.c:4327

7336 +#: sequencer.c:4217

7337 msgid "could not remove CHERRY_PICK_HEAD"

7338 msgstr "no se puede eliminar CHERRY_PICK_HEAD"

7339

7072 -#: sequencer.c:4334

7340 +#: sequencer.c:4224

7341 msgid "could not commit staged changes."

7342 msgstr "no se pudo realizar el commit con los cambios en el área de stage."

7343

7076 -#: sequencer.c:4440

7344 +#: sequencer.c:4338

7345 #, c-format

7346 msgid "%s: can't cherry-pick a %s"

7347 msgstr "%s: no se puede aplicar cherry-pick a un %s"

7348

7081 -#: sequencer.c:4444

7349 +#: sequencer.c:4342

7350 #, c-format

7351 msgid "%s: bad revision"

7352 msgstr "%s: revisión errónea"

7353

7086 -#: sequencer.c:4479

7354 +#: sequencer.c:4377

7355 msgid "can't revert as initial commit"

7356 msgstr "no se puede revertir como commit inicial"

7357

7090 -#: sequencer.c:4952

7358 +#: sequencer.c:4846

7359 msgid "make_script: unhandled options"

7360 msgstr "make_script: opciones desconocidas"

7361

7094 -#: sequencer.c:4955

7362 +#: sequencer.c:4849

7363 msgid "make_script: error preparing revisions"

7364 msgstr "make_script: error preparando revisiones"

7365

7098 -#: sequencer.c:5113

7099 -msgid ""

7100 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7101 -"continue'.\n"

7102 -"Or you can abort the rebase with 'git rebase --abort'.\n"

7103 -msgstr ""

7104 -"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "

7105 -"rebase --continue'.\n"

7106 -"O se puede abortar el rebase con 'git rebase --abort'.\n"

7107 -

7108 -#: sequencer.c:5226 sequencer.c:5243

7366 +#: sequencer.c:5083 sequencer.c:5100

7367 msgid "nothing to do"

7368 msgstr "nada que hacer"

7369

7112 -#: sequencer.c:5257

7370 +#: sequencer.c:5119

7371 msgid "could not skip unnecessary pick commands"

7372 msgstr "no se pudo saltar los comandos pick innecesarios"

7373

7116 -#: sequencer.c:5351

7374 +#: sequencer.c:5213

7375 msgid "the script was already rearranged."

7376 msgstr "este script ya fue reorganizado."

7377

7378 #: setup.c:124

7379 #, c-format

7122 -msgid "'%s' is outside repository"

7123 -msgstr "'%s' está fuera del repositorio"

7380 +msgid "'%s' is outside repository at '%s'"

7381 +msgstr "'%s' está fuera del repositorio en '%s'"

7382

7125 -#: setup.c:174

7383 +#: setup.c:175

7384 #, c-format

7385 msgid ""

7386 "%s: no such path in the working tree.\n"

@@ -7132,7 +7390,7 @@ msgstr ""

7390 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "

7391 "localmente."

7392

7135 -#: setup.c:187

7393 +#: setup.c:188

7394 #, c-format

7395 msgid ""

7396 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -7144,12 +7402,12 @@ msgstr ""

7402 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"

7403 "'git <comando> [<revisión>...] -- [<archivo>...]'"

7404

7147 -#: setup.c:236

7405 +#: setup.c:254

7406 #, c-format

7407 msgid "option '%s' must come before non-option arguments"

7408 msgstr "opción '%s' debe venir antes de argumentos no opcionales"

7409

7152 -#: setup.c:255

7410 +#: setup.c:273

7411 #, c-format

7412 msgid ""

7413 "ambiguous argument '%s': both revision and filename\n"

@@ -7160,95 +7418,95 @@ msgstr ""

7418 "Use '--' para separar rutas de revisiones, de esta manera:\n"

7419 "'git <comando> [<revisión>...] -- [<archivo>...]'"

7420

7163 -#: setup.c:391

7421 +#: setup.c:409

7422 msgid "unable to set up work tree using invalid config"

7423 msgstr ""

7424 "no es posible configurar el directorio de trabajo usando una configuración "

7425 "inválida"

7426

7169 -#: setup.c:395

7427 +#: setup.c:413

7428 msgid "this operation must be run in a work tree"

7429 msgstr "esta operación debe ser realizada en un árbol de trabajo"

7430

7173 -#: setup.c:541

7431 +#: setup.c:559

7432 #, c-format

7433 msgid "Expected git repo version <= %d, found %d"

7434 msgstr "Se esperaba versión de git repo <= %d, encontrada %d"

7435

7178 -#: setup.c:549

7436 +#: setup.c:567

7437 msgid "unknown repository extensions found:"

7438 msgstr "se encontró extensión de repositorio desconocida:"

7439

7182 -#: setup.c:568

7440 +#: setup.c:586

7441 #, c-format

7442 msgid "error opening '%s'"

7443 msgstr "error abriendo '%s'"

7444

7187 -#: setup.c:570

7445 +#: setup.c:588

7446 #, c-format

7447 msgid "too large to be a .git file: '%s'"

7448 msgstr "muy grande para ser un archivo .git: '%s'"

7449

7192 -#: setup.c:572

7450 +#: setup.c:590

7451 #, c-format

7452 msgid "error reading %s"

7453 msgstr "error leyendo %s"

7454

7197 -#: setup.c:574

7455 +#: setup.c:592

7456 #, c-format

7457 msgid "invalid gitfile format: %s"

7458 msgstr "formato gitfile inválido: %s"

7459

7202 -#: setup.c:576

7460 +#: setup.c:594

7461 #, c-format

7462 msgid "no path in gitfile: %s"

7463 msgstr "no hay ruta en gitfile: %s"

7464

7207 -#: setup.c:578

7465 +#: setup.c:596

7466 #, c-format

7467 msgid "not a git repository: %s"

7468 msgstr "no es un repositorio git: %s"

7469

7212 -#: setup.c:677

7470 +#: setup.c:695

7471 #, c-format

7472 msgid "'$%s' too big"

7473 msgstr "'$%s' muy grande"

7474

7217 -#: setup.c:691

7475 +#: setup.c:709

7476 #, c-format

7477 msgid "not a git repository: '%s'"

7478 msgstr "no es un repositorio git: '%s'"

7479

7222 -#: setup.c:720 setup.c:722 setup.c:753

7480 +#: setup.c:738 setup.c:740 setup.c:771

7481 #, c-format

7482 msgid "cannot chdir to '%s'"

7483 msgstr "no se puede aplicar chdir a '%s'"

7484

7227 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838

7485 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856

7486 msgid "cannot come back to cwd"

7487 msgstr "no se puede volver a cwd"

7488

7231 -#: setup.c:852

7489 +#: setup.c:870

7490 #, c-format

7491 msgid "failed to stat '%*s%s%s'"

7492 msgstr "falló al determinar '%*s%s%s'"

7493

7236 -#: setup.c:1090

7494 +#: setup.c:1108

7495 msgid "Unable to read current working directory"

7496 msgstr "Incapaz de leer el directorio de trabajo actual"

7497

7240 -#: setup.c:1099 setup.c:1105

7498 +#: setup.c:1117 setup.c:1123

7499 #, c-format

7500 msgid "cannot change to '%s'"

7501 msgstr "no se puede cambiar a '%s'"

7502

7245 -#: setup.c:1110

7503 +#: setup.c:1128

7504 #, c-format

7505 msgid "not a git repository (or any of the parent directories): %s"

7506 msgstr ""

7507 "no es un repositorio git (ni ninguno de los directorios superiores): %s"

7508

7251 -#: setup.c:1116

7509 +#: setup.c:1134

7510 #, c-format

7511 msgid ""

7512 "not a git repository (or any parent up to mount point %s)\n"

@@ -7258,7 +7516,7 @@ msgstr ""

7516 "Parando en el límite del sistema de archivos "

7517 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."

7518

7261 -#: setup.c:1227

7519 +#: setup.c:1245

7520 #, c-format

7521 msgid ""

7522 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7267,15 +7525,15 @@ msgstr ""

7525 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"

7526 "El dueño de los archivos tiene que tener permisos de lectura y escritura."

7527

7270 -#: setup.c:1271

7528 +#: setup.c:1289

7529 msgid "open /dev/null or dup failed"

7530 msgstr "falló al abrir /dev/null o dup"

7531

7274 -#: setup.c:1286

7532 +#: setup.c:1304

7533 msgid "fork failed"

7534 msgstr "falló fork"

7535

7278 -#: setup.c:1291

7536 +#: setup.c:1309

7537 msgid "setsid failed"

7538 msgstr "falló setsid"

7539

@@ -7357,196 +7615,196 @@ msgstr "mmap falló"

7615 msgid "object file %s is empty"

7616 msgstr "archivo de objeto %s está vacío"

7617

7360 -#: sha1-file.c:1252 sha1-file.c:2392

7618 +#: sha1-file.c:1263 sha1-file.c:2443

7619 #, c-format

7620 msgid "corrupt loose object '%s'"

7621 msgstr "objeto perdido corrupto '%s'"

7622

7365 -#: sha1-file.c:1254 sha1-file.c:2396

7623 +#: sha1-file.c:1265 sha1-file.c:2447

7624 #, c-format

7625 msgid "garbage at end of loose object '%s'"

7626 msgstr "basura al final del objeto perdido '%s'"

7627

7370 -#: sha1-file.c:1296

7628 +#: sha1-file.c:1307

7629 msgid "invalid object type"

7630 msgstr "tipo de objeto inválido"

7631

7374 -#: sha1-file.c:1380

7632 +#: sha1-file.c:1391

7633 #, c-format

7634 msgid "unable to unpack %s header with --allow-unknown-type"

7635 msgstr "no es posible desempacar header %s con --allow-unknown-type"

7636

7379 -#: sha1-file.c:1383

7637 +#: sha1-file.c:1394

7638 #, c-format

7639 msgid "unable to unpack %s header"

7640 msgstr "incapaz de desempaquetar header %s"

7641

7384 -#: sha1-file.c:1389

7642 +#: sha1-file.c:1400

7643 #, c-format

7644 msgid "unable to parse %s header with --allow-unknown-type"

7645 msgstr "no es posible analizar header %s con --allow-unknown-type"

7646

7389 -#: sha1-file.c:1392

7647 +#: sha1-file.c:1403

7648 #, c-format

7649 msgid "unable to parse %s header"

7650 msgstr "incapaz de analizar header %s"

7651

7394 -#: sha1-file.c:1584

7652 +#: sha1-file.c:1629

7653 #, c-format

7654 msgid "failed to read object %s"

7655 msgstr "falló al leer objeto %s"

7656

7399 -#: sha1-file.c:1588

7657 +#: sha1-file.c:1633

7658 #, c-format

7659 msgid "replacement %s not found for %s"

7660 msgstr "reemplazo %s no encontrado para %s"

7661

7404 -#: sha1-file.c:1592

7662 +#: sha1-file.c:1637

7663 #, c-format

7664 msgid "loose object %s (stored in %s) is corrupt"

7665 msgstr "objeto perdido %s (guardado en %s) está corrompido"

7666

7409 -#: sha1-file.c:1596

7667 +#: sha1-file.c:1641

7668 #, c-format

7669 msgid "packed object %s (stored in %s) is corrupt"

7670 msgstr "paquete de objeto %s (guardado en %s) está corrompido"

7671

7414 -#: sha1-file.c:1699

7672 +#: sha1-file.c:1746

7673 #, c-format

7674 msgid "unable to write file %s"

7675 msgstr "no es posible escribir archivo %s"

7676

7419 -#: sha1-file.c:1706

7677 +#: sha1-file.c:1753

7678 #, c-format

7679 msgid "unable to set permission to '%s'"

7680 msgstr "no se pudo poner permisos a '%s'"

7681

7424 -#: sha1-file.c:1713

7682 +#: sha1-file.c:1760

7683 msgid "file write error"

7684 msgstr "falló de escritura"

7685

7428 -#: sha1-file.c:1732

7686 +#: sha1-file.c:1780

7687 msgid "error when closing loose object file"

7688 msgstr "error cerrando el archivo de objeto suelto"

7689

7432 -#: sha1-file.c:1797

7690 +#: sha1-file.c:1845

7691 #, c-format

7692 msgid "insufficient permission for adding an object to repository database %s"

7693 msgstr ""

7694 "permisos insuficientes para agregar un objeto a la base de datos del "

7695 "repositorio %s"

7696

7439 -#: sha1-file.c:1799

7697 +#: sha1-file.c:1847

7698 msgid "unable to create temporary file"

7699 msgstr "no es posible crear un archivo temporal"

7700

7443 -#: sha1-file.c:1823

7701 +#: sha1-file.c:1871

7702 msgid "unable to write loose object file"

7703 msgstr "no es posible escribir el archivo de objeto suelto"

7704

7447 -#: sha1-file.c:1829

7705 +#: sha1-file.c:1877

7706 #, c-format

7707 msgid "unable to deflate new object %s (%d)"

7708 msgstr "no es posible desinflar el objeto nuevo %s (%d)"

7709

7452 -#: sha1-file.c:1833

7710 +#: sha1-file.c:1881

7711 #, c-format

7712 msgid "deflateEnd on object %s failed (%d)"

7713 msgstr "deflateEnd en objeto %s falló (%d)"

7714

7457 -#: sha1-file.c:1837

7715 +#: sha1-file.c:1885

7716 #, c-format

7717 msgid "confused by unstable object source data for %s"

7718 msgstr "confundido por fuente de data de objetos inestable para %s"

7719

7462 -#: sha1-file.c:1847 builtin/pack-objects.c:925

7720 +#: sha1-file.c:1895 builtin/pack-objects.c:1054

7721 #, c-format

7722 msgid "failed utime() on %s"

7723 msgstr "falló utime() en %s"

7724

7467 -#: sha1-file.c:1922

7725 +#: sha1-file.c:1972

7726 #, c-format

7727 msgid "cannot read object for %s"

7728 msgstr "no se pudo leer el objeto para %s"

7729

7472 -#: sha1-file.c:1962

7730 +#: sha1-file.c:2011

7731 msgid "corrupt commit"

7732 msgstr "commit corrupto"

7733

7476 -#: sha1-file.c:1970

7734 +#: sha1-file.c:2019

7735 msgid "corrupt tag"

7736 msgstr "tag corrupto"

7737

7480 -#: sha1-file.c:2069

7738 +#: sha1-file.c:2119

7739 #, c-format

7740 msgid "read error while indexing %s"

7741 msgstr "error leyendo al indexar %s"

7742

7485 -#: sha1-file.c:2072

7743 +#: sha1-file.c:2122

7744 #, c-format

7745 msgid "short read while indexing %s"

7746 msgstr "lectura corta al indexar %s"

7747

7490 -#: sha1-file.c:2145 sha1-file.c:2154

7748 +#: sha1-file.c:2195 sha1-file.c:2205

7749 #, c-format

7750 msgid "%s: failed to insert into database"

7751 msgstr "%s: falló al insertar en la base de datos"

7752

7495 -#: sha1-file.c:2160

7753 +#: sha1-file.c:2211

7754 #, c-format

7755 msgid "%s: unsupported file type"

7756 msgstr "%s: tipo de archivo no soportado"

7757

7500 -#: sha1-file.c:2184

7758 +#: sha1-file.c:2235

7759 #, c-format

7760 msgid "%s is not a valid object"

7761 msgstr "%s no es objeto válido"

7762

7505 -#: sha1-file.c:2186

7763 +#: sha1-file.c:2237

7764 #, c-format

7765 msgid "%s is not a valid '%s' object"

7766 msgstr "%s no es un objeto '%s' válido"

7767

7510 -#: sha1-file.c:2213 builtin/index-pack.c:155

7768 +#: sha1-file.c:2264 builtin/index-pack.c:155

7769 #, c-format

7770 msgid "unable to open %s"

7771 msgstr "no es posible abrir %s"

7772

7515 -#: sha1-file.c:2403 sha1-file.c:2455

7773 +#: sha1-file.c:2454 sha1-file.c:2507

7774 #, c-format

7775 msgid "hash mismatch for %s (expected %s)"

7776 msgstr "hash no concuerda para %s (se esperaba %s)"

7777

7520 -#: sha1-file.c:2427

7778 +#: sha1-file.c:2478

7779 #, c-format

7780 msgid "unable to mmap %s"

7781 msgstr "no es posible hacer mmap a %s"

7782

7525 -#: sha1-file.c:2432

7783 +#: sha1-file.c:2483

7784 #, c-format

7785 msgid "unable to unpack header of %s"

7786 msgstr "incapaz de desempaquetar header de %s"

7787

7530 -#: sha1-file.c:2438

7788 +#: sha1-file.c:2489

7789 #, c-format

7790 msgid "unable to parse header of %s"

7791 msgstr "incapaz de analizar header de %s"

7792

7535 -#: sha1-file.c:2449

7793 +#: sha1-file.c:2500

7794 #, c-format

7795 msgid "unable to unpack contents of %s"

7796 msgstr "no es posible desempaquetar contenidos de %s"

7797

7540 -#: sha1-name.c:487

7798 +#: sha1-name.c:486

7799 #, c-format

7800 msgid "short SHA1 %s is ambiguous"

7801 msgstr "SHA1 %s corto es ambiguo"

7802

7545 -#: sha1-name.c:498

7803 +#: sha1-name.c:497

7804 msgid "The candidates are:"

7805 msgstr "Los candidatos son:"

7806

7549 -#: sha1-name.c:797

7807 +#: sha1-name.c:796

7808 msgid ""

7809 "Git normally never creates a ref that ends with 40 hex characters\n"

7810 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -7569,44 +7827,111 @@ msgstr ""

7827 "examina estas refs y tal vez bórralas. Silencia este mensaje \n"

7828 "ejecutando \"git config advice.objectNameWarning false\""

7829

7830 +#: sha1-name.c:916

7831 +#, c-format

7832 +msgid "log for '%.*s' only goes back to %s"

7833 +msgstr "log para '%.*s' solo va hasta %s"

7834 +

7835 +#: sha1-name.c:924

7836 +#, c-format

7837 +msgid "log for '%.*s' only has %d entries"

7838 +msgstr "log para '%.*s' solo tiene %d entradas"

7839 +

7840 +#: sha1-name.c:1689

7841 +#, c-format

7842 +msgid "path '%s' exists on disk, but not in '%.*s'"

7843 +msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"

7844 +

7845 +#: sha1-name.c:1695

7846 +#, c-format

7847 +msgid ""

7848 +"path '%s' exists, but not '%s'\n"

7849 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

l10n: es: 2.26.0 round#2