0c32704f6a · 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: 2020-10-10 09:32+0800\n"

11 +"POT-Creation-Date: 2020-12-15 16:27+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,200 +18,200 @@ msgstr ""

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

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

20

21 -#: add-interactive.c:368

21 +#: add-interactive.c:376

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr ""

25

26 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

27 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

28 -#: builtin/rebase.c:1944

26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

27 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

28 +#: builtin/rebase.c:1955

29 msgid "could not read index"

30 msgstr ""

31

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

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

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

34 msgid "binary"

35 msgstr ""

36

37 -#: add-interactive.c:634 git-add--interactive.perl:278

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

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

39 msgid "nothing"

40 msgstr ""

41

42 -#: add-interactive.c:635 git-add--interactive.perl:314

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

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

44 msgid "unchanged"

45 msgstr ""

46

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

47 +#: add-interactive.c:680 git-add--interactive.perl:641

48 msgid "Update"

49 msgstr ""

50

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

51 +#: add-interactive.c:697 add-interactive.c:885

52 #, c-format

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

57 msgid "could not write index"

58 msgstr ""

59

60 -#: add-interactive.c:698 git-add--interactive.perl:628

60 +#: add-interactive.c:706 git-add--interactive.perl:626

61 #, c-format, perl-format

62 msgid "updated %d path\n"

63 msgid_plural "updated %d paths\n"

64 msgstr[0] ""

65 msgstr[1] ""

66

67 -#: add-interactive.c:716 git-add--interactive.perl:678

67 +#: add-interactive.c:724 git-add--interactive.perl:676

68 #, c-format, perl-format

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

70 msgstr ""

71

72 -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

72 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295

73 #: builtin/reset.c:145

74 #, c-format

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

76 msgstr ""

77

78 -#: add-interactive.c:751 git-add--interactive.perl:655

78 +#: add-interactive.c:759 git-add--interactive.perl:653

79 msgid "Revert"

80 msgstr ""

81

82 -#: add-interactive.c:767

82 +#: add-interactive.c:775

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

84 msgstr ""

85

86 -#: add-interactive.c:805 git-add--interactive.perl:631

86 +#: add-interactive.c:813 git-add--interactive.perl:629

87 #, c-format, perl-format

88 msgid "reverted %d path\n"

89 msgid_plural "reverted %d paths\n"

90 msgstr[0] ""

91 msgstr[1] ""

92

93 -#: add-interactive.c:856 git-add--interactive.perl:695

93 +#: add-interactive.c:864 git-add--interactive.perl:693

94 #, c-format

95 msgid "No untracked files.\n"

96 msgstr ""

97

98 -#: add-interactive.c:860 git-add--interactive.perl:689

98 +#: add-interactive.c:868 git-add--interactive.perl:687

99 msgid "Add untracked"

100 msgstr ""

101

102 -#: add-interactive.c:887 git-add--interactive.perl:625

102 +#: add-interactive.c:895 git-add--interactive.perl:623

103 #, c-format, perl-format

104 msgid "added %d path\n"

105 msgid_plural "added %d paths\n"

106 msgstr[0] ""

107 msgstr[1] ""

108

109 -#: add-interactive.c:917

109 +#: add-interactive.c:925

110 #, c-format

111 msgid "ignoring unmerged: %s"

112 msgstr ""

113

114 -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

114 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr ""

118

119 -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

119 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr ""

123

124 -#: add-interactive.c:935 git-add--interactive.perl:1381

124 +#: add-interactive.c:943 git-add--interactive.perl:1379

125 msgid "Patch update"

126 msgstr ""

127

128 -#: add-interactive.c:974 git-add--interactive.perl:1794

128 +#: add-interactive.c:982 git-add--interactive.perl:1792

129 msgid "Review diff"

130 msgstr ""

131

132 -#: add-interactive.c:1002

132 +#: add-interactive.c:1010

133 msgid "show paths with changes"

134 msgstr ""

135

136 -#: add-interactive.c:1004

136 +#: add-interactive.c:1012

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

138 msgstr ""

139

140 -#: add-interactive.c:1006

140 +#: add-interactive.c:1014

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

142 msgstr ""

143

144 -#: add-interactive.c:1008

144 +#: add-interactive.c:1016

145 msgid "pick hunks and update selectively"

146 msgstr ""

147

148 -#: add-interactive.c:1010

148 +#: add-interactive.c:1018

149 msgid "view diff between HEAD and index"

150 msgstr ""

151

152 -#: add-interactive.c:1012

152 +#: add-interactive.c:1020

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

154 msgstr ""

155

156 -#: add-interactive.c:1020 add-interactive.c:1069

156 +#: add-interactive.c:1028 add-interactive.c:1077

157 msgid "Prompt help:"

158 msgstr ""

159

160 -#: add-interactive.c:1022

160 +#: add-interactive.c:1030

161 msgid "select a single item"

162 msgstr ""

163

164 -#: add-interactive.c:1024

164 +#: add-interactive.c:1032

165 msgid "select a range of items"

166 msgstr ""

167

168 -#: add-interactive.c:1026

168 +#: add-interactive.c:1034

169 msgid "select multiple ranges"

170 msgstr ""

171

172 -#: add-interactive.c:1028 add-interactive.c:1073

172 +#: add-interactive.c:1036 add-interactive.c:1081

173 msgid "select item based on unique prefix"

174 msgstr ""

175

176 -#: add-interactive.c:1030

176 +#: add-interactive.c:1038

177 msgid "unselect specified items"

178 msgstr ""

179

180 -#: add-interactive.c:1032

180 +#: add-interactive.c:1040

181 msgid "choose all items"

182 msgstr ""

183

184 -#: add-interactive.c:1034

184 +#: add-interactive.c:1042

185 msgid "(empty) finish selecting"

186 msgstr ""

187

188 -#: add-interactive.c:1071

188 +#: add-interactive.c:1079

189 msgid "select a numbered item"

190 msgstr ""

191

192 -#: add-interactive.c:1075

192 +#: add-interactive.c:1083

193 msgid "(empty) select nothing"

194 msgstr ""

195

196 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891

196 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr ""

199

200 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888

200 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr ""

203

204 -#: add-interactive.c:1136 git-add--interactive.perl:213

204 +#: add-interactive.c:1144 git-add--interactive.perl:213

205 msgid "staged"

206 msgstr ""

207

208 -#: add-interactive.c:1136 git-add--interactive.perl:213

208 +#: add-interactive.c:1144 git-add--interactive.perl:213

209 msgid "unstaged"

210 msgstr ""

211

212 -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

213 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

214 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

212 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257

213 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

214 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

215 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

@@ -219,31 +219,31 @@ msgstr ""

219 msgid "path"

220 msgstr ""

221

222 -#: add-interactive.c:1143

222 +#: add-interactive.c:1151

223 msgid "could not refresh index"

224 msgstr ""

225

226 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805

226 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

227 #, c-format

228 msgid "Bye.\n"

229 msgstr ""

230

231 -#: add-patch.c:34 git-add--interactive.perl:1433

231 +#: add-patch.c:34 git-add--interactive.perl:1431

232 #, c-format, perl-format

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

234 msgstr ""

235

236 -#: add-patch.c:35 git-add--interactive.perl:1434

236 +#: add-patch.c:35 git-add--interactive.perl:1432

237 #, c-format, perl-format

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

239 msgstr ""

240

241 -#: add-patch.c:36 git-add--interactive.perl:1435

241 +#: add-patch.c:36 git-add--interactive.perl:1433

242 #, c-format, perl-format

243 msgid "Stage addition [y,n,q,a,d%s,?]? "

244 msgstr ""

245

246 -#: add-patch.c:37 git-add--interactive.perl:1436

246 +#: add-patch.c:37 git-add--interactive.perl:1434

247 #, c-format, perl-format

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

249 msgstr ""

@@ -263,22 +263,22 @@ msgid ""

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

264 msgstr ""

265

266 -#: add-patch.c:56 git-add--interactive.perl:1439

266 +#: add-patch.c:56 git-add--interactive.perl:1437

267 #, c-format, perl-format

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

269 msgstr ""

270

271 -#: add-patch.c:57 git-add--interactive.perl:1440

271 +#: add-patch.c:57 git-add--interactive.perl:1438

272 #, c-format, perl-format

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

274 msgstr ""

275

276 -#: add-patch.c:58 git-add--interactive.perl:1441

276 +#: add-patch.c:58 git-add--interactive.perl:1439

277 #, c-format, perl-format

278 msgid "Stash addition [y,n,q,a,d%s,?]? "

279 msgstr ""

280

281 -#: add-patch.c:59 git-add--interactive.perl:1442

281 +#: add-patch.c:59 git-add--interactive.perl:1440

282 #, c-format, perl-format

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

284 msgstr ""

@@ -298,22 +298,22 @@ msgid ""

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

299 msgstr ""

300

301 -#: add-patch.c:80 git-add--interactive.perl:1445

301 +#: add-patch.c:80 git-add--interactive.perl:1443

302 #, c-format, perl-format

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

304 msgstr ""

305

306 -#: add-patch.c:81 git-add--interactive.perl:1446

306 +#: add-patch.c:81 git-add--interactive.perl:1444

307 #, c-format, perl-format

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

309 msgstr ""

310

311 -#: add-patch.c:82 git-add--interactive.perl:1447

311 +#: add-patch.c:82 git-add--interactive.perl:1445

312 #, c-format, perl-format

313 msgid "Unstage addition [y,n,q,a,d%s,?]? "

314 msgstr ""

315

316 -#: add-patch.c:83 git-add--interactive.perl:1448

316 +#: add-patch.c:83 git-add--interactive.perl:1446

317 #, c-format, perl-format

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

319 msgstr ""

@@ -333,22 +333,22 @@ msgid ""

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

334 msgstr ""

335

336 -#: add-patch.c:103 git-add--interactive.perl:1451

336 +#: add-patch.c:103 git-add--interactive.perl:1449

337 #, c-format, perl-format

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

339 msgstr ""

340

341 -#: add-patch.c:104 git-add--interactive.perl:1452

341 +#: add-patch.c:104 git-add--interactive.perl:1450

342 #, c-format, perl-format

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

344 msgstr ""

345

346 -#: add-patch.c:105 git-add--interactive.perl:1453

346 +#: add-patch.c:105 git-add--interactive.perl:1451

347 #, c-format, perl-format

348 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

349 msgstr ""

350

351 -#: add-patch.c:106 git-add--interactive.perl:1454

351 +#: add-patch.c:106 git-add--interactive.perl:1452

352 #, c-format, perl-format

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

354 msgstr ""

@@ -368,26 +368,26 @@ msgid ""

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

369 msgstr ""

370

371 -#: add-patch.c:126 git-add--interactive.perl:1457

372 -#: git-add--interactive.perl:1475

371 +#: add-patch.c:126 git-add--interactive.perl:1455

372 +#: git-add--interactive.perl:1473

373 #, c-format, perl-format

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

375 msgstr ""

376

377 -#: add-patch.c:127 git-add--interactive.perl:1458

378 -#: git-add--interactive.perl:1476

377 +#: add-patch.c:127 git-add--interactive.perl:1456

378 +#: git-add--interactive.perl:1474

379 #, c-format, perl-format

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

381 msgstr ""

382

383 -#: add-patch.c:128 git-add--interactive.perl:1459

384 -#: git-add--interactive.perl:1477

383 +#: add-patch.c:128 git-add--interactive.perl:1457

384 +#: git-add--interactive.perl:1475

385 #, c-format, perl-format

386 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

387 msgstr ""

388

389 -#: add-patch.c:129 git-add--interactive.perl:1460

390 -#: git-add--interactive.perl:1478

389 +#: add-patch.c:129 git-add--interactive.perl:1458

390 +#: git-add--interactive.perl:1476

391 #, c-format, perl-format

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

393 msgstr ""

@@ -407,22 +407,22 @@ msgid ""

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

408 msgstr ""

409

410 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

410 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

411 #, c-format, perl-format

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

413 msgstr ""

414

415 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

415 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

416 #, c-format, perl-format

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

418 msgstr ""

419

420 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

420 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

421 #, c-format, perl-format

422 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

423 msgstr ""

424

425 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

425 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

426 #, c-format, perl-format

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

428 msgstr ""

@@ -436,22 +436,22 @@ msgid ""

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

437 msgstr ""

438

439 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

439 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

440 #, c-format, perl-format

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

442 msgstr ""

443

444 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

444 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

445 #, c-format, perl-format

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

447 msgstr ""

448

449 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

449 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

450 #, c-format, perl-format

451 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

452 msgstr ""

453

454 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

454 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

455 #, c-format, perl-format

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

457 msgstr ""

@@ -507,14 +507,14 @@ msgid ""

507 "between its input and output lines."

508 msgstr ""

509

510 -#: add-patch.c:785

510 +#: add-patch.c:790

511 #, c-format

512 msgid ""

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

514 "%.*s"

515 msgstr ""

516

517 -#: add-patch.c:800

517 +#: add-patch.c:805

518 #, c-format

519 msgid ""

520 "hunks do not overlap:\n"

@@ -523,11 +523,11 @@ msgid ""

523 "%.*s"

524 msgstr ""

525

526 -#: add-patch.c:1076 git-add--interactive.perl:1117

526 +#: add-patch.c:1081 git-add--interactive.perl:1115

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

528 msgstr ""

529

530 -#: add-patch.c:1080

530 +#: add-patch.c:1085

531 #, c-format

532 msgid ""

533 "---\n"

@@ -537,18 +537,18 @@ msgid ""

537 msgstr ""

538

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

540 -#: add-patch.c:1094 git-add--interactive.perl:1131

540 +#: add-patch.c:1099 git-add--interactive.perl:1129

541 msgid ""

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

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

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

545 msgstr ""

546

547 -#: add-patch.c:1127

547 +#: add-patch.c:1132

548 msgid "could not parse hunk header"

549 msgstr ""

550

551 -#: add-patch.c:1172

551 +#: add-patch.c:1177

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

553 msgstr ""

554

@@ -564,24 +564,24 @@ msgstr ""

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

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

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

567 -#: add-patch.c:1241 git-add--interactive.perl:1244

567 +#: add-patch.c:1246 git-add--interactive.perl:1242

568 msgid ""

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

570 msgstr ""

571

572 -#: add-patch.c:1284

572 +#: add-patch.c:1289

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

574 msgstr ""

575

576 -#: add-patch.c:1285 git-add--interactive.perl:1348

576 +#: add-patch.c:1290 git-add--interactive.perl:1346

577 msgid "Apply them to the worktree anyway? "

578 msgstr ""

579

580 -#: add-patch.c:1292 git-add--interactive.perl:1351

580 +#: add-patch.c:1297 git-add--interactive.perl:1349

581 msgid "Nothing was applied.\n"

582 msgstr ""

583

584 -#: add-patch.c:1349

584 +#: add-patch.c:1354

585 msgid ""

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

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

@@ -594,132 +594,132 @@ msgid ""

594 "? - print help\n"

595 msgstr ""

596

597 -#: add-patch.c:1511 add-patch.c:1521

597 +#: add-patch.c:1516 add-patch.c:1526

598 msgid "No previous hunk"

599 msgstr ""

600

601 -#: add-patch.c:1516 add-patch.c:1526

601 +#: add-patch.c:1521 add-patch.c:1531

602 msgid "No next hunk"

603 msgstr ""

604

605 -#: add-patch.c:1532

605 +#: add-patch.c:1537

606 msgid "No other hunks to goto"

607 msgstr ""

608

609 -#: add-patch.c:1543 git-add--interactive.perl:1608

609 +#: add-patch.c:1548 git-add--interactive.perl:1606

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

611 msgstr ""

612

613 -#: add-patch.c:1544 git-add--interactive.perl:1610

613 +#: add-patch.c:1549 git-add--interactive.perl:1608

614 msgid "go to which hunk? "

615 msgstr ""

616

617 -#: add-patch.c:1555

617 +#: add-patch.c:1560

618 #, c-format

619 msgid "Invalid number: '%s'"

620 msgstr ""

621

622 -#: add-patch.c:1560

622 +#: add-patch.c:1565

623 #, c-format

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

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

626 msgstr[0] ""

627 msgstr[1] ""

628

629 -#: add-patch.c:1569

629 +#: add-patch.c:1574

630 msgid "No other hunks to search"

631 msgstr ""

632

633 -#: add-patch.c:1575 git-add--interactive.perl:1663

633 +#: add-patch.c:1580 git-add--interactive.perl:1661

634 msgid "search for regex? "

635 msgstr ""

636

637 -#: add-patch.c:1590

637 +#: add-patch.c:1595

638 #, c-format

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

640 msgstr ""

641

642 -#: add-patch.c:1607

642 +#: add-patch.c:1612

643 msgid "No hunk matches the given pattern"

644 msgstr ""

645

646 -#: add-patch.c:1614

646 +#: add-patch.c:1619

647 msgid "Sorry, cannot split this hunk"

648 msgstr ""

649

650 -#: add-patch.c:1618

650 +#: add-patch.c:1623

651 #, c-format

652 msgid "Split into %d hunks."

653 msgstr ""

654

655 -#: add-patch.c:1622

655 +#: add-patch.c:1627

656 msgid "Sorry, cannot edit this hunk"

657 msgstr ""

658

659 -#: add-patch.c:1674

659 +#: add-patch.c:1679

660 msgid "'git apply' failed"

661 msgstr ""

662

663 -#: advice.c:140

663 +#: advice.c:143

664 #, c-format

665 msgid ""

666 "\n"

667 "Disable this message with \"git config advice.%s false\""

668 msgstr ""

669

670 -#: advice.c:156

670 +#: advice.c:159

671 #, c-format

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

673 msgstr ""

674

675 -#: advice.c:247

675 +#: advice.c:250

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

677 msgstr ""

678

679 -#: advice.c:249

679 +#: advice.c:252

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

681 msgstr ""

682

683 -#: advice.c:251

683 +#: advice.c:254

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

685 msgstr ""

686

687 -#: advice.c:253

687 +#: advice.c:256

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

689 msgstr ""

690

691 -#: advice.c:255

691 +#: advice.c:258

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

693 msgstr ""

694

695 -#: advice.c:257

695 +#: advice.c:260

696 #, c-format

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

698 msgstr ""

699

700 -#: advice.c:265

700 +#: advice.c:268

701 msgid ""

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

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

704 msgstr ""

705

706 -#: advice.c:273

706 +#: advice.c:276

707 msgid "Exiting because of an unresolved conflict."

708 msgstr ""

709

710 -#: advice.c:278 builtin/merge.c:1349

710 +#: advice.c:281 builtin/merge.c:1369

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

712 msgstr ""

713

714 -#: advice.c:280

714 +#: advice.c:283

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

716 msgstr ""

717

718 -#: advice.c:281

718 +#: advice.c:284

719 msgid "Exiting because of unfinished merge."

720 msgstr ""

721

722 -#: advice.c:287

722 +#: advice.c:290

723 #, c-format

724 msgid ""

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

@@ -979,7 +979,7 @@ msgstr ""

979 msgid "cannot checkout %s"

980 msgstr ""

981

982 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

982 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

983 #, c-format

984 msgid "failed to read %s"

985 msgstr ""

@@ -1138,7 +1138,7 @@ msgstr ""

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

1139 msgstr ""

1140

1141 -#: apply.c:4376 builtin/bisect--helper.c:537

1141 +#: apply.c:4376 builtin/bisect--helper.c:524

1142 #, c-format

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

1144 msgstr ""

@@ -1189,170 +1189,170 @@ msgstr ""

1189 msgid "Rejected hunk #%d."

1190 msgstr ""

1191

1192 -#: apply.c:4715

1192 +#: apply.c:4720

1193 #, c-format

1194 msgid "Skipped patch '%s'."

1195 msgstr ""

1196

1197 -#: apply.c:4723

1197 +#: apply.c:4728

1198 msgid "unrecognized input"

1199 msgstr ""

1200

1201 -#: apply.c:4743

1201 +#: apply.c:4748

1202 msgid "unable to read index file"

1203 msgstr ""

1204

1205 -#: apply.c:4900

1205 +#: apply.c:4905

1206 #, c-format

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

1208 msgstr ""

1209

1210 -#: apply.c:4927

1210 +#: apply.c:4932

1211 #, c-format

1212 msgid "squelched %d whitespace error"

1213 msgid_plural "squelched %d whitespace errors"

1214 msgstr[0] ""

1215 msgstr[1] ""

1216

1217 -#: apply.c:4933 apply.c:4948

1217 +#: apply.c:4938 apply.c:4953

1218 #, c-format

1219 msgid "%d line adds whitespace errors."

1220 msgid_plural "%d lines add whitespace errors."

1221 msgstr[0] ""

1222 msgstr[1] ""

1223

1224 -#: apply.c:4941

1224 +#: apply.c:4946

1225 #, c-format

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

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

1228 msgstr[0] ""

1229 msgstr[1] ""

1230

1231 -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1231 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1232 msgid "Unable to write new index file"

1233 msgstr ""

1234

1235 -#: apply.c:4985

1235 +#: apply.c:4990

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

1237 msgstr ""

1238

1239 -#: apply.c:4988

1239 +#: apply.c:4993

1240 msgid "apply changes matching the given path"

1241 msgstr ""

1242

1243 -#: apply.c:4990 builtin/am.c:2279

1243 +#: apply.c:4995 builtin/am.c:2266

1244 msgid "num"

1245 msgstr ""

1246

1247 -#: apply.c:4991

1247 +#: apply.c:4996

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

1249 msgstr ""

1250

1251 -#: apply.c:4994

1251 +#: apply.c:4999

1252 msgid "ignore additions made by the patch"

1253 msgstr ""

1254

1255 -#: apply.c:4996

1255 +#: apply.c:5001

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

1257 msgstr ""

1258

1259 -#: apply.c:5000

1259 +#: apply.c:5005

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

1261 msgstr ""

1262

1263 -#: apply.c:5002

1263 +#: apply.c:5007

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

1265 msgstr ""

1266

1267 -#: apply.c:5004

1267 +#: apply.c:5009

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

1269 msgstr ""

1270

1271 -#: apply.c:5006

1271 +#: apply.c:5011

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

1273 msgstr ""

1274

1275 -#: apply.c:5008

1275 +#: apply.c:5013

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

1277 msgstr ""

1278

1279 -#: apply.c:5010

1279 +#: apply.c:5015

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

1281 msgstr ""

1282

1283 -#: apply.c:5012

1283 +#: apply.c:5017

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

1285 msgstr ""

1286

1287 -#: apply.c:5015

1287 +#: apply.c:5020

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

1289 msgstr ""

1290

1291 -#: apply.c:5017

1291 +#: apply.c:5022

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

1293 msgstr ""

1294

1295 -#: apply.c:5019

1295 +#: apply.c:5024

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

1297 msgstr ""

1298

1299 -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1299 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525

1300 msgid "paths are separated with NUL character"

1301 msgstr ""

1302

1303 -#: apply.c:5024

1303 +#: apply.c:5029

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

1305 msgstr ""

1306

1307 -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

1307 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98

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

1309 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1309 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1310 msgid "action"

1311 msgstr ""

1312

1313 -#: apply.c:5026

1313 +#: apply.c:5031

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

1315 msgstr ""

1316

1317 -#: apply.c:5029 apply.c:5032

1317 +#: apply.c:5034 apply.c:5037

1318 msgid "ignore changes in whitespace when finding context"

1319 msgstr ""

1320

1321 -#: apply.c:5035

1321 +#: apply.c:5040

1322 msgid "apply the patch in reverse"

1323 msgstr ""

1324

1325 -#: apply.c:5037

1325 +#: apply.c:5042

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

1327 msgstr ""

1328

1329 -#: apply.c:5039

1329 +#: apply.c:5044

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

1331 msgstr ""

1332

1333 -#: apply.c:5041

1333 +#: apply.c:5046

1334 msgid "allow overlapping hunks"

1335 msgstr ""

1336

1337 -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1337 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22

1338 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1339 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1339 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1340 msgid "be verbose"

1341 msgstr ""

1342

1343 -#: apply.c:5044

1343 +#: apply.c:5049

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

1345 msgstr ""

1346

1347 -#: apply.c:5047

1347 +#: apply.c:5052

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

1349 msgstr ""

1350

1351 -#: apply.c:5049 builtin/am.c:2267

1351 +#: apply.c:5054 builtin/am.c:2254

1352 msgid "root"

1353 msgstr ""

1354

1355 -#: apply.c:5050

1355 +#: apply.c:5055

1356 msgid "prepend <root> to all filenames"

1357 msgstr ""

1358

@@ -1366,16 +1366,16 @@ msgstr ""

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

1367 msgstr ""

1368

1369 -#: archive-tar.c:449

1369 +#: archive-tar.c:450

1370 #, c-format

1371 msgid "unable to start '%s' filter"

1372 msgstr ""

1373

1374 -#: archive-tar.c:452

1374 +#: archive-tar.c:453

1375 msgid "unable to redirect descriptor"

1376 msgstr ""

1377

1378 -#: archive-tar.c:459

1378 +#: archive-tar.c:460

1379 #, c-format

1380 msgid "'%s' filter reported error"

1381 msgstr ""

@@ -1422,9 +1422,9 @@ msgstr ""

1422 msgid "cannot read %s"

1423 msgstr ""

1424

1425 -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1426 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1427 -#: builtin/merge.c:1124

1425 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1426 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1427 +#: builtin/merge.c:1138

1428 #, c-format

1429 msgid "could not read '%s'"

1430 msgstr ""

@@ -1463,160 +1463,152 @@ msgstr ""

1463 msgid "Not a regular file: %s"

1464 msgstr ""

1465

1466 -#: archive.c:553

1466 +#: archive.c:555

1467 msgid "fmt"

1468 msgstr ""

1469

1470 -#: archive.c:553

1470 +#: archive.c:555

1471 msgid "archive format"

1472 msgstr ""

1473

1474 -#: archive.c:554 builtin/log.c:1760

1474 +#: archive.c:556 builtin/log.c:1765

1475 msgid "prefix"

1476 msgstr ""

1477

1478 -#: archive.c:555

1478 +#: archive.c:557

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

1480 msgstr ""

1481

1482 -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1483 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1482 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1483 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1484 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1485 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1485 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105

1486 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1487 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1488 msgid "file"

1489 msgstr ""

1490

1491 -#: archive.c:557

1491 +#: archive.c:559

1492 msgid "add untracked file to archive"

1493 msgstr ""

1494

1495 -#: archive.c:560 builtin/archive.c:90

1495 +#: archive.c:562 builtin/archive.c:90

1496 msgid "write the archive to this file"

1497 msgstr ""

1498

1499 -#: archive.c:562

1500 -msgid "read .gitattributes in working directory"

1501 -msgstr ""

1502 -

1503 -#: archive.c:563

1504 -msgid "report archived files on stderr"

1505 -msgstr ""

1506 -

1499 #: archive.c:564

1508 -msgid "store only"

1500 +msgid "read .gitattributes in working directory"

1501 msgstr ""

1502

1503 #: archive.c:565

1512 -msgid "compress faster"

1504 +msgid "report archived files on stderr"

1505 msgstr ""

1506

1515 -#: archive.c:573

1516 -msgid "compress better"

1507 +#: archive.c:567

1508 +msgid "set compression level"

1509 msgstr ""

1510

1519 -#: archive.c:576

1511 +#: archive.c:570

1512 msgid "list supported archive formats"

1513 msgstr ""

1514

1523 -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1515 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1516 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1517 msgid "repo"

1518 msgstr ""

1519

1528 -#: archive.c:579 builtin/archive.c:92

1520 +#: archive.c:573 builtin/archive.c:92

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

1522 msgstr ""

1523

1532 -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1524 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1525 #: builtin/notes.c:498

1526 msgid "command"

1527 msgstr ""

1528

1537 -#: archive.c:581 builtin/archive.c:94

1529 +#: archive.c:575 builtin/archive.c:94

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

1531 msgstr ""

1532

1541 -#: archive.c:588

1533 +#: archive.c:582

1534 msgid "Unexpected option --remote"

1535 msgstr ""

1536

1545 -#: archive.c:590

1537 +#: archive.c:584

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

1539 msgstr ""

1540

1549 -#: archive.c:592

1541 +#: archive.c:586

1542 msgid "Unexpected option --output"

1543 msgstr ""

1544

1553 -#: archive.c:594

1545 +#: archive.c:588

1546 msgid "Options --add-file and --remote cannot be used together"

1547 msgstr ""

1548

1557 -#: archive.c:616

1549 +#: archive.c:610

1550 #, c-format

1551 msgid "Unknown archive format '%s'"

1552 msgstr ""

1553

1562 -#: archive.c:623

1554 +#: archive.c:619

1555 #, c-format

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

1557 msgstr ""

1558

1567 -#: attr.c:212

1559 +#: attr.c:202

1560 #, c-format

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

1562 msgstr ""

1563

1572 -#: attr.c:369

1564 +#: attr.c:359

1565 #, c-format

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

1567 msgstr ""

1568

1577 -#: attr.c:409

1569 +#: attr.c:399

1570 msgid ""

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

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

1573 msgstr ""

1574

1583 -#: bisect.c:476

1575 +#: bisect.c:489

1576 #, c-format

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

1578 msgstr ""

1579

1588 -#: bisect.c:686

1580 +#: bisect.c:699

1581 #, c-format

1582 msgid "We cannot bisect more!\n"

1583 msgstr ""

1584

1593 -#: bisect.c:753

1585 +#: bisect.c:766

1586 #, c-format

1587 msgid "Not a valid commit name %s"

1588 msgstr ""

1589

1598 -#: bisect.c:778

1590 +#: bisect.c:791

1591 #, c-format

1592 msgid ""

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

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

1595 msgstr ""

1596

1605 -#: bisect.c:783

1597 +#: bisect.c:796

1598 #, c-format

1599 msgid ""

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

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

1602 msgstr ""

1603

1612 -#: bisect.c:788

1604 +#: bisect.c:801

1605 #, c-format

1606 msgid ""

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

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

1609 msgstr ""

1610

1619 -#: bisect.c:796

1611 +#: bisect.c:809

1612 #, c-format

1613 msgid ""

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

@@ -1624,7 +1616,7 @@ msgid ""

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

1617 msgstr ""

1618

1627 -#: bisect.c:809

1619 +#: bisect.c:822

1620 #, c-format

1621 msgid ""

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

@@ -1632,43 +1624,43 @@ msgid ""

1624 "We continue anyway."

1625 msgstr ""

1626

1635 -#: bisect.c:848

1627 +#: bisect.c:861

1628 #, c-format

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

1630 msgstr ""

1631

1640 -#: bisect.c:898

1632 +#: bisect.c:911

1633 #, c-format

1634 msgid "a %s revision is needed"

1635 msgstr ""

1636

1645 -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1637 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

1638 #, c-format

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

1640 msgstr ""

1641

1650 -#: bisect.c:974 builtin/merge.c:150

1642 +#: bisect.c:987 builtin/merge.c:152

1643 #, c-format

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

1645 msgstr ""

1646

1655 -#: bisect.c:1014

1647 +#: bisect.c:1027

1648 msgid "reading bisect refs failed"

1649 msgstr ""

1650

1659 -#: bisect.c:1044

1651 +#: bisect.c:1057

1652 #, c-format

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

1654 msgstr ""

1655

1664 -#: bisect.c:1053

1656 +#: bisect.c:1066

1657 #, c-format

1658 msgid ""

1659 "No testable commit found.\n"

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

1661 msgstr ""

1662

1671 -#: bisect.c:1082

1663 +#: bisect.c:1095

1664 #, c-format

1665 msgid "(roughly %d step)"

1666 msgid_plural "(roughly %d steps)"

@@ -1678,44 +1670,44 @@ msgstr[1] ""

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

1671 #. steps)" translation.

1672 #.

1681 -#: bisect.c:1088

1673 +#: bisect.c:1101

1674 #, c-format

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

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

1677 msgstr[0] ""

1678 msgstr[1] ""

1679

1688 -#: blame.c:2778

1680 +#: blame.c:2777

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

1682 msgstr ""

1683

1692 -#: blame.c:2792

1684 +#: blame.c:2791

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

1686 msgstr ""

1687

1696 -#: blame.c:2813

1688 +#: blame.c:2812

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

1690 msgstr ""

1691

1700 -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1701 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1702 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1703 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1704 -#: builtin/shortlog.c:320

1692 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1693 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1694 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1695 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1696 +#: builtin/shortlog.c:267

1697 msgid "revision walk setup failed"

1698 msgstr ""

1699

1708 -#: blame.c:2840

1700 +#: blame.c:2839

1701 msgid ""

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

1703 msgstr ""

1704

1713 -#: blame.c:2851

1705 +#: blame.c:2850

1706 #, c-format

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

1708 msgstr ""

1709

1718 -#: blame.c:2862

1710 +#: blame.c:2861

1711 #, c-format

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

1713 msgstr ""

@@ -1864,7 +1856,7 @@ msgstr ""

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

1857 msgstr ""

1858

1867 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

1859 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

1860 #: builtin/commit.c:814

1861 #, c-format

1862 msgid "could not open '%s'"

@@ -1927,7 +1919,7 @@ msgstr ""

1919 msgid "cannot write bundle version %d with algorithm %s"

1920 msgstr ""

1921

1930 -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

1922 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

1923 #, c-format

1924 msgid "unrecognized argument: %s"

1925 msgstr ""

@@ -1950,7 +1942,7 @@ msgstr ""

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

1943 msgstr ""

1944

1953 -#: commit-graph.c:188 midx.c:46

1945 +#: commit-graph.c:188 midx.c:47

1946 msgid "invalid hash version"

1947 msgstr ""

1948

@@ -2014,7 +2006,7 @@ msgstr ""

2006 msgid "could not find commit %s"

2007 msgstr ""

2008

2017 -#: commit-graph.c:1042 builtin/am.c:1306

2009 +#: commit-graph.c:1042 builtin/am.c:1292

2010 #, c-format

2011 msgid "unable to parse commit %s"

2012 msgstr ""

@@ -2081,7 +2073,7 @@ msgstr ""

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

2074 msgstr ""

2075

2084 -#: commit-graph.c:1720 midx.c:826

2076 +#: commit-graph.c:1720 midx.c:819

2077 #, c-format

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

2079 msgstr ""

@@ -2118,96 +2110,95 @@ msgstr ""

2110 msgid "Scanning merged commits"

2111 msgstr ""

2112

2121 -#: commit-graph.c:2026

2122 -#, c-format

2123 -msgid "unexpected duplicate commit id %s"

2113 +#: commit-graph.c:2059

2114 +msgid "Merging commit-graph"

2115 msgstr ""

2116

2126 -#: commit-graph.c:2049

2127 -msgid "Merging commit-graph"

2117 +#: commit-graph.c:2165

2118 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2119 msgstr ""

2120

2130 -#: commit-graph.c:2259

2121 +#: commit-graph.c:2274

2122 #, c-format

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

2124 msgstr ""

2125

2135 -#: commit-graph.c:2270

2126 +#: commit-graph.c:2285

2127 msgid "too many commits to write graph"

2128 msgstr ""

2129

2139 -#: commit-graph.c:2363

2130 +#: commit-graph.c:2378

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

2132 msgstr ""

2133

2143 -#: commit-graph.c:2373

2134 +#: commit-graph.c:2388

2135 #, c-format

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

2137 msgstr ""

2138

2148 -#: commit-graph.c:2383 commit-graph.c:2398

2139 +#: commit-graph.c:2398 commit-graph.c:2413

2140 #, c-format

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

2142 msgstr ""

2143

2153 -#: commit-graph.c:2390

2144 +#: commit-graph.c:2405

2145 #, c-format

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

2147 msgstr ""

2148

2158 -#: commit-graph.c:2408

2149 +#: commit-graph.c:2423

2150 msgid "Verifying commits in commit graph"

2151 msgstr ""

2152

2162 -#: commit-graph.c:2423

2153 +#: commit-graph.c:2438

2154 #, c-format

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

2156 msgstr ""

2157

2167 -#: commit-graph.c:2430

2158 +#: commit-graph.c:2445

2159 #, c-format

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

2161 msgstr ""

2162

2172 -#: commit-graph.c:2440

2163 +#: commit-graph.c:2455

2164 #, c-format

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

2166 msgstr ""

2167

2177 -#: commit-graph.c:2449

2168 +#: commit-graph.c:2464

2169 #, c-format

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

2171 msgstr ""

2172

2182 -#: commit-graph.c:2463

2173 +#: commit-graph.c:2478

2174 #, c-format

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

2176 msgstr ""

2177

2187 -#: commit-graph.c:2468

2178 +#: commit-graph.c:2483

2179 #, c-format

2180 msgid ""

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

2182 msgstr ""

2183

2193 -#: commit-graph.c:2472

2184 +#: commit-graph.c:2487

2185 #, c-format

2186 msgid ""

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

2188 msgstr ""

2189

2199 -#: commit-graph.c:2488

2190 +#: commit-graph.c:2503

2191 #, c-format

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

2193 msgstr ""

2194

2204 -#: commit-graph.c:2494

2195 +#: commit-graph.c:2509

2196 #, c-format

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

2198 msgstr ""

2199

2209 -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2210 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2200 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2201 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2202 #, c-format

2203 msgid "could not parse %s"

2204 msgstr ""

@@ -2293,7 +2284,7 @@ msgstr ""

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

2285 msgstr ""

2286

2296 -#: config.c:408 sequencer.c:2547

2287 +#: config.c:408 sequencer.c:2580

2288 #, c-format

2289 msgid "invalid key: %s"

2290 msgstr ""

@@ -2482,77 +2473,77 @@ msgstr ""

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

2474 msgstr ""

2475

2485 -#: config.c:2470

2476 +#: config.c:2473

2477 #, c-format

2478 msgid "invalid section name '%s'"

2479 msgstr ""

2480

2490 -#: config.c:2502

2481 +#: config.c:2505

2482 #, c-format

2483 msgid "%s has multiple values"

2484 msgstr ""

2485

2495 -#: config.c:2531

2486 +#: config.c:2534

2487 #, c-format

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

2489 msgstr ""

2490

2500 -#: config.c:2783 config.c:3107

2491 +#: config.c:2786 config.c:3112

2492 #, c-format

2493 msgid "could not lock config file %s"

2494 msgstr ""

2495

2505 -#: config.c:2794

2496 +#: config.c:2797

2497 #, c-format

2498 msgid "opening %s"

2499 msgstr ""

2500

2510 -#: config.c:2829 builtin/config.c:354

2501 +#: config.c:2834 builtin/config.c:361

2502 #, c-format

2503 msgid "invalid pattern: %s"

2504 msgstr ""

2505

2515 -#: config.c:2854

2506 +#: config.c:2859

2507 #, c-format

2508 msgid "invalid config file %s"

2509 msgstr ""

2510

2520 -#: config.c:2867 config.c:3120

2511 +#: config.c:2872 config.c:3125

2512 #, c-format

2513 msgid "fstat on %s failed"

2514 msgstr ""

2515

2525 -#: config.c:2878

2516 +#: config.c:2883

2517 #, c-format

2518 msgid "unable to mmap '%s'"

2519 msgstr ""

2520

2530 -#: config.c:2887 config.c:3125

2521 +#: config.c:2892 config.c:3130

2522 #, c-format

2523 msgid "chmod on %s failed"

2524 msgstr ""

2525

2535 -#: config.c:2972 config.c:3222

2526 +#: config.c:2977 config.c:3227

2527 #, c-format

2528 msgid "could not write config file %s"

2529 msgstr ""

2530

2540 -#: config.c:3006

2531 +#: config.c:3011

2532 #, c-format

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

2534 msgstr ""

2535

2545 -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2536 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2537 #, c-format

2538 msgid "could not unset '%s'"

2539 msgstr ""

2540

2550 -#: config.c:3098

2541 +#: config.c:3103

2542 #, c-format

2543 msgid "invalid section name: %s"

2544 msgstr ""

2545

2555 -#: config.c:3265

2546 +#: config.c:3270

2547 #, c-format

2548 msgid "missing value for '%s'"

2549 msgstr ""

@@ -2970,6 +2961,26 @@ msgstr ""

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

2962 msgstr ""

2963

2964 +#: diff-lib.c:534

2965 +msgid "--merge-base does not work with ranges"

2966 +msgstr ""

2967 +

2968 +#: diff-lib.c:536

2969 +msgid "--merge-base only works with commits"

2970 +msgstr ""

2971 +

2972 +#: diff-lib.c:553

2973 +msgid "unable to get HEAD"

2974 +msgstr ""

2975 +

2976 +#: diff-lib.c:560

2977 +msgid "no merge base found"

2978 +msgstr ""

2979 +

2980 +#: diff-lib.c:562

2981 +msgid "multiple merge bases found"

2982 +msgstr ""

2983 +

2984 #: diff-no-index.c:238

2985 msgid "git diff --no-index [<options>] <path> <path>"

2986 msgstr ""

@@ -3021,523 +3032,532 @@ msgid ""

3032 "%s"

3033 msgstr ""

3034

3024 -#: diff.c:4269

3035 +#: diff.c:4276

3036 #, c-format

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

3038 msgstr ""

3039

3029 -#: diff.c:4618

3040 +#: diff.c:4625

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

3042 msgstr ""

3043

3033 -#: diff.c:4621

3044 +#: diff.c:4628

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

3046 msgstr ""

3047

3037 -#: diff.c:4699

3048 +#: diff.c:4706

3049 msgid "--follow requires exactly one pathspec"

3050 msgstr ""

3051

3041 -#: diff.c:4747

3052 +#: diff.c:4754

3053 #, c-format

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

3055 msgstr ""

3056

3046 -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3057 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302

3058 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3059 #, c-format

3060 msgid "%s expects a numerical value"

3061 msgstr ""

3062

3052 -#: diff.c:4784

3063 +#: diff.c:4791

3064 #, c-format

3065 msgid ""

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

3067 "%s"

3068 msgstr ""

3069

3059 -#: diff.c:4869

3070 +#: diff.c:4876

3071 #, c-format

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

3073 msgstr ""

3074

3064 -#: diff.c:4893

3075 +#: diff.c:4900

3076 #, c-format

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

3078 msgstr ""

3079

3069 -#: diff.c:4907

3080 +#: diff.c:4914

3081 #, c-format

3082 msgid "unable to resolve '%s'"

3083 msgstr ""

3084

3074 -#: diff.c:4957 diff.c:4963

3085 +#: diff.c:4964 diff.c:4970

3086 #, c-format

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

3088 msgstr ""

3089

3079 -#: diff.c:4975

3090 +#: diff.c:4982

3091 #, c-format

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

3093 msgstr ""

3094

3084 -#: diff.c:4996

3095 +#: diff.c:5003

3096 #, c-format

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

3098 msgstr ""

3099

3089 -#: diff.c:5015

3100 +#: diff.c:5022

3101 #, c-format

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

3103 msgstr ""

3104

3094 -#: diff.c:5055

3105 +#: diff.c:5062

3106 msgid ""

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

3108 "\"histogram\""

3109 msgstr ""

3110

3100 -#: diff.c:5091 diff.c:5111

3111 +#: diff.c:5098 diff.c:5118

3112 #, c-format

3113 msgid "invalid argument to %s"

3114 msgstr ""

3115

3105 -#: diff.c:5248

3116 +#: diff.c:5222

3117 +#, c-format

3118 +msgid "invalid regex given to -I: '%s'"

3119 +msgstr ""

3120 +

3121 +#: diff.c:5271

3122 #, c-format

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

3124 msgstr ""

3125

3110 -#: diff.c:5304

3126 +#: diff.c:5327

3127 #, c-format

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

3129 msgstr ""

3130

3115 -#: diff.c:5327

3131 +#: diff.c:5350

3132 msgid "Diff output format options"

3133 msgstr ""

3134

3119 -#: diff.c:5329 diff.c:5335

3135 +#: diff.c:5352 diff.c:5358

3136 msgid "generate patch"

3137 msgstr ""

3138

3123 -#: diff.c:5332 builtin/log.c:176

3139 +#: diff.c:5355 builtin/log.c:178

3140 msgid "suppress diff output"

3141 msgstr ""

3142

3127 -#: diff.c:5337 diff.c:5451 diff.c:5458

3143 +#: diff.c:5360 diff.c:5474 diff.c:5481

3144 msgid "<n>"

3145 msgstr ""

3146

3131 -#: diff.c:5338 diff.c:5341

3147 +#: diff.c:5361 diff.c:5364

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

3149 msgstr ""

3150

3135 -#: diff.c:5343

3151 +#: diff.c:5366

3152 msgid "generate the diff in raw format"

3153 msgstr ""

3154

3139 -#: diff.c:5346

3155 +#: diff.c:5369

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

3157 msgstr ""

3158

3143 -#: diff.c:5350

3159 +#: diff.c:5373

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

3161 msgstr ""

3162

3147 -#: diff.c:5354

3163 +#: diff.c:5377

3164 msgid "machine friendly --stat"

3165 msgstr ""

3166

3151 -#: diff.c:5357

3167 +#: diff.c:5380

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

3169 msgstr ""

3170

3155 -#: diff.c:5359 diff.c:5367

3171 +#: diff.c:5382 diff.c:5390

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

3173 msgstr ""

3174

3159 -#: diff.c:5360

3175 +#: diff.c:5383

3176 msgid ""

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

3178 msgstr ""

3179

3164 -#: diff.c:5364

3180 +#: diff.c:5387

3181 msgid "synonym for --dirstat=cumulative"

3182 msgstr ""

3183

3168 -#: diff.c:5368

3184 +#: diff.c:5391

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

3186 msgstr ""

3187

3172 -#: diff.c:5372

3188 +#: diff.c:5395

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

3190 msgstr ""

3191

3176 -#: diff.c:5375

3192 +#: diff.c:5398

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

3194 msgstr ""

3195

3180 -#: diff.c:5378

3196 +#: diff.c:5401

3197 msgid "show only names of changed files"

3198 msgstr ""

3199

3184 -#: diff.c:5381

3200 +#: diff.c:5404

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

3202 msgstr ""

3203

3188 -#: diff.c:5383

3204 +#: diff.c:5406

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

3206 msgstr ""

3207

3192 -#: diff.c:5384

3208 +#: diff.c:5407

3209 msgid "generate diffstat"

3210 msgstr ""

3211

3196 -#: diff.c:5386 diff.c:5389 diff.c:5392

3212 +#: diff.c:5409 diff.c:5412 diff.c:5415

3213 msgid "<width>"

3214 msgstr ""

3215

3200 -#: diff.c:5387

3216 +#: diff.c:5410

3217 msgid "generate diffstat with a given width"

3218 msgstr ""

3219

3204 -#: diff.c:5390

3220 +#: diff.c:5413

3221 msgid "generate diffstat with a given name width"

3222 msgstr ""

3223

3208 -#: diff.c:5393

3224 +#: diff.c:5416

3225 msgid "generate diffstat with a given graph width"

3226 msgstr ""

3227

3212 -#: diff.c:5395

3228 +#: diff.c:5418

3229 msgid "<count>"

3230 msgstr ""

3231

3216 -#: diff.c:5396

3232 +#: diff.c:5419

3233 msgid "generate diffstat with limited lines"

3234 msgstr ""

3235

3220 -#: diff.c:5399

3236 +#: diff.c:5422

3237 msgid "generate compact summary in diffstat"

3238 msgstr ""

3239

3224 -#: diff.c:5402

3240 +#: diff.c:5425

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

3242 msgstr ""

3243

3228 -#: diff.c:5405

3244 +#: diff.c:5428

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

3246 msgstr ""

3247

3232 -#: diff.c:5407

3248 +#: diff.c:5430

3249 msgid "show colored diff"

3250 msgstr ""

3251

3236 -#: diff.c:5408

3252 +#: diff.c:5431

3253 msgid "<kind>"

3254 msgstr ""

3255

3240 -#: diff.c:5409

3256 +#: diff.c:5432

3257 msgid ""

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

3259 "diff"

3260 msgstr ""

3261

3246 -#: diff.c:5412

3262 +#: diff.c:5435

3263 msgid ""

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

3265 "--numstat"

3266 msgstr ""

3267

3252 -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3268 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553

3269 msgid "<prefix>"

3270 msgstr ""

3271

3256 -#: diff.c:5416

3272 +#: diff.c:5439

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

3274 msgstr ""

3275

3260 -#: diff.c:5419

3276 +#: diff.c:5442

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

3278 msgstr ""

3279

3264 -#: diff.c:5422

3280 +#: diff.c:5445

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

3282 msgstr ""

3283

3268 -#: diff.c:5425

3284 +#: diff.c:5448

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

3286 msgstr ""

3287

3272 -#: diff.c:5428

3288 +#: diff.c:5451

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

3290 msgstr ""

3291

3276 -#: diff.c:5432 diff.c:5437 diff.c:5442

3292 +#: diff.c:5455 diff.c:5460 diff.c:5465

3293 msgid "<char>"

3294 msgstr ""

3295

3280 -#: diff.c:5433

3296 +#: diff.c:5456

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

3298 msgstr ""

3299

3284 -#: diff.c:5438

3300 +#: diff.c:5461

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

3302 msgstr ""

3303

3288 -#: diff.c:5443

3304 +#: diff.c:5466

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

3306 msgstr ""

3307

3292 -#: diff.c:5446

3308 +#: diff.c:5469

3309 msgid "Diff rename options"

3310 msgstr ""

3311

3296 -#: diff.c:5447

3312 +#: diff.c:5470

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

3314 msgstr ""

3315

3300 -#: diff.c:5448

3316 +#: diff.c:5471

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

3318 msgstr ""

3319

3304 -#: diff.c:5452

3320 +#: diff.c:5475

3321 msgid "detect renames"

3322 msgstr ""

3323

3308 -#: diff.c:5456

3324 +#: diff.c:5479

3325 msgid "omit the preimage for deletes"

3326 msgstr ""

3327

3312 -#: diff.c:5459

3328 +#: diff.c:5482

3329 msgid "detect copies"

3330 msgstr ""

3331

3316 -#: diff.c:5463

3332 +#: diff.c:5486

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

3334 msgstr ""

3335

3320 -#: diff.c:5465

3336 +#: diff.c:5488

3337 msgid "disable rename detection"

3338 msgstr ""

3339

3324 -#: diff.c:5468

3340 +#: diff.c:5491

3341 msgid "use empty blobs as rename source"

3342 msgstr ""

3343

3328 -#: diff.c:5470

3344 +#: diff.c:5493

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

3346 msgstr ""

3347

3332 -#: diff.c:5473

3348 +#: diff.c:5496

3349 msgid ""

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

3351 "given limit"

3352 msgstr ""

3353

3338 -#: diff.c:5475

3354 +#: diff.c:5498

3355 msgid "Diff algorithm options"

3356 msgstr ""

3357

3342 -#: diff.c:5477

3358 +#: diff.c:5500

3359 msgid "produce the smallest possible diff"

3360 msgstr ""

3361

3346 -#: diff.c:5480

3362 +#: diff.c:5503

3363 msgid "ignore whitespace when comparing lines"

3364 msgstr ""

3365

3350 -#: diff.c:5483

3366 +#: diff.c:5506

3367 msgid "ignore changes in amount of whitespace"

3368 msgstr ""

3369

3354 -#: diff.c:5486

3370 +#: diff.c:5509

3371 msgid "ignore changes in whitespace at EOL"

3372 msgstr ""

3373

3358 -#: diff.c:5489

3374 +#: diff.c:5512

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

3376 msgstr ""

3377

3362 -#: diff.c:5492

3378 +#: diff.c:5515

3379 msgid "ignore changes whose lines are all blank"

3380 msgstr ""

3381

3366 -#: diff.c:5495

3382 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587

3383 +msgid "<regex>"

3384 +msgstr ""

3385 +

3386 +#: diff.c:5518

3387 +msgid "ignore changes whose all lines match <regex>"

3388 +msgstr ""

3389 +

3390 +#: diff.c:5521

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

3392 msgstr ""

3393

3370 -#: diff.c:5498

3394 +#: diff.c:5524

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

3396 msgstr ""

3397

3374 -#: diff.c:5502

3398 +#: diff.c:5528

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

3400 msgstr ""

3401

3378 -#: diff.c:5504

3402 +#: diff.c:5530

3403 msgid "<algorithm>"

3404 msgstr ""

3405

3382 -#: diff.c:5505

3406 +#: diff.c:5531

3407 msgid "choose a diff algorithm"

3408 msgstr ""

3409

3386 -#: diff.c:5507

3410 +#: diff.c:5533

3411 msgid "<text>"

3412 msgstr ""

3413

3390 -#: diff.c:5508

3414 +#: diff.c:5534

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

3416 msgstr ""

3417

3394 -#: diff.c:5510 diff.c:5519 diff.c:5522

3418 +#: diff.c:5536 diff.c:5545 diff.c:5548

3419 msgid "<mode>"

3420 msgstr ""

3421

3398 -#: diff.c:5511

3422 +#: diff.c:5537

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

3424 msgstr ""

3425

3402 -#: diff.c:5513 diff.c:5516 diff.c:5561

3403 -msgid "<regex>"

3404 -msgstr ""

3405 -

3406 -#: diff.c:5514

3426 +#: diff.c:5540

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

3428 msgstr ""

3429

3410 -#: diff.c:5517

3430 +#: diff.c:5543

3431 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3432 msgstr ""

3433

3414 -#: diff.c:5520

3434 +#: diff.c:5546

3435 msgid "moved lines of code are colored differently"

3436 msgstr ""

3437

3418 -#: diff.c:5523

3438 +#: diff.c:5549

3439 msgid "how white spaces are ignored in --color-moved"

3440 msgstr ""

3441

3422 -#: diff.c:5526

3442 +#: diff.c:5552

3443 msgid "Other diff options"

3444 msgstr ""

3445

3426 -#: diff.c:5528

3446 +#: diff.c:5554

3447 msgid "when run from subdir, exclude changes outside and show relative paths"

3448 msgstr ""

3449

3430 -#: diff.c:5532

3450 +#: diff.c:5558

3451 msgid "treat all files as text"

3452 msgstr ""

3453

3434 -#: diff.c:5534

3454 +#: diff.c:5560

3455 msgid "swap two inputs, reverse the diff"

3456 msgstr ""

3457

3438 -#: diff.c:5536

3458 +#: diff.c:5562

3459 msgid "exit with 1 if there were differences, 0 otherwise"

3460 msgstr ""

3461

3442 -#: diff.c:5538

3462 +#: diff.c:5564

3463 msgid "disable all output of the program"

3464 msgstr ""

3465

3446 -#: diff.c:5540

3466 +#: diff.c:5566

3467 msgid "allow an external diff helper to be executed"

3468 msgstr ""

3469

3450 -#: diff.c:5542

3470 +#: diff.c:5568

3471 msgid "run external text conversion filters when comparing binary files"

3472 msgstr ""

3473

3454 -#: diff.c:5544

3474 +#: diff.c:5570

3475 msgid "<when>"

3476 msgstr ""

3477

3458 -#: diff.c:5545

3478 +#: diff.c:5571

3479 msgid "ignore changes to submodules in the diff generation"

3480 msgstr ""

3481

3462 -#: diff.c:5548

3482 +#: diff.c:5574

3483 msgid "<format>"

3484 msgstr ""

3485

3466 -#: diff.c:5549

3486 +#: diff.c:5575

3487 msgid "specify how differences in submodules are shown"

3488 msgstr ""

3489

3470 -#: diff.c:5553

3490 +#: diff.c:5579

3491 msgid "hide 'git add -N' entries from the index"

3492 msgstr ""

3493

3474 -#: diff.c:5556

3494 +#: diff.c:5582

3495 msgid "treat 'git add -N' entries as real in the index"

3496 msgstr ""

3497

3478 -#: diff.c:5558

3498 +#: diff.c:5584

3499 msgid "<string>"

3500 msgstr ""

3501

3482 -#: diff.c:5559

3502 +#: diff.c:5585

3503 msgid ""

3504 "look for differences that change the number of occurrences of the specified "

3505 "string"

3506 msgstr ""

3507

3488 -#: diff.c:5562

3508 +#: diff.c:5588

3509 msgid ""

3510 "look for differences that change the number of occurrences of the specified "

3511 "regex"

3512 msgstr ""

3513

3494 -#: diff.c:5565

3514 +#: diff.c:5591

3515 msgid "show all changes in the changeset with -S or -G"

3516 msgstr ""

3517

3498 -#: diff.c:5568

3518 +#: diff.c:5594

3519 msgid "treat <string> in -S as extended POSIX regular expression"

3520 msgstr ""

3521

3502 -#: diff.c:5571

3522 +#: diff.c:5597

3523 msgid "control the order in which files appear in the output"

3524 msgstr ""

3525

3506 -#: diff.c:5572

3526 +#: diff.c:5598

3527 msgid "<object-id>"

3528 msgstr ""

3529

3510 -#: diff.c:5573

3530 +#: diff.c:5599

3531 msgid ""

3532 "look for differences that change the number of occurrences of the specified "

3533 "object"

3534 msgstr ""

3535

3516 -#: diff.c:5575

3536 +#: diff.c:5601

3537 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3538 msgstr ""

3539

3520 -#: diff.c:5576

3540 +#: diff.c:5602

3541 msgid "select files by diff type"

3542 msgstr ""

3543

3524 -#: diff.c:5578

3544 +#: diff.c:5604

3545 msgid "<file>"

3546 msgstr ""

3547

3528 -#: diff.c:5579

3548 +#: diff.c:5605

3549 msgid "Output to a specific file"

3550 msgstr ""

3551

3532 -#: diff.c:6236

3552 +#: diff.c:6262

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

3554 msgstr ""

3555

3536 -#: diff.c:6239

3556 +#: diff.c:6265

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

3558 msgstr ""

3559

3540 -#: diff.c:6242

3560 +#: diff.c:6268

3561 #, c-format

3562 msgid ""

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

@@ -3638,245 +3658,245 @@ msgstr ""

3658 msgid "too many args to run %s"

3659 msgstr ""

3660

3641 -#: fetch-pack.c:176

3661 +#: fetch-pack.c:177

3662 msgid "git fetch-pack: expected shallow list"

3663 msgstr ""

3664

3645 -#: fetch-pack.c:179

3665 +#: fetch-pack.c:180

3666 msgid "git fetch-pack: expected a flush packet after shallow list"

3667 msgstr ""

3668

3649 -#: fetch-pack.c:190

3669 +#: fetch-pack.c:191

3670 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3671 msgstr ""

3672

3653 -#: fetch-pack.c:210

3673 +#: fetch-pack.c:211

3674 #, c-format

3675 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3676 msgstr ""

3677

3658 -#: fetch-pack.c:221

3678 +#: fetch-pack.c:222

3679 msgid "unable to write to remote"

3680 msgstr ""

3681

3662 -#: fetch-pack.c:282

3682 +#: fetch-pack.c:283

3683 msgid "--stateless-rpc requires multi_ack_detailed"

3684 msgstr ""

3685

3666 -#: fetch-pack.c:375 fetch-pack.c:1397

3686 +#: fetch-pack.c:378 fetch-pack.c:1406

3687 #, c-format

3688 msgid "invalid shallow line: %s"

3689 msgstr ""

3690

3671 -#: fetch-pack.c:381 fetch-pack.c:1403

3691 +#: fetch-pack.c:384 fetch-pack.c:1412

3692 #, c-format

3693 msgid "invalid unshallow line: %s"

3694 msgstr ""

3695

3676 -#: fetch-pack.c:383 fetch-pack.c:1405

3696 +#: fetch-pack.c:386 fetch-pack.c:1414

3697 #, c-format

3698 msgid "object not found: %s"

3699 msgstr ""

3700

3681 -#: fetch-pack.c:386 fetch-pack.c:1408

3701 +#: fetch-pack.c:389 fetch-pack.c:1417

3702 #, c-format

3703 msgid "error in object: %s"

3704 msgstr ""

3705

3686 -#: fetch-pack.c:388 fetch-pack.c:1410

3706 +#: fetch-pack.c:391 fetch-pack.c:1419

3707 #, c-format

3708 msgid "no shallow found: %s"

3709 msgstr ""

3710

3691 -#: fetch-pack.c:391 fetch-pack.c:1414

3711 +#: fetch-pack.c:394 fetch-pack.c:1423

3712 #, c-format

3713 msgid "expected shallow/unshallow, got %s"

3714 msgstr ""

3715

3696 -#: fetch-pack.c:431

3716 +#: fetch-pack.c:434

3717 #, c-format

3718 msgid "got %s %d %s"

3719 msgstr ""

3720

3701 -#: fetch-pack.c:448

3721 +#: fetch-pack.c:451

3722 #, c-format

3723 msgid "invalid commit %s"

3724 msgstr ""

3725

3706 -#: fetch-pack.c:479

3726 +#: fetch-pack.c:482

3727 msgid "giving up"

3728 msgstr ""

3729

3710 -#: fetch-pack.c:492 progress.c:339

3730 +#: fetch-pack.c:495 progress.c:339

3731 msgid "done"

3732 msgstr ""

3733

3714 -#: fetch-pack.c:504

3734 +#: fetch-pack.c:507

3735 #, c-format

3736 msgid "got %s (%d) %s"

3737 msgstr ""

3738

3719 -#: fetch-pack.c:540

3739 +#: fetch-pack.c:543

3740 #, c-format

3741 msgid "Marking %s as complete"

3742 msgstr ""

3743

3724 -#: fetch-pack.c:755

3744 +#: fetch-pack.c:758

3745 #, c-format

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

3747 msgstr ""

3748

3729 -#: fetch-pack.c:824

3749 +#: fetch-pack.c:827

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

3751 msgstr ""

3752

3733 -#: fetch-pack.c:832

3753 +#: fetch-pack.c:835

3754 msgid "protocol error: bad pack header"

3755 msgstr ""

3756

3737 -#: fetch-pack.c:916

3757 +#: fetch-pack.c:919

3758 #, c-format

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

3760 msgstr ""

3761

3742 -#: fetch-pack.c:933

3762 +#: fetch-pack.c:937

3763 #, c-format

3764 msgid "%s failed"

3765 msgstr ""

3766

3747 -#: fetch-pack.c:935

3767 +#: fetch-pack.c:939

3768 msgid "error in sideband demultiplexer"

3769 msgstr ""

3770

3751 -#: fetch-pack.c:978

3771 +#: fetch-pack.c:982

3772 #, c-format

3773 msgid "Server version is %.*s"

3774 msgstr ""

3775

3756 -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

3757 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

3758 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

3759 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

3776 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

3777 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

3778 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

3779 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

3780 #, c-format

3781 msgid "Server supports %s"

3782 msgstr ""

3783

3764 -#: fetch-pack.c:985

3784 +#: fetch-pack.c:992

3785 msgid "Server does not support shallow clients"

3786 msgstr ""

3787

3768 -#: fetch-pack.c:1045

3788 +#: fetch-pack.c:1052

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

3790 msgstr ""

3791

3772 -#: fetch-pack.c:1050

3792 +#: fetch-pack.c:1057

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

3794 msgstr ""

3795

3776 -#: fetch-pack.c:1054

3796 +#: fetch-pack.c:1061

3797 msgid "Server does not support --deepen"

3798 msgstr ""

3799

3780 -#: fetch-pack.c:1056

3800 +#: fetch-pack.c:1063

3801 msgid "Server does not support this repository's object format"

3802 msgstr ""

3803

3784 -#: fetch-pack.c:1069

3804 +#: fetch-pack.c:1076

3805 msgid "no common commits"

3806 msgstr ""

3807

3788 -#: fetch-pack.c:1081 fetch-pack.c:1619

3808 +#: fetch-pack.c:1088 fetch-pack.c:1628

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

3810 msgstr ""

3811

3792 -#: fetch-pack.c:1205

3812 +#: fetch-pack.c:1214

3813 #, c-format

3814 msgid "mismatched algorithms: client %s; server %s"

3815 msgstr ""

3816

3797 -#: fetch-pack.c:1209

3817 +#: fetch-pack.c:1218

3818 #, c-format

3819 msgid "the server does not support algorithm '%s'"

3820 msgstr ""

3821

3802 -#: fetch-pack.c:1229

3822 +#: fetch-pack.c:1238

3823 msgid "Server does not support shallow requests"

3824 msgstr ""

3825

3806 -#: fetch-pack.c:1236

3826 +#: fetch-pack.c:1245

3827 msgid "Server supports filter"

3828 msgstr ""

3829

3810 -#: fetch-pack.c:1275

3830 +#: fetch-pack.c:1284

3831 msgid "unable to write request to remote"

3832 msgstr ""

3833

3814 -#: fetch-pack.c:1293

3834 +#: fetch-pack.c:1302

3835 #, c-format

3836 msgid "error reading section header '%s'"

3837 msgstr ""

3838

3819 -#: fetch-pack.c:1299

3839 +#: fetch-pack.c:1308

3840 #, c-format

3841 msgid "expected '%s', received '%s'"

3842 msgstr ""

3843

3824 -#: fetch-pack.c:1360

3844 +#: fetch-pack.c:1369

3845 #, c-format

3846 msgid "unexpected acknowledgment line: '%s'"

3847 msgstr ""

3848

3829 -#: fetch-pack.c:1365

3849 +#: fetch-pack.c:1374

3850 #, c-format

3851 msgid "error processing acks: %d"

3852 msgstr ""

3853

3834 -#: fetch-pack.c:1375

3854 +#: fetch-pack.c:1384

3855 msgid "expected packfile to be sent after 'ready'"

3856 msgstr ""

3857

3838 -#: fetch-pack.c:1377

3858 +#: fetch-pack.c:1386

3859 msgid "expected no other sections to be sent after no 'ready'"

3860 msgstr ""

3861

3842 -#: fetch-pack.c:1419

3862 +#: fetch-pack.c:1428

3863 #, c-format

3864 msgid "error processing shallow info: %d"

3865 msgstr ""

3866

3847 -#: fetch-pack.c:1466

3867 +#: fetch-pack.c:1475

3868 #, c-format

3869 msgid "expected wanted-ref, got '%s'"

3870 msgstr ""

3871

3852 -#: fetch-pack.c:1471

3872 +#: fetch-pack.c:1480

3873 #, c-format

3874 msgid "unexpected wanted-ref: '%s'"

3875 msgstr ""

3876

3857 -#: fetch-pack.c:1476

3877 +#: fetch-pack.c:1485

3878 #, c-format

3879 msgid "error processing wanted refs: %d"

3880 msgstr ""

3881

3862 -#: fetch-pack.c:1506

3882 +#: fetch-pack.c:1515

3883 msgid "git fetch-pack: expected response end packet"

3884 msgstr ""

3885

3866 -#: fetch-pack.c:1887

3886 +#: fetch-pack.c:1897

3887 msgid "no matching remote head"

3888 msgstr ""

3889

3870 -#: fetch-pack.c:1910 builtin/clone.c:692

3890 +#: fetch-pack.c:1920 builtin/clone.c:693

3891 msgid "remote did not send all necessary objects"

3892 msgstr ""

3893

3874 -#: fetch-pack.c:1937

3894 +#: fetch-pack.c:1947

3895 #, c-format

3896 msgid "no such remote ref %s"

3897 msgstr ""

3898

3879 -#: fetch-pack.c:1940

3899 +#: fetch-pack.c:1950

3900 #, c-format

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

3902 msgstr ""

@@ -3899,24 +3919,24 @@ msgstr ""

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

3920 msgstr ""

3921

3902 -#: grep.c:668

3922 +#: grep.c:640

3923 msgid ""

3924 "given pattern contains NULL byte (via -f <file>). This is only supported "

3925 "with -P under PCRE v2"

3926 msgstr ""

3927

3908 -#: grep.c:2128

3928 +#: grep.c:2100

3929 #, c-format

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

3931 msgstr ""

3932

3913 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

3933 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

3934 #: builtin/rm.c:135

3935 #, c-format

3936 msgid "failed to stat '%s'"

3937 msgstr ""

3938

3919 -#: grep.c:2156

3939 +#: grep.c:2128

3940 #, c-format

3941 msgid "'%s': short read"

3942 msgstr ""

@@ -4007,38 +4027,38 @@ msgstr ""

4027 msgid "Command aliases"

4028 msgstr ""

4029

4010 -#: help.c:513

4030 +#: help.c:527

4031 #, c-format

4032 msgid ""

4033 "'%s' appears to be a git command, but we were not\n"

4034 "able to execute it. Maybe git-%s is broken?"

4035 msgstr ""

4036

4017 -#: help.c:572

4037 +#: help.c:543 help.c:631

4038 +#, c-format

4039 +msgid "git: '%s' is not a git command. See 'git --help'."

4040 +msgstr ""

4041 +

4042 +#: help.c:591

4043 msgid "Uh oh. Your system reports no Git commands at all."

4044 msgstr ""

4045

4021 -#: help.c:594

4046 +#: help.c:613

4047 #, c-format

4048 msgid "WARNING: You called a Git command named '%s', which does not exist."

4049 msgstr ""

4050

4026 -#: help.c:599

4051 +#: help.c:618

4052 #, c-format

4053 msgid "Continuing under the assumption that you meant '%s'."

4054 msgstr ""

4055

4031 -#: help.c:604

4056 +#: help.c:623

4057 #, c-format

4058 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4059 msgstr ""

4060

4036 -#: help.c:612

4037 -#, c-format

4038 -msgid "git: '%s' is not a git command. See 'git --help'."

4039 -msgstr ""

4040 -

4041 -#: help.c:616

4061 +#: help.c:635

4062 msgid ""

4063 "\n"

4064 "The most similar command is"

@@ -4048,16 +4068,16 @@ msgid_plural ""

4068 msgstr[0] ""

4069 msgstr[1] ""

4070

4051 -#: help.c:656

4071 +#: help.c:675

4072 msgid "git version [<options>]"

4073 msgstr ""

4074

4055 -#: help.c:711

4075 +#: help.c:730

4076 #, c-format

4077 msgid "%s: %s - %s"

4078 msgstr ""

4079

4060 -#: help.c:715

4080 +#: help.c:734

4081 msgid ""

4082 "\n"

4083 "Did you mean this?"

@@ -4199,6 +4219,18 @@ msgstr ""

4219 msgid "expected flush after ls-refs arguments"

4220 msgstr ""

4221

4222 +#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4223 +#, c-format

4224 +msgid ""

4225 +"Your local changes to the following files would be overwritten by merge:\n"

4226 +" %s"

4227 +msgstr ""

4228 +

4229 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4230 +#, c-format

4231 +msgid "Already up to date!"

4232 +msgstr ""

4233 +

4234 #: merge-recursive.c:356

4235 msgid "(bad commit)\n"

4236 msgstr ""

@@ -4545,10 +4577,6 @@ msgstr ""

4577 msgid "CONFLICT (add/add): Merge conflict in %s"

4578 msgstr ""

4579

4548 -#: merge-recursive.c:3436

4549 -msgid "Already up to date!"

4550 -msgstr ""

4551 -

4580 #: merge-recursive.c:3445

4581 #, c-format

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

@@ -4569,19 +4597,12 @@ msgstr[1] ""

4597 msgid "merge returned no commit"

4598 msgstr ""

4599

4572 -#: merge-recursive.c:3672

4573 -#, c-format

4574 -msgid ""

4575 -"Your local changes to the following files would be overwritten by merge:\n"

4576 -" %s"

4577 -msgstr ""

4578 -

4600 #: merge-recursive.c:3769

4601 #, c-format

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

4603 msgstr ""

4604

4584 -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

4605 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

4606 msgid "Unable to write index."

4607 msgstr ""

4608

@@ -4589,174 +4610,170 @@ msgstr ""

4610 msgid "failed to read the cache"

4611 msgstr ""

4612

4592 -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

4593 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

4613 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

4614 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

4615 #: builtin/stash.c:265

4616 msgid "unable to write new index file"

4617 msgstr ""

4618

4598 -#: midx.c:79

4619 +#: midx.c:80

4620 #, c-format

4621 msgid "multi-pack-index file %s is too small"

4622 msgstr ""

4623

4603 -#: midx.c:95

4624 +#: midx.c:96

4625 #, c-format

4626 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4627 msgstr ""

4628

4608 -#: midx.c:100

4629 +#: midx.c:101

4630 #, c-format

4631 msgid "multi-pack-index version %d not recognized"

4632 msgstr ""

4633

4613 -#: midx.c:105

4634 +#: midx.c:106

4635 #, c-format

4636 msgid "multi-pack-index hash version %u does not match version %u"

4637 msgstr ""

4638

4618 -#: midx.c:122

4639 +#: midx.c:123

4640 msgid "invalid chunk offset (too large)"

4641 msgstr ""

4642

4622 -#: midx.c:146

4643 +#: midx.c:147

4644 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4645 msgstr ""

4646

4626 -#: midx.c:159

4647 +#: midx.c:160

4648 msgid "multi-pack-index missing required pack-name chunk"

4649 msgstr ""

4650

4630 -#: midx.c:161

4651 +#: midx.c:162

4652 msgid "multi-pack-index missing required OID fanout chunk"

4653 msgstr ""

4654

4634 -#: midx.c:163

4655 +#: midx.c:164

4656 msgid "multi-pack-index missing required OID lookup chunk"

4657 msgstr ""

4658

4638 -#: midx.c:165

4659 +#: midx.c:166

4660 msgid "multi-pack-index missing required object offsets chunk"

4661 msgstr ""

4662

4642 -#: midx.c:179

4663 +#: midx.c:180

4664 #, c-format

4665 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4666 msgstr ""

4667

4647 -#: midx.c:222

4668 +#: midx.c:223

4669 #, c-format

4670 msgid "bad pack-int-id: %u (%u total packs)"

4671 msgstr ""

4672

4652 -#: midx.c:272

4673 +#: midx.c:273

4674 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4675 msgstr ""

4676

4656 -#: midx.c:300

4657 -msgid "error preparing packfile from multi-pack-index"

4658 -msgstr ""

4659 -

4660 -#: midx.c:485

4677 +#: midx.c:480

4678 #, c-format

4679 msgid "failed to add packfile '%s'"

4680 msgstr ""

4681

4665 -#: midx.c:491

4682 +#: midx.c:486

4683 #, c-format

4684 msgid "failed to open pack-index '%s'"

4685 msgstr ""

4686

4670 -#: midx.c:551

4687 +#: midx.c:546

4688 #, c-format

4689 msgid "failed to locate object %d in packfile"

4690 msgstr ""

4691

4675 -#: midx.c:853

4692 +#: midx.c:846

4693 msgid "Adding packfiles to multi-pack-index"

4694 msgstr ""

4695

4679 -#: midx.c:886

4696 +#: midx.c:879

4697 #, c-format

4698 msgid "did not see pack-file %s to drop"

4699 msgstr ""

4700

4684 -#: midx.c:938

4701 +#: midx.c:931

4702 msgid "no pack files to index."

4703 msgstr ""

4704

4688 -#: midx.c:990

4705 +#: midx.c:982

4706 msgid "Writing chunks to multi-pack-index"

4707 msgstr ""

4708

4692 -#: midx.c:1068

4709 +#: midx.c:1060

4710 #, c-format

4711 msgid "failed to clear multi-pack-index at %s"

4712 msgstr ""

4713

4697 -#: midx.c:1124

4714 +#: midx.c:1116

4715 msgid "multi-pack-index file exists, but failed to parse"

4716 msgstr ""

4717

4701 -#: midx.c:1132

4718 +#: midx.c:1124

4719 msgid "Looking for referenced packfiles"

4720 msgstr ""

4721

4705 -#: midx.c:1147

4722 +#: midx.c:1139

4723 #, c-format

4724 msgid ""

4725 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4726 msgstr ""

4727

4711 -#: midx.c:1152

4728 +#: midx.c:1144

4729 msgid "the midx contains no oid"

4730 msgstr ""

4731

4715 -#: midx.c:1161

4732 +#: midx.c:1153

4733 msgid "Verifying OID order in multi-pack-index"

4734 msgstr ""

4735

4719 -#: midx.c:1170

4736 +#: midx.c:1162

4737 #, c-format

4738 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4739 msgstr ""

4740

4724 -#: midx.c:1190

4741 +#: midx.c:1182

4742 msgid "Sorting objects by packfile"

4743 msgstr ""

4744

4728 -#: midx.c:1197

4745 +#: midx.c:1189

4746 msgid "Verifying object offsets"

4747 msgstr ""

4748

4732 -#: midx.c:1213

4749 +#: midx.c:1205

4750 #, c-format

4751 msgid "failed to load pack entry for oid[%d] = %s"

4752 msgstr ""

4753

4737 -#: midx.c:1219

4754 +#: midx.c:1211

4755 #, c-format

4756 msgid "failed to load pack-index for packfile %s"

4757 msgstr ""

4758

4742 -#: midx.c:1228

4759 +#: midx.c:1220

4760 #, c-format

4761 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4762 msgstr ""

4763

4747 -#: midx.c:1253

4764 +#: midx.c:1245

4765 msgid "Counting referenced objects"

4766 msgstr ""

4767

4751 -#: midx.c:1263

4768 +#: midx.c:1255

4769 msgid "Finding and deleting unreferenced packfiles"

4770 msgstr ""

4771

4755 -#: midx.c:1454

4772 +#: midx.c:1446

4773 msgid "could not start pack-objects"

4774 msgstr ""

4775

4759 -#: midx.c:1474

4776 +#: midx.c:1466

4777 msgid "could not finish pack-objects"

4778 msgstr ""

4779

@@ -4841,16 +4858,16 @@ msgstr ""

4858 msgid "unable to get size of %s"

4859 msgstr ""

4860

4844 -#: packfile.c:630

4861 +#: packfile.c:615

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

4863 msgstr ""

4864

4848 -#: packfile.c:1922

4865 +#: packfile.c:1907

4866 #, c-format

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

4868 msgstr ""

4869

4853 -#: packfile.c:1926

4870 +#: packfile.c:1911

4871 #, c-format

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

4873 msgstr ""

@@ -5092,7 +5109,7 @@ msgstr ""

5109 msgid "protocol error: bad line length %d"

5110 msgstr ""

5111

5095 -#: pkt-line.c:373 sideband.c:150

5112 +#: pkt-line.c:373 sideband.c:165

5113 #, c-format

5114 msgid "remote error: %s"

5115 msgstr ""

@@ -5139,7 +5156,7 @@ msgstr ""

5156 msgid "could not read `log` output"

5157 msgstr ""

5158

5142 -#: range-diff.c:98 sequencer.c:5283

5159 +#: range-diff.c:98 sequencer.c:5310

5160 #, c-format

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

5162 msgstr ""

@@ -5156,11 +5173,11 @@ msgstr ""

5173 msgid "could not parse git header '%.*s'"

5174 msgstr ""

5175

5159 -#: range-diff.c:301

5176 +#: range-diff.c:299

5177 msgid "failed to generate diff"

5178 msgstr ""

5179

5163 -#: range-diff.c:534 range-diff.c:536

5180 +#: range-diff.c:532 range-diff.c:534

5181 #, c-format

5182 msgid "could not parse log for '%s'"

5183 msgstr ""

@@ -5272,8 +5289,8 @@ msgstr ""

5289

5290 #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5291 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5275 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5276 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5292 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5293 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5294 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5295 #: builtin/submodule--helper.c:332

5296 msgid "index file corrupt"

@@ -5329,12 +5346,12 @@ msgstr ""

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

5347 msgstr ""

5348

5332 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5349 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5350 #, c-format

5351 msgid "could not close '%s'"

5352 msgstr ""

5353

5337 -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5354 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5355 #, c-format

5356 msgid "could not stat '%s'"

5357 msgstr ""

@@ -5429,14 +5446,14 @@ msgid ""

5446 "\n"

5447 msgstr ""

5448

5432 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5433 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5449 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5450 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

5451 #, c-format

5452 msgid "could not write '%s'"

5453 msgstr ""

5454

5438 -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5439 -#: builtin/rebase.c:246

5455 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5456 +#: builtin/rebase.c:252

5457 #, c-format

5458 msgid "could not write '%s'."

5459 msgstr ""

@@ -5459,9 +5476,9 @@ msgid ""

5476 "\n"

5477 msgstr ""

5478

5462 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5463 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5464 -#: builtin/rebase.c:258

5479 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5480 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5481 +#: builtin/rebase.c:264

5482 #, c-format

5483 msgid "could not read '%s'."

5484 msgstr ""

@@ -5656,61 +5673,61 @@ msgstr ""

5673 msgid "malformed format string %s"

5674 msgstr ""

5675

5659 -#: ref-filter.c:1541

5676 +#: ref-filter.c:1549

5677 #, c-format

5678 msgid "no branch, rebasing %s"

5679 msgstr ""

5680

5664 -#: ref-filter.c:1544

5681 +#: ref-filter.c:1552

5682 #, c-format

5683 msgid "no branch, rebasing detached HEAD %s"

5684 msgstr ""

5685

5669 -#: ref-filter.c:1547

5686 +#: ref-filter.c:1555

5687 #, c-format

5688 msgid "no branch, bisect started on %s"

5689 msgstr ""

5690

5674 -#: ref-filter.c:1557

5691 +#: ref-filter.c:1565

5692 msgid "no branch"

5693 msgstr ""

5694

5678 -#: ref-filter.c:1591 ref-filter.c:1800

5695 +#: ref-filter.c:1599 ref-filter.c:1808

5696 #, c-format

5697 msgid "missing object %s for %s"

5698 msgstr ""

5699

5683 -#: ref-filter.c:1601

5700 +#: ref-filter.c:1609

5701 #, c-format

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

5703 msgstr ""

5704

5688 -#: ref-filter.c:2054

5705 +#: ref-filter.c:2062

5706 #, c-format

5707 msgid "malformed object at '%s'"

5708 msgstr ""

5709

5693 -#: ref-filter.c:2143

5710 +#: ref-filter.c:2151

5711 #, c-format

5712 msgid "ignoring ref with broken name %s"

5713 msgstr ""

5714

5698 -#: ref-filter.c:2148 refs.c:657

5715 +#: ref-filter.c:2156 refs.c:660

5716 #, c-format

5717 msgid "ignoring broken ref %s"

5718 msgstr ""

5719

5703 -#: ref-filter.c:2464

5720 +#: ref-filter.c:2472

5721 #, c-format

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

5723 msgstr ""

5724

5708 -#: ref-filter.c:2563

5725 +#: ref-filter.c:2571

5726 #, c-format

5727 msgid "malformed object name %s"

5728 msgstr ""

5729

5713 -#: ref-filter.c:2568

5730 +#: ref-filter.c:2576

5731 #, c-format

5732 msgid "option `%s' must point to a commit"

5733 msgstr ""

@@ -5720,65 +5737,65 @@ msgstr ""

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

5738 msgstr ""

5739

5723 -#: refs.c:572

5740 +#: refs.c:575

5741 #, c-format

5742 msgid "could not retrieve `%s`"

5743 msgstr ""

5744

5728 -#: refs.c:579

5745 +#: refs.c:582

5746 #, c-format

5747 msgid "invalid branch name: %s = %s"

5748 msgstr ""

5749

5733 -#: refs.c:655

5750 +#: refs.c:658

5751 #, c-format

5752 msgid "ignoring dangling symref %s"

5753 msgstr ""

5754

5738 -#: refs.c:892

5755 +#: refs.c:895

5756 #, c-format

5757 msgid "log for ref %s has gap after %s"

5758 msgstr ""

5759

5743 -#: refs.c:898

5760 +#: refs.c:901

5761 #, c-format

5762 msgid "log for ref %s unexpectedly ended on %s"

5763 msgstr ""

5764

5748 -#: refs.c:957

5765 +#: refs.c:960

5766 #, c-format

5767 msgid "log for %s is empty"

5768 msgstr ""

5769

5753 -#: refs.c:1049

5770 +#: refs.c:1052

5771 #, c-format

5772 msgid "refusing to update ref with bad name '%s'"

5773 msgstr ""

5774

5758 -#: refs.c:1120

5775 +#: refs.c:1123

5776 #, c-format

5777 msgid "update_ref failed for ref '%s': %s"

5778 msgstr ""

5779

5763 -#: refs.c:1944

5780 +#: refs.c:1947

5781 #, c-format

5782 msgid "multiple updates for ref '%s' not allowed"

5783 msgstr ""

5784

5768 -#: refs.c:2024

5785 +#: refs.c:2027

5786 msgid "ref updates forbidden inside quarantine environment"

5787 msgstr ""

5788

5772 -#: refs.c:2035

5789 +#: refs.c:2038

5790 msgid "ref updates aborted by hook"

5791 msgstr ""

5792

5776 -#: refs.c:2135 refs.c:2165

5793 +#: refs.c:2138 refs.c:2168

5794 #, c-format

5795 msgid "'%s' exists; cannot create '%s'"

5796 msgstr ""

5797

5781 -#: refs.c:2141 refs.c:2176

5798 +#: refs.c:2144 refs.c:2179

5799 #, c-format

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

5801 msgstr ""

@@ -5799,7 +5816,7 @@ msgstr ""

5816 msgid "could not delete references: %s"

5817 msgstr ""

5818

5802 -#: refspec.c:167

5819 +#: refspec.c:170

5820 #, c-format

5821 msgid "invalid refspec '%s'"

5822 msgstr ""

@@ -5922,94 +5939,94 @@ msgstr ""

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

5940 msgstr ""

5941

5925 -#: remote.c:1703 remote.c:1804

5942 +#: remote.c:1714 remote.c:1815

5943 msgid "HEAD does not point to a branch"

5944 msgstr ""

5945

5929 -#: remote.c:1712

5946 +#: remote.c:1723

5947 #, c-format

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

5949 msgstr ""

5950

5934 -#: remote.c:1715

5951 +#: remote.c:1726

5952 #, c-format

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

5954 msgstr ""

5955

5939 -#: remote.c:1721

5956 +#: remote.c:1732

5957 #, c-format

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

5959 msgstr ""

5960

5944 -#: remote.c:1736

5961 +#: remote.c:1747

5962 #, c-format

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

5964 msgstr ""

5965

5949 -#: remote.c:1748

5966 +#: remote.c:1759

5967 #, c-format

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

5969 msgstr ""

5970

5954 -#: remote.c:1758

5971 +#: remote.c:1769

5972 #, c-format

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

5974 msgstr ""

5975

5959 -#: remote.c:1771

5976 +#: remote.c:1782

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

5978 msgstr ""

5979

5963 -#: remote.c:1793

5980 +#: remote.c:1804

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

5982 msgstr ""

5983

5967 -#: remote.c:1922

5984 +#: remote.c:1933

5985 #, c-format

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

5987 msgstr ""

5988

5972 -#: remote.c:1935

5989 +#: remote.c:1946

5990 #, c-format

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

5992 msgstr ""

5993

5977 -#: remote.c:2098

5994 +#: remote.c:2109

5995 #, c-format

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

5997 msgstr ""

5998

5982 -#: remote.c:2102

5999 +#: remote.c:2113

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

6001 msgstr ""

6002

5986 -#: remote.c:2105

6003 +#: remote.c:2116

6004 #, c-format

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

6006 msgstr ""

6007

5991 -#: remote.c:2109

6008 +#: remote.c:2120

6009 #, c-format

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

6011 msgstr ""

6012

5996 -#: remote.c:2112

6013 +#: remote.c:2123

6014 #, c-format

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

6016 msgstr ""

6017

6001 -#: remote.c:2116

6018 +#: remote.c:2127

6019 #, c-format

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

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

6022 msgstr[0] ""

6023 msgstr[1] ""

6024

6008 -#: remote.c:2122

6025 +#: remote.c:2133

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

6027 msgstr ""

6028

6012 -#: remote.c:2125

6029 +#: remote.c:2136

6030 #, c-format

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

6032 msgid_plural ""

@@ -6017,11 +6034,11 @@ msgid_plural ""

6034 msgstr[0] ""

6035 msgstr[1] ""

6036

6020 -#: remote.c:2133

6037 +#: remote.c:2144

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

6039 msgstr ""

6040

6024 -#: remote.c:2136

6041 +#: remote.c:2147

6042 #, c-format

6043 msgid ""

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

@@ -6032,11 +6049,11 @@ msgid_plural ""

6049 msgstr[0] ""

6050 msgstr[1] ""

6051

6035 -#: remote.c:2146

6052 +#: remote.c:2157

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

6054 msgstr ""

6055

6039 -#: remote.c:2337

6056 +#: remote.c:2348

6057 #, c-format

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

6059 msgstr ""

@@ -6114,7 +6131,7 @@ msgstr ""

6131 msgid "Recorded preimage for '%s'"

6132 msgstr ""

6133

6117 -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6134 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992

6135 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6136 #, c-format

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

@@ -6153,171 +6170,171 @@ msgstr ""

6170 msgid "could not determine HEAD revision"

6171 msgstr ""

6172

6156 -#: reset.c:70 reset.c:76 sequencer.c:3426

6173 +#: reset.c:70 reset.c:76 sequencer.c:3460

6174 #, c-format

6175 msgid "failed to find tree of %s"

6176 msgstr ""

6177

6161 -#: revision.c:2344

6178 +#: revision.c:2336

6179 msgid "--unpacked=<packfile> no longer supported"

6180 msgstr ""

6181

6165 -#: revision.c:2364

6182 +#: revision.c:2356

6183 #, c-format

6184 msgid "unknown value for --diff-merges: %s"

6185 msgstr ""

6186

6170 -#: revision.c:2702

6187 +#: revision.c:2694

6188 msgid "your current branch appears to be broken"

6189 msgstr ""

6190

6174 -#: revision.c:2705

6191 +#: revision.c:2697

6192 #, c-format

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

6194 msgstr ""

6195

6179 -#: revision.c:2915

6196 +#: revision.c:2907

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

6198 msgstr ""

6199

6183 -#: run-command.c:763

6200 +#: run-command.c:764

6201 msgid "open /dev/null failed"

6202 msgstr ""

6203

6187 -#: run-command.c:1270

6204 +#: run-command.c:1271

6205 #, c-format

6206 msgid "cannot create async thread: %s"

6207 msgstr ""

6208

6192 -#: run-command.c:1334

6209 +#: run-command.c:1335

6210 #, c-format

6211 msgid ""

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

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

6214 msgstr ""

6215

6199 -#: send-pack.c:145

6216 +#: send-pack.c:146

6217 msgid "unexpected flush packet while reading remote unpack status"

6218 msgstr ""

6219

6203 -#: send-pack.c:147

6220 +#: send-pack.c:148

6221 #, c-format

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

6223 msgstr ""

6224

6208 -#: send-pack.c:149

6225 +#: send-pack.c:150

6226 #, c-format

6227 msgid "remote unpack failed: %s"

6228 msgstr ""

6229

6213 -#: send-pack.c:372

6230 +#: send-pack.c:374

6231 msgid "failed to sign the push certificate"

6232 msgstr ""

6233

6217 -#: send-pack.c:460

6234 +#: send-pack.c:467

6235 msgid "the receiving end does not support this repository's hash algorithm"

6236 msgstr ""

6237

6221 -#: send-pack.c:469

6238 +#: send-pack.c:476

6239 msgid "the receiving end does not support --signed push"

6240 msgstr ""

6241

6225 -#: send-pack.c:471

6242 +#: send-pack.c:478

6243 msgid ""

6244 "not sending a push certificate since the receiving end does not support --"

6245 "signed push"

6246 msgstr ""

6247

6231 -#: send-pack.c:483

6248 +#: send-pack.c:490

6249 msgid "the receiving end does not support --atomic push"

6250 msgstr ""

6251

6235 -#: send-pack.c:488

6252 +#: send-pack.c:495

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

6254 msgstr ""

6255

6239 -#: sequencer.c:194

6256 +#: sequencer.c:195

6257 #, c-format

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

6259 msgstr ""

6260

6244 -#: sequencer.c:308

6261 +#: sequencer.c:323

6262 #, c-format

6263 msgid "could not delete '%s'"

6264 msgstr ""

6265

6249 -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6266 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385

6267 #, c-format

6268 msgid "could not remove '%s'"

6269 msgstr ""

6270

6254 -#: sequencer.c:339

6271 +#: sequencer.c:353

6272 msgid "revert"

6273 msgstr ""

6274

6258 -#: sequencer.c:341

6275 +#: sequencer.c:355

6276 msgid "cherry-pick"

6277 msgstr ""

6278

6262 -#: sequencer.c:343

6279 +#: sequencer.c:357

6280 msgid "rebase"

6281 msgstr ""

6282

6266 -#: sequencer.c:345

6283 +#: sequencer.c:359

6284 #, c-format

6285 msgid "unknown action: %d"

6286 msgstr ""

6287

6271 -#: sequencer.c:404

6288 +#: sequencer.c:418

6289 msgid ""

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

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

6292 msgstr ""

6293

6277 -#: sequencer.c:407

6294 +#: sequencer.c:421

6295 msgid ""

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

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

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

6299 msgstr ""

6300

6284 -#: sequencer.c:420 sequencer.c:3028

6301 +#: sequencer.c:434 sequencer.c:3062

6302 #, c-format

6303 msgid "could not lock '%s'"

6304 msgstr ""

6305

6289 -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6290 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6306 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080

6307 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631

6308 #, c-format

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

6310 msgstr ""

6311

6295 -#: sequencer.c:427

6312 +#: sequencer.c:441

6313 #, c-format

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

6315 msgstr ""

6316

6300 -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6301 -#: sequencer.c:3311

6317 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082

6318 +#: sequencer.c:3345

6319 #, c-format

6320 msgid "failed to finalize '%s'"

6321 msgstr ""

6322

6306 -#: sequencer.c:471

6323 +#: sequencer.c:485

6324 #, c-format

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

6326 msgstr ""

6327

6311 -#: sequencer.c:475

6328 +#: sequencer.c:489

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

6330 msgstr ""

6331

6315 -#: sequencer.c:507

6332 +#: sequencer.c:521

6333 #, c-format

6334 msgid "%s: fast-forward"

6335 msgstr ""

6336

6320 -#: sequencer.c:546 builtin/tag.c:566

6337 +#: sequencer.c:560 builtin/tag.c:566

6338 #, c-format

6339 msgid "Invalid cleanup mode %s"

6340 msgstr ""

@@ -6325,65 +6342,65 @@ msgstr ""

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

6343 #. "rebase".

6344 #.

6328 -#: sequencer.c:640

6345 +#: sequencer.c:670

6346 #, c-format

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

6348 msgstr ""

6349

6333 -#: sequencer.c:657

6350 +#: sequencer.c:687

6351 msgid "unable to update cache tree"

6352 msgstr ""

6353

6337 -#: sequencer.c:671

6354 +#: sequencer.c:701

6355 msgid "could not resolve HEAD commit"

6356 msgstr ""

6357

6341 -#: sequencer.c:751

6358 +#: sequencer.c:781

6359 #, c-format

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

6361 msgstr ""

6362

6346 -#: sequencer.c:762

6363 +#: sequencer.c:792

6364 #, c-format

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

6366 msgstr ""

6367

6351 -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6352 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

6368 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710

6369 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908

6370 #, c-format

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

6372 msgstr ""

6373

6357 -#: sequencer.c:809

6374 +#: sequencer.c:839

6375 msgid "'GIT_AUTHOR_NAME' already given"

6376 msgstr ""

6377

6361 -#: sequencer.c:814

6378 +#: sequencer.c:844

6379 msgid "'GIT_AUTHOR_EMAIL' already given"

6380 msgstr ""

6381

6365 -#: sequencer.c:819

6382 +#: sequencer.c:849

6383 msgid "'GIT_AUTHOR_DATE' already given"

6384 msgstr ""

6385

6369 -#: sequencer.c:823

6386 +#: sequencer.c:853

6387 #, c-format

6388 msgid "unknown variable '%s'"

6389 msgstr ""

6390

6374 -#: sequencer.c:828

6391 +#: sequencer.c:858

6392 msgid "missing 'GIT_AUTHOR_NAME'"

6393 msgstr ""

6394

6378 -#: sequencer.c:830

6395 +#: sequencer.c:860

6396 msgid "missing 'GIT_AUTHOR_EMAIL'"

6397 msgstr ""

6398

6382 -#: sequencer.c:832

6399 +#: sequencer.c:862

6400 msgid "missing 'GIT_AUTHOR_DATE'"

6401 msgstr ""

6402

6386 -#: sequencer.c:897

6403 +#: sequencer.c:927

6404 #, c-format

6405 msgid ""

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

@@ -6400,11 +6417,11 @@ msgid ""

6417 " git rebase --continue\n"

6418 msgstr ""

6419

6403 -#: sequencer.c:1178

6420 +#: sequencer.c:1208

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

6422 msgstr ""

6423

6407 -#: sequencer.c:1184

6424 +#: sequencer.c:1214

6425 msgid ""

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

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

@@ -6419,7 +6436,7 @@ msgid ""

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

6437 msgstr ""

6438

6422 -#: sequencer.c:1197

6439 +#: sequencer.c:1227

6440 msgid ""

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

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

@@ -6433,354 +6450,354 @@ msgid ""

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

6451 msgstr ""

6452

6436 -#: sequencer.c:1239

6453 +#: sequencer.c:1269

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

6455 msgstr ""

6456

6440 -#: sequencer.c:1241

6457 +#: sequencer.c:1271

6458 msgid "could not parse newly created commit"

6459 msgstr ""

6460

6444 -#: sequencer.c:1287

6461 +#: sequencer.c:1317

6462 msgid "unable to resolve HEAD after creating commit"

6463 msgstr ""

6464

6448 -#: sequencer.c:1289

6465 +#: sequencer.c:1319

6466 msgid "detached HEAD"

6467 msgstr ""

6468

6452 -#: sequencer.c:1293

6469 +#: sequencer.c:1323

6470 msgid " (root-commit)"

6471 msgstr ""

6472

6456 -#: sequencer.c:1314

6473 +#: sequencer.c:1344

6474 msgid "could not parse HEAD"

6475 msgstr ""

6476

6460 -#: sequencer.c:1316

6477 +#: sequencer.c:1346

6478 #, c-format

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

6480 msgstr ""

6481

6465 -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577

6482 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577

6483 msgid "could not parse HEAD commit"

6484 msgstr ""

6485

6469 -#: sequencer.c:1373 sequencer.c:2067

6486 +#: sequencer.c:1403 sequencer.c:2100

6487 msgid "unable to parse commit author"

6488 msgstr ""

6489

6473 -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692

6490 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701

6491 msgid "git write-tree failed to write a tree"

6492 msgstr ""

6493

6477 -#: sequencer.c:1417 sequencer.c:1535

6494 +#: sequencer.c:1447 sequencer.c:1565

6495 #, c-format

6496 msgid "unable to read commit message from '%s'"

6497 msgstr ""

6498

6482 -#: sequencer.c:1446 sequencer.c:1478

6499 +#: sequencer.c:1476 sequencer.c:1508

6500 #, c-format

6501 msgid "invalid author identity '%s'"

6502 msgstr ""

6503

6487 -#: sequencer.c:1452

6504 +#: sequencer.c:1482

6505 msgid "corrupt author: missing date information"

6506 msgstr ""

6507

6491 -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890

6492 -#: builtin/merge.c:915

6508 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904

6509 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78

6510 msgid "failed to write commit object"

6511 msgstr ""

6512

6496 -#: sequencer.c:1518 sequencer.c:4237

6513 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198

6514 #, c-format

6515 msgid "could not update %s"

6516 msgstr ""

6517

6501 -#: sequencer.c:1567

6518 +#: sequencer.c:1597

6519 #, c-format

6520 msgid "could not parse commit %s"

6521 msgstr ""

6522

6506 -#: sequencer.c:1572

6523 +#: sequencer.c:1602

6524 #, c-format

6525 msgid "could not parse parent commit %s"

6526 msgstr ""

6527

6511 -#: sequencer.c:1655 sequencer.c:1766

6528 +#: sequencer.c:1685 sequencer.c:1796

6529 #, c-format

6530 msgid "unknown command: %d"

6531 msgstr ""

6532

6516 -#: sequencer.c:1713 sequencer.c:1738

6533 +#: sequencer.c:1743 sequencer.c:1768

6534 #, c-format

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

6536 msgstr ""

6537

6521 -#: sequencer.c:1723

6538 +#: sequencer.c:1753

6539 msgid "need a HEAD to fixup"

6540 msgstr ""

6541

6525 -#: sequencer.c:1725 sequencer.c:3338

6542 +#: sequencer.c:1755 sequencer.c:3372

6543 msgid "could not read HEAD"

6544 msgstr ""

6545

6529 -#: sequencer.c:1727

6546 +#: sequencer.c:1757

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

6548 msgstr ""

6549

6533 -#: sequencer.c:1733

6550 +#: sequencer.c:1763

6551 #, c-format

6552 msgid "cannot write '%s'"

6553 msgstr ""

6554

6538 -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486

6555 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486

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

6557 msgstr ""

6558

6542 -#: sequencer.c:1748

6559 +#: sequencer.c:1778

6560 #, c-format

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

6562 msgstr ""

6563

6547 -#: sequencer.c:1755

6564 +#: sequencer.c:1785

6565 #, c-format

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

6567 msgstr ""

6568

6552 -#: sequencer.c:1761

6569 +#: sequencer.c:1791

6570 #, c-format

6571 msgid "The commit message #%d will be skipped:"

6572 msgstr ""

6573

6557 -#: sequencer.c:1849

6574 +#: sequencer.c:1879

6575 msgid "your index file is unmerged."

6576 msgstr ""

6577

6561 -#: sequencer.c:1856

6578 +#: sequencer.c:1886

6579 msgid "cannot fixup root commit"

6580 msgstr ""

6581

6565 -#: sequencer.c:1875

6582 +#: sequencer.c:1905

6583 #, c-format

6584 msgid "commit %s is a merge but no -m option was given."

6585 msgstr ""

6586

6570 -#: sequencer.c:1883 sequencer.c:1891

6587 +#: sequencer.c:1913 sequencer.c:1921

6588 #, c-format

6589 msgid "commit %s does not have parent %d"

6590 msgstr ""

6591

6575 -#: sequencer.c:1897

6592 +#: sequencer.c:1927

6593 #, c-format

6594 msgid "cannot get commit message for %s"

6595 msgstr ""

6596

6597 #. TRANSLATORS: The first %s will be a "todo" command like

6598 #. "revert" or "pick", the second %s a SHA1.

6582 -#: sequencer.c:1916

6599 +#: sequencer.c:1946

6600 #, c-format

6601 msgid "%s: cannot parse parent commit %s"

6602 msgstr ""

6603

6587 -#: sequencer.c:1981

6604 +#: sequencer.c:2011

6605 #, c-format

6606 msgid "could not rename '%s' to '%s'"

6607 msgstr ""

6608

6592 -#: sequencer.c:2038

6609 +#: sequencer.c:2071

6610 #, c-format

6611 msgid "could not revert %s... %s"

6612 msgstr ""

6613

6597 -#: sequencer.c:2039

6614 +#: sequencer.c:2072

6615 #, c-format

6616 msgid "could not apply %s... %s"

6617 msgstr ""

6618

6602 -#: sequencer.c:2059

6619 +#: sequencer.c:2092

6620 #, c-format

6621 msgid "dropping %s %s -- patch contents already upstream\n"

6622 msgstr ""

6623

6607 -#: sequencer.c:2117

6624 +#: sequencer.c:2150

6625 #, c-format

6626 msgid "git %s: failed to read the index"

6627 msgstr ""

6628

6612 -#: sequencer.c:2124

6629 +#: sequencer.c:2157

6630 #, c-format

6631 msgid "git %s: failed to refresh the index"

6632 msgstr ""

6633

6617 -#: sequencer.c:2201

6634 +#: sequencer.c:2234

6635 #, c-format

6636 msgid "%s does not accept arguments: '%s'"

6637 msgstr ""

6638

6622 -#: sequencer.c:2210

6639 +#: sequencer.c:2243

6640 #, c-format

6641 msgid "missing arguments for %s"

6642 msgstr ""

6643

6627 -#: sequencer.c:2241

6644 +#: sequencer.c:2274

6645 #, c-format

6646 msgid "could not parse '%s'"

6647 msgstr ""

6648

6632 -#: sequencer.c:2302

6649 +#: sequencer.c:2335

6650 #, c-format

6651 msgid "invalid line %d: %.*s"

6652 msgstr ""

6653

6637 -#: sequencer.c:2313

6654 +#: sequencer.c:2346

6655 #, c-format

6656 msgid "cannot '%s' without a previous commit"

6657 msgstr ""

6658

6642 -#: sequencer.c:2399

6659 +#: sequencer.c:2432

6660 msgid "cancelling a cherry picking in progress"

6661 msgstr ""

6662

6646 -#: sequencer.c:2408

6663 +#: sequencer.c:2441

6664 msgid "cancelling a revert in progress"

6665 msgstr ""

6666

6650 -#: sequencer.c:2452

6667 +#: sequencer.c:2485

6668 msgid "please fix this using 'git rebase --edit-todo'."

6669 msgstr ""

6670

6654 -#: sequencer.c:2454

6671 +#: sequencer.c:2487

6672 #, c-format

6673 msgid "unusable instruction sheet: '%s'"

6674 msgstr ""

6675

6659 -#: sequencer.c:2459

6676 +#: sequencer.c:2492

6677 msgid "no commits parsed."

6678 msgstr ""

6679

6663 -#: sequencer.c:2470

6680 +#: sequencer.c:2503

6681 msgid "cannot cherry-pick during a revert."

6682 msgstr ""

6683

6667 -#: sequencer.c:2472

6684 +#: sequencer.c:2505

6685 msgid "cannot revert during a cherry-pick."

6686 msgstr ""

6687

6671 -#: sequencer.c:2550

6688 +#: sequencer.c:2583

6689 #, c-format

6690 msgid "invalid value for %s: %s"

6691 msgstr ""

6692

6676 -#: sequencer.c:2657

6693 +#: sequencer.c:2690

6694 msgid "unusable squash-onto"

6695 msgstr ""

6696

6680 -#: sequencer.c:2677

6697 +#: sequencer.c:2710

6698 #, c-format

6699 msgid "malformed options sheet: '%s'"

6700 msgstr ""

6701

6685 -#: sequencer.c:2769 sequencer.c:4609

6702 +#: sequencer.c:2803 sequencer.c:4636

6703 msgid "empty commit set passed"

6704 msgstr ""

6705

6689 -#: sequencer.c:2786

6706 +#: sequencer.c:2820

6707 msgid "revert is already in progress"

6708 msgstr ""

6709

6693 -#: sequencer.c:2788

6710 +#: sequencer.c:2822

6711 #, c-format

6712 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6713 msgstr ""

6714

6698 -#: sequencer.c:2791

6715 +#: sequencer.c:2825

6716 msgid "cherry-pick is already in progress"

6717 msgstr ""

6718

6702 -#: sequencer.c:2793

6719 +#: sequencer.c:2827

6720 #, c-format

6721 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6722 msgstr ""

6723

6707 -#: sequencer.c:2807

6724 +#: sequencer.c:2841

6725 #, c-format

6726 msgid "could not create sequencer directory '%s'"

6727 msgstr ""

6728

6712 -#: sequencer.c:2822

6729 +#: sequencer.c:2856

6730 msgid "could not lock HEAD"

6731 msgstr ""

6732

6716 -#: sequencer.c:2882 sequencer.c:4325

6733 +#: sequencer.c:2916 sequencer.c:4371

6734 msgid "no cherry-pick or revert in progress"

6735 msgstr ""

6736

6720 -#: sequencer.c:2884 sequencer.c:2895

6737 +#: sequencer.c:2918 sequencer.c:2929

6738 msgid "cannot resolve HEAD"

6739 msgstr ""

6740

6724 -#: sequencer.c:2886 sequencer.c:2930

6741 +#: sequencer.c:2920 sequencer.c:2964

6742 msgid "cannot abort from a branch yet to be born"

6743 msgstr ""

6744

6728 -#: sequencer.c:2916 builtin/grep.c:745

6745 +#: sequencer.c:2950 builtin/grep.c:756

6746 #, c-format

6747 msgid "cannot open '%s'"

6748 msgstr ""

6749

6733 -#: sequencer.c:2918

6750 +#: sequencer.c:2952

6751 #, c-format

6752 msgid "cannot read '%s': %s"

6753 msgstr ""

6754

6738 -#: sequencer.c:2919

6755 +#: sequencer.c:2953

6756 msgid "unexpected end of file"

6757 msgstr ""

6758

6742 -#: sequencer.c:2925

6759 +#: sequencer.c:2959

6760 #, c-format

6761 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6762 msgstr ""

6763

6747 -#: sequencer.c:2936

6764 +#: sequencer.c:2970

6765 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6766 msgstr ""

6767

6751 -#: sequencer.c:2977

6768 +#: sequencer.c:3011

6769 msgid "no revert in progress"

6770 msgstr ""

6771

6755 -#: sequencer.c:2986

6772 +#: sequencer.c:3020

6773 msgid "no cherry-pick in progress"

6774 msgstr ""

6775

6759 -#: sequencer.c:2996

6776 +#: sequencer.c:3030

6777 msgid "failed to skip the commit"

6778 msgstr ""

6779

6763 -#: sequencer.c:3003

6780 +#: sequencer.c:3037

6781 msgid "there is nothing to skip"

6782 msgstr ""

6783

6767 -#: sequencer.c:3006

6784 +#: sequencer.c:3040

6785 #, c-format

6786 msgid ""

6787 "have you committed already?\n"

6788 "try \"git %s --continue\""

6789 msgstr ""

6790

6774 -#: sequencer.c:3168 sequencer.c:4217

6791 +#: sequencer.c:3202 sequencer.c:4263

6792 msgid "cannot read HEAD"

6793 msgstr ""

6794

6778 -#: sequencer.c:3185

6795 +#: sequencer.c:3219

6796 #, c-format

6797 msgid "unable to copy '%s' to '%s'"

6798 msgstr ""

6799

6783 -#: sequencer.c:3193

6800 +#: sequencer.c:3227

6801 #, c-format

6802 msgid ""

6803 "You can amend the commit now, with\n"

@@ -6792,27 +6809,27 @@ msgid ""

6809 " git rebase --continue\n"

6810 msgstr ""

6811

6795 -#: sequencer.c:3203

6812 +#: sequencer.c:3237

6813 #, c-format

6814 msgid "Could not apply %s... %.*s"

6815 msgstr ""

6816

6800 -#: sequencer.c:3210

6817 +#: sequencer.c:3244

6818 #, c-format

6819 msgid "Could not merge %.*s"

6820 msgstr ""

6821

6805 -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641

6822 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640

6823 #, c-format

6824 msgid "could not copy '%s' to '%s'"

6825 msgstr ""

6826

6810 -#: sequencer.c:3240

6827 +#: sequencer.c:3274

6828 #, c-format

6829 msgid "Executing: %s\n"

6830 msgstr ""

6831

6815 -#: sequencer.c:3255

6832 +#: sequencer.c:3289

6833 #, c-format

6834 msgid ""

6835 "execution failed: %s\n"

@@ -6822,11 +6839,11 @@ msgid ""

6839 "\n"

6840 msgstr ""

6841

6825 -#: sequencer.c:3261

6842 +#: sequencer.c:3295

6843 msgid "and made changes to the index and/or the working tree\n"

6844 msgstr ""

6845

6829 -#: sequencer.c:3267

6846 +#: sequencer.c:3301

6847 #, c-format

6848 msgid ""

6849 "execution succeeded: %s\n"

@@ -6837,90 +6854,90 @@ msgid ""

6854 "\n"

6855 msgstr ""

6856

6840 -#: sequencer.c:3328

6857 +#: sequencer.c:3362

6858 #, c-format

6859 msgid "illegal label name: '%.*s'"

6860 msgstr ""

6861

6845 -#: sequencer.c:3382

6862 +#: sequencer.c:3416

6863 msgid "writing fake root commit"

6864 msgstr ""

6865

6849 -#: sequencer.c:3387

6866 +#: sequencer.c:3421

6867 msgid "writing squash-onto"

6868 msgstr ""

6869

6853 -#: sequencer.c:3471

6870 +#: sequencer.c:3505

6871 #, c-format

6872 msgid "could not resolve '%s'"

6873 msgstr ""

6874

6858 -#: sequencer.c:3502

6875 +#: sequencer.c:3538

6876 msgid "cannot merge without a current revision"

6877 msgstr ""

6878

6862 -#: sequencer.c:3524

6879 +#: sequencer.c:3560

6880 #, c-format

6881 msgid "unable to parse '%.*s'"

6882 msgstr ""

6883

6867 -#: sequencer.c:3533

6884 +#: sequencer.c:3569

6885 #, c-format

6886 msgid "nothing to merge: '%.*s'"

6887 msgstr ""

6888

6872 -#: sequencer.c:3545

6889 +#: sequencer.c:3581

6890 msgid "octopus merge cannot be executed on top of a [new root]"

6891 msgstr ""

6892

6876 -#: sequencer.c:3561

6893 +#: sequencer.c:3597

6894 #, c-format

6895 msgid "could not get commit message of '%s'"

6896 msgstr ""

6897

6881 -#: sequencer.c:3730

6898 +#: sequencer.c:3780

6899 #, c-format

6900 msgid "could not even attempt to merge '%.*s'"

6901 msgstr ""

6902

6886 -#: sequencer.c:3746

6903 +#: sequencer.c:3796

6904 msgid "merge: Unable to write new index file"

6905 msgstr ""

6906

6890 -#: sequencer.c:3820

6907 +#: sequencer.c:3870

6908 msgid "Cannot autostash"

6909 msgstr ""

6910

6894 -#: sequencer.c:3823

6911 +#: sequencer.c:3873

6912 #, c-format

6913 msgid "Unexpected stash response: '%s'"

6914 msgstr ""

6915

6899 -#: sequencer.c:3829

6916 +#: sequencer.c:3879

6917 #, c-format

6918 msgid "Could not create directory for '%s'"

6919 msgstr ""

6920

6904 -#: sequencer.c:3832

6921 +#: sequencer.c:3882

6922 #, c-format

6923 msgid "Created autostash: %s\n"

6924 msgstr ""

6925

6909 -#: sequencer.c:3836

6926 +#: sequencer.c:3886

6927 msgid "could not reset --hard"

6928 msgstr ""

6929

6913 -#: sequencer.c:3861

6930 +#: sequencer.c:3911

6931 #, c-format

6932 msgid "Applied autostash.\n"

6933 msgstr ""

6934

6918 -#: sequencer.c:3873

6935 +#: sequencer.c:3923

6936 #, c-format

6937 msgid "cannot store %s"

6938 msgstr ""

6939

6923 -#: sequencer.c:3876

6940 +#: sequencer.c:3926

6941 #, c-format

6942 msgid ""

6943 "%s\n"

@@ -6928,34 +6945,29 @@ msgid ""

6945 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

6946 msgstr ""

6947

6931 -#: sequencer.c:3881

6948 +#: sequencer.c:3931

6949 msgid "Applying autostash resulted in conflicts."

6950 msgstr ""

6951

6935 -#: sequencer.c:3882

6952 +#: sequencer.c:3932

6953 msgid "Autostash exists; creating a new stash entry."

6954 msgstr ""

6955

6939 -#: sequencer.c:3974

6940 -#, c-format

6941 -msgid "%s: not a valid OID"

6942 -msgstr ""

6943 -

6944 -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769

6956 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769

6957 msgid "could not detach HEAD"

6958 msgstr ""

6959

6948 -#: sequencer.c:3994

6960 +#: sequencer.c:4040

6961 #, c-format

6962 msgid "Stopped at HEAD\n"

6963 msgstr ""

6964

6953 -#: sequencer.c:3996

6965 +#: sequencer.c:4042

6966 #, c-format

6967 msgid "Stopped at %s\n"

6968 msgstr ""

6969

6958 -#: sequencer.c:4004

6970 +#: sequencer.c:4050

6971 #, c-format

6972 msgid ""

6973 "Could not execute the todo command\n"

@@ -6968,113 +6980,108 @@ msgid ""

6980 " git rebase --continue\n"

6981 msgstr ""

6982

6971 -#: sequencer.c:4050

6983 +#: sequencer.c:4096

6984 #, c-format

6985 msgid "Rebasing (%d/%d)%s"

6986 msgstr ""

6987

6976 -#: sequencer.c:4095

6988 +#: sequencer.c:4141

6989 #, c-format

6990 msgid "Stopped at %s... %.*s\n"

6991 msgstr ""

6992

6981 -#: sequencer.c:4166

6993 +#: sequencer.c:4212

6994 #, c-format

6995 msgid "unknown command %d"

6996 msgstr ""

6997

6986 -#: sequencer.c:4225

6998 +#: sequencer.c:4271

6999 msgid "could not read orig-head"

7000 msgstr ""

7001

6990 -#: sequencer.c:4230

7002 +#: sequencer.c:4276

7003 msgid "could not read 'onto'"

7004 msgstr ""

7005

6994 -#: sequencer.c:4244

7006 +#: sequencer.c:4290

7007 #, c-format

7008 msgid "could not update HEAD to %s"

7009 msgstr ""

7010

6999 -#: sequencer.c:4304

7011 +#: sequencer.c:4350

7012 #, c-format

7013 msgid "Successfully rebased and updated %s.\n"

7014 msgstr ""

7015

7004 -#: sequencer.c:4337

7016 +#: sequencer.c:4383

7017 msgid "cannot rebase: You have unstaged changes."

7018 msgstr ""

7019

7008 -#: sequencer.c:4346

7020 +#: sequencer.c:4392

7021 msgid "cannot amend non-existing commit"

7022 msgstr ""

7023

7012 -#: sequencer.c:4348

7024 +#: sequencer.c:4394

7025 #, c-format

7026 msgid "invalid file: '%s'"

7027 msgstr ""

7028

7017 -#: sequencer.c:4350

7029 +#: sequencer.c:4396

7030 #, c-format

7031 msgid "invalid contents: '%s'"

7032 msgstr ""

7033

7022 -#: sequencer.c:4353

7034 +#: sequencer.c:4399

7035 msgid ""

7036 "\n"

7037 "You have uncommitted changes in your working tree. Please, commit them\n"

7038 "first and then run 'git rebase --continue' again."

7039 msgstr ""

7040

7029 -#: sequencer.c:4389 sequencer.c:4428

7041 +#: sequencer.c:4435 sequencer.c:4474

7042 #, c-format

7043 msgid "could not write file: '%s'"

7044 msgstr ""

7045

7034 -#: sequencer.c:4444

7046 +#: sequencer.c:4490

7047 msgid "could not remove CHERRY_PICK_HEAD"

7048 msgstr ""

7049

7038 -#: sequencer.c:4451

7050 +#: sequencer.c:4497

7051 msgid "could not commit staged changes."

7052 msgstr ""

7053

7042 -#: sequencer.c:4477

7043 -#, c-format

7044 -msgid "invalid committer '%s'"

7045 -msgstr ""

7046 -

7047 -#: sequencer.c:4586

7054 +#: sequencer.c:4613

7055 #, c-format

7056 msgid "%s: can't cherry-pick a %s"

7057 msgstr ""

7058

7052 -#: sequencer.c:4590

7059 +#: sequencer.c:4617

7060 #, c-format

7061 msgid "%s: bad revision"

7062 msgstr ""

7063

7057 -#: sequencer.c:4625

7064 +#: sequencer.c:4652

7065 msgid "can't revert as initial commit"

7066 msgstr ""

7067

7061 -#: sequencer.c:5102

7068 +#: sequencer.c:5129

7069 msgid "make_script: unhandled options"

7070 msgstr ""

7071

7065 -#: sequencer.c:5105

7072 +#: sequencer.c:5132

7073 msgid "make_script: error preparing revisions"

7074 msgstr ""

7075

7069 -#: sequencer.c:5347 sequencer.c:5364

7076 +#: sequencer.c:5374 sequencer.c:5391

7077 msgid "nothing to do"

7078 msgstr ""

7079

7073 -#: sequencer.c:5383

7080 +#: sequencer.c:5410

7081 msgid "could not skip unnecessary pick commands"

7082 msgstr ""

7083

7077 -#: sequencer.c:5480

7084 +#: sequencer.c:5504

7085 msgid "the script was already rearranged."

7086 msgstr ""

7087

@@ -7226,256 +7233,256 @@ msgstr ""

7233 msgid "setsid failed"

7234 msgstr ""

7235

7229 -#: sha1-file.c:470

7236 +#: sha1-file.c:480

7237 #, c-format

7238 msgid "object directory %s does not exist; check .git/objects/info/alternates"

7239 msgstr ""

7240

7234 -#: sha1-file.c:521

7241 +#: sha1-file.c:531

7242 #, c-format

7243 msgid "unable to normalize alternate object path: %s"

7244 msgstr ""

7245

7239 -#: sha1-file.c:593

7246 +#: sha1-file.c:603

7247 #, c-format

7248 msgid "%s: ignoring alternate object stores, nesting too deep"

7249 msgstr ""

7250

7244 -#: sha1-file.c:600

7251 +#: sha1-file.c:610

7252 #, c-format

7253 msgid "unable to normalize object directory: %s"

7254 msgstr ""

7255

7249 -#: sha1-file.c:643

7256 +#: sha1-file.c:653

7257 msgid "unable to fdopen alternates lockfile"

7258 msgstr ""

7259

7253 -#: sha1-file.c:661

7260 +#: sha1-file.c:671

7261 msgid "unable to read alternates file"

7262 msgstr ""

7263

7257 -#: sha1-file.c:668

7264 +#: sha1-file.c:678

7265 msgid "unable to move new alternates file into place"

7266 msgstr ""

7267

7261 -#: sha1-file.c:703

7268 +#: sha1-file.c:713

7269 #, c-format

7270 msgid "path '%s' does not exist"

7271 msgstr ""

7272

7266 -#: sha1-file.c:724

7273 +#: sha1-file.c:734

7274 #, c-format

7275 msgid "reference repository '%s' as a linked checkout is not supported yet."

7276 msgstr ""

7277

7271 -#: sha1-file.c:730

7278 +#: sha1-file.c:740

7279 #, c-format

7280 msgid "reference repository '%s' is not a local repository."

7281 msgstr ""

7282

7276 -#: sha1-file.c:736

7283 +#: sha1-file.c:746

7284 #, c-format

7285 msgid "reference repository '%s' is shallow"

7286 msgstr ""

7287

7281 -#: sha1-file.c:744

7288 +#: sha1-file.c:754

7289 #, c-format

7290 msgid "reference repository '%s' is grafted"

7291 msgstr ""

7292

7286 -#: sha1-file.c:804

7293 +#: sha1-file.c:814

7294 #, c-format

7295 msgid "invalid line while parsing alternate refs: %s"

7296 msgstr ""

7297

7291 -#: sha1-file.c:954

7298 +#: sha1-file.c:964

7299 #, c-format

7300 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

7301 msgstr ""

7302

7296 -#: sha1-file.c:975

7303 +#: sha1-file.c:985

7304 msgid "mmap failed"

7305 msgstr ""

7306

7300 -#: sha1-file.c:1139

7307 +#: sha1-file.c:1149

7308 #, c-format

7309 msgid "object file %s is empty"

7310 msgstr ""

7311

7305 -#: sha1-file.c:1274 sha1-file.c:2467

7312 +#: sha1-file.c:1284 sha1-file.c:2477

7313 #, c-format

7314 msgid "corrupt loose object '%s'"

7315 msgstr ""

7316

7310 -#: sha1-file.c:1276 sha1-file.c:2471

7317 +#: sha1-file.c:1286 sha1-file.c:2481

7318 #, c-format

7319 msgid "garbage at end of loose object '%s'"

7320 msgstr ""

7321

7315 -#: sha1-file.c:1318

7322 +#: sha1-file.c:1328

7323 msgid "invalid object type"

7324 msgstr ""

7325

7319 -#: sha1-file.c:1402

7326 +#: sha1-file.c:1412

7327 #, c-format

7328 msgid "unable to unpack %s header with --allow-unknown-type"

7329 msgstr ""

7330

7324 -#: sha1-file.c:1405

7331 +#: sha1-file.c:1415

7332 #, c-format

7333 msgid "unable to unpack %s header"

7334 msgstr ""

7335

7329 -#: sha1-file.c:1411

7336 +#: sha1-file.c:1421

7337 #, c-format

7338 msgid "unable to parse %s header with --allow-unknown-type"

7339 msgstr ""

7340

7334 -#: sha1-file.c:1414

7341 +#: sha1-file.c:1424

7342 #, c-format

7343 msgid "unable to parse %s header"

7344 msgstr ""

7345

7339 -#: sha1-file.c:1641

7346 +#: sha1-file.c:1651

7347 #, c-format

7348 msgid "failed to read object %s"

7349 msgstr ""

7350

7344 -#: sha1-file.c:1645

7351 +#: sha1-file.c:1655

7352 #, c-format

7353 msgid "replacement %s not found for %s"

7354 msgstr ""

7355

7349 -#: sha1-file.c:1649

7356 +#: sha1-file.c:1659

7357 #, c-format

7358 msgid "loose object %s (stored in %s) is corrupt"

7359 msgstr ""

7360

7354 -#: sha1-file.c:1653

7361 +#: sha1-file.c:1663

7362 #, c-format

7363 msgid "packed object %s (stored in %s) is corrupt"

7364 msgstr ""

7365

7359 -#: sha1-file.c:1758

7366 +#: sha1-file.c:1768

7367 #, c-format

7368 msgid "unable to write file %s"

7369 msgstr ""

7370

7364 -#: sha1-file.c:1765

7371 +#: sha1-file.c:1775

7372 #, c-format

7373 msgid "unable to set permission to '%s'"

7374 msgstr ""

7375

7369 -#: sha1-file.c:1772

7376 +#: sha1-file.c:1782

7377 msgid "file write error"

7378 msgstr ""

7379

7373 -#: sha1-file.c:1792

7380 +#: sha1-file.c:1802

7381 msgid "error when closing loose object file"

7382 msgstr ""

7383

7377 -#: sha1-file.c:1857

7384 +#: sha1-file.c:1867

7385 #, c-format

7386 msgid "insufficient permission for adding an object to repository database %s"

7387 msgstr ""

7388

7382 -#: sha1-file.c:1859

7389 +#: sha1-file.c:1869

7390 msgid "unable to create temporary file"

7391 msgstr ""

7392

7386 -#: sha1-file.c:1883

7393 +#: sha1-file.c:1893

7394 msgid "unable to write loose object file"

7395 msgstr ""

7396

7390 -#: sha1-file.c:1889

7397 +#: sha1-file.c:1899

7398 #, c-format

7399 msgid "unable to deflate new object %s (%d)"

7400 msgstr ""

7401

7395 -#: sha1-file.c:1893

7402 +#: sha1-file.c:1903

7403 #, c-format

7404 msgid "deflateEnd on object %s failed (%d)"

7405 msgstr ""

7406

7400 -#: sha1-file.c:1897

7407 +#: sha1-file.c:1907

7408 #, c-format

7409 msgid "confused by unstable object source data for %s"

7410 msgstr ""

7411

7405 -#: sha1-file.c:1907 builtin/pack-objects.c:1086

7412 +#: sha1-file.c:1917 builtin/pack-objects.c:1086

7413 #, c-format

7414 msgid "failed utime() on %s"

7415 msgstr ""

7416

7410 -#: sha1-file.c:1984

7417 +#: sha1-file.c:1994

7418 #, c-format

7419 msgid "cannot read object for %s"

7420 msgstr ""

7421

7415 -#: sha1-file.c:2035

7422 +#: sha1-file.c:2045

7423 msgid "corrupt commit"

7424 msgstr ""

7425

7419 -#: sha1-file.c:2043

7426 +#: sha1-file.c:2053

7427 msgid "corrupt tag"

7428 msgstr ""

7429

7423 -#: sha1-file.c:2143

7430 +#: sha1-file.c:2153

7431 #, c-format

7432 msgid "read error while indexing %s"

7433 msgstr ""

7434

7428 -#: sha1-file.c:2146

7435 +#: sha1-file.c:2156

7436 #, c-format

7437 msgid "short read while indexing %s"

7438 msgstr ""

7439

7433 -#: sha1-file.c:2219 sha1-file.c:2229

7440 +#: sha1-file.c:2229 sha1-file.c:2239

7441 #, c-format

7442 msgid "%s: failed to insert into database"

7443 msgstr ""

7444

7438 -#: sha1-file.c:2235

7445 +#: sha1-file.c:2245

7446 #, c-format

7447 msgid "%s: unsupported file type"

7448 msgstr ""

7449

7443 -#: sha1-file.c:2259

7450 +#: sha1-file.c:2269

7451 #, c-format

7452 msgid "%s is not a valid object"

7453 msgstr ""

7454

7448 -#: sha1-file.c:2261

7455 +#: sha1-file.c:2271

7456 #, c-format

7457 msgid "%s is not a valid '%s' object"

7458 msgstr ""

7459

7453 -#: sha1-file.c:2288 builtin/index-pack.c:192

7460 +#: sha1-file.c:2298 builtin/index-pack.c:192

7461 #, c-format

7462 msgid "unable to open %s"

7463 msgstr ""

7464

7458 -#: sha1-file.c:2478 sha1-file.c:2531

7465 +#: sha1-file.c:2488 sha1-file.c:2541

7466 #, c-format

7467 msgid "hash mismatch for %s (expected %s)"

7468 msgstr ""

7469

7463 -#: sha1-file.c:2502

7470 +#: sha1-file.c:2512

7471 #, c-format

7472 msgid "unable to mmap %s"

7473 msgstr ""

7474

7468 -#: sha1-file.c:2507

7475 +#: sha1-file.c:2517

7476 #, c-format

7477 msgid "unable to unpack header of %s"

7478 msgstr ""

7479

7473 -#: sha1-file.c:2513

7480 +#: sha1-file.c:2523

7481 #, c-format

7482 msgid "unable to parse header of %s"

7483 msgstr ""

7484

7478 -#: sha1-file.c:2524

7485 +#: sha1-file.c:2534

7486 #, c-format

7487 msgid "unable to unpack contents of %s"

7488 msgstr ""

@@ -7614,8 +7621,8 @@ msgid_plural "%u bytes/s"

7621 msgstr[0] ""

7622 msgstr[1] ""

7623

7617 -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733

7618 -#: builtin/rebase.c:858

7624 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719

7625 +#: builtin/rebase.c:864

7626 #, c-format

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

7628 msgstr ""

@@ -7835,7 +7842,7 @@ msgstr ""

7842 msgid "unknown value '%s' for key '%s'"

7843 msgstr ""

7844

7838 -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323

7845 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324

7846 #, c-format

7847 msgid "more than one %s"

7848 msgstr ""

@@ -7920,7 +7927,7 @@ msgstr ""

7927 msgid "error while running fast-import"

7928 msgstr ""

7929

7923 -#: transport-helper.c:549 transport-helper.c:1226

7930 +#: transport-helper.c:549 transport-helper.c:1236

7931 #, c-format

7932 msgid "could not read ref %s"

7933 msgstr ""

@@ -7938,7 +7945,7 @@ msgstr ""

7945 msgid "invalid remote service path"

7946 msgstr ""

7947

7941 -#: transport-helper.c:661 transport.c:1428

7948 +#: transport-helper.c:661 transport.c:1446

7949 msgid "operation not supported by protocol"

7950 msgstr ""

7951

@@ -7956,106 +7963,111 @@ msgstr ""

7963 msgid "expected ok/error, helper said '%s'"

7964 msgstr ""

7965

7959 -#: transport-helper.c:841

7966 +#: transport-helper.c:845

7967 #, c-format

7968 msgid "helper reported unexpected status of %s"

7969 msgstr ""

7970

7964 -#: transport-helper.c:924

7971 +#: transport-helper.c:928

7972 #, c-format

7973 msgid "helper %s does not support dry-run"

7974 msgstr ""

7975

7969 -#: transport-helper.c:927

7976 +#: transport-helper.c:931

7977 #, c-format

7978 msgid "helper %s does not support --signed"

7979 msgstr ""

7980

7974 -#: transport-helper.c:930

7981 +#: transport-helper.c:934

7982 #, c-format

7983 msgid "helper %s does not support --signed=if-asked"

7984 msgstr ""

7985

7979 -#: transport-helper.c:935

7986 +#: transport-helper.c:939

7987 #, c-format

7988 msgid "helper %s does not support --atomic"

7989 msgstr ""

7990

7984 -#: transport-helper.c:941

7991 +#: transport-helper.c:943

7992 +#, c-format

7993 +msgid "helper %s does not support --%s"

7994 +msgstr ""

7995 +

7996 +#: transport-helper.c:950

7997 #, c-format

7998 msgid "helper %s does not support 'push-option'"

7999 msgstr ""

8000

7989 -#: transport-helper.c:1040

8001 +#: transport-helper.c:1050

8002 msgid "remote-helper doesn't support push; refspec needed"

8003 msgstr ""

8004

7993 -#: transport-helper.c:1045

8005 +#: transport-helper.c:1055

8006 #, c-format

8007 msgid "helper %s does not support 'force'"

8008 msgstr ""

8009

7998 -#: transport-helper.c:1092

8010 +#: transport-helper.c:1102

8011 msgid "couldn't run fast-export"

8012 msgstr ""

8013

8002 -#: transport-helper.c:1097

8014 +#: transport-helper.c:1107

8015 msgid "error while running fast-export"

8016 msgstr ""

8017

8006 -#: transport-helper.c:1122

8018 +#: transport-helper.c:1132

8019 #, c-format

8020 msgid ""

8021 "No refs in common and none specified; doing nothing.\n"

8022 "Perhaps you should specify a branch.\n"

8023 msgstr ""

8024

8013 -#: transport-helper.c:1203

8025 +#: transport-helper.c:1213

8026 #, c-format

8027 msgid "unsupported object format '%s'"

8028 msgstr ""

8029

8018 -#: transport-helper.c:1212

8030 +#: transport-helper.c:1222

8031 #, c-format

8032 msgid "malformed response in ref list: %s"

8033 msgstr ""

8034

8023 -#: transport-helper.c:1364

8035 +#: transport-helper.c:1374

8036 #, c-format

8037 msgid "read(%s) failed"

8038 msgstr ""

8039

8028 -#: transport-helper.c:1391

8040 +#: transport-helper.c:1401

8041 #, c-format

8042 msgid "write(%s) failed"

8043 msgstr ""

8044

8033 -#: transport-helper.c:1440

8045 +#: transport-helper.c:1450

8046 #, c-format

8047 msgid "%s thread failed"

8048 msgstr ""

8049

8038 -#: transport-helper.c:1444

8050 +#: transport-helper.c:1454

8051 #, c-format

8052 msgid "%s thread failed to join: %s"

8053 msgstr ""

8054

8043 -#: transport-helper.c:1463 transport-helper.c:1467

8055 +#: transport-helper.c:1473 transport-helper.c:1477

8056 #, c-format

8057 msgid "can't start thread for copying data: %s"

8058 msgstr ""

8059

8048 -#: transport-helper.c:1504

8060 +#: transport-helper.c:1514

8061 #, c-format

8062 msgid "%s process failed to wait"

8063 msgstr ""

8064

8053 -#: transport-helper.c:1508

8065 +#: transport-helper.c:1518

8066 #, c-format

8067 msgid "%s process failed"

8068 msgstr ""

8069

8058 -#: transport-helper.c:1526 transport-helper.c:1535

8070 +#: transport-helper.c:1536 transport-helper.c:1545

8071 msgid "can't start thread for copying data"

8072 msgstr ""

8073

@@ -8082,36 +8094,36 @@ msgstr ""

8094 msgid "server options require protocol version 2 or later"

8095 msgstr ""

8096

8085 -#: transport.c:712

8097 +#: transport.c:727

8098 msgid "could not parse transport.color.* config"

8099 msgstr ""

8100

8089 -#: transport.c:785

8101 +#: transport.c:802

8102 msgid "support for protocol v2 not implemented yet"

8103 msgstr ""

8104

8093 -#: transport.c:919

8105 +#: transport.c:936

8106 #, c-format

8107 msgid "unknown value for config '%s': %s"

8108 msgstr ""

8109

8098 -#: transport.c:985

8110 +#: transport.c:1002

8111 #, c-format

8112 msgid "transport '%s' not allowed"

8113 msgstr ""

8114

8103 -#: transport.c:1038

8115 +#: transport.c:1055

8116 msgid "git-over-rsync is no longer supported"

8117 msgstr ""

8118

8107 -#: transport.c:1140

8119 +#: transport.c:1157

8120 #, c-format

8121 msgid ""

8122 "The following submodule paths contain changes that can\n"

8123 "not be found on any remote:\n"

8124 msgstr ""

8125

8114 -#: transport.c:1144

8126 +#: transport.c:1161

8127 #, c-format

8128 msgid ""

8129 "\n"

@@ -8127,11 +8139,11 @@ msgid ""

8139 "\n"

8140 msgstr ""

8141

8130 -#: transport.c:1152

8142 +#: transport.c:1169

8143 msgid "Aborting."

8144 msgstr ""

8145

8134 -#: transport.c:1297

8146 +#: transport.c:1315

8147 msgid "failed to push all needed submodules"

8148 msgstr ""

8149

@@ -8348,7 +8360,7 @@ msgstr ""

8360 msgid "Updating index flags"

8361 msgstr ""

8362

8351 -#: upload-pack.c:1516

8363 +#: upload-pack.c:1550

8364 msgid "expected flush after fetch arguments"

8365 msgstr ""

8366

@@ -8385,7 +8397,7 @@ msgstr ""

8397 msgid "Fetching objects"

8398 msgstr ""

8399

8388 -#: worktree.c:236 builtin/am.c:2116

8400 +#: worktree.c:236 builtin/am.c:2103

8401 #, c-format

8402 msgid "failed to read '%s'"

8403 msgstr ""

@@ -8963,7 +8975,7 @@ msgstr ""

8975 msgid "cannot %s: Your index contains uncommitted changes."

8976 msgstr ""

8977

8966 -#: compat/precompose_utf8.c:58 builtin/clone.c:456

8978 +#: compat/precompose_utf8.c:58 builtin/clone.c:457

8979 #, c-format

8980 msgid "failed to unlink '%s'"

8981 msgstr ""

@@ -8990,7 +9002,7 @@ msgstr ""

9002 msgid "Unstaged changes after refreshing the index:"

9003 msgstr ""

9004

8993 -#: builtin/add.c:272 builtin/rev-parse.c:904

9005 +#: builtin/add.c:272 builtin/rev-parse.c:908

9006 msgid "Could not read the index"

9007 msgstr ""

9008

@@ -9026,8 +9038,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

9038 msgstr ""

9039

9040 #: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124

9029 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538

9030 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184

9041 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559

9042 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190

9043 msgid "dry run"

9044 msgstr ""

9045

@@ -9035,7 +9047,7 @@ msgstr ""

9047 msgid "interactive picking"

9048 msgstr ""

9049

9038 -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308

9050 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308

9051 msgid "select hunks interactively"

9052 msgstr ""

9053

l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)