f7c6172e97 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

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

11 +"POT-Creation-Date: 2020-03-06 14:25+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -18,257 +18,467 @@ msgstr ""

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

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: add-interactive.c:347

21 +#: add-interactive.c:368

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr ""

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 ""

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 ""

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 ""

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 ""

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 ""

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 ""

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 ""

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] ""

66 msgstr[1] ""

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 ""

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 ""

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 ""

82

83 -#: add-interactive.c:746

83 +#: add-interactive.c:767

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

85 msgstr ""

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] ""

92 msgstr[1] ""

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 ""

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 ""

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] ""

108 msgstr[1] ""

109

110 -#: add-interactive.c:896

110 +#: add-interactive.c:917

111 #, c-format

112 msgid "ignoring unmerged: %s"

113 msgstr ""

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 ""

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 ""

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 ""

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 ""

132

133 -#: add-interactive.c:981

133 +#: add-interactive.c:1002

134 msgid "show paths with changes"

135 msgstr ""

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 ""

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 ""

144

145 -#: add-interactive.c:987

145 +#: add-interactive.c:1008

146 msgid "pick hunks and update selectively"

147 msgstr ""

148

149 -#: add-interactive.c:989

149 +#: add-interactive.c:1010

150 msgid "view diff between HEAD and index"

151 msgstr ""

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

157 -#: add-interactive.c:999 add-interactive.c:1048

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

158 msgid "Prompt help:"

159 msgstr ""

160

161 -#: add-interactive.c:1001

161 +#: add-interactive.c:1022

162 msgid "select a single item"

163 msgstr ""

164

165 -#: add-interactive.c:1003

165 +#: add-interactive.c:1024

166 msgid "select a range of items"

167 msgstr ""

168

169 -#: add-interactive.c:1005

169 +#: add-interactive.c:1026

170 msgid "select multiple ranges"

171 msgstr ""

172

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

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

174 msgid "select item based on unique prefix"

175 msgstr ""

176

177 -#: add-interactive.c:1009

177 +#: add-interactive.c:1030

178 msgid "unselect specified items"

179 msgstr ""

180

181 -#: add-interactive.c:1011

181 +#: add-interactive.c:1032

182 msgid "choose all items"

183 msgstr ""

184

185 -#: add-interactive.c:1013

185 +#: add-interactive.c:1034

186 msgid "(empty) finish selecting"

187 msgstr ""

188

189 -#: add-interactive.c:1050

189 +#: add-interactive.c:1071

190 msgid "select a numbered item"

191 msgstr ""

192

193 -#: add-interactive.c:1054

193 +#: add-interactive.c:1075

194 msgid "(empty) select nothing"

195 msgstr ""

196

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

197 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

198 msgid "*** Commands ***"

199 msgstr ""

200

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

201 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

202 msgid "What now"

203 msgstr ""

204

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

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

206 msgid "staged"

207 msgstr ""

208

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

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

210 msgid "unstaged"

211 msgstr ""

212

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

213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197

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

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

216 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

217 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

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

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

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

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

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

219 msgid "path"

220 msgstr ""

221

222 -#: add-interactive.c:1122

222 +#: add-interactive.c:1143

223 msgid "could not refresh index"

224 msgstr ""

225

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

226 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

227 #, c-format

228 msgid "Bye.\n"

229 msgstr ""

230

231 -#: add-patch.c:15

232 -#, c-format

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

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

232 +#, c-format, perl-format

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

234 msgstr ""

235

236 -#: add-patch.c:16

237 -#, c-format

238 -msgid "Stage deletion [y,n,a,q,d%s,?]? "

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

237 +#, c-format, perl-format

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

239 msgstr ""

240

241 -#: add-patch.c:17

242 -#, c-format

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

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

242 +#, c-format, perl-format

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

244 +msgstr ""

245 +

246 +#: add-patch.c:37

247 +msgid ""

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

249 +"staging."

250 +msgstr ""

251 +

252 +#: add-patch.c:40

253 +msgid ""

254 +"y - stage this hunk\n"

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

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

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

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

259 +msgstr ""

260 +

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

262 +#, c-format, perl-format

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

264 +msgstr ""

265 +

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

267 +#, c-format, perl-format

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

269 +msgstr ""

270 +

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

272 +#, c-format, perl-format

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

274 +msgstr ""

275 +

276 +#: add-patch.c:58

277 +msgid ""

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

279 +"stashing."

280 +msgstr ""

281 +

282 +#: add-patch.c:61

283 +msgid ""

284 +"y - stash this hunk\n"

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

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

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

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

289 +msgstr ""

290 +

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

292 +#, c-format, perl-format

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

294 +msgstr ""

295 +

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

297 +#, c-format, perl-format

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

299 +msgstr ""

300 +

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

302 +#, c-format, perl-format

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

304 +msgstr ""

305 +

306 +#: add-patch.c:81

307 +msgid ""

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

309 +"unstaging."

310 +msgstr ""

311 +

312 +#: add-patch.c:84

313 +msgid ""

314 +"y - unstage this hunk\n"

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

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

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

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

319 +msgstr ""

320 +

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

322 +#, c-format, perl-format

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

324 +msgstr ""

325 +

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

327 +#, c-format, perl-format

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

329 +msgstr ""

330 +

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

332 +#, c-format, perl-format

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

334 +msgstr ""

335 +

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

337 +msgid ""

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

339 +"applying."

340 +msgstr ""

341 +

342 +#: add-patch.c:106

343 +msgid ""

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

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

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

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

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

349 +msgstr ""

350 +

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

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

353 +#, c-format, perl-format

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

355 +msgstr ""

356 +

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

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

359 +#, c-format, perl-format

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

361 +msgstr ""

362 +

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

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

365 +#, c-format, perl-format

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

367 +msgstr ""

368 +

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

370 +msgid ""

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

372 +"discarding."

373 +msgstr ""

374 +

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

376 +msgid ""

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

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

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

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

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

382 +msgstr ""

383 +

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

385 +#, c-format, perl-format

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

387 +msgstr ""

388 +

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

390 +#, c-format, perl-format

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

392 +msgstr ""

393 +

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

395 +#, c-format, perl-format

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

397 +msgstr ""

398 +

399 +#: add-patch.c:150

400 +msgid ""

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

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

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

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

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

406 +msgstr ""

407 +

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

409 +#, c-format, perl-format

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

411 +msgstr ""

412 +

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

414 +#, c-format, perl-format

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

416 +msgstr ""

417 +

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

419 +#, c-format, perl-format

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

421 +msgstr ""

422 +

423 +#: add-patch.c:171

424 +msgid ""

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

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

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

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

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

430 +msgstr ""

431 +

432 +#: add-patch.c:214

433 +msgid ""

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

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

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

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

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

439 msgstr ""

440

246 -#: add-patch.c:111

441 +#: add-patch.c:318

442 #, c-format

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

444 msgstr ""

445

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

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

447 #, c-format

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

449 msgstr ""

450

256 -#: add-patch.c:176

451 +#: add-patch.c:395

452 msgid "could not parse diff"

453 msgstr ""

454

260 -#: add-patch.c:194

455 +#: add-patch.c:414

456 msgid "could not parse colored diff"

457 msgstr ""

458

264 -#: add-patch.c:508

459 +#: add-patch.c:428

460 +#, c-format

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

462 +msgstr ""

463 +

464 +#: add-patch.c:587

465 +msgid "mismatched output from interactive.diffFilter"

466 +msgstr ""

467 +

468 +#: add-patch.c:588

469 +msgid ""

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

471 +"between its input and output lines."

472 +msgstr ""

473 +

474 +#: add-patch.c:761

475 #, c-format

476 msgid ""

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

478 "%.*s"

479 msgstr ""

480

271 -#: add-patch.c:523

481 +#: add-patch.c:776

482 #, c-format

483 msgid ""

484 "hunks do not overlap:\n"

@@ -277,11 +487,11 @@ msgid ""

487 "%.*s"

488 msgstr ""

489

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

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

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

492 msgstr ""

493

284 -#: add-patch.c:803

494 +#: add-patch.c:1056

495 #, c-format

496 msgid ""

497 "---\n"

@@ -290,25 +500,19 @@ msgid ""

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

501 msgstr ""

502

293 -#: add-patch.c:810

294 -msgid ""

295 -"If the patch applies cleanly, the edited hunk will immediately be\n"

296 -"marked for staging.\n"

297 -msgstr ""

298 -

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

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

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

505 msgid ""

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

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

508 "aborted and the hunk is left unchanged.\n"

509 msgstr ""

510

307 -#: add-patch.c:851

511 +#: add-patch.c:1103

512 msgid "could not parse hunk header"

513 msgstr ""

514

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

515 +#: add-patch.c:1148

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

517 msgstr ""

518

@@ -324,21 +528,24 @@ msgstr ""

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

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

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

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

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

532 msgid ""

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

534 msgstr ""

535

332 -#: add-patch.c:1009

333 -msgid ""

334 -"y - stage this hunk\n"

335 -"n - do not stage this hunk\n"

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

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

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

536 +#: add-patch.c:1261

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

538 msgstr ""

539

341 -#: add-patch.c:1016

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

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

542 +msgstr ""

543 +

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

545 +msgid "Nothing was applied.\n"

546 +msgstr ""

547 +

548 +#: add-patch.c:1326

549 msgid ""

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

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

@@ -351,121 +558,125 @@ msgid ""

558 "? - print help\n"

559 msgstr ""

560

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

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

562 msgid "No previous hunk"

563 msgstr ""

564

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

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

566 msgid "No next hunk"

567 msgstr ""

568

362 -#: add-patch.c:1158

569 +#: add-patch.c:1468

570 msgid "No other hunks to goto"

571 msgstr ""

572

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

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

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

575 msgstr ""

576

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

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

578 msgid "go to which hunk? "

579 msgstr ""

580

374 -#: add-patch.c:1181

581 +#: add-patch.c:1491

582 #, c-format

583 msgid "Invalid number: '%s'"

584 msgstr ""

585

379 -#: add-patch.c:1186

586 +#: add-patch.c:1496

587 #, c-format

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

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

590 msgstr[0] ""

591 msgstr[1] ""

592

386 -#: add-patch.c:1195

593 +#: add-patch.c:1505

594 msgid "No other hunks to search"

595 msgstr ""

596

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

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

598 msgid "search for regex? "

599 msgstr ""

600

394 -#: add-patch.c:1216

601 +#: add-patch.c:1526

602 #, c-format

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

604 msgstr ""

605

399 -#: add-patch.c:1233

606 +#: add-patch.c:1543

607 msgid "No hunk matches the given pattern"

608 msgstr ""

609

403 -#: add-patch.c:1240

610 +#: add-patch.c:1550

611 msgid "Sorry, cannot split this hunk"

612 msgstr ""

613

407 -#: add-patch.c:1244

614 +#: add-patch.c:1554

615 #, c-format

616 msgid "Split into %d hunks."

617 msgstr ""

618

412 -#: add-patch.c:1248

619 +#: add-patch.c:1558

620 msgid "Sorry, cannot edit this hunk"

621 msgstr ""

622

416 -#: advice.c:111

623 +#: add-patch.c:1609

624 +msgid "'git apply' failed"

625 +msgstr ""

626 +

627 +#: advice.c:115

628 #, c-format

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

630 msgstr ""

631

421 -#: advice.c:164

632 +#: advice.c:168

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

634 msgstr ""

635

425 -#: advice.c:166

636 +#: advice.c:170

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

638 msgstr ""

639

429 -#: advice.c:168

640 +#: advice.c:172

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

642 msgstr ""

643

433 -#: advice.c:170

644 +#: advice.c:174

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

646 msgstr ""

647

437 -#: advice.c:172

648 +#: advice.c:176

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

650 msgstr ""

651

441 -#: advice.c:174

652 +#: advice.c:178

653 #, c-format

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

655 msgstr ""

656

446 -#: advice.c:182

657 +#: advice.c:186

658 msgid ""

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

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

661 msgstr ""

662

452 -#: advice.c:190

663 +#: advice.c:194

664 msgid "Exiting because of an unresolved conflict."

665 msgstr ""

666

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

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

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

669 msgstr ""

670

460 -#: advice.c:197

671 +#: advice.c:201

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

673 msgstr ""

674

464 -#: advice.c:198

675 +#: advice.c:202

676 msgid "Exiting because of unfinished merge."

677 msgstr ""

678

468 -#: advice.c:204

679 +#: advice.c:208

680 #, c-format

681 msgid ""

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

@@ -689,416 +900,416 @@ msgstr ""

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

901 msgstr ""

902

692 -#: apply.c:3162

903 +#: apply.c:3163

904 #, c-format

905 msgid ""

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

907 msgstr ""

908

698 -#: apply.c:3170

909 +#: apply.c:3171

910 #, c-format

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

912 msgstr ""

913

703 -#: apply.c:3188

914 +#: apply.c:3189

915 #, c-format

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

917 msgstr ""

918

708 -#: apply.c:3201

919 +#: apply.c:3202

920 #, c-format

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

922 msgstr ""

923

713 -#: apply.c:3207

924 +#: apply.c:3209

925 #, c-format

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

927 msgstr ""

928

718 -#: apply.c:3228

929 +#: apply.c:3230

930 #, c-format

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

932 msgstr ""

933

723 -#: apply.c:3351

934 +#: apply.c:3353

935 #, c-format

936 msgid "cannot checkout %s"

937 msgstr ""

938

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

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

940 #, c-format

941 msgid "failed to read %s"

942 msgstr ""

943

733 -#: apply.c:3411

944 +#: apply.c:3413

945 #, c-format

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

947 msgstr ""

948

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

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

950 #, c-format

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

952 msgstr ""

953

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

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

955 #, c-format

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

957 msgstr ""

958

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

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

960 #, c-format

961 msgid "%s: does not match index"

962 msgstr ""

963

753 -#: apply.c:3570

964 +#: apply.c:3572

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

966 msgstr ""

967

757 -#: apply.c:3573

968 +#: apply.c:3575

969 #, c-format

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

971 msgstr ""

972

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

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

974 #, c-format

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

976 msgstr ""

977

767 -#: apply.c:3605

978 +#: apply.c:3607

979 #, c-format

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

981 msgstr ""

982

772 -#: apply.c:3619

983 +#: apply.c:3621

984 #, c-format

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

986 msgstr ""

987

777 -#: apply.c:3624

988 +#: apply.c:3626

989 #, c-format

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

991 msgstr ""

992

782 -#: apply.c:3650

993 +#: apply.c:3652

994 msgid "removal patch leaves file contents"

995 msgstr ""

996

786 -#: apply.c:3723

997 +#: apply.c:3725

998 #, c-format

999 msgid "%s: wrong type"

1000 msgstr ""

1001

791 -#: apply.c:3725

1002 +#: apply.c:3727

1003 #, c-format

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

1005 msgstr ""

1006

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

797 -#: read-cache.c:1320

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

1008 +#: read-cache.c:1325

1009 #, c-format

1010 msgid "invalid path '%s'"

1011 msgstr ""

1012

802 -#: apply.c:3934

1013 +#: apply.c:3936

1014 #, c-format

1015 msgid "%s: already exists in index"

1016 msgstr ""

1017

807 -#: apply.c:3937

1018 +#: apply.c:3939

1019 #, c-format

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

1021 msgstr ""

1022

812 -#: apply.c:3957

1023 +#: apply.c:3959

1024 #, c-format

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

1026 msgstr ""

1027

817 -#: apply.c:3962

1028 +#: apply.c:3964

1029 #, c-format

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

1031 msgstr ""

1032

822 -#: apply.c:3982

1033 +#: apply.c:3984

1034 #, c-format

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

1036 msgstr ""

1037

827 -#: apply.c:3986

1038 +#: apply.c:3988

1039 #, c-format

1040 msgid "%s: patch does not apply"

1041 msgstr ""

1042

832 -#: apply.c:4001

1043 +#: apply.c:4003

1044 #, c-format

1045 msgid "Checking patch %s..."

1046 msgstr ""

1047

837 -#: apply.c:4093

1048 +#: apply.c:4095

1049 #, c-format

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

1051 msgstr ""

1052

842 -#: apply.c:4100

1053 +#: apply.c:4102

1054 #, c-format

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

1056 msgstr ""

1057

847 -#: apply.c:4103

1058 +#: apply.c:4105

1059 #, c-format

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

1061 msgstr ""

1062

852 -#: apply.c:4112

1063 +#: apply.c:4114

1064 #, c-format

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

1066 msgstr ""

1067

857 -#: apply.c:4122

1068 +#: apply.c:4124

1069 #, c-format

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

1071 msgstr ""

1072

862 -#: apply.c:4260

1073 +#: apply.c:4262

1074 #, c-format

1075 msgid "unable to remove %s from index"

1076 msgstr ""

1077

867 -#: apply.c:4294

1078 +#: apply.c:4296

1079 #, c-format

1080 msgid "corrupt patch for submodule %s"

1081 msgstr ""

1082

872 -#: apply.c:4300

1083 +#: apply.c:4302

1084 #, c-format

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

1086 msgstr ""

1087

877 -#: apply.c:4308

1088 +#: apply.c:4310

1089 #, c-format

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

1091 msgstr ""

1092

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

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

1094 #, c-format

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

1096 msgstr ""

1097

887 -#: apply.c:4357

1098 +#: apply.c:4359

1099 #, c-format

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

1101 msgstr ""

1102

892 -#: apply.c:4361

1103 +#: apply.c:4363

1104 #, c-format

1105 msgid "closing file '%s'"

1106 msgstr ""

1107

897 -#: apply.c:4431

1108 +#: apply.c:4433

1109 #, c-format

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

1111 msgstr ""

1112

902 -#: apply.c:4529

1113 +#: apply.c:4531

1114 #, c-format

1115 msgid "Applied patch %s cleanly."

1116 msgstr ""

1117

907 -#: apply.c:4537

1118 +#: apply.c:4539

1119 msgid "internal error"

1120 msgstr ""

1121

911 -#: apply.c:4540

1122 +#: apply.c:4542

1123 #, c-format

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

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

1126 msgstr[0] ""

1127 msgstr[1] ""

1128

918 -#: apply.c:4551

1129 +#: apply.c:4553

1130 #, c-format

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

1132 msgstr ""

1133

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

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

1135 #, c-format

1136 msgid "cannot open %s"

1137 msgstr ""

1138

928 -#: apply.c:4573

1139 +#: apply.c:4575

1140 #, c-format

1141 msgid "Hunk #%d applied cleanly."

1142 msgstr ""

1143

933 -#: apply.c:4577

1144 +#: apply.c:4579

1145 #, c-format

1146 msgid "Rejected hunk #%d."

1147 msgstr ""

1148

938 -#: apply.c:4696

1149 +#: apply.c:4698

1150 #, c-format

1151 msgid "Skipped patch '%s'."

1152 msgstr ""

1153

943 -#: apply.c:4704

1154 +#: apply.c:4706

1155 msgid "unrecognized input"

1156 msgstr ""

1157

947 -#: apply.c:4724

1158 +#: apply.c:4726

1159 msgid "unable to read index file"

1160 msgstr ""

1161

951 -#: apply.c:4881

1162 +#: apply.c:4883

1163 #, c-format

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

1165 msgstr ""

1166

956 -#: apply.c:4908

1167 +#: apply.c:4910

1168 #, c-format

1169 msgid "squelched %d whitespace error"

1170 msgid_plural "squelched %d whitespace errors"

1171 msgstr[0] ""

1172 msgstr[1] ""

1173

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

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

1175 #, c-format

1176 msgid "%d line adds whitespace errors."

1177 msgid_plural "%d lines add whitespace errors."

1178 msgstr[0] ""

1179 msgstr[1] ""

1180

970 -#: apply.c:4922

1181 +#: apply.c:4924

1182 #, c-format

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

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

1185 msgstr[0] ""

1186 msgstr[1] ""

1187

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

1188 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390

1189 msgid "Unable to write new index file"

1190 msgstr ""

1191

981 -#: apply.c:4966

1192 +#: apply.c:4968

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

1194 msgstr ""

1195

985 -#: apply.c:4969

1196 +#: apply.c:4971

1197 msgid "apply changes matching the given path"

1198 msgstr ""

1199

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

1200 +#: apply.c:4973 builtin/am.c:2206

1201 msgid "num"

1202 msgstr ""

1203

993 -#: apply.c:4972

1204 +#: apply.c:4974

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

1206 msgstr ""

1207

997 -#: apply.c:4975

1208 +#: apply.c:4977

1209 msgid "ignore additions made by the patch"

1210 msgstr ""

1211

1001 -#: apply.c:4977

1212 +#: apply.c:4979

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

1214 msgstr ""

1215

1005 -#: apply.c:4981

1216 +#: apply.c:4983

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

1218 msgstr ""

1219

1009 -#: apply.c:4983

1220 +#: apply.c:4985

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

1222 msgstr ""

1223

1013 -#: apply.c:4985

1224 +#: apply.c:4987

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

1226 msgstr ""

1227

1017 -#: apply.c:4987

1228 +#: apply.c:4989

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

1230 msgstr ""

1231

1021 -#: apply.c:4989

1232 +#: apply.c:4991

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

1234 msgstr ""

1235

1025 -#: apply.c:4991

1236 +#: apply.c:4993

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

1238 msgstr ""

1239

1029 -#: apply.c:4993

1240 +#: apply.c:4995

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

1242 msgstr ""

1243

1033 -#: apply.c:4996

1244 +#: apply.c:4998

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

1246 msgstr ""

1247

1037 -#: apply.c:4998

1248 +#: apply.c:5000

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

1250 msgstr ""

1251

1041 -#: apply.c:5000

1252 +#: apply.c:5002

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

1254 msgstr ""

1255

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

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

1257 msgid "paths are separated with NUL character"

1258 msgstr ""

1259

1049 -#: apply.c:5005

1260 +#: apply.c:5007

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

1262 msgstr ""

1263

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

1264 +#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

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

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

1267 msgid "action"

1268 msgstr ""

1269

1059 -#: apply.c:5007

1270 +#: apply.c:5009

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

1272 msgstr ""

1273

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

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

1275 msgid "ignore changes in whitespace when finding context"

1276 msgstr ""

1277

1067 -#: apply.c:5016

1278 +#: apply.c:5018

1279 msgid "apply the patch in reverse"

1280 msgstr ""

1281

1071 -#: apply.c:5018

1282 +#: apply.c:5020

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

1284 msgstr ""

1285

1075 -#: apply.c:5020

1286 +#: apply.c:5022

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

1288 msgstr ""

1289

1079 -#: apply.c:5022

1290 +#: apply.c:5024

1291 msgid "allow overlapping hunks"

1292 msgstr ""

1293

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

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

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

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

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

1297 msgid "be verbose"

1298 msgstr ""

1299

1089 -#: apply.c:5025

1300 +#: apply.c:5027

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

1302 msgstr ""

1303

1093 -#: apply.c:5028

1304 +#: apply.c:5030

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

1306 msgstr ""

1307

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

1308 +#: apply.c:5032 builtin/am.c:2194

1309 msgid "root"

1310 msgstr ""

1311

1101 -#: apply.c:5031

1312 +#: apply.c:5033

1313 msgid "prepend <root> to all filenames"

1314 msgstr ""

1315

@@ -1119,7 +1330,7 @@ msgstr ""

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

1331 msgstr ""

1332

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

1333 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299

1334 #, c-format

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

1336 msgstr ""

@@ -1160,8 +1371,8 @@ msgid "prepend prefix to each pathname in the archive"

1371 msgstr ""

1372

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

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

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

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

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

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

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

1378 #: parse-options.h:190

@@ -1197,7 +1408,7 @@ msgid "list supported archive formats"

1408 msgstr ""

1409

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

1200 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

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

1412 msgid "repo"

1413 msgstr ""

1414

@@ -1236,17 +1447,17 @@ msgstr ""

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

1448 msgstr ""

1449

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

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

1451 #, c-format

1452 msgid "cannot stream blob %s"

1453 msgstr ""

1454

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

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

1456 #, c-format

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

1458 msgstr ""

1459

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

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

1461 #, c-format

1462 msgid "cannot read %s"

1463 msgstr ""

@@ -1275,12 +1486,12 @@ msgstr ""

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

1487 msgstr ""

1488

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

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

1490 #, c-format

1491 msgid "deflate error (%d)"

1492 msgstr ""

1493

1283 -#: archive-zip.c:614

1494 +#: archive-zip.c:615

1495 #, c-format

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

1497 msgstr ""

@@ -1311,33 +1522,33 @@ msgstr ""

1522 msgid "We cannot bisect more!\n"

1523 msgstr ""

1524

1314 -#: bisect.c:733

1525 +#: bisect.c:745

1526 #, c-format

1527 msgid "Not a valid commit name %s"

1528 msgstr ""

1529

1319 -#: bisect.c:758

1530 +#: bisect.c:770

1531 #, c-format

1532 msgid ""

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

1534 "This means the bug has been fixed between %s and [%s].\n"

1535 msgstr ""

1536

1326 -#: bisect.c:763

1537 +#: bisect.c:775

1538 #, c-format

1539 msgid ""

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

1541 "The property has changed between %s and [%s].\n"

1542 msgstr ""

1543

1333 -#: bisect.c:768

1544 +#: bisect.c:780

1545 #, c-format

1546 msgid ""

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

1548 "This means the first '%s' commit is between %s and [%s].\n"

1549 msgstr ""

1550

1340 -#: bisect.c:776

1551 +#: bisect.c:788

1552 #, c-format

1553 msgid ""

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

@@ -1345,7 +1556,7 @@ msgid ""

1556 "Maybe you mistook %s and %s revs?\n"

1557 msgstr ""

1558

1348 -#: bisect.c:789

1559 +#: bisect.c:801

1560 #, c-format

1561 msgid ""

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

@@ -1353,43 +1564,43 @@ msgid ""

1564 "We continue anyway."

1565 msgstr ""

1566

1356 -#: bisect.c:822

1567 +#: bisect.c:840

1568 #, c-format

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

1570 msgstr ""

1571

1361 -#: bisect.c:865

1572 +#: bisect.c:890

1573 #, c-format

1574 msgid "a %s revision is needed"

1575 msgstr ""

1576

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

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

1578 #, c-format

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

1580 msgstr ""

1581

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

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

1583 #, c-format

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

1585 msgstr ""

1586

1376 -#: bisect.c:958

1587 +#: bisect.c:997

1588 msgid "reading bisect refs failed"

1589 msgstr ""

1590

1380 -#: bisect.c:977

1591 +#: bisect.c:1019

1592 #, c-format

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

1594 msgstr ""

1595

1385 -#: bisect.c:985

1596 +#: bisect.c:1028

1597 #, c-format

1598 msgid ""

1599 "No testable commit found.\n"

1600 "Maybe you started with bad path parameters?\n"

1601 msgstr ""

1602

1392 -#: bisect.c:1004

1603 +#: bisect.c:1057

1604 #, c-format

1605 msgid "(roughly %d step)"

1606 msgid_plural "(roughly %d steps)"

@@ -1399,7 +1610,7 @@ msgstr[1] ""

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

1611 #. steps)" translation.

1612 #.

1402 -#: bisect.c:1010

1613 +#: bisect.c:1063

1614 #, c-format

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

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

@@ -1418,10 +1629,10 @@ msgstr ""

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

1630 msgstr ""

1631

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

1422 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1423 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

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

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

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

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

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

1636 #: builtin/shortlog.c:192

1637 msgid "revision walk setup failed"

1638 msgstr ""

@@ -1575,8 +1786,8 @@ msgstr ""

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

1787 msgstr ""

1788

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

1579 -#: builtin/commit.c:811

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

1790 +#: builtin/commit.c:815

1791 #, c-format

1792 msgid "could not open '%s'"

1793 msgstr ""

@@ -1646,13 +1857,13 @@ msgstr ""

1857 msgid "index-pack died"

1858 msgstr ""

1859

1649 -#: color.c:296

1860 +#: color.c:329

1861 #, c-format

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

1863 msgstr ""

1864

1654 -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1655 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1865 +#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398

1866 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457

1867 #, c-format

1868 msgid "could not parse %s"

1869 msgstr ""

@@ -1674,280 +1885,280 @@ msgid ""

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

1886 msgstr ""

1887

1677 -#: commit.c:1152

1888 +#: commit.c:1153

1889 #, c-format

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

1891 msgstr ""

1892

1682 -#: commit.c:1155

1893 +#: commit.c:1157

1894 #, c-format

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

1896 msgstr ""

1897

1687 -#: commit.c:1158

1898 +#: commit.c:1160

1899 #, c-format

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

1901 msgstr ""

1902

1692 -#: commit.c:1161

1903 +#: commit.c:1163

1904 #, c-format

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

1906 msgstr ""

1907

1697 -#: commit.c:1415

1908 +#: commit.c:1417

1909 msgid ""

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

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

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

1913 msgstr ""

1914

1704 -#: commit-graph.c:130

1915 +#: commit-graph.c:122

1916 msgid "commit-graph file is too small"

1917 msgstr ""

1918

1708 -#: commit-graph.c:195

1919 +#: commit-graph.c:189

1920 #, c-format

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

1922 msgstr ""

1923

1713 -#: commit-graph.c:202

1924 +#: commit-graph.c:196

1925 #, c-format

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

1927 msgstr ""

1928

1718 -#: commit-graph.c:209

1929 +#: commit-graph.c:203

1930 #, c-format

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

1932 msgstr ""

1933

1723 -#: commit-graph.c:232

1934 +#: commit-graph.c:226

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

1936 msgstr ""

1937

1727 -#: commit-graph.c:243

1938 +#: commit-graph.c:237

1939 #, c-format

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

1941 msgstr ""

1942

1732 -#: commit-graph.c:286

1943 +#: commit-graph.c:280

1944 #, c-format

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

1946 msgstr ""

1947

1737 -#: commit-graph.c:350

1948 +#: commit-graph.c:343

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

1950 msgstr ""

1951

1741 -#: commit-graph.c:360

1952 +#: commit-graph.c:353

1953 msgid "commit-graph chain does not match"

1954 msgstr ""

1955

1745 -#: commit-graph.c:407

1956 +#: commit-graph.c:401

1957 #, c-format

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

1959 msgstr ""

1960

1750 -#: commit-graph.c:433

1961 +#: commit-graph.c:425

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

1963 msgstr ""

1964

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

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

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

1967 msgstr ""

1968

1758 -#: commit-graph.c:585

1969 +#: commit-graph.c:579

1970 #, c-format

1971 msgid "could not find commit %s"

1972 msgstr ""

1973

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

1974 +#: commit-graph.c:852 builtin/am.c:1287

1975 #, c-format

1976 msgid "unable to parse commit %s"

1977 msgstr ""

1978

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

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

1980 #, c-format

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

1982 msgstr ""

1983

1773 -#: commit-graph.c:1049

1984 +#: commit-graph.c:1043

1985 msgid "Loading known commits in commit graph"

1986 msgstr ""

1987

1777 -#: commit-graph.c:1066

1988 +#: commit-graph.c:1060

1989 msgid "Expanding reachable commits in commit graph"

1990 msgstr ""

1991

1781 -#: commit-graph.c:1085

1992 +#: commit-graph.c:1079

1993 msgid "Clearing commit marks in commit graph"

1994 msgstr ""

1995

1785 -#: commit-graph.c:1104

1996 +#: commit-graph.c:1098

1997 msgid "Computing commit graph generation numbers"

1998 msgstr ""

1999

1789 -#: commit-graph.c:1179

2000 +#: commit-graph.c:1173

2001 #, c-format

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

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

2004 msgstr[0] ""

2005 msgstr[1] ""

2006

1796 -#: commit-graph.c:1192

2007 +#: commit-graph.c:1186

2008 #, c-format

2009 msgid "error adding pack %s"

2010 msgstr ""

2011

1801 -#: commit-graph.c:1196

2012 +#: commit-graph.c:1190

2013 #, c-format

2014 msgid "error opening index for %s"

2015 msgstr ""

2016

1806 -#: commit-graph.c:1220

2017 +#: commit-graph.c:1214

2018 #, c-format

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

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

2021 msgstr[0] ""

2022 msgstr[1] ""

2023

1813 -#: commit-graph.c:1240

2024 +#: commit-graph.c:1234

2025 #, c-format

2026 msgid "invalid commit object id: %s"

2027 msgstr ""

2028

1818 -#: commit-graph.c:1255

2029 +#: commit-graph.c:1249

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

2031 msgstr ""

2032

1822 -#: commit-graph.c:1270

2033 +#: commit-graph.c:1264

2034 msgid "Counting distinct commits in commit graph"

2035 msgstr ""

2036

1826 -#: commit-graph.c:1300

2037 +#: commit-graph.c:1294

2038 msgid "Finding extra edges in commit graph"

2039 msgstr ""

2040

1830 -#: commit-graph.c:1346

2041 +#: commit-graph.c:1340

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

2043 msgstr ""

2044

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

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

2046 #, c-format

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

2048 msgstr ""

2049

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

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

2051 #, c-format

2052 msgid "unable to create '%s'"

2053 msgstr ""

2054

1844 -#: commit-graph.c:1451

2055 +#: commit-graph.c:1445

2056 #, c-format

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

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

2059 msgstr[0] ""

2060 msgstr[1] ""

2061

1851 -#: commit-graph.c:1492

2062 +#: commit-graph.c:1486

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

2064 msgstr ""

2065

1855 -#: commit-graph.c:1504

2066 +#: commit-graph.c:1498

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

2068 msgstr ""

2069

1859 -#: commit-graph.c:1524

2070 +#: commit-graph.c:1518

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

2072 msgstr ""

2073

1863 -#: commit-graph.c:1635

2074 +#: commit-graph.c:1631

2075 msgid "Scanning merged commits"

2076 msgstr ""

2077

1867 -#: commit-graph.c:1646

2078 +#: commit-graph.c:1642

2079 #, c-format

2080 msgid "unexpected duplicate commit id %s"

2081 msgstr ""

2082

1872 -#: commit-graph.c:1670

2083 +#: commit-graph.c:1665

2084 msgid "Merging commit-graph"

2085 msgstr ""

2086

1876 -#: commit-graph.c:1860

2087 +#: commit-graph.c:1844

2088 #, c-format

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

2090 msgstr ""

2091

1881 -#: commit-graph.c:1871

2092 +#: commit-graph.c:1855

2093 msgid "too many commits to write graph"

2094 msgstr ""

2095

1885 -#: commit-graph.c:1961

2096 +#: commit-graph.c:1944

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

2098 msgstr ""

2099

1889 -#: commit-graph.c:1971

2100 +#: commit-graph.c:1954

2101 #, c-format

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

2103 msgstr ""

2104

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

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

2106 #, c-format

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

2108 msgstr ""

2109

1899 -#: commit-graph.c:1988

2110 +#: commit-graph.c:1971

2111 #, c-format

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

2113 msgstr ""

2114

1904 -#: commit-graph.c:2006

2115 +#: commit-graph.c:1989

2116 msgid "Verifying commits in commit graph"

2117 msgstr ""

2118

1908 -#: commit-graph.c:2020

2119 +#: commit-graph.c:2003

2120 #, c-format

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

2122 msgstr ""

2123

1913 -#: commit-graph.c:2027

2124 +#: commit-graph.c:2010

2125 #, c-format

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

2127 msgstr ""

2128

1918 -#: commit-graph.c:2037

2129 +#: commit-graph.c:2020

2130 #, c-format

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

2132 msgstr ""

2133

1923 -#: commit-graph.c:2046

2134 +#: commit-graph.c:2029

2135 #, c-format

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

2137 msgstr ""

2138

1928 -#: commit-graph.c:2059

2139 +#: commit-graph.c:2042

2140 #, c-format

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

2142 msgstr ""

2143

1933 -#: commit-graph.c:2064

2144 +#: commit-graph.c:2047

2145 #, c-format

2146 msgid ""

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

2148 msgstr ""

2149

1939 -#: commit-graph.c:2068

2150 +#: commit-graph.c:2051

2151 #, c-format

2152 msgid ""

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

2154 msgstr ""

2155

1945 -#: commit-graph.c:2083

2156 +#: commit-graph.c:2066

2157 #, c-format

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

2159 msgstr ""

2160

1950 -#: commit-graph.c:2089

2161 +#: commit-graph.c:2072

2162 #, c-format

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

2164 msgstr ""

@@ -1989,7 +2200,7 @@ msgstr ""

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

2201 msgstr ""

2202

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

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

2204 #, c-format

2205 msgid "invalid key: %s"

2206 msgstr ""

@@ -2125,7 +2336,7 @@ msgstr ""

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

2337 msgstr ""

2338

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

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

2340 #, c-format

2341 msgid "bad pack compression level %d"

2342 msgstr ""

@@ -2150,105 +2361,105 @@ msgstr ""

2361 msgid "failed to parse %s"

2362 msgstr ""

2363

2153 -#: config.c:1745

2364 +#: config.c:1743

2365 msgid "unable to parse command-line config"

2366 msgstr ""

2367

2157 -#: config.c:2096

2368 +#: config.c:2097

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

2370 msgstr ""

2371

2161 -#: config.c:2266

2372 +#: config.c:2267

2373 #, c-format

2374 msgid "Invalid %s: '%s'"

2375 msgstr ""

2376

2166 -#: config.c:2311

2377 +#: config.c:2312

2378 #, c-format

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

2380 msgstr ""

2381

2171 -#: config.c:2357

2382 +#: config.c:2358

2383 #, c-format

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

2385 msgstr ""

2386

2176 -#: config.c:2359

2387 +#: config.c:2360

2388 #, c-format

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

2390 msgstr ""

2391

2181 -#: config.c:2440

2392 +#: config.c:2441

2393 #, c-format

2394 msgid "invalid section name '%s'"

2395 msgstr ""

2396

2186 -#: config.c:2472

2397 +#: config.c:2473

2398 #, c-format

2399 msgid "%s has multiple values"

2400 msgstr ""

2401

2191 -#: config.c:2501

2402 +#: config.c:2502

2403 #, c-format

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

2405 msgstr ""

2406

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

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

2408 #, c-format

2409 msgid "could not lock config file %s"

2410 msgstr ""

2411

2201 -#: config.c:2764

2412 +#: config.c:2765

2413 #, c-format

2414 msgid "opening %s"

2415 msgstr ""

2416

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

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

2418 #, c-format

2419 msgid "invalid pattern: %s"

2420 msgstr ""

2421

2211 -#: config.c:2824

2422 +#: config.c:2825

2423 #, c-format

2424 msgid "invalid config file %s"

2425 msgstr ""

2426

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

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

2428 #, c-format

2429 msgid "fstat on %s failed"

2430 msgstr ""

2431

2221 -#: config.c:2848

2432 +#: config.c:2849

2433 #, c-format

2434 msgid "unable to mmap '%s'"

2435 msgstr ""

2436

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

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

2438 #, c-format

2439 msgid "chmod on %s failed"

2440 msgstr ""

2441

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

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

2443 #, c-format

2444 msgid "could not write config file %s"

2445 msgstr ""

2446

2236 -#: config.c:2976

2447 +#: config.c:2977

2448 #, c-format

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

2450 msgstr ""

2451

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

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

2453 #, c-format

2454 msgid "could not unset '%s'"

2455 msgstr ""

2456

2246 -#: config.c:3068

2457 +#: config.c:3069

2458 #, c-format

2459 msgid "invalid section name: %s"

2460 msgstr ""

2461

2251 -#: config.c:3235

2462 +#: config.c:3236

2463 #, c-format

2464 msgid "missing value for '%s'"

2465 msgstr ""

@@ -2404,19 +2615,19 @@ msgstr ""

2615 msgid "unable to fork"

2616 msgstr ""

2617

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

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

2619 msgid "Checking connectivity"

2620 msgstr ""

2621

2411 -#: connected.c:101

2622 +#: connected.c:110

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

2624 msgstr ""

2625

2415 -#: connected.c:121

2626 +#: connected.c:130

2627 msgid "failed write to rev-list"

2628 msgstr ""

2629

2419 -#: connected.c:128

2630 +#: connected.c:137

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

2632 msgstr ""

2633

@@ -3211,59 +3422,59 @@ msgid ""

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

3423 msgstr ""

3424

3214 -#: dir.c:554

3425 +#: dir.c:555

3426 #, c-format

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

3428 msgstr ""

3429

3219 -#: dir.c:664

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

3431 #, c-format

3432 msgid "unrecognized pattern: '%s'"

3433 msgstr ""

3434

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

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

3436 #, c-format

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

3438 msgstr ""

3439

3229 -#: dir.c:714

3440 +#: dir.c:786

3441 #, c-format

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

3443 msgstr ""

3444

3234 -#: dir.c:724

3445 +#: dir.c:796

3446 msgid "disabling cone pattern matching"

3447 msgstr ""

3448

3238 -#: dir.c:1101

3449 +#: dir.c:1173

3450 #, c-format

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

3452 msgstr ""

3453

3243 -#: dir.c:2078

3454 +#: dir.c:2144

3455 #, c-format

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

3457 msgstr ""

3458

3248 -#: dir.c:2415

3459 +#: dir.c:2479

3460 msgid "failed to get kernel name and information"

3461 msgstr ""

3462

3252 -#: dir.c:2539

3463 +#: dir.c:2603

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

3465 msgstr ""

3466

3256 -#: dir.c:3343

3467 +#: dir.c:3407

3468 #, c-format

3469 msgid "index file corrupt in repo %s"

3470 msgstr ""

3471

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

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

3473 #, c-format

3474 msgid "could not create directories for %s"

3475 msgstr ""

3476

3266 -#: dir.c:3422

3477 +#: dir.c:3486

3478 #, c-format

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

3480 msgstr ""

@@ -3508,7 +3719,7 @@ msgstr ""

3719 msgid "no matching remote head"

3720 msgstr ""

3721

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

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

3723 msgid "remote did not send all necessary objects"

3724 msgstr ""

3725

@@ -3522,19 +3733,19 @@ msgstr ""

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

3734 msgstr ""

3735

3525 -#: gpg-interface.c:223

3736 +#: gpg-interface.c:408

3737 +msgid "gpg failed to sign the data"

3738 +msgstr ""

3739 +

3740 +#: gpg-interface.c:434

3741 msgid "could not create temporary file"

3742 msgstr ""

3743

3529 -#: gpg-interface.c:226

3744 +#: gpg-interface.c:437

3745 #, c-format

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

3747 msgstr ""

3748

3534 -#: gpg-interface.c:390

3535 -msgid "gpg failed to sign the data"

3536 -msgstr ""

3537 -

3749 #: graph.c:98

3750 #, c-format

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

@@ -3546,18 +3757,18 @@ msgid ""

3757 "with -P under PCRE v2"

3758 msgstr ""

3759

3549 -#: grep.c:2124

3760 +#: grep.c:2128

3761 #, c-format

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

3763 msgstr ""

3764

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

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

3766 #: builtin/rm.c:135

3767 #, c-format

3768 msgid "failed to stat '%s'"

3769 msgstr ""

3770

3560 -#: grep.c:2152

3771 +#: grep.c:2156

3772 #, c-format

3773 msgid "'%s': short read"

3774 msgstr ""

@@ -3751,7 +3962,7 @@ msgstr ""

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

3963 msgstr ""

3964

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

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

3966 #, c-format

3967 msgid "invalid date format: %s"

3968 msgstr ""

@@ -3829,109 +4040,109 @@ msgid "failed to read the cache"

4040 msgstr ""

4041

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

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

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

4044 #: builtin/stash.c:264

4045 msgid "unable to write new index file"

4046 msgstr ""

4047

3837 -#: merge-recursive.c:367

4048 +#: merge-recursive.c:356

4049 msgid "(bad commit)\n"

4050 msgstr ""

4051

3841 -#: merge-recursive.c:390

4052 +#: merge-recursive.c:379

4053 #, c-format

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

4055 msgstr ""

4056

3846 -#: merge-recursive.c:399

4057 +#: merge-recursive.c:388

4058 #, c-format

4059 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4060 msgstr ""

4061

3851 -#: merge-recursive.c:885

4062 +#: merge-recursive.c:874

4063 #, c-format

4064 msgid "failed to create path '%s'%s"

4065 msgstr ""

4066

3856 -#: merge-recursive.c:896

4067 +#: merge-recursive.c:885

4068 #, c-format

4069 msgid "Removing %s to make room for subdirectory\n"

4070 msgstr ""

4071

3861 -#: merge-recursive.c:910 merge-recursive.c:929

4072 +#: merge-recursive.c:899 merge-recursive.c:918

4073 msgid ": perhaps a D/F conflict?"

4074 msgstr ""

4075

3865 -#: merge-recursive.c:919

4076 +#: merge-recursive.c:908

4077 #, c-format

4078 msgid "refusing to lose untracked file at '%s'"

4079 msgstr ""

4080

3870 -#: merge-recursive.c:960 builtin/cat-file.c:41

4081 +#: merge-recursive.c:949 builtin/cat-file.c:41

4082 #, c-format

4083 msgid "cannot read object %s '%s'"

4084 msgstr ""

4085

3875 -#: merge-recursive.c:965

4086 +#: merge-recursive.c:954

4087 #, c-format

4088 msgid "blob expected for %s '%s'"

4089 msgstr ""

4090

3880 -#: merge-recursive.c:990

4091 +#: merge-recursive.c:979

4092 #, c-format

4093 msgid "failed to open '%s': %s"

4094 msgstr ""

4095

3885 -#: merge-recursive.c:1001

4096 +#: merge-recursive.c:990

4097 #, c-format

4098 msgid "failed to symlink '%s': %s"

4099 msgstr ""

4100

3890 -#: merge-recursive.c:1006

4101 +#: merge-recursive.c:995

4102 #, c-format

4103 msgid "do not know what to do with %06o %s '%s'"

4104 msgstr ""

4105

3895 -#: merge-recursive.c:1199

4106 +#: merge-recursive.c:1191

4107 #, c-format

4108 msgid "Failed to merge submodule %s (not checked out)"

4109 msgstr ""

4110

3900 -#: merge-recursive.c:1206

4111 +#: merge-recursive.c:1198

4112 #, c-format

4113 msgid "Failed to merge submodule %s (commits not present)"

4114 msgstr ""

4115

3905 -#: merge-recursive.c:1213

4116 +#: merge-recursive.c:1205

4117 #, c-format

4118 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4119 msgstr ""

4120

3910 -#: merge-recursive.c:1221 merge-recursive.c:1233

4121 +#: merge-recursive.c:1213 merge-recursive.c:1225

4122 #, c-format

4123 msgid "Fast-forwarding submodule %s to the following commit:"

4124 msgstr ""

4125

3915 -#: merge-recursive.c:1224 merge-recursive.c:1236

4126 +#: merge-recursive.c:1216 merge-recursive.c:1228

4127 #, c-format

4128 msgid "Fast-forwarding submodule %s"

4129 msgstr ""

4130

3920 -#: merge-recursive.c:1259

4131 +#: merge-recursive.c:1251

4132 #, c-format

4133 msgid "Failed to merge submodule %s (merge following commits not found)"

4134 msgstr ""

4135

3925 -#: merge-recursive.c:1263

4136 +#: merge-recursive.c:1255

4137 #, c-format

4138 msgid "Failed to merge submodule %s (not fast-forward)"

4139 msgstr ""

4140

3930 -#: merge-recursive.c:1264

4141 +#: merge-recursive.c:1256

4142 msgid "Found a possible merge resolution for the submodule:\n"

4143 msgstr ""

4144

3934 -#: merge-recursive.c:1267

4145 +#: merge-recursive.c:1259

4146 #, c-format

4147 msgid ""

4148 "If this is correct simply add it to the index for example\n"

@@ -3942,87 +4153,87 @@ msgid ""

4153 "which will accept this suggestion.\n"

4154 msgstr ""

4155

3945 -#: merge-recursive.c:1276

4156 +#: merge-recursive.c:1268

4157 #, c-format

4158 msgid "Failed to merge submodule %s (multiple merges found)"

4159 msgstr ""

4160

3950 -#: merge-recursive.c:1349

4161 +#: merge-recursive.c:1341

4162 msgid "Failed to execute internal merge"

4163 msgstr ""

4164

3954 -#: merge-recursive.c:1354

4165 +#: merge-recursive.c:1346

4166 #, c-format

4167 msgid "Unable to add %s to database"

4168 msgstr ""

4169

3959 -#: merge-recursive.c:1386

4170 +#: merge-recursive.c:1378

4171 #, c-format

4172 msgid "Auto-merging %s"

4173 msgstr ""

4174

3964 -#: merge-recursive.c:1410

4175 +#: merge-recursive.c:1402

4176 #, c-format

4177 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4178 msgstr ""

4179

3969 -#: merge-recursive.c:1482

4180 +#: merge-recursive.c:1474

4181 #, c-format

4182 msgid ""

4183 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

4184 "in tree."

4185 msgstr ""

4186

3976 -#: merge-recursive.c:1487

4187 +#: merge-recursive.c:1479

4188 #, c-format

4189 msgid ""

4190 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4191 "left in tree."

4192 msgstr ""

4193

3983 -#: merge-recursive.c:1494

4194 +#: merge-recursive.c:1486

4195 #, c-format

4196 msgid ""

4197 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

4198 "in tree at %s."

4199 msgstr ""

4200

3990 -#: merge-recursive.c:1499

4201 +#: merge-recursive.c:1491

4202 #, c-format

4203 msgid ""

4204 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4205 "left in tree at %s."

4206 msgstr ""

4207

3997 -#: merge-recursive.c:1534

4208 +#: merge-recursive.c:1526

4209 msgid "rename"

4210 msgstr ""

4211

4001 -#: merge-recursive.c:1534

4212 +#: merge-recursive.c:1526

4213 msgid "renamed"

4214 msgstr ""

4215

4005 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4216 +#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175

4217 #, c-format

4218 msgid "Refusing to lose dirty file at %s"

4219 msgstr ""

4220

4010 -#: merge-recursive.c:1624

4221 +#: merge-recursive.c:1616

4222 #, c-format

4223 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4224 msgstr ""

4225

4015 -#: merge-recursive.c:1682

4226 +#: merge-recursive.c:1674

4227 #, c-format

4228 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4229 msgstr ""

4230

4020 -#: merge-recursive.c:1713

4231 +#: merge-recursive.c:1705

4232 #, c-format

4233 msgid "%s is a directory in %s adding as %s instead"

4234 msgstr ""

4235

4025 -#: merge-recursive.c:1718

4236 +#: merge-recursive.c:1710

4237 #, c-format

4238 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4239 msgstr ""

@@ -4110,7 +4321,7 @@ msgstr ""

4321 msgid "Skipped %s (merged same as existing)"

4322 msgstr ""

4323

4113 -#: merge-recursive.c:3147 git-submodule.sh:993

4324 +#: merge-recursive.c:3147 git-submodule.sh:1003

4325 msgid "submodule"

4326 msgstr ""

4327

@@ -4216,7 +4427,7 @@ msgstr ""

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

4428 msgstr ""

4429

4219 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4430 +#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877

4431 msgid "Unable to write index."

4432 msgstr ""

4433

@@ -4444,25 +4655,30 @@ msgstr ""

4655 msgid "unable to parse object: %s"

4656 msgstr ""

4657

4447 -#: object.c:266 object.c:277

4658 +#: object.c:266 object.c:278

4659 #, c-format

4660 msgid "hash mismatch %s"

4661 msgstr ""

4662

4452 -#: packfile.c:641

4663 +#: packfile.c:629

4664 msgid "offset before end of packfile (broken .idx?)"

4665 msgstr ""

4666

4456 -#: packfile.c:1888

4667 +#: packfile.c:1899

4668 #, c-format

4669 msgid "offset before start of pack index for %s (corrupt index?)"

4670 msgstr ""

4671

4461 -#: packfile.c:1892

4672 +#: packfile.c:1903

4673 #, c-format

4674 msgid "offset beyond end of pack index for %s (truncated index?)"

4675 msgstr ""

4676

4677 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

4678 +#, c-format

4679 +msgid "unable to get size of %s"

4680 +msgstr ""

4681 +

4682 #: parse-options.c:38

4683 #, c-format

4684 msgid "%s requires a value"

@@ -4493,36 +4709,36 @@ msgstr ""

4709 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

4710 msgstr ""

4711

4496 -#: parse-options.c:389

4712 +#: parse-options.c:388

4713 #, c-format

4714 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

4715 msgstr ""

4716

4501 -#: parse-options.c:423 parse-options.c:431

4717 +#: parse-options.c:422 parse-options.c:430

4718 #, c-format

4503 -msgid "did you mean `--%s` (with two dashes ?)"

4719 +msgid "did you mean `--%s` (with two dashes)?"

4720 msgstr ""

4721

4506 -#: parse-options.c:860

4722 +#: parse-options.c:859

4723 #, c-format

4724 msgid "unknown option `%s'"

4725 msgstr ""

4726

4511 -#: parse-options.c:862

4727 +#: parse-options.c:861

4728 #, c-format

4729 msgid "unknown switch `%c'"

4730 msgstr ""

4731

4516 -#: parse-options.c:864

4732 +#: parse-options.c:863

4733 #, c-format

4734 msgid "unknown non-ascii option in string: `%s'"

4735 msgstr ""

4736

4521 -#: parse-options.c:888

4737 +#: parse-options.c:887

4738 msgid "..."

4739 msgstr ""

4740

4525 -#: parse-options.c:907

4741 +#: parse-options.c:906

4742 #, c-format

4743 msgid "usage: %s"

4744 msgstr ""

@@ -4530,21 +4746,21 @@ msgstr ""

4746 #. TRANSLATORS: the colon here should align with the

4747 #. one in "usage: %s" translation.

4748 #.

4533 -#: parse-options.c:913

4749 +#: parse-options.c:912

4750 #, c-format

4751 msgid " or: %s"

4752 msgstr ""

4753

4538 -#: parse-options.c:916

4754 +#: parse-options.c:915

4755 #, c-format

4756 msgid " %s"

4757 msgstr ""

4758

4543 -#: parse-options.c:955

4759 +#: parse-options.c:954

4760 msgid "-NUM"

4761 msgstr ""

4762

4547 -#: parse-options.c:969

4763 +#: parse-options.c:968

4764 #, c-format

4765 msgid "alias of --%s"

4766 msgstr ""

@@ -4627,25 +4843,25 @@ msgstr ""

4843

4844 #: pathspec.c:442

4845 #, c-format

4630 -msgid "%s: '%s' is outside repository"

4846 +msgid "%s: '%s' is outside repository at '%s'"

4847 msgstr ""

4848

4633 -#: pathspec.c:516

4849 +#: pathspec.c:517

4850 #, c-format

4851 msgid "'%s' (mnemonic: '%c')"

4852 msgstr ""

4853

4638 -#: pathspec.c:526

4854 +#: pathspec.c:527

4855 #, c-format

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

4857 msgstr ""

4858

4643 -#: pathspec.c:593

4859 +#: pathspec.c:594

4860 #, c-format

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

4862 msgstr ""

4863

4648 -#: pathspec.c:638

4864 +#: pathspec.c:639

4865 #, c-format

4866 msgid "line is badly quoted: %s"

4867 msgstr ""

@@ -4731,7 +4947,7 @@ msgstr ""

4947 msgid "could not read `log` output"

4948 msgstr ""

4949

4734 -#: range-diff.c:96 sequencer.c:5163

4950 +#: range-diff.c:96 sequencer.c:5020

4951 #, c-format

4952 msgid "could not parse commit '%s'"

4953 msgstr ""

@@ -4784,172 +5000,180 @@ msgstr ""

5000 msgid "unable to stat '%s'"

5001 msgstr ""

5002

4787 -#: read-cache.c:1325

5003 +#: read-cache.c:1330

5004 #, c-format

5005 msgid "'%s' appears as both a file and as a directory"

5006 msgstr ""

5007

4792 -#: read-cache.c:1531

5008 +#: read-cache.c:1536

5009 msgid "Refresh index"

5010 msgstr ""

5011

4796 -#: read-cache.c:1646

5012 +#: read-cache.c:1651

5013 #, c-format

5014 msgid ""

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

5016 "Using version %i"

5017 msgstr ""

5018

4803 -#: read-cache.c:1656

5019 +#: read-cache.c:1661

5020 #, c-format

5021 msgid ""

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

5023 "Using version %i"

5024 msgstr ""

5025

4810 -#: read-cache.c:1712

5026 +#: read-cache.c:1717

5027 #, c-format

5028 msgid "bad signature 0x%08x"

5029 msgstr ""

5030

4815 -#: read-cache.c:1715

5031 +#: read-cache.c:1720

5032 #, c-format

5033 msgid "bad index version %d"

5034 msgstr ""

5035

4820 -#: read-cache.c:1724

5036 +#: read-cache.c:1729

5037 msgid "bad index file sha1 signature"

5038 msgstr ""

5039

4824 -#: read-cache.c:1754

5040 +#: read-cache.c:1759

5041 #, c-format

5042 msgid "index uses %.4s extension, which we do not understand"

5043 msgstr ""

5044

4829 -#: read-cache.c:1756

5045 +#: read-cache.c:1761

5046 #, c-format

5047 msgid "ignoring %.4s extension"

5048 msgstr ""

5049

4834 -#: read-cache.c:1793

5050 +#: read-cache.c:1798

5051 #, c-format

5052 msgid "unknown index entry format 0x%08x"

5053 msgstr ""

5054

4839 -#: read-cache.c:1809

5055 +#: read-cache.c:1814

5056 #, c-format

5057 msgid "malformed name field in the index, near path '%s'"

5058 msgstr ""

5059

4844 -#: read-cache.c:1866

5060 +#: read-cache.c:1871

5061 msgid "unordered stage entries in index"

5062 msgstr ""

5063

4848 -#: read-cache.c:1869

5064 +#: read-cache.c:1874

5065 #, c-format

5066 msgid "multiple stage entries for merged file '%s'"

5067 msgstr ""

5068

4853 -#: read-cache.c:1872

5069 +#: read-cache.c:1877

5070 #, c-format

5071 msgid "unordered stage entries for '%s'"

5072 msgstr ""

5073

4858 -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

4859 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

4860 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

4861 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4862 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5074 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5075 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5076 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5077 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5078 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271

5079 +#: builtin/submodule--helper.c:332

5080 msgid "index file corrupt"

5081 msgstr ""

5082

4866 -#: read-cache.c:2119

5083 +#: read-cache.c:2124

5084 #, c-format

5085 msgid "unable to create load_cache_entries thread: %s"

5086 msgstr ""

5087

4871 -#: read-cache.c:2132

5088 +#: read-cache.c:2137

5089 #, c-format

5090 msgid "unable to join load_cache_entries thread: %s"

5091 msgstr ""

5092

4876 -#: read-cache.c:2165

5093 +#: read-cache.c:2170

5094 #, c-format

5095 msgid "%s: index file open failed"

5096 msgstr ""

5097

4881 -#: read-cache.c:2169

5098 +#: read-cache.c:2174

5099 #, c-format

5100 msgid "%s: cannot stat the open index"

5101 msgstr ""

5102

4886 -#: read-cache.c:2173

5103 +#: read-cache.c:2178

5104 #, c-format

5105 msgid "%s: index file smaller than expected"

5106 msgstr ""

5107

4891 -#: read-cache.c:2177

5108 +#: read-cache.c:2182

5109 #, c-format

5110 msgid "%s: unable to map index file"

5111 msgstr ""

5112

4896 -#: read-cache.c:2219

5113 +#: read-cache.c:2224

5114 #, c-format

5115 msgid "unable to create load_index_extensions thread: %s"

5116 msgstr ""

5117

4901 -#: read-cache.c:2246

5118 +#: read-cache.c:2251

5119 #, c-format

5120 msgid "unable to join load_index_extensions thread: %s"

5121 msgstr ""

5122

4906 -#: read-cache.c:2278

5123 +#: read-cache.c:2283

5124 #, c-format

5125 msgid "could not freshen shared index '%s'"

5126 msgstr ""

5127

4911 -#: read-cache.c:2325

5128 +#: read-cache.c:2330

5129 #, c-format

5130 msgid "broken index, expect %s in %s, got %s"

5131 msgstr ""

5132

4916 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5133 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5134 #, c-format

5135 msgid "could not close '%s'"

5136 msgstr ""

5137

4921 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5138 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5139 #, c-format

5140 msgid "could not stat '%s'"

5141 msgstr ""

5142

4926 -#: read-cache.c:3137

5143 +#: read-cache.c:3142

5144 #, c-format

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

5146 msgstr ""

5147

4931 -#: read-cache.c:3149

5148 +#: read-cache.c:3154

5149 #, c-format

5150 msgid "unable to unlink: %s"

5151 msgstr ""

5152

4936 -#: read-cache.c:3174

5153 +#: read-cache.c:3179

5154 #, c-format

5155 msgid "cannot fix permission bits on '%s'"

5156 msgstr ""

5157

4941 -#: read-cache.c:3323

5158 +#: read-cache.c:3328

5159 #, c-format

5160 msgid "%s: cannot drop to stage #0"

5161 msgstr ""

5162

4946 -#: rebase-interactive.c:26

5163 +#: rebase-interactive.c:11

5164 +msgid ""

5165 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5166 +"continue'.\n"

5167 +"Or you can abort the rebase with 'git rebase --abort'.\n"

5168 +msgstr ""

5169 +

5170 +#: rebase-interactive.c:33

5171 #, c-format

5172 msgid ""

5173 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5174 msgstr ""

5175

4952 -#: rebase-interactive.c:35

5176 +#: rebase-interactive.c:42

5177 msgid ""

5178 "\n"

5179 "Commands:\n"

@@ -4971,26 +5195,26 @@ msgid ""

5195 "These lines can be re-ordered; they are executed from top to bottom.\n"

5196 msgstr ""

5197

4974 -#: rebase-interactive.c:56

5198 +#: rebase-interactive.c:63

5199 #, c-format

5200 msgid "Rebase %s onto %s (%d command)"

5201 msgid_plural "Rebase %s onto %s (%d commands)"

5202 msgstr[0] ""

5203 msgstr[1] ""

5204

4981 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

5205 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5206 msgid ""

5207 "\n"

5208 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

5209 msgstr ""

5210

4987 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

5211 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5212 msgid ""

5213 "\n"

5214 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

5215 msgstr ""

5216

4993 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

5217 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5218 msgid ""

5219 "\n"

5220 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4999,36 +5223,33 @@ msgid ""

5223 "\n"

5224 msgstr ""

5225

5002 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

5226 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5227 msgid ""

5228 "\n"

5229 "However, if you remove everything, the rebase will be aborted.\n"

5230 "\n"

5231 msgstr ""

5232

5009 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

5010 -msgid "Note that empty commits are commented out"

5011 -msgstr ""

5012 -

5013 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5014 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5233 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5234 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5235 #, c-format

5236 msgid "could not write '%s'"

5237 msgstr ""

5238

5019 -#: rebase-interactive.c:108

5239 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5240 +#: builtin/rebase.c:234

5241 #, c-format

5021 -msgid "could not copy '%s' to '%s'."

5242 +msgid "could not write '%s'."

5243 msgstr ""

5244

5024 -#: rebase-interactive.c:173

5245 +#: rebase-interactive.c:193

5246 #, c-format

5247 msgid ""

5248 "Warning: some commits may have been dropped accidentally.\n"

5249 "Dropped commits (newer to older):\n"

5250 msgstr ""

5251

5031 -#: rebase-interactive.c:180

5252 +#: rebase-interactive.c:200

5253 #, c-format

5254 msgid ""

5255 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5039,6 +5260,13 @@ msgid ""

5260 "\n"

5261 msgstr ""

5262

5263 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5264 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5265 +#: builtin/rebase.c:246

5266 +#, c-format

5267 +msgid "could not read '%s'."

5268 +msgstr ""

5269 +

5270 #: refs.c:262

5271 #, c-format

5272 msgid "%s does not point to a valid object!"

@@ -5074,15 +5302,15 @@ msgstr ""

5302 msgid "unexpected object ID when writing '%s'"

5303 msgstr ""

5304

5077 -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5078 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5305 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5306 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5307 #: wrapper.c:620

5308 #, c-format

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

5310 msgstr ""

5311

5084 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5085 -#: builtin/rebase.c:1031

5312 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5313 +#: builtin/rebase.c:1029

5314 #, c-format

5315 msgid "could not open '%s' for writing"

5316 msgstr ""

@@ -5136,18 +5364,18 @@ msgstr ""

5364 msgid "cannot process '%s' and '%s' at the same time"

5365 msgstr ""

5366

5139 -#: refs/files-backend.c:1234

5367 +#: refs/files-backend.c:1233

5368 #, c-format

5369 msgid "could not remove reference %s"

5370 msgstr ""

5371

5144 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5372 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5373 #: refs/packed-backend.c:1551

5374 #, c-format

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

5376 msgstr ""

5377

5150 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5378 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5379 #, c-format

5380 msgid "could not delete references: %s"

5381 msgstr ""

@@ -5411,45 +5639,45 @@ msgstr ""

5639 msgid "config remote shorthand cannot begin with '/': %s"

5640 msgstr ""

5641

5414 -#: remote.c:413

5642 +#: remote.c:414

5643 msgid "more than one receivepack given, using the first"

5644 msgstr ""

5645

5418 -#: remote.c:421

5646 +#: remote.c:422

5647 msgid "more than one uploadpack given, using the first"

5648 msgstr ""

5649

5422 -#: remote.c:611

5650 +#: remote.c:612

5651 #, c-format

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

5653 msgstr ""

5654

5427 -#: remote.c:615

5655 +#: remote.c:616

5656 #, c-format

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

5658 msgstr ""

5659

5432 -#: remote.c:619

5660 +#: remote.c:620

5661 #, c-format

5662 msgid "%s tracks both %s and %s"

5663 msgstr ""

5664

5437 -#: remote.c:687

5665 +#: remote.c:688

5666 #, c-format

5667 msgid "key '%s' of pattern had no '*'"

5668 msgstr ""

5669

5442 -#: remote.c:697

5670 +#: remote.c:698

5671 #, c-format

5672 msgid "value '%s' of pattern has no '*'"

5673 msgstr ""

5674

5447 -#: remote.c:1003

5675 +#: remote.c:1004

5676 #, c-format

5677 msgid "src refspec %s does not match any"

5678 msgstr ""

5679

5452 -#: remote.c:1008

5680 +#: remote.c:1009

5681 #, c-format

5682 msgid "src refspec %s matches more than one"

5683 msgstr ""

@@ -5458,7 +5686,7 @@ msgstr ""

5686 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5687 #. the <src>.

5688 #.

5461 -#: remote.c:1023

5689 +#: remote.c:1024

5690 #, c-format

5691 msgid ""

5692 "The destination you provided is not a full refname (i.e.,\n"

@@ -5472,7 +5700,7 @@ msgid ""

5700 "Neither worked, so we gave up. You must fully qualify the ref."

5701 msgstr ""

5702

5475 -#: remote.c:1043

5703 +#: remote.c:1044

5704 #, c-format

5705 msgid ""

5706 "The <src> part of the refspec is a commit object.\n"

@@ -5480,7 +5708,7 @@ msgid ""

5708 "'%s:refs/heads/%s'?"

5709 msgstr ""

5710

5483 -#: remote.c:1048

5711 +#: remote.c:1049

5712 #, c-format

5713 msgid ""

5714 "The <src> part of the refspec is a tag object.\n"

@@ -5488,7 +5716,7 @@ msgid ""

5716 "'%s:refs/tags/%s'?"

5717 msgstr ""

5718

5491 -#: remote.c:1053

5719 +#: remote.c:1054

5720 #, c-format

5721 msgid ""

5722 "The <src> part of the refspec is a tree object.\n"

@@ -5496,7 +5724,7 @@ msgid ""

5724 "'%s:refs/tags/%s'?"

5725 msgstr ""

5726

5499 -#: remote.c:1058

5727 +#: remote.c:1059

5728 #, c-format

5729 msgid ""

5730 "The <src> part of the refspec is a blob object.\n"

@@ -5504,114 +5732,114 @@ msgid ""

5732 "'%s:refs/tags/%s'?"

5733 msgstr ""

5734

5507 -#: remote.c:1094

5735 +#: remote.c:1095

5736 #, c-format

5737 msgid "%s cannot be resolved to branch"

5738 msgstr ""

5739

5512 -#: remote.c:1105

5740 +#: remote.c:1106

5741 #, c-format

5742 msgid "unable to delete '%s': remote ref does not exist"

5743 msgstr ""

5744

5517 -#: remote.c:1117

5745 +#: remote.c:1118

5746 #, c-format

5747 msgid "dst refspec %s matches more than one"

5748 msgstr ""

5749

5522 -#: remote.c:1124

5750 +#: remote.c:1125

5751 #, c-format

5752 msgid "dst ref %s receives from more than one src"

5753 msgstr ""

5754

5527 -#: remote.c:1627 remote.c:1728

5755 +#: remote.c:1628 remote.c:1729

5756 msgid "HEAD does not point to a branch"

5757 msgstr ""

5758

5531 -#: remote.c:1636

5759 +#: remote.c:1637

5760 #, c-format

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

5762 msgstr ""

5763

5536 -#: remote.c:1639

5764 +#: remote.c:1640

5765 #, c-format

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

5767 msgstr ""

5768

5541 -#: remote.c:1645

5769 +#: remote.c:1646

5770 #, c-format

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

5772 msgstr ""

5773

5546 -#: remote.c:1660

5774 +#: remote.c:1661

5775 #, c-format

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

5777 msgstr ""

5778

5551 -#: remote.c:1672

5779 +#: remote.c:1673

5780 #, c-format

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

5782 msgstr ""

5783

5556 -#: remote.c:1682

5784 +#: remote.c:1683

5785 #, c-format

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

5787 msgstr ""

5788

5561 -#: remote.c:1695

5789 +#: remote.c:1696

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

5791 msgstr ""

5792

5565 -#: remote.c:1717

5793 +#: remote.c:1718

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

5795 msgstr ""

5796

5569 -#: remote.c:1843

5797 +#: remote.c:1844

5798 #, c-format

5799 msgid "couldn't find remote ref %s"

5800 msgstr ""

5801

5574 -#: remote.c:1856

5802 +#: remote.c:1857

5803 #, c-format

5804 msgid "* Ignoring funny ref '%s' locally"

5805 msgstr ""

5806

5579 -#: remote.c:2019

5807 +#: remote.c:2020

5808 #, c-format

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

5810 msgstr ""

5811

5584 -#: remote.c:2023

5812 +#: remote.c:2024

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

5814 msgstr ""

5815

5588 -#: remote.c:2026

5816 +#: remote.c:2027

5817 #, c-format

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

5819 msgstr ""

5820

5593 -#: remote.c:2030

5821 +#: remote.c:2031

5822 #, c-format

5823 msgid "Your branch and '%s' refer to different commits.\n"

5824 msgstr ""

5825

5598 -#: remote.c:2033

5826 +#: remote.c:2034

5827 #, c-format

5828 msgid " (use \"%s\" for details)\n"

5829 msgstr ""

5830

5603 -#: remote.c:2037

5831 +#: remote.c:2038

5832 #, c-format

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

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

5835 msgstr[0] ""

5836 msgstr[1] ""

5837

5610 -#: remote.c:2043

5838 +#: remote.c:2044

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

5840 msgstr ""

5841

5614 -#: remote.c:2046

5842 +#: remote.c:2047

5843 #, c-format

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

5845 msgid_plural ""

@@ -5619,11 +5847,11 @@ msgid_plural ""

5847 msgstr[0] ""

5848 msgstr[1] ""

5849

5622 -#: remote.c:2054

5850 +#: remote.c:2055

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

5852 msgstr ""

5853

5626 -#: remote.c:2057

5854 +#: remote.c:2058

5855 #, c-format

5856 msgid ""

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

@@ -5634,11 +5862,11 @@ msgid_plural ""

5862 msgstr[0] ""

5863 msgstr[1] ""

5864

5637 -#: remote.c:2067

5865 +#: remote.c:2068

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

5867 msgstr ""

5868

5641 -#: remote.c:2250

5869 +#: remote.c:2251

5870 #, c-format

5871 msgid "cannot parse expected object name '%s'"

5872 msgstr ""

@@ -5653,7 +5881,7 @@ msgstr ""

5881 msgid "duplicate replace ref: %s"

5882 msgstr ""

5883

5656 -#: replace-object.c:73

5884 +#: replace-object.c:82

5885 #, c-format

5886 msgid "replace depth too high for object %s"

5887 msgstr ""

@@ -5716,8 +5944,8 @@ msgstr ""

5944 msgid "Recorded preimage for '%s'"

5945 msgstr ""

5946

5719 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

5720 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

5947 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

5948 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

5949 #, c-format

5950 msgid "could not create directory '%s'"

5951 msgstr ""

@@ -5768,16 +5996,16 @@ msgstr ""

5996 msgid "-L does not yet support diff formats besides -p and -s"

5997 msgstr ""

5998

5771 -#: run-command.c:762

5999 +#: run-command.c:763

6000 msgid "open /dev/null failed"

6001 msgstr ""

6002

5775 -#: run-command.c:1268

6003 +#: run-command.c:1269

6004 #, c-format

6005 msgid "cannot create async thread: %s"

6006 msgstr ""

6007

5780 -#: run-command.c:1332

6008 +#: run-command.c:1333

6009 #, c-format

6010 msgid ""

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

@@ -5820,159 +6048,155 @@ msgstr ""

6048 msgid "the receiving end does not support push options"

6049 msgstr ""

6050

5823 -#: sequencer.c:189

6051 +#: sequencer.c:191

6052 #, c-format

6053 msgid "invalid commit message cleanup mode '%s'"

6054 msgstr ""

6055

5828 -#: sequencer.c:294

6056 +#: sequencer.c:296

6057 #, c-format

6058 msgid "could not delete '%s'"

6059 msgstr ""

6060

5833 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6061 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369

6062 #, c-format

6063 msgid "could not remove '%s'"

6064 msgstr ""

6065

5838 -#: sequencer.c:323

6066 +#: sequencer.c:325

6067 msgid "revert"

6068 msgstr ""

6069

5842 -#: sequencer.c:325

6070 +#: sequencer.c:327

6071 msgid "cherry-pick"

6072 msgstr ""

6073

5846 -#: sequencer.c:327

5847 -msgid "rebase -i"

6074 +#: sequencer.c:329

6075 +msgid "rebase"

6076 msgstr ""

6077

5850 -#: sequencer.c:329

6078 +#: sequencer.c:331

6079 #, c-format

6080 msgid "unknown action: %d"

6081 msgstr ""

6082

5855 -#: sequencer.c:387

6083 +#: sequencer.c:389

6084 msgid ""

6085 "after resolving the conflicts, mark the corrected paths\n"

6086 "with 'git add <paths>' or 'git rm <paths>'"

6087 msgstr ""

6088

5861 -#: sequencer.c:390

6089 +#: sequencer.c:392

6090 msgid ""

6091 "after resolving the conflicts, mark the corrected paths\n"

6092 "with 'git add <paths>' or 'git rm <paths>'\n"

6093 "and commit the result with 'git commit'"

6094 msgstr ""

6095

5868 -#: sequencer.c:403 sequencer.c:2993

6096 +#: sequencer.c:405 sequencer.c:2901

6097 #, c-format

6098 msgid "could not lock '%s'"

6099 msgstr ""

6100

5873 -#: sequencer.c:410

6101 +#: sequencer.c:412

6102 #, c-format

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

6104 msgstr ""

6105

5878 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

5879 -#: sequencer.c:3277

6106 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6107 +#: sequencer.c:3185

6108 #, c-format

6109 msgid "failed to finalize '%s'"

6110 msgstr ""

6111

5884 -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

5885 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

5886 -#: builtin/rebase.c:589

6112 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6113 +#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120

6114 +#: builtin/rebase.c:593

6115 #, c-format

6116 msgid "could not read '%s'"

6117 msgstr ""

6118

5891 -#: sequencer.c:464

6119 +#: sequencer.c:466

6120 #, c-format

6121 msgid "your local changes would be overwritten by %s."

6122 msgstr ""

6123

5896 -#: sequencer.c:468

6124 +#: sequencer.c:470

6125 msgid "commit your changes or stash them to proceed."

6126 msgstr ""

6127

5900 -#: sequencer.c:500

6128 +#: sequencer.c:502

6129 #, c-format

6130 msgid "%s: fast-forward"

6131 msgstr ""

6132

5905 -#: sequencer.c:539 builtin/tag.c:565

6133 +#: sequencer.c:541 builtin/tag.c:565

6134 #, c-format

6135 msgid "Invalid cleanup mode %s"

6136 msgstr ""

6137

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

5911 -#. "rebase -i".

6139 +#. "rebase".

6140 #.

5913 -#: sequencer.c:633

6141 +#: sequencer.c:635

6142 #, c-format

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

6144 msgstr ""

6145

5918 -#: sequencer.c:650

6146 +#: sequencer.c:652

6147 msgid "unable to update cache tree"

6148 msgstr ""

6149

5922 -#: sequencer.c:664

6150 +#: sequencer.c:666

6151 msgid "could not resolve HEAD commit"

6152 msgstr ""

6153

5926 -#: sequencer.c:744

6154 +#: sequencer.c:746

6155 #, c-format

6156 msgid "no key present in '%.*s'"

6157 msgstr ""

6158

5931 -#: sequencer.c:755

6159 +#: sequencer.c:757

6160 #, c-format

6161 msgid "unable to dequote value of '%s'"

6162 msgstr ""

6163

5936 -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5937 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6164 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6165 +#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072

6166 #, c-format

6167 msgid "could not open '%s' for reading"

6168 msgstr ""

6169

5942 -#: sequencer.c:802

6170 +#: sequencer.c:804

6171 msgid "'GIT_AUTHOR_NAME' already given"

6172 msgstr ""

6173

5946 -#: sequencer.c:807

6174 +#: sequencer.c:809

6175 msgid "'GIT_AUTHOR_EMAIL' already given"

6176 msgstr ""

6177

5950 -#: sequencer.c:812

6178 +#: sequencer.c:814

6179 msgid "'GIT_AUTHOR_DATE' already given"

6180 msgstr ""

6181

5954 -#: sequencer.c:816

6182 +#: sequencer.c:818

6183 #, c-format

6184 msgid "unknown variable '%s'"

6185 msgstr ""

6186

5959 -#: sequencer.c:821

6187 +#: sequencer.c:823

6188 msgid "missing 'GIT_AUTHOR_NAME'"

6189 msgstr ""

6190

5963 -#: sequencer.c:823

6191 +#: sequencer.c:825

6192 msgid "missing 'GIT_AUTHOR_EMAIL'"

6193 msgstr ""

6194

5967 -#: sequencer.c:825

6195 +#: sequencer.c:827

6196 msgid "missing 'GIT_AUTHOR_DATE'"

6197 msgstr ""

6198

5971 -#: sequencer.c:902 sequencer.c:1427

5972 -msgid "malformed ident line"

5973 -msgstr ""

5974 -

5975 -#: sequencer.c:925

6199 +#: sequencer.c:876

6200 #, c-format

6201 msgid ""

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

@@ -5989,11 +6213,11 @@ msgid ""

6213 " git rebase --continue\n"

6214 msgstr ""

6215

5992 -#: sequencer.c:1218

6216 +#: sequencer.c:1148

6217 msgid "'prepare-commit-msg' hook failed"

6218 msgstr ""

6219

5996 -#: sequencer.c:1224

6220 +#: sequencer.c:1154

6221 msgid ""

6222 "Your name and email address were configured automatically based\n"

6223 "on your username and hostname. Please check that they are accurate.\n"

@@ -6008,7 +6232,7 @@ msgid ""

6232 " git commit --amend --reset-author\n"

6233 msgstr ""

6234

6011 -#: sequencer.c:1237

6235 +#: sequencer.c:1167

6236 msgid ""

6237 "Your name and email address were configured automatically based\n"

6238 "on your username and hostname. Please check that they are accurate.\n"

@@ -6022,350 +6246,345 @@ msgid ""

6246 " git commit --amend --reset-author\n"

6247 msgstr ""

6248

6025 -#: sequencer.c:1279

6249 +#: sequencer.c:1209

6250 msgid "couldn't look up newly created commit"

6251 msgstr ""

6252

6029 -#: sequencer.c:1281

6253 +#: sequencer.c:1211

6254 msgid "could not parse newly created commit"

6255 msgstr ""

6256

6033 -#: sequencer.c:1327

6257 +#: sequencer.c:1257

6258 msgid "unable to resolve HEAD after creating commit"

6259 msgstr ""

6260

6037 -#: sequencer.c:1329

6261 +#: sequencer.c:1259

6262 msgid "detached HEAD"

6263 msgstr ""

6264

6041 -#: sequencer.c:1333

6265 +#: sequencer.c:1263

6266 msgid " (root-commit)"

6267 msgstr ""

6268

6045 -#: sequencer.c:1354

6269 +#: sequencer.c:1284

6270 msgid "could not parse HEAD"

6271 msgstr ""

6272

6049 -#: sequencer.c:1356

6273 +#: sequencer.c:1286

6274 #, c-format

6275 msgid "HEAD %s is not a commit!"

6276 msgstr ""

6277

6054 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6278 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6279 msgid "could not parse HEAD commit"

6280 msgstr ""

6281

6058 -#: sequencer.c:1411 sequencer.c:2055

6282 +#: sequencer.c:1342 sequencer.c:1968

6283 msgid "unable to parse commit author"

6284 msgstr ""

6285

6062 -#: sequencer.c:1431

6063 -msgid "corrupted author without date information"

6064 -msgstr ""

6065 -

6066 -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6286 +#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687

6287 msgid "git write-tree failed to write a tree"

6288 msgstr ""

6289

6070 -#: sequencer.c:1480 sequencer.c:1550

6290 +#: sequencer.c:1386 sequencer.c:1447

6291 #, c-format

6292 msgid "unable to read commit message from '%s'"

6293 msgstr ""

6294

6075 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6076 -#: builtin/merge.c:908

6295 +#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886

6296 +#: builtin/merge.c:911

6297 msgid "failed to write commit object"

6298 msgstr ""

6299

6080 -#: sequencer.c:1577

6300 +#: sequencer.c:1474

6301 #, c-format

6302 msgid "could not parse commit %s"

6303 msgstr ""

6304

6085 -#: sequencer.c:1582

6305 +#: sequencer.c:1479

6306 #, c-format

6307 msgid "could not parse parent commit %s"

6308 msgstr ""

6309

6090 -#: sequencer.c:1656 sequencer.c:1767

6310 +#: sequencer.c:1562 sequencer.c:1673

6311 #, c-format

6312 msgid "unknown command: %d"

6313 msgstr ""

6314

6095 -#: sequencer.c:1714 sequencer.c:1739

6315 +#: sequencer.c:1620 sequencer.c:1645

6316 #, c-format

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

6318 msgstr ""

6319

6100 -#: sequencer.c:1724

6320 +#: sequencer.c:1630

6321 msgid "need a HEAD to fixup"

6322 msgstr ""

6323

6104 -#: sequencer.c:1726 sequencer.c:3304

6324 +#: sequencer.c:1632 sequencer.c:3212

6325 msgid "could not read HEAD"

6326 msgstr ""

6327

6108 -#: sequencer.c:1728

6328 +#: sequencer.c:1634

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

6330 msgstr ""

6331

6112 -#: sequencer.c:1734

6332 +#: sequencer.c:1640

6333 #, c-format

6334 msgid "cannot write '%s'"

6335 msgstr ""

6336

6117 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6337 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

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

6339 msgstr ""

6340

6121 -#: sequencer.c:1749

6341 +#: sequencer.c:1655

6342 #, c-format

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

6344 msgstr ""

6345

6126 -#: sequencer.c:1756

6346 +#: sequencer.c:1662

6347 #, c-format

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

6349 msgstr ""

6350

6131 -#: sequencer.c:1762

6351 +#: sequencer.c:1668

6352 #, c-format

6353 msgid "The commit message #%d will be skipped:"

6354 msgstr ""

6355

6136 -#: sequencer.c:1850

6356 +#: sequencer.c:1756

6357 msgid "your index file is unmerged."

6358 msgstr ""

6359

6140 -#: sequencer.c:1857

6360 +#: sequencer.c:1763

6361 msgid "cannot fixup root commit"

6362 msgstr ""

6363

6144 -#: sequencer.c:1876

6364 +#: sequencer.c:1782

6365 #, c-format

6366 msgid "commit %s is a merge but no -m option was given."

6367 msgstr ""

6368

6149 -#: sequencer.c:1884 sequencer.c:1892

6369 +#: sequencer.c:1790 sequencer.c:1798

6370 #, c-format

6371 msgid "commit %s does not have parent %d"

6372 msgstr ""

6373

6154 -#: sequencer.c:1898

6374 +#: sequencer.c:1804

6375 #, c-format

6376 msgid "cannot get commit message for %s"

6377 msgstr ""

6378

6379 #. TRANSLATORS: The first %s will be a "todo" command like

6380 #. "revert" or "pick", the second %s a SHA1.

6161 -#: sequencer.c:1917

6381 +#: sequencer.c:1823

6382 #, c-format

6383 msgid "%s: cannot parse parent commit %s"

6384 msgstr ""

6385

6166 -#: sequencer.c:1982

6386 +#: sequencer.c:1888

6387 #, c-format

6388 msgid "could not rename '%s' to '%s'"

6389 msgstr ""

6390

6171 -#: sequencer.c:2037

6391 +#: sequencer.c:1943

6392 #, c-format

6393 msgid "could not revert %s... %s"

6394 msgstr ""

6395

6176 -#: sequencer.c:2038

6396 +#: sequencer.c:1944

6397 #, c-format

6398 msgid "could not apply %s... %s"

6399 msgstr ""

6400

6181 -#: sequencer.c:2105

6401 +#: sequencer.c:1961

6402 +#, c-format

6403 +msgid "dropping %s %s -- patch contents already upstream\n"

6404 +msgstr ""

6405 +

6406 +#: sequencer.c:2018

6407 #, c-format

6408 msgid "git %s: failed to read the index"

6409 msgstr ""

6410

6186 -#: sequencer.c:2112

6411 +#: sequencer.c:2025

6412 #, c-format

6413 msgid "git %s: failed to refresh the index"

6414 msgstr ""

6415

6191 -#: sequencer.c:2189

6416 +#: sequencer.c:2102

6417 #, c-format

6418 msgid "%s does not accept arguments: '%s'"

6419 msgstr ""

6420

6196 -#: sequencer.c:2198

6421 +#: sequencer.c:2111

6422 #, c-format

6423 msgid "missing arguments for %s"

6424 msgstr ""

6425

6201 -#: sequencer.c:2235

6426 +#: sequencer.c:2142

6427 #, c-format

6203 -msgid "could not parse '%.*s'"

6428 +msgid "could not parse '%s'"

6429 msgstr ""

6430

6206 -#: sequencer.c:2289

6431 +#: sequencer.c:2203

6432 #, c-format

6433 msgid "invalid line %d: %.*s"

6434 msgstr ""

6435

6211 -#: sequencer.c:2300

6436 +#: sequencer.c:2214

6437 #, c-format

6438 msgid "cannot '%s' without a previous commit"

6439 msgstr ""

6440

6216 -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6217 -#: builtin/rebase.c:223 builtin/rebase.c:248

6218 -#, c-format

6219 -msgid "could not read '%s'."

6220 -msgstr ""

6221 -

6222 -#: sequencer.c:2384

6441 +#: sequencer.c:2298

6442 msgid "cancelling a cherry picking in progress"

6443 msgstr ""

6444

6226 -#: sequencer.c:2391

6445 +#: sequencer.c:2305

6446 msgid "cancelling a revert in progress"

6447 msgstr ""

6448

6230 -#: sequencer.c:2435

6449 +#: sequencer.c:2349

6450 msgid "please fix this using 'git rebase --edit-todo'."

6451 msgstr ""

6452

6234 -#: sequencer.c:2437

6453 +#: sequencer.c:2351

6454 #, c-format

6455 msgid "unusable instruction sheet: '%s'"

6456 msgstr ""

6457

6239 -#: sequencer.c:2442

6458 +#: sequencer.c:2356

6459 msgid "no commits parsed."

6460 msgstr ""

6461

6243 -#: sequencer.c:2453

6462 +#: sequencer.c:2367

6463 msgid "cannot cherry-pick during a revert."

6464 msgstr ""

6465

6247 -#: sequencer.c:2455

6466 +#: sequencer.c:2369

6467 msgid "cannot revert during a cherry-pick."

6468 msgstr ""

6469

6251 -#: sequencer.c:2533

6470 +#: sequencer.c:2447

6471 #, c-format

6472 msgid "invalid value for %s: %s"

6473 msgstr ""

6474

6256 -#: sequencer.c:2630

6475 +#: sequencer.c:2540

6476 msgid "unusable squash-onto"

6477 msgstr ""

6478

6260 -#: sequencer.c:2646

6479 +#: sequencer.c:2556

6480 #, c-format

6481 msgid "malformed options sheet: '%s'"

6482 msgstr ""

6483

6265 -#: sequencer.c:2736 sequencer.c:4463

6484 +#: sequencer.c:2644 sequencer.c:4361

6485 msgid "empty commit set passed"

6486 msgstr ""

6487

6269 -#: sequencer.c:2752

6488 +#: sequencer.c:2660

6489 msgid "revert is already in progress"

6490 msgstr ""

6491

6273 -#: sequencer.c:2754

6492 +#: sequencer.c:2662

6493 #, c-format

6494 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6495 msgstr ""

6496

6278 -#: sequencer.c:2757

6497 +#: sequencer.c:2665

6498 msgid "cherry-pick is already in progress"

6499 msgstr ""

6500

6282 -#: sequencer.c:2759

6501 +#: sequencer.c:2667

6502 #, c-format

6503 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6504 msgstr ""

6505

6287 -#: sequencer.c:2773

6506 +#: sequencer.c:2681

6507 #, c-format

6508 msgid "could not create sequencer directory '%s'"

6509 msgstr ""

6510

6292 -#: sequencer.c:2788

6511 +#: sequencer.c:2696

6512 msgid "could not lock HEAD"

6513 msgstr ""

6514

6296 -#: sequencer.c:2848 sequencer.c:4209

6515 +#: sequencer.c:2756 sequencer.c:4099

6516 msgid "no cherry-pick or revert in progress"

6517 msgstr ""

6518

6300 -#: sequencer.c:2850 sequencer.c:2861

6519 +#: sequencer.c:2758 sequencer.c:2769

6520 msgid "cannot resolve HEAD"

6521 msgstr ""

6522

6304 -#: sequencer.c:2852 sequencer.c:2896

6523 +#: sequencer.c:2760 sequencer.c:2804

6524 msgid "cannot abort from a branch yet to be born"

6525 msgstr ""

6526

6308 -#: sequencer.c:2882 builtin/grep.c:736

6527 +#: sequencer.c:2790 builtin/grep.c:724

6528 #, c-format

6529 msgid "cannot open '%s'"

6530 msgstr ""

6531

6313 -#: sequencer.c:2884

6532 +#: sequencer.c:2792

6533 #, c-format

6534 msgid "cannot read '%s': %s"

6535 msgstr ""

6536

6318 -#: sequencer.c:2885

6537 +#: sequencer.c:2793

6538 msgid "unexpected end of file"

6539 msgstr ""

6540

6322 -#: sequencer.c:2891

6541 +#: sequencer.c:2799

6542 #, c-format

6543 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6544 msgstr ""

6545

6327 -#: sequencer.c:2902

6546 +#: sequencer.c:2810

6547 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6548 msgstr ""

6549

6331 -#: sequencer.c:2943

6550 +#: sequencer.c:2851

6551 msgid "no revert in progress"

6552 msgstr ""

6553

6335 -#: sequencer.c:2951

6554 +#: sequencer.c:2859

6555 msgid "no cherry-pick in progress"

6556 msgstr ""

6557

6339 -#: sequencer.c:2961

6558 +#: sequencer.c:2869

6559 msgid "failed to skip the commit"

6560 msgstr ""

6561

6343 -#: sequencer.c:2968

6562 +#: sequencer.c:2876

6563 msgid "there is nothing to skip"

6564 msgstr ""

6565

6347 -#: sequencer.c:2971

6566 +#: sequencer.c:2879

6567 #, c-format

6568 msgid ""

6569 "have you committed already?\n"

6570 "try \"git %s --continue\""

6571 msgstr ""

6572

6354 -#: sequencer.c:3095 sequencer.c:4121

6573 +#: sequencer.c:3003 sequencer.c:4011

6574 #, c-format

6575 msgid "could not update %s"

6576 msgstr ""

6577

6359 -#: sequencer.c:3134 sequencer.c:4101

6578 +#: sequencer.c:3042 sequencer.c:3991

6579 msgid "cannot read HEAD"

6580 msgstr ""

6581

6363 -#: sequencer.c:3151

6582 +#: sequencer.c:3059

6583 #, c-format

6584 msgid "unable to copy '%s' to '%s'"

6585 msgstr ""

6586

6368 -#: sequencer.c:3159

6587 +#: sequencer.c:3067

6588 #, c-format

6589 msgid ""

6590 "You can amend the commit now, with\n"

@@ -6377,22 +6596,22 @@ msgid ""

6596 " git rebase --continue\n"

6597 msgstr ""

6598

6380 -#: sequencer.c:3169

6599 +#: sequencer.c:3077

6600 #, c-format

6601 msgid "Could not apply %s... %.*s"

6602 msgstr ""

6603

6385 -#: sequencer.c:3176

6604 +#: sequencer.c:3084

6605 #, c-format

6606 msgid "Could not merge %.*s"

6607 msgstr ""

6608

6390 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

6609 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641

6610 #, c-format

6611 msgid "could not copy '%s' to '%s'"

6612 msgstr ""

6613

6395 -#: sequencer.c:3221

6614 +#: sequencer.c:3129

6615 #, c-format

6616 msgid ""

6617 "execution failed: %s\n"

@@ -6402,11 +6621,11 @@ msgid ""

6621 "\n"

6622 msgstr ""

6623

6405 -#: sequencer.c:3227

6624 +#: sequencer.c:3135

6625 msgid "and made changes to the index and/or the working tree\n"

6626 msgstr ""

6627

6409 -#: sequencer.c:3233

6628 +#: sequencer.c:3141

6629 #, c-format

6630 msgid ""

6631 "execution succeeded: %s\n"

@@ -6417,72 +6636,72 @@ msgid ""

6636 "\n"

6637 msgstr ""

6638

6420 -#: sequencer.c:3294

6639 +#: sequencer.c:3202

6640 #, c-format

6641 msgid "illegal label name: '%.*s'"

6642 msgstr ""

6643

6425 -#: sequencer.c:3348

6644 +#: sequencer.c:3256

6645 msgid "writing fake root commit"

6646 msgstr ""

6647

6429 -#: sequencer.c:3353

6648 +#: sequencer.c:3261

6649 msgid "writing squash-onto"

6650 msgstr ""

6651

6433 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

6652 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886

6653 #, c-format

6654 msgid "failed to find tree of %s"

6655 msgstr ""

6656

6438 -#: sequencer.c:3436

6657 +#: sequencer.c:3344

6658 #, c-format

6659 msgid "could not resolve '%s'"

6660 msgstr ""

6661

6443 -#: sequencer.c:3467

6662 +#: sequencer.c:3375

6663 msgid "cannot merge without a current revision"

6664 msgstr ""

6665

6447 -#: sequencer.c:3489

6666 +#: sequencer.c:3397

6667 #, c-format

6668 msgid "unable to parse '%.*s'"

6669 msgstr ""

6670

6452 -#: sequencer.c:3498

6671 +#: sequencer.c:3406

6672 #, c-format

6673 msgid "nothing to merge: '%.*s'"

6674 msgstr ""

6675

6457 -#: sequencer.c:3510

6676 +#: sequencer.c:3418

6677 msgid "octopus merge cannot be executed on top of a [new root]"

6678 msgstr ""

6679

6461 -#: sequencer.c:3526

6680 +#: sequencer.c:3434

6681 #, c-format

6682 msgid "could not get commit message of '%s'"

6683 msgstr ""

6684

6466 -#: sequencer.c:3688

6685 +#: sequencer.c:3594

6686 #, c-format

6687 msgid "could not even attempt to merge '%.*s'"

6688 msgstr ""

6689

6471 -#: sequencer.c:3704

6690 +#: sequencer.c:3610

6691 msgid "merge: Unable to write new index file"

6692 msgstr ""

6693

6475 -#: sequencer.c:3773 builtin/rebase.c:733

6694 +#: sequencer.c:3679 builtin/rebase.c:737

6695 #, c-format

6696 msgid "Applied autostash.\n"

6697 msgstr ""

6698

6480 -#: sequencer.c:3785

6699 +#: sequencer.c:3691

6700 #, c-format

6701 msgid "cannot store %s"

6702 msgstr ""

6703

6485 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

6704 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113

6705 #, c-format

6706 msgid ""

6707 "Applying autostash resulted in conflicts.\n"

@@ -6490,31 +6709,26 @@ msgid ""

6709 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

6710 msgstr ""

6711

6493 -#: sequencer.c:3849

6494 -#, c-format

6495 -msgid "could not checkout %s"

6496 -msgstr ""

6497 -

6498 -#: sequencer.c:3863

6712 +#: sequencer.c:3755

6713 #, c-format

6714 msgid "%s: not a valid OID"

6715 msgstr ""

6716

6503 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

6717 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779

6718 msgid "could not detach HEAD"

6719 msgstr ""

6720

6507 -#: sequencer.c:3883

6721 +#: sequencer.c:3775

6722 #, c-format

6723 msgid "Stopped at HEAD\n"

6724 msgstr ""

6725

6512 -#: sequencer.c:3885

6726 +#: sequencer.c:3777

6727 #, c-format

6728 msgid "Stopped at %s\n"

6729 msgstr ""

6730

6517 -#: sequencer.c:3893

6731 +#: sequencer.c:3785

6732 #, c-format

6733 msgid ""

6734 "Could not execute the todo command\n"

@@ -6527,121 +6741,114 @@ msgid ""

6741 " git rebase --continue\n"

6742 msgstr ""

6743

6530 -#: sequencer.c:3979

6744 +#: sequencer.c:3869

6745 #, c-format

6746 msgid "Stopped at %s... %.*s\n"

6747 msgstr ""

6748

6535 -#: sequencer.c:4050

6749 +#: sequencer.c:3940

6750 #, c-format

6751 msgid "unknown command %d"

6752 msgstr ""

6753

6540 -#: sequencer.c:4109

6754 +#: sequencer.c:3999

6755 msgid "could not read orig-head"

6756 msgstr ""

6757

6544 -#: sequencer.c:4114

6758 +#: sequencer.c:4004

6759 msgid "could not read 'onto'"

6760 msgstr ""

6761

6548 -#: sequencer.c:4128

6762 +#: sequencer.c:4018

6763 #, c-format

6764 msgid "could not update HEAD to %s"

6765 msgstr ""

6766

6553 -#: sequencer.c:4221

6767 +#: sequencer.c:4111

6768 msgid "cannot rebase: You have unstaged changes."

6769 msgstr ""

6770

6557 -#: sequencer.c:4230

6771 +#: sequencer.c:4120

6772 msgid "cannot amend non-existing commit"

6773 msgstr ""

6774

6561 -#: sequencer.c:4232

6775 +#: sequencer.c:4122

6776 #, c-format

6777 msgid "invalid file: '%s'"

6778 msgstr ""

6779

6566 -#: sequencer.c:4234

6780 +#: sequencer.c:4124

6781 #, c-format

6782 msgid "invalid contents: '%s'"

6783 msgstr ""

6784

6571 -#: sequencer.c:4237

6785 +#: sequencer.c:4127

6786 msgid ""

6787 "\n"

6788 "You have uncommitted changes in your working tree. Please, commit them\n"

6789 "first and then run 'git rebase --continue' again."

6790 msgstr ""

6791

6578 -#: sequencer.c:4273 sequencer.c:4312

6792 +#: sequencer.c:4163 sequencer.c:4202

6793 #, c-format

6794 msgid "could not write file: '%s'"

6795 msgstr ""

6796

6583 -#: sequencer.c:4327

6797 +#: sequencer.c:4217

6798 msgid "could not remove CHERRY_PICK_HEAD"

6799 msgstr ""

6800

6587 -#: sequencer.c:4334

6801 +#: sequencer.c:4224

6802 msgid "could not commit staged changes."

6803 msgstr ""

6804

6591 -#: sequencer.c:4440

6805 +#: sequencer.c:4338

6806 #, c-format

6807 msgid "%s: can't cherry-pick a %s"

6808 msgstr ""

6809

6596 -#: sequencer.c:4444

6810 +#: sequencer.c:4342

6811 #, c-format

6812 msgid "%s: bad revision"

6813 msgstr ""

6814

6601 -#: sequencer.c:4479

6815 +#: sequencer.c:4377

6816 msgid "can't revert as initial commit"

6817 msgstr ""

6818

6605 -#: sequencer.c:4952

6819 +#: sequencer.c:4846

6820 msgid "make_script: unhandled options"

6821 msgstr ""

6822

6609 -#: sequencer.c:4955

6823 +#: sequencer.c:4849

6824 msgid "make_script: error preparing revisions"

6825 msgstr ""

6826

6613 -#: sequencer.c:5113

6614 -msgid ""

6615 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

6616 -"continue'.\n"

6617 -"Or you can abort the rebase with 'git rebase --abort'.\n"

6618 -msgstr ""

6619 -

6620 -#: sequencer.c:5226 sequencer.c:5243

6827 +#: sequencer.c:5083 sequencer.c:5100

6828 msgid "nothing to do"

6829 msgstr ""

6830

6624 -#: sequencer.c:5257

6831 +#: sequencer.c:5119

6832 msgid "could not skip unnecessary pick commands"

6833 msgstr ""

6834

6628 -#: sequencer.c:5351

6835 +#: sequencer.c:5213

6836 msgid "the script was already rearranged."

6837 msgstr ""

6838

6839 #: setup.c:124

6840 #, c-format

6634 -msgid "'%s' is outside repository"

6841 +msgid "'%s' is outside repository at '%s'"

6842 msgstr ""

6843

6637 -#: setup.c:174

6844 +#: setup.c:175

6845 #, c-format

6846 msgid ""

6847 "%s: no such path in the working tree.\n"

6848 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."

6849 msgstr ""

6850

6644 -#: setup.c:187

6851 +#: setup.c:188

6852 #, c-format

6853 msgid ""

6854 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -6649,12 +6856,12 @@ msgid ""

6856 "'git <command> [<revision>...] -- [<file>...]'"

6857 msgstr ""

6858

6652 -#: setup.c:236

6859 +#: setup.c:254

6860 #, c-format

6861 msgid "option '%s' must come before non-option arguments"

6862 msgstr ""

6863

6657 -#: setup.c:255

6864 +#: setup.c:273

6865 #, c-format

6866 msgid ""

6867 "ambiguous argument '%s': both revision and filename\n"

@@ -6662,114 +6869,114 @@ msgid ""

6869 "'git <command> [<revision>...] -- [<file>...]'"

6870 msgstr ""

6871

6665 -#: setup.c:391

6872 +#: setup.c:409

6873 msgid "unable to set up work tree using invalid config"

6874 msgstr ""

6875

6669 -#: setup.c:395

6876 +#: setup.c:413

6877 msgid "this operation must be run in a work tree"

6878 msgstr ""

6879

6673 -#: setup.c:541

6880 +#: setup.c:559

6881 #, c-format

6882 msgid "Expected git repo version <= %d, found %d"

6883 msgstr ""

6884

6678 -#: setup.c:549

6885 +#: setup.c:567

6886 msgid "unknown repository extensions found:"

6887 msgstr ""

6888

6682 -#: setup.c:568

6889 +#: setup.c:586

6890 #, c-format

6891 msgid "error opening '%s'"

6892 msgstr ""

6893

6687 -#: setup.c:570

6894 +#: setup.c:588

6895 #, c-format

6896 msgid "too large to be a .git file: '%s'"

6897 msgstr ""

6898

6692 -#: setup.c:572

6899 +#: setup.c:590

6900 #, c-format

6901 msgid "error reading %s"

6902 msgstr ""

6903

6697 -#: setup.c:574

6904 +#: setup.c:592

6905 #, c-format

6906 msgid "invalid gitfile format: %s"

6907 msgstr ""

6908

6702 -#: setup.c:576

6909 +#: setup.c:594

6910 #, c-format

6911 msgid "no path in gitfile: %s"

6912 msgstr ""

6913

6707 -#: setup.c:578

6914 +#: setup.c:596

6915 #, c-format

6916 msgid "not a git repository: %s"

6917 msgstr ""

6918

6712 -#: setup.c:677

6919 +#: setup.c:695

6920 #, c-format

6921 msgid "'$%s' too big"

6922 msgstr ""

6923

6717 -#: setup.c:691

6924 +#: setup.c:709

6925 #, c-format

6926 msgid "not a git repository: '%s'"

6927 msgstr ""

6928

6722 -#: setup.c:720 setup.c:722 setup.c:753

6929 +#: setup.c:738 setup.c:740 setup.c:771

6930 #, c-format

6931 msgid "cannot chdir to '%s'"

6932 msgstr ""

6933

6727 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838

6934 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856

6935 msgid "cannot come back to cwd"

6936 msgstr ""

6937

6731 -#: setup.c:852

6938 +#: setup.c:870

6939 #, c-format

6940 msgid "failed to stat '%*s%s%s'"

6941 msgstr ""

6942

6736 -#: setup.c:1090

6943 +#: setup.c:1108

6944 msgid "Unable to read current working directory"

6945 msgstr ""

6946

6740 -#: setup.c:1099 setup.c:1105

6947 +#: setup.c:1117 setup.c:1123

6948 #, c-format

6949 msgid "cannot change to '%s'"

6950 msgstr ""

6951

6745 -#: setup.c:1110

6952 +#: setup.c:1128

6953 #, c-format

6954 msgid "not a git repository (or any of the parent directories): %s"

6955 msgstr ""

6956

6750 -#: setup.c:1116

6957 +#: setup.c:1134

6958 #, c-format

6959 msgid ""

6960 "not a git repository (or any parent up to mount point %s)\n"

6961 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

6962 msgstr ""

6963

6757 -#: setup.c:1227

6964 +#: setup.c:1245

6965 #, c-format

6966 msgid ""

6967 "problem with core.sharedRepository filemode value (0%.3o).\n"

6968 "The owner of files must always have read and write permissions."

6969 msgstr ""

6970

6764 -#: setup.c:1271

6971 +#: setup.c:1289

6972 msgid "open /dev/null or dup failed"

6973 msgstr ""

6974

6768 -#: setup.c:1286

6975 +#: setup.c:1304

6976 msgid "fork failed"

6977 msgstr ""

6978

6772 -#: setup.c:1291

6979 +#: setup.c:1309

6980 msgid "setsid failed"

6981 msgstr ""

6982

@@ -6849,194 +7056,194 @@ msgstr ""

7056 msgid "object file %s is empty"

7057 msgstr ""

7058

6852 -#: sha1-file.c:1252 sha1-file.c:2392

7059 +#: sha1-file.c:1263 sha1-file.c:2443

7060 #, c-format

7061 msgid "corrupt loose object '%s'"

7062 msgstr ""

7063

6857 -#: sha1-file.c:1254 sha1-file.c:2396

7064 +#: sha1-file.c:1265 sha1-file.c:2447

7065 #, c-format

7066 msgid "garbage at end of loose object '%s'"

7067 msgstr ""

7068

6862 -#: sha1-file.c:1296

7069 +#: sha1-file.c:1307

7070 msgid "invalid object type"

7071 msgstr ""

7072

6866 -#: sha1-file.c:1380

7073 +#: sha1-file.c:1391

7074 #, c-format

7075 msgid "unable to unpack %s header with --allow-unknown-type"

7076 msgstr ""

7077

6871 -#: sha1-file.c:1383

7078 +#: sha1-file.c:1394

7079 #, c-format

7080 msgid "unable to unpack %s header"

7081 msgstr ""

7082

6876 -#: sha1-file.c:1389

7083 +#: sha1-file.c:1400

7084 #, c-format

7085 msgid "unable to parse %s header with --allow-unknown-type"

7086 msgstr ""

7087

6881 -#: sha1-file.c:1392

7088 +#: sha1-file.c:1403

7089 #, c-format

7090 msgid "unable to parse %s header"

7091 msgstr ""

7092

6886 -#: sha1-file.c:1584

7093 +#: sha1-file.c:1629

7094 #, c-format

7095 msgid "failed to read object %s"

7096 msgstr ""

7097

6891 -#: sha1-file.c:1588

7098 +#: sha1-file.c:1633

7099 #, c-format

7100 msgid "replacement %s not found for %s"

7101 msgstr ""

7102

6896 -#: sha1-file.c:1592

7103 +#: sha1-file.c:1637

7104 #, c-format

7105 msgid "loose object %s (stored in %s) is corrupt"

7106 msgstr ""

7107

6901 -#: sha1-file.c:1596

7108 +#: sha1-file.c:1641

7109 #, c-format

7110 msgid "packed object %s (stored in %s) is corrupt"

7111 msgstr ""

7112

6906 -#: sha1-file.c:1699

7113 +#: sha1-file.c:1746

7114 #, c-format

7115 msgid "unable to write file %s"

7116 msgstr ""

7117

6911 -#: sha1-file.c:1706

7118 +#: sha1-file.c:1753

7119 #, c-format

7120 msgid "unable to set permission to '%s'"

7121 msgstr ""

7122

6916 -#: sha1-file.c:1713

7123 +#: sha1-file.c:1760

7124 msgid "file write error"

7125 msgstr ""

7126

6920 -#: sha1-file.c:1732

7127 +#: sha1-file.c:1780

7128 msgid "error when closing loose object file"

7129 msgstr ""

7130

6924 -#: sha1-file.c:1797

7131 +#: sha1-file.c:1845

7132 #, c-format

7133 msgid "insufficient permission for adding an object to repository database %s"

7134 msgstr ""

7135

6929 -#: sha1-file.c:1799

7136 +#: sha1-file.c:1847

7137 msgid "unable to create temporary file"

7138 msgstr ""

7139

6933 -#: sha1-file.c:1823

7140 +#: sha1-file.c:1871

7141 msgid "unable to write loose object file"

7142 msgstr ""

7143

6937 -#: sha1-file.c:1829

7144 +#: sha1-file.c:1877

7145 #, c-format

7146 msgid "unable to deflate new object %s (%d)"

7147 msgstr ""

7148

6942 -#: sha1-file.c:1833

7149 +#: sha1-file.c:1881

7150 #, c-format

7151 msgid "deflateEnd on object %s failed (%d)"

7152 msgstr ""

7153

6947 -#: sha1-file.c:1837

7154 +#: sha1-file.c:1885

7155 #, c-format

7156 msgid "confused by unstable object source data for %s"

7157 msgstr ""

7158

6952 -#: sha1-file.c:1847 builtin/pack-objects.c:925

7159 +#: sha1-file.c:1895 builtin/pack-objects.c:1054

7160 #, c-format

7161 msgid "failed utime() on %s"

7162 msgstr ""

7163

6957 -#: sha1-file.c:1922

7164 +#: sha1-file.c:1972

7165 #, c-format

7166 msgid "cannot read object for %s"

7167 msgstr ""

7168

6962 -#: sha1-file.c:1962

7169 +#: sha1-file.c:2011

7170 msgid "corrupt commit"

7171 msgstr ""

7172

6966 -#: sha1-file.c:1970

7173 +#: sha1-file.c:2019

7174 msgid "corrupt tag"

7175 msgstr ""

7176

6970 -#: sha1-file.c:2069

7177 +#: sha1-file.c:2119

7178 #, c-format

7179 msgid "read error while indexing %s"

7180 msgstr ""

7181

6975 -#: sha1-file.c:2072

7182 +#: sha1-file.c:2122

7183 #, c-format

7184 msgid "short read while indexing %s"

7185 msgstr ""

7186

6980 -#: sha1-file.c:2145 sha1-file.c:2154

7187 +#: sha1-file.c:2195 sha1-file.c:2205

7188 #, c-format

7189 msgid "%s: failed to insert into database"

7190 msgstr ""

7191

6985 -#: sha1-file.c:2160

7192 +#: sha1-file.c:2211

7193 #, c-format

7194 msgid "%s: unsupported file type"

7195 msgstr ""

7196

6990 -#: sha1-file.c:2184

7197 +#: sha1-file.c:2235

7198 #, c-format

7199 msgid "%s is not a valid object"

7200 msgstr ""

7201

6995 -#: sha1-file.c:2186

7202 +#: sha1-file.c:2237

7203 #, c-format

7204 msgid "%s is not a valid '%s' object"

7205 msgstr ""

7206

7000 -#: sha1-file.c:2213 builtin/index-pack.c:155

7207 +#: sha1-file.c:2264 builtin/index-pack.c:155

7208 #, c-format

7209 msgid "unable to open %s"

7210 msgstr ""

7211

7005 -#: sha1-file.c:2403 sha1-file.c:2455

7212 +#: sha1-file.c:2454 sha1-file.c:2507

7213 #, c-format

7214 msgid "hash mismatch for %s (expected %s)"

7215 msgstr ""

7216

7010 -#: sha1-file.c:2427

7217 +#: sha1-file.c:2478

7218 #, c-format

7219 msgid "unable to mmap %s"

7220 msgstr ""

7221

7015 -#: sha1-file.c:2432

7222 +#: sha1-file.c:2483

7223 #, c-format

7224 msgid "unable to unpack header of %s"

7225 msgstr ""

7226

7020 -#: sha1-file.c:2438

7227 +#: sha1-file.c:2489

7228 #, c-format

7229 msgid "unable to parse header of %s"

7230 msgstr ""

7231

7025 -#: sha1-file.c:2449

7232 +#: sha1-file.c:2500

7233 #, c-format

7234 msgid "unable to unpack contents of %s"

7235 msgstr ""

7236

7030 -#: sha1-name.c:487

7237 +#: sha1-name.c:486

7238 #, c-format

7239 msgid "short SHA1 %s is ambiguous"

7240 msgstr ""

7241

7035 -#: sha1-name.c:498

7242 +#: sha1-name.c:497

7243 msgid "The candidates are:"

7244 msgstr ""

7245

7039 -#: sha1-name.c:797

7246 +#: sha1-name.c:796

7247 msgid ""

7248 "Git normally never creates a ref that ends with 40 hex characters\n"

7249 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -7049,44 +7256,104 @@ msgid ""

7256 "running \"git config advice.objectNameWarning false\""

7257 msgstr ""

7258

7259 +#: sha1-name.c:916

7260 +#, c-format

7261 +msgid "log for '%.*s' only goes back to %s"

7262 +msgstr ""

7263 +

7264 +#: sha1-name.c:924

7265 +#, c-format

7266 +msgid "log for '%.*s' only has %d entries"

7267 +msgstr ""

7268 +

7269 +#: sha1-name.c:1689

7270 +#, c-format

7271 +msgid "path '%s' exists on disk, but not in '%.*s'"

7272 +msgstr ""

7273 +

7274 +#: sha1-name.c:1695

7275 +#, c-format

7276 +msgid ""

7277 +"path '%s' exists, but not '%s'\n"

7278 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

7279 +msgstr ""

7280 +

7281 +#: sha1-name.c:1704

7282 +#, c-format

7283 +msgid "path '%s' does not exist in '%.*s'"

7284 +msgstr ""

7285 +

7286 +#: sha1-name.c:1732

7287 +#, c-format

7288 +msgid ""

7289 +"path '%s' is in the index, but not at stage %d\n"

7290 +"hint: Did you mean ':%d:%s'?"

7291 +msgstr ""

7292 +

7293 +#: sha1-name.c:1748

7294 +#, c-format

7295 +msgid ""

7296 +"path '%s' is in the index, but not '%s'\n"

7297 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

7298 +msgstr ""

7299 +

7300 +#: sha1-name.c:1756

7301 +#, c-format

7302 +msgid "path '%s' exists on disk, but not in the index"

7303 +msgstr ""

7304 +

7305 +#: sha1-name.c:1758

7306 +#, c-format

7307 +msgid "path '%s' does not exist (neither on disk nor in the index)"

7308 +msgstr ""

7309 +

7310 +#: sha1-name.c:1771

7311 +msgid "relative path syntax can't be used outside working tree"

7312 +msgstr ""

7313 +

7314 +#: sha1-name.c:1909

7315 +#, c-format

7316 +msgid "invalid object name '%.*s'."

7317 +msgstr ""

7318 +

7319 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

7053 -#: strbuf.c:822

7320 +#: strbuf.c:837

7321 #, c-format

7322 msgid "%u.%2.2u GiB"

7323 msgstr ""

7324

7325 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

7059 -#: strbuf.c:824

7326 +#: strbuf.c:839

7327 #, c-format

7328 msgid "%u.%2.2u GiB/s"

7329 msgstr ""

7330

7331 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

7065 -#: strbuf.c:832

7332 +#: strbuf.c:847

7333 #, c-format

7334 msgid "%u.%2.2u MiB"

7335 msgstr ""

7336

7337 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

7071 -#: strbuf.c:834

7338 +#: strbuf.c:849

7339 #, c-format

7340 msgid "%u.%2.2u MiB/s"

7341 msgstr ""

7342

7343 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

7077 -#: strbuf.c:841

7344 +#: strbuf.c:856

7345 #, c-format

7346 msgid "%u.%2.2u KiB"

7347 msgstr ""

7348

7349 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

7083 -#: strbuf.c:843

7350 +#: strbuf.c:858

7351 #, c-format

7352 msgid "%u.%2.2u KiB/s"

7353 msgstr ""

7354

7355 #. TRANSLATORS: IEC 80000-13:2008 byte

7089 -#: strbuf.c:849

7356 +#: strbuf.c:864

7357 #, c-format

7358 msgid "%u byte"

7359 msgid_plural "%u bytes"

@@ -7094,14 +7361,14 @@ msgstr[0] ""

7361 msgstr[1] ""

7362

7363 #. TRANSLATORS: IEC 80000-13:2008 byte/second

7097 -#: strbuf.c:851

7364 +#: strbuf.c:866

7365 #, c-format

7366 msgid "%u byte/s"

7367 msgid_plural "%u bytes/s"

7368 msgstr[0] ""

7369 msgstr[1] ""

7370

7104 -#: strbuf.c:1149

7371 +#: strbuf.c:1164

7372 #, c-format

7373 msgid "could not edit '%s'"

7374 msgstr ""

@@ -7134,72 +7401,137 @@ msgstr ""

7401 msgid "Pathspec '%s' is in submodule '%.*s'"

7402 msgstr ""

7403

7404 +#: submodule.c:434

7405 +#, c-format

7406 +msgid "bad --ignore-submodules argument: %s"

7407 +msgstr ""

7408 +

7409 +#: submodule.c:815

7410 +#, c-format

7411 +msgid ""

7412 +"Submodule in commit %s at path: '%s' collides with a submodule named the "

7413 +"same. Skipping it."

7414 +msgstr ""

7415 +

7416 #: submodule.c:910

7417 #, c-format

7418 msgid "submodule entry '%s' (%s) is a %s, not a commit"

7419 msgstr ""

7420

7142 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

7421 +#: submodule.c:995

7422 +#, c-format

7423 +msgid ""

7424 +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

7425 +"submodule %s"

7426 +msgstr ""

7427 +

7428 +#: submodule.c:1118

7429 +#, c-format

7430 +msgid "process for submodule '%s' failed"

7431 +msgstr ""

7432 +

7433 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045

7434 msgid "Failed to resolve HEAD as a valid ref."

7435 msgstr ""

7436

7146 -#: submodule.c:1481

7437 +#: submodule.c:1158

7438 #, c-format

7148 -msgid "Could not access submodule '%s'"

7439 +msgid "Pushing submodule '%s'\n"

7440 msgstr ""

7441

7151 -#: submodule.c:1651

7442 +#: submodule.c:1161

7443 +#, c-format

7444 +msgid "Unable to push submodule '%s'\n"

7445 +msgstr ""

7446 +

7447 +#: submodule.c:1453

7448 +#, c-format

7449 +msgid "Fetching submodule %s%s\n"

7450 +msgstr ""

7451 +

7452 +#: submodule.c:1483

7453 +#, c-format

7454 +msgid "Could not access submodule '%s'\n"

7455 +msgstr ""

7456 +

7457 +#: submodule.c:1637

7458 +#, c-format

7459 +msgid ""

7460 +"Errors during submodule fetch:\n"

7461 +"%s"

7462 +msgstr ""

7463 +

7464 +#: submodule.c:1662

7465 #, c-format

7466 msgid "'%s' not recognized as a git repository"

7467 msgstr ""

7468

7156 -#: submodule.c:1789

7469 +#: submodule.c:1679

7470 +#, c-format

7471 +msgid "Could not run 'git status --porcelain=2' in submodule %s"

7472 +msgstr ""

7473 +

7474 +#: submodule.c:1720

7475 +#, c-format

7476 +msgid "'git status --porcelain=2' failed in submodule %s"

7477 +msgstr ""

7478 +

7479 +#: submodule.c:1800

7480 #, c-format

7481 msgid "could not start 'git status' in submodule '%s'"

7482 msgstr ""

7483

7161 -#: submodule.c:1802

7484 +#: submodule.c:1813

7485 #, c-format

7486 msgid "could not run 'git status' in submodule '%s'"

7487 msgstr ""

7488

7166 -#: submodule.c:1817

7489 +#: submodule.c:1828

7490 #, c-format

7491 msgid "Could not unset core.worktree setting in submodule '%s'"

7492 msgstr ""

7493

7171 -#: submodule.c:1907

7494 +#: submodule.c:1855 submodule.c:2165

7495 +#, c-format

7496 +msgid "could not recurse into submodule '%s'"

7497 +msgstr ""

7498 +

7499 +#: submodule.c:1876

7500 +msgid "could not reset submodule index"

7501 +msgstr ""

7502 +

7503 +#: submodule.c:1918

7504 #, c-format

7505 msgid "submodule '%s' has dirty index"

7506 msgstr ""

7507

7176 -#: submodule.c:1959

7508 +#: submodule.c:1970

7509 #, c-format

7510 msgid "Submodule '%s' could not be updated."

7511 msgstr ""

7512

7181 -#: submodule.c:2027

7513 +#: submodule.c:2038

7514 #, c-format

7515 msgid "submodule git dir '%s' is inside git dir '%.*s'"

7516 msgstr ""

7517

7186 -#: submodule.c:2048

7518 +#: submodule.c:2059

7519 #, c-format

7520 msgid ""

7521 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

7522 msgstr ""

7523

7192 -#: submodule.c:2060 submodule.c:2119

7524 +#: submodule.c:2071 submodule.c:2130

7525 #, c-format

7526 msgid "could not lookup name for submodule '%s'"

7527 msgstr ""

7528

7197 -#: submodule.c:2064

7529 +#: submodule.c:2075

7530 #, c-format

7531 msgid "refusing to move '%s' into an existing git dir"

7532 msgstr ""

7533

7202 -#: submodule.c:2071

7534 +#: submodule.c:2082

7535 #, c-format

7536 msgid ""

7537 "Migrating git directory of '%s%s' from\n"

@@ -7207,16 +7539,11 @@ msgid ""

7539 "'%s'\n"

7540 msgstr ""

7541

7210 -#: submodule.c:2154

7211 -#, c-format

7212 -msgid "could not recurse into submodule '%s'"

7213 -msgstr ""

7214 -

7215 -#: submodule.c:2198

7542 +#: submodule.c:2209

7543 msgid "could not start ls-files in .."

7544 msgstr ""

7545

7219 -#: submodule.c:2237

7546 +#: submodule.c:2248

7547 #, c-format

7548 msgid "ls-tree returned unexpected return code %d"

7549 msgstr ""

@@ -7240,7 +7567,7 @@ msgstr ""

7567 msgid "invalid value for %s"

7568 msgstr ""

7569

7243 -#: submodule-config.c:769

7570 +#: submodule-config.c:765

7571 #, c-format

7572 msgid "Could not update .gitmodules entry %s"

7573 msgstr ""

@@ -7256,7 +7583,7 @@ msgstr ""

7583 msgid "unknown value '%s' for key '%s'"

7584 msgstr ""

7585

7259 -#: trailer.c:539 trailer.c:544 builtin/remote.c:295

7586 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323

7587 #, c-format

7588 msgid "more than one %s"

7589 msgstr ""

@@ -7375,7 +7702,7 @@ msgstr ""

7702 msgid "failed to push all needed submodules"

7703 msgstr ""

7704

7378 -#: transport.c:1345 transport-helper.c:656

7705 +#: transport.c:1345 transport-helper.c:657

7706 msgid "operation not supported by protocol"

7707 msgstr ""

7708

@@ -7388,7 +7715,7 @@ msgstr ""

7715 msgid "unable to find remote helper for '%s'"

7716 msgstr ""

7717

7391 -#: transport-helper.c:160 transport-helper.c:570

7718 +#: transport-helper.c:160 transport-helper.c:571

7719 msgid "can't dup helper output fd"

7720 msgstr ""

7721

@@ -7403,168 +7730,163 @@ msgstr ""

7730 msgid "this remote helper should implement refspec capability"

7731 msgstr ""

7732

7406 -#: transport-helper.c:284 transport-helper.c:424

7733 +#: transport-helper.c:284 transport-helper.c:425

7734 #, c-format

7735 msgid "%s unexpectedly said: '%s'"

7736 msgstr ""

7737

7411 -#: transport-helper.c:413

7738 +#: transport-helper.c:414

7739 #, c-format

7740 msgid "%s also locked %s"

7741 msgstr ""

7742

7416 -#: transport-helper.c:492

7743 +#: transport-helper.c:493

7744 msgid "couldn't run fast-import"

7745 msgstr ""

7746

7420 -#: transport-helper.c:515

7747 +#: transport-helper.c:516

7748 msgid "error while running fast-import"

7749 msgstr ""

7750

7424 -#: transport-helper.c:544 transport-helper.c:1133

7751 +#: transport-helper.c:545 transport-helper.c:1134

7752 #, c-format

7753 msgid "could not read ref %s"

7754 msgstr ""

7755

7429 -#: transport-helper.c:589

7756 +#: transport-helper.c:590

7757 #, c-format

7758 msgid "unknown response to connect: %s"

7759 msgstr ""

7760

7434 -#: transport-helper.c:611

7761 +#: transport-helper.c:612

7762 msgid "setting remote service path not supported by protocol"

7763 msgstr ""

7764

7438 -#: transport-helper.c:613

7765 +#: transport-helper.c:614

7766 msgid "invalid remote service path"

7767 msgstr ""

7768

7442 -#: transport-helper.c:659

7769 +#: transport-helper.c:660

7770 #, c-format

7771 msgid "can't connect to subservice %s"

7772 msgstr ""

7773

7447 -#: transport-helper.c:735

7774 +#: transport-helper.c:736

7775 #, c-format

7776 msgid "expected ok/error, helper said '%s'"

7777 msgstr ""

7778

7452 -#: transport-helper.c:788

7779 +#: transport-helper.c:789

7780 #, c-format

7781 msgid "helper reported unexpected status of %s"

7782 msgstr ""

7783

7457 -#: transport-helper.c:849

7784 +#: transport-helper.c:850

7785 #, c-format

7786 msgid "helper %s does not support dry-run"

7787 msgstr ""

7788

7462 -#: transport-helper.c:852

7789 +#: transport-helper.c:853

7790 #, c-format

7791 msgid "helper %s does not support --signed"

7792 msgstr ""

7793

7467 -#: transport-helper.c:855

7794 +#: transport-helper.c:856

7795 #, c-format

7796 msgid "helper %s does not support --signed=if-asked"

7797 msgstr ""

7798

7472 -#: transport-helper.c:860

7799 +#: transport-helper.c:861

7800 #, c-format

7801 msgid "helper %s does not support --atomic"

7802 msgstr ""

7803

7477 -#: transport-helper.c:866

7804 +#: transport-helper.c:867

7805 #, c-format

7806 msgid "helper %s does not support 'push-option'"

7807 msgstr ""

7808

7482 -#: transport-helper.c:964

7809 +#: transport-helper.c:965

7810 msgid "remote-helper doesn't support push; refspec needed"

7811 msgstr ""

7812

7486 -#: transport-helper.c:969

7813 +#: transport-helper.c:970

7814 #, c-format

7815 msgid "helper %s does not support 'force'"

7816 msgstr ""

7817

7491 -#: transport-helper.c:1016

7818 +#: transport-helper.c:1017

7819 msgid "couldn't run fast-export"

7820 msgstr ""

7821

l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)