6b0f1a9b43 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2019-06-04 08:24+0800\n"

11 +"POT-Creation-Date: 2019-07-30 09:59+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,71 +18,78 @@ msgstr ""

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

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

20

21 -#: advice.c:103

21 +#: advice.c:109

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:156

26 +#: advice.c:162

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

28 msgstr ""

29

30 -#: advice.c:158

30 +#: advice.c:164

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

32 msgstr ""

33

34 -#: advice.c:160

34 +#: advice.c:166

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

36 msgstr ""

37

38 -#: advice.c:162

38 +#: advice.c:168

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

40 msgstr ""

41

42 -#: advice.c:164

42 +#: advice.c:170

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

44 msgstr ""

45

46 -#: advice.c:166

46 +#: advice.c:172

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:174

51 +#: advice.c:180

52 msgid ""

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

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

55 msgstr ""

56

57 -#: advice.c:182

57 +#: advice.c:188

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:187 builtin/merge.c:1320

61 +#: advice.c:193 builtin/merge.c:1327

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

63 msgstr ""

64

65 -#: advice.c:189

65 +#: advice.c:195

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

67 msgstr ""

68

69 -#: advice.c:190

69 +#: advice.c:196

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:196

73 +#: advice.c:202

74 #, c-format

75 msgid ""

76 -"Note: checking out '%s'.\n"

76 +"Note: switching to '%s'.\n"

77 "\n"

78 "You are in 'detached HEAD' state. You can look around, make experimental\n"

79 "changes and commit them, and you can discard any commits you make in this\n"

80 -"state without impacting any branches by performing another checkout.\n"

80 +"state without impacting any branches by switching back to a branch.\n"

81 "\n"

82 "If you want to create a new branch to retain commits you create, you may\n"

83 -"do so (now or later) by using -b with the checkout command again. Example:\n"

83 +"do so (now or later) by using -c with the switch command. Example:\n"

84 "\n"

85 -" git checkout -b <new-branch-name>\n"

85 +" git switch -c <new-branch-name>\n"

86 +"\n"

87 +"Or undo this operation with:\n"

88 +"\n"

89 +" git switch -\n"

90 +"\n"

91 +"Turn off this advice by setting config variable advice.detachedHead to "

92 +"false\n"

93 "\n"

94 msgstr ""

95

@@ -94,92 +101,92 @@ msgstr ""

101 msgid "unclosed quote"

102 msgstr ""

103

97 -#: apply.c:63

104 +#: apply.c:69

105 #, c-format

106 msgid "unrecognized whitespace option '%s'"

107 msgstr ""

108

102 -#: apply.c:79

109 +#: apply.c:85

110 #, c-format

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

112 msgstr ""

113

107 -#: apply.c:129

114 +#: apply.c:135

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

116 msgstr ""

117

111 -#: apply.c:131

118 +#: apply.c:137

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

120 msgstr ""

121

115 -#: apply.c:134

122 +#: apply.c:140

123 msgid "--3way outside a repository"

124 msgstr ""

125

119 -#: apply.c:145

126 +#: apply.c:151

127 msgid "--index outside a repository"

128 msgstr ""

129

123 -#: apply.c:148

130 +#: apply.c:154

131 msgid "--cached outside a repository"

132 msgstr ""

133

127 -#: apply.c:829

134 +#: apply.c:801

135 #, c-format

136 msgid "Cannot prepare timestamp regexp %s"

137 msgstr ""

138

132 -#: apply.c:838

139 +#: apply.c:810

140 #, c-format

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

142 msgstr ""

143

137 -#: apply.c:912

144 +#: apply.c:884

145 #, c-format

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

147 msgstr ""

148

142 -#: apply.c:950

149 +#: apply.c:922

150 #, c-format

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

152 msgstr ""

153

147 -#: apply.c:956

154 +#: apply.c:928

155 #, c-format

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

157 msgstr ""

158

152 -#: apply.c:957

159 +#: apply.c:929

160 #, c-format

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

162 msgstr ""

163

157 -#: apply.c:962

164 +#: apply.c:934

165 #, c-format

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

167 msgstr ""

168

162 -#: apply.c:991

169 +#: apply.c:963

170 #, c-format

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

172 msgstr ""

173

167 -#: apply.c:1310

174 +#: apply.c:1282

175 #, c-format

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

177 msgstr ""

178

172 -#: apply.c:1482

179 +#: apply.c:1460

180 #, c-format

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

182 msgstr ""

183

177 -#: apply.c:1551

184 +#: apply.c:1529

185 #, c-format

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

187 msgstr ""

188

182 -#: apply.c:1571

189 +#: apply.c:1551

190 #, c-format

191 msgid ""

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

@@ -190,527 +197,527 @@ msgid_plural ""

197 msgstr[0] ""

198 msgstr[1] ""

199

193 -#: apply.c:1584

200 +#: apply.c:1564

201 #, c-format

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

203 msgstr ""

204

198 -#: apply.c:1772

205 +#: apply.c:1752

206 msgid "new file depends on old contents"

207 msgstr ""

208

202 -#: apply.c:1774

209 +#: apply.c:1754

210 msgid "deleted file still has contents"

211 msgstr ""

212

206 -#: apply.c:1808

213 +#: apply.c:1788

214 #, c-format

215 msgid "corrupt patch at line %d"

216 msgstr ""

217

211 -#: apply.c:1845

218 +#: apply.c:1825

219 #, c-format

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

221 msgstr ""

222

216 -#: apply.c:1847

223 +#: apply.c:1827

224 #, c-format

225 msgid "deleted file %s still has contents"

226 msgstr ""

227

221 -#: apply.c:1850

228 +#: apply.c:1830

229 #, c-format

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

231 msgstr ""

232

226 -#: apply.c:1997

233 +#: apply.c:1977

234 #, c-format

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

236 msgstr ""

237

231 -#: apply.c:2034

238 +#: apply.c:2014

239 #, c-format

240 msgid "unrecognized binary patch at line %d"

241 msgstr ""

242

236 -#: apply.c:2196

243 +#: apply.c:2176

244 #, c-format

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

246 msgstr ""

247

241 -#: apply.c:2282

248 +#: apply.c:2262

249 #, c-format

250 msgid "unable to read symlink %s"

251 msgstr ""

252

246 -#: apply.c:2286

253 +#: apply.c:2266

254 #, c-format

255 msgid "unable to open or read %s"

256 msgstr ""

257

251 -#: apply.c:2945

258 +#: apply.c:2925

259 #, c-format

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

261 msgstr ""

262

256 -#: apply.c:3066

263 +#: apply.c:3046

264 #, c-format

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

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

267 msgstr[0] ""

268 msgstr[1] ""

269

263 -#: apply.c:3078

270 +#: apply.c:3058

271 #, c-format

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

273 msgstr ""

274

268 -#: apply.c:3084

275 +#: apply.c:3064

276 #, c-format

277 msgid ""

278 "while searching for:\n"

279 "%.*s"

280 msgstr ""

281

275 -#: apply.c:3106

282 +#: apply.c:3086

283 #, c-format

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

285 msgstr ""

286

280 -#: apply.c:3114

287 +#: apply.c:3094

288 #, c-format

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

290 msgstr ""

291

285 -#: apply.c:3161

292 +#: apply.c:3141

293 #, c-format

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

295 msgstr ""

296

290 -#: apply.c:3171

297 +#: apply.c:3151

298 #, c-format

299 msgid ""

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

301 msgstr ""

302

296 -#: apply.c:3179

303 +#: apply.c:3159

304 #, c-format

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

306 msgstr ""

307

301 -#: apply.c:3197

308 +#: apply.c:3177

309 #, c-format

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

311 msgstr ""

312

306 -#: apply.c:3210

313 +#: apply.c:3190

314 #, c-format

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

316 msgstr ""

317

311 -#: apply.c:3216

318 +#: apply.c:3196

319 #, c-format

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

321 msgstr ""

322

316 -#: apply.c:3237

323 +#: apply.c:3217

324 #, c-format

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

326 msgstr ""

327

321 -#: apply.c:3360

328 +#: apply.c:3340

329 #, c-format

330 msgid "cannot checkout %s"

331 msgstr ""

332

326 -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279

333 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

334 #, c-format

335 msgid "failed to read %s"

336 msgstr ""

337

331 -#: apply.c:3420

338 +#: apply.c:3400

339 #, c-format

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

341 msgstr ""

342

336 -#: apply.c:3449 apply.c:3692

343 +#: apply.c:3429 apply.c:3672

344 #, c-format

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

346 msgstr ""

347

341 -#: apply.c:3535 apply.c:3707

348 +#: apply.c:3515 apply.c:3687

349 #, c-format

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

351 msgstr ""

352

346 -#: apply.c:3544 apply.c:3715

353 +#: apply.c:3524 apply.c:3695

354 #, c-format

355 msgid "%s: does not match index"

356 msgstr ""

357

351 -#: apply.c:3579

358 +#: apply.c:3559

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

360 msgstr ""

361

355 -#: apply.c:3582

362 +#: apply.c:3562

363 #, c-format

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

365 msgstr ""

366

360 -#: apply.c:3598 apply.c:3602

367 +#: apply.c:3578 apply.c:3582

368 #, c-format

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

370 msgstr ""

371

365 -#: apply.c:3614

372 +#: apply.c:3594

373 #, c-format

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

375 msgstr ""

376

370 -#: apply.c:3628

377 +#: apply.c:3608

378 #, c-format

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

380 msgstr ""

381

375 -#: apply.c:3633

382 +#: apply.c:3613

383 #, c-format

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

385 msgstr ""

386

380 -#: apply.c:3659

387 +#: apply.c:3639

388 msgid "removal patch leaves file contents"

389 msgstr ""

390

384 -#: apply.c:3732

391 +#: apply.c:3712

392 #, c-format

393 msgid "%s: wrong type"

394 msgstr ""

395

389 -#: apply.c:3734

396 +#: apply.c:3714

397 #, c-format

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

399 msgstr ""

400

394 -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856

401 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

402 #: read-cache.c:1309

403 #, c-format

404 msgid "invalid path '%s'"

405 msgstr ""

406

400 -#: apply.c:3943

407 +#: apply.c:3923

408 #, c-format

409 msgid "%s: already exists in index"

410 msgstr ""

411

405 -#: apply.c:3946

412 +#: apply.c:3926

413 #, c-format

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

415 msgstr ""

416

410 -#: apply.c:3966

417 +#: apply.c:3946

418 #, c-format

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

420 msgstr ""

421

415 -#: apply.c:3971

422 +#: apply.c:3951

423 #, c-format

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

425 msgstr ""

426

420 -#: apply.c:3991

427 +#: apply.c:3971

428 #, c-format

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

430 msgstr ""

431

425 -#: apply.c:3995

432 +#: apply.c:3975

433 #, c-format

434 msgid "%s: patch does not apply"

435 msgstr ""

436

430 -#: apply.c:4010

437 +#: apply.c:3990

438 #, c-format

439 msgid "Checking patch %s..."

440 msgstr ""

441

435 -#: apply.c:4102

442 +#: apply.c:4082

443 #, c-format

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

445 msgstr ""

446

440 -#: apply.c:4109

447 +#: apply.c:4089

448 #, c-format

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

450 msgstr ""

451

445 -#: apply.c:4112

452 +#: apply.c:4092

453 #, c-format

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

455 msgstr ""

456

450 -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143

457 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

458 #, c-format

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

460 msgstr ""

461

455 -#: apply.c:4121

462 +#: apply.c:4101

463 #, c-format

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

465 msgstr ""

466

460 -#: apply.c:4131

467 +#: apply.c:4111

468 #, c-format

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

470 msgstr ""

471

465 -#: apply.c:4269

472 +#: apply.c:4249

473 #, c-format

474 msgid "unable to remove %s from index"

475 msgstr ""

476

470 -#: apply.c:4303

477 +#: apply.c:4283

478 #, c-format

479 msgid "corrupt patch for submodule %s"

480 msgstr ""

481

475 -#: apply.c:4309

482 +#: apply.c:4289

483 #, c-format

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

485 msgstr ""

486

480 -#: apply.c:4317

487 +#: apply.c:4297

488 #, c-format

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

490 msgstr ""

491

485 -#: apply.c:4323 apply.c:4468

492 +#: apply.c:4303 apply.c:4448

493 #, c-format

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

495 msgstr ""

496

490 -#: apply.c:4366

497 +#: apply.c:4346

498 #, c-format

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

500 msgstr ""

501

495 -#: apply.c:4370

502 +#: apply.c:4350

503 #, c-format

504 msgid "closing file '%s'"

505 msgstr ""

506

500 -#: apply.c:4440

507 +#: apply.c:4420

508 #, c-format

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

510 msgstr ""

511

505 -#: apply.c:4538

512 +#: apply.c:4518

513 #, c-format

514 msgid "Applied patch %s cleanly."

515 msgstr ""

516

510 -#: apply.c:4546

517 +#: apply.c:4526

518 msgid "internal error"

519 msgstr ""

520

514 -#: apply.c:4549

521 +#: apply.c:4529

522 #, c-format

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

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

525 msgstr[0] ""

526 msgstr[1] ""

527

521 -#: apply.c:4560

528 +#: apply.c:4540

529 #, c-format

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

531 msgstr ""

532

526 -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118

533 +#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161

534 #, c-format

535 msgid "cannot open %s"

536 msgstr ""

537

531 -#: apply.c:4582

538 +#: apply.c:4562

539 #, c-format

540 msgid "Hunk #%d applied cleanly."

541 msgstr ""

542

536 -#: apply.c:4586

543 +#: apply.c:4566

544 #, c-format

545 msgid "Rejected hunk #%d."

546 msgstr ""

547

541 -#: apply.c:4696

548 +#: apply.c:4676

549 #, c-format

550 msgid "Skipped patch '%s'."

551 msgstr ""

552

546 -#: apply.c:4704

553 +#: apply.c:4684

554 msgid "unrecognized input"

555 msgstr ""

556

550 -#: apply.c:4724

557 +#: apply.c:4704

558 msgid "unable to read index file"

559 msgstr ""

560

554 -#: apply.c:4879

561 +#: apply.c:4859

562 #, c-format

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

564 msgstr ""

565

559 -#: apply.c:4906

566 +#: apply.c:4886

567 #, c-format

568 msgid "squelched %d whitespace error"

569 msgid_plural "squelched %d whitespace errors"

570 msgstr[0] ""

571 msgstr[1] ""

572

566 -#: apply.c:4912 apply.c:4927

573 +#: apply.c:4892 apply.c:4907

574 #, c-format

575 msgid "%d line adds whitespace errors."

576 msgid_plural "%d lines add whitespace errors."

577 msgstr[0] ""

578 msgstr[1] ""

579

573 -#: apply.c:4920

580 +#: apply.c:4900

581 #, c-format

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

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

584 msgstr[0] ""

585 msgstr[1] ""

586

580 -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

587 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

588 msgid "Unable to write new index file"

589 msgstr ""

590

584 -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

585 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271

586 -#: builtin/pull.c:207 builtin/submodule--helper.c:407

587 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

588 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

589 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197

591 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

592 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

593 +#: builtin/pull.c:208 builtin/submodule--helper.c:407

594 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

595 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

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

597 msgid "path"

598 msgstr ""

599

593 -#: apply.c:4964

600 +#: apply.c:4944

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

602 msgstr ""

603

597 -#: apply.c:4967

604 +#: apply.c:4947

605 msgid "apply changes matching the given path"

606 msgstr ""

607

601 -#: apply.c:4969 builtin/am.c:2219

608 +#: apply.c:4949 builtin/am.c:2217

609 msgid "num"

610 msgstr ""

611

605 -#: apply.c:4970

612 +#: apply.c:4950

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

614 msgstr ""

615

609 -#: apply.c:4973

616 +#: apply.c:4953

617 msgid "ignore additions made by the patch"

618 msgstr ""

619

613 -#: apply.c:4975

620 +#: apply.c:4955

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

622 msgstr ""

623

617 -#: apply.c:4979

624 +#: apply.c:4959

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

626 msgstr ""

627

621 -#: apply.c:4981

628 +#: apply.c:4961

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

630 msgstr ""

631

625 -#: apply.c:4983

632 +#: apply.c:4963

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

634 msgstr ""

635

629 -#: apply.c:4985

636 +#: apply.c:4965

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

638 msgstr ""

639

633 -#: apply.c:4987

640 +#: apply.c:4967

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

642 msgstr ""

643

637 -#: apply.c:4989

644 +#: apply.c:4969

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

646 msgstr ""

647

641 -#: apply.c:4991

648 +#: apply.c:4971

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

650 msgstr ""

651

645 -#: apply.c:4994

652 +#: apply.c:4974

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

654 msgstr ""

655

649 -#: apply.c:4996

656 +#: apply.c:4976

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

658 msgstr ""

659

653 -#: apply.c:4998

660 +#: apply.c:4978

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

662 msgstr ""

663

657 -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524

664 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

665 msgid "paths are separated with NUL character"

666 msgstr ""

667

661 -#: apply.c:5003

668 +#: apply.c:4983

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

670 msgstr ""

671

665 -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97

666 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

667 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415

672 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

673 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

674 +#: builtin/pack-objects.c:3319 builtin/rebase.c:1421

675 msgid "action"

676 msgstr ""

677

671 -#: apply.c:5005

678 +#: apply.c:4985

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

680 msgstr ""

681

675 -#: apply.c:5008 apply.c:5011

682 +#: apply.c:4988 apply.c:4991

683 msgid "ignore changes in whitespace when finding context"

684 msgstr ""

685

679 -#: apply.c:5014

686 +#: apply.c:4994

687 msgid "apply the patch in reverse"

688 msgstr ""

689

683 -#: apply.c:5016

690 +#: apply.c:4996

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

692 msgstr ""

693

687 -#: apply.c:5018

694 +#: apply.c:4998

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

696 msgstr ""

697

691 -#: apply.c:5020

698 +#: apply.c:5000

699 msgid "allow overlapping hunks"

700 msgstr ""

701

695 -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22

696 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786

697 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128

702 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

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

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

705 msgid "be verbose"

706 msgstr ""

707

701 -#: apply.c:5023

708 +#: apply.c:5003

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

710 msgstr ""

711

705 -#: apply.c:5026

712 +#: apply.c:5006

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

714 msgstr ""

715

709 -#: apply.c:5028 builtin/am.c:2207

716 +#: apply.c:5008 builtin/am.c:2205

717 msgid "root"

718 msgstr ""

719

713 -#: apply.c:5029

720 +#: apply.c:5009

721 msgid "prepend <root> to all filenames"

722 msgstr ""

723

@@ -751,98 +758,98 @@ msgstr ""

758 msgid "not a tree object: %s"

759 msgstr ""

760

754 -#: archive.c:424

761 +#: archive.c:426

762 msgid "current working directory is untracked"

763 msgstr ""

764

758 -#: archive.c:455

765 +#: archive.c:457

766 msgid "fmt"

767 msgstr ""

768

762 -#: archive.c:455

769 +#: archive.c:457

770 msgid "archive format"

771 msgstr ""

772

766 -#: archive.c:456 builtin/log.c:1557

773 +#: archive.c:458 builtin/log.c:1597

774 msgid "prefix"

775 msgstr ""

776

770 -#: archive.c:457

777 +#: archive.c:459

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

779 msgstr ""

780

774 -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822

775 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

776 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

781 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

782 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

783 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

784 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

785 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

786 msgid "file"

787 msgstr ""

788

782 -#: archive.c:459 builtin/archive.c:90

789 +#: archive.c:461 builtin/archive.c:90

790 msgid "write the archive to this file"

791 msgstr ""

792

786 -#: archive.c:461

793 +#: archive.c:463

794 msgid "read .gitattributes in working directory"

795 msgstr ""

796

790 -#: archive.c:462

797 +#: archive.c:464

798 msgid "report archived files on stderr"

799 msgstr ""

800

794 -#: archive.c:463

801 +#: archive.c:465

802 msgid "store only"

803 msgstr ""

804

798 -#: archive.c:464

805 +#: archive.c:466

806 msgid "compress faster"

807 msgstr ""

808

802 -#: archive.c:472

809 +#: archive.c:474

810 msgid "compress better"

811 msgstr ""

812

806 -#: archive.c:475

813 +#: archive.c:477

814 msgid "list supported archive formats"

815 msgstr ""

816

810 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113

811 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

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

818 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

819 msgid "repo"

820 msgstr ""

821

815 -#: archive.c:478 builtin/archive.c:92

822 +#: archive.c:480 builtin/archive.c:92

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

824 msgstr ""

825

819 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707

826 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

827 #: builtin/notes.c:498

828 msgid "command"

829 msgstr ""

830

824 -#: archive.c:480 builtin/archive.c:94

831 +#: archive.c:482 builtin/archive.c:94

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

833 msgstr ""

834

828 -#: archive.c:487

835 +#: archive.c:489

836 msgid "Unexpected option --remote"

837 msgstr ""

838

832 -#: archive.c:489

839 +#: archive.c:491

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

841 msgstr ""

842

836 -#: archive.c:491

843 +#: archive.c:493

844 msgid "Unexpected option --output"

845 msgstr ""

846

840 -#: archive.c:513

847 +#: archive.c:515

848 #, c-format

849 msgid "Unknown archive format '%s'"

850 msgstr ""

851

845 -#: archive.c:520

852 +#: archive.c:522

853 #, c-format

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

855 msgstr ""

@@ -974,12 +981,12 @@ msgstr ""

981 msgid "a %s revision is needed"

982 msgstr ""

983

977 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248

984 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

985 #, c-format

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

987 msgstr ""

988

982 -#: bisect.c:928 builtin/merge.c:146

989 +#: bisect.c:928 builtin/merge.c:148

990 #, c-format

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

992 msgstr ""

@@ -1017,37 +1024,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1024 msgstr[0] ""

1025 msgstr[1] ""

1026

1020 -#: blame.c:1794

1027 +#: blame.c:2697

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

1029 msgstr ""

1030

1024 -#: blame.c:1808

1031 +#: blame.c:2711

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

1033 msgstr ""

1034

1028 -#: blame.c:1829

1035 +#: blame.c:2732

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

1037 msgstr ""

1038

1032 -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030

1033 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940

1034 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415

1035 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155

1039 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1040 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980

1041 +#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1042 +#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157

1043 #: builtin/shortlog.c:192

1044 msgid "revision walk setup failed"

1045 msgstr ""

1046

1040 -#: blame.c:1856

1047 +#: blame.c:2759

1048 msgid ""

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

1050 msgstr ""

1051

1045 -#: blame.c:1867

1052 +#: blame.c:2770

1053 #, c-format

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

1055 msgstr ""

1056

1050 -#: blame.c:1878

1057 +#: blame.c:2781

1058 #, c-format

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

1060 msgstr ""

@@ -1166,12 +1173,12 @@ msgstr ""

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

1174 msgstr ""

1175

1169 -#: branch.c:359

1176 +#: branch.c:364

1177 #, c-format

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

1179 msgstr ""

1180

1174 -#: branch.c:382

1181 +#: branch.c:387

1182 #, c-format

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

1184 msgstr ""

@@ -1186,8 +1193,8 @@ msgstr ""

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

1194 msgstr ""

1195

1189 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916

1190 -#: builtin/commit.c:788

1196 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1197 +#: builtin/commit.c:791

1198 #, c-format

1199 msgid "could not open '%s'"

1200 msgstr ""

@@ -1196,60 +1203,64 @@ msgstr ""

1203 msgid "Repository lacks these prerequisite commits:"

1204 msgstr ""

1205

1199 -#: bundle.c:194

1206 +#: bundle.c:146

1207 +msgid "need a repository to verify a bundle"

1208 +msgstr ""

1209 +

1210 +#: bundle.c:197

1211 #, c-format

1212 msgid "The bundle contains this ref:"

1213 msgid_plural "The bundle contains these %d refs:"

1214 msgstr[0] ""

1215 msgstr[1] ""

1216

1206 -#: bundle.c:201

1217 +#: bundle.c:204

1218 msgid "The bundle records a complete history."

1219 msgstr ""

1220

1210 -#: bundle.c:203

1221 +#: bundle.c:206

1222 #, c-format

1223 msgid "The bundle requires this ref:"

1224 msgid_plural "The bundle requires these %d refs:"

1225 msgstr[0] ""

1226 msgstr[1] ""

1227

1217 -#: bundle.c:269

1228 +#: bundle.c:272

1229 msgid "unable to dup bundle descriptor"

1230 msgstr ""

1231

1221 -#: bundle.c:276

1232 +#: bundle.c:279

1233 msgid "Could not spawn pack-objects"

1234 msgstr ""

1235

1225 -#: bundle.c:287

1236 +#: bundle.c:290

1237 msgid "pack-objects died"

1238 msgstr ""

1239

1229 -#: bundle.c:329

1240 +#: bundle.c:332

1241 msgid "rev-list died"

1242 msgstr ""

1243

1233 -#: bundle.c:378

1244 +#: bundle.c:381

1245 #, c-format

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

1247 msgstr ""

1248

1238 -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306

1249 +#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306

1250 #, c-format

1251 msgid "unrecognized argument: %s"

1252 msgstr ""

1253

1243 -#: bundle.c:465

1254 +#: bundle.c:468

1255 msgid "Refusing to create empty bundle."

1256 msgstr ""

1257

1247 -#: bundle.c:475

1258 +#: bundle.c:478

1259 #, c-format

1260 msgid "cannot create '%s'"

1261 msgstr ""

1262

1252 -#: bundle.c:500

1263 +#: bundle.c:503

1264 msgid "index-pack died"

1265 msgstr ""

1266

@@ -1258,8 +1269,8 @@ msgstr ""

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

1270 msgstr ""

1271

1261 -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399

1262 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455

1272 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1273 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1274 #, c-format

1275 msgid "could not parse %s"

1276 msgstr ""

@@ -1269,7 +1280,7 @@ msgstr ""

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

1281 msgstr ""

1282

1272 -#: commit.c:193

1283 +#: commit.c:192

1284 msgid ""

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

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

@@ -1281,215 +1292,270 @@ msgid ""

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

1293 msgstr ""

1294

1284 -#: commit.c:1128

1295 +#: commit.c:1127

1296 #, c-format

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

1298 msgstr ""

1299

1289 -#: commit.c:1131

1300 +#: commit.c:1130

1301 #, c-format

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

1303 msgstr ""

1304

1294 -#: commit.c:1134

1305 +#: commit.c:1133

1306 #, c-format

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

1308 msgstr ""

1309

1299 -#: commit.c:1137

1310 +#: commit.c:1136

1311 #, c-format

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

1313 msgstr ""

1314

1304 -#: commit.c:1391

1315 +#: commit.c:1390

1316 msgid ""

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

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

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

1320 msgstr ""

1321

1311 -#: commit-graph.c:105

1322 +#: commit-graph.c:127

1323 msgid "commit-graph file is too small"

1324 msgstr ""

1325

1315 -#: commit-graph.c:170

1326 +#: commit-graph.c:192

1327 #, c-format

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

1329 msgstr ""

1330

1320 -#: commit-graph.c:177

1331 +#: commit-graph.c:199

1332 #, c-format

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

1334 msgstr ""

1335

1325 -#: commit-graph.c:184

1336 +#: commit-graph.c:206

1337 #, c-format

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

1339 msgstr ""

1340

1330 -#: commit-graph.c:207

1341 +#: commit-graph.c:229

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

1343 msgstr ""

1344

1334 -#: commit-graph.c:218

1345 +#: commit-graph.c:240

1346 #, c-format

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

1348 msgstr ""

1349

1339 -#: commit-graph.c:255

1350 +#: commit-graph.c:283

1351 #, c-format

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

1353 msgstr ""

1354

1344 -#: commit-graph.c:390

1355 +#: commit-graph.c:347

1356 +msgid "commit-graph has no base graphs chunk"

1357 +msgstr ""

1358 +

1359 +#: commit-graph.c:357

1360 +msgid "commit-graph chain does not match"

1361 +msgstr ""

1362 +

1363 +#: commit-graph.c:404

1364 +#, c-format

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

1366 +msgstr ""

1367 +

1368 +#: commit-graph.c:430

1369 +msgid "unable to find all commit-graph files"

1370 +msgstr ""

1371 +

1372 +#: commit-graph.c:553 commit-graph.c:613

1373 +msgid "invalid commit position. commit-graph is likely corrupt"

1374 +msgstr ""

1375 +

1376 +#: commit-graph.c:574

1377 #, c-format

1378 msgid "could not find commit %s"

1379 msgstr ""

1380

1349 -#: commit-graph.c:732 builtin/pack-objects.c:2649

1381 +#: commit-graph.c:1001 builtin/pack-objects.c:2651

1382 #, c-format

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

1384 msgstr ""

1385

1354 -#: commit-graph.c:765

1386 +#: commit-graph.c:1033

1387 msgid "Loading known commits in commit graph"

1388 msgstr ""

1389

1358 -#: commit-graph.c:781

1390 +#: commit-graph.c:1050

1391 msgid "Expanding reachable commits in commit graph"

1392 msgstr ""

1393

1362 -#: commit-graph.c:793

1394 +#: commit-graph.c:1069

1395 msgid "Clearing commit marks in commit graph"

1396 msgstr ""

1397

1366 -#: commit-graph.c:813

1398 +#: commit-graph.c:1088

1399 msgid "Computing commit graph generation numbers"

1400 msgstr ""

1401

1370 -#: commit-graph.c:930

1402 +#: commit-graph.c:1162

1403 #, c-format

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

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

1406 msgstr[0] ""

1407 msgstr[1] ""

1408

1377 -#: commit-graph.c:943

1409 +#: commit-graph.c:1175

1410 #, c-format

1411 msgid "error adding pack %s"

1412 msgstr ""

1413

1382 -#: commit-graph.c:945

1414 +#: commit-graph.c:1179

1415 #, c-format

1416 msgid "error opening index for %s"

1417 msgstr ""

1418

1387 -#: commit-graph.c:959

1419 +#: commit-graph.c:1203

1420 #, c-format

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

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

1423 msgstr[0] ""

1424 msgstr[1] ""

1425

1394 -#: commit-graph.c:991

1426 +#: commit-graph.c:1237

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

1428 msgstr ""

1429

1398 -#: commit-graph.c:1004

1430 +#: commit-graph.c:1252

1431 msgid "Counting distinct commits in commit graph"

1432 msgstr ""

1433

1402 -#: commit-graph.c:1017

1403 -#, c-format

1404 -msgid "the commit graph format cannot write %d commits"

1405 -msgstr ""

1406 -

1407 -#: commit-graph.c:1026

1434 +#: commit-graph.c:1283

1435 msgid "Finding extra edges in commit graph"

1436 msgstr ""

1437

1411 -#: commit-graph.c:1050

1412 -msgid "too many commits to write graph"

1438 +#: commit-graph.c:1331

1439 +msgid "failed to write correct number of base graph ids"

1440 msgstr ""

1441

1415 -#: commit-graph.c:1057 midx.c:819

1442 +#: commit-graph.c:1364 midx.c:811

1443 #, c-format

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

1445 msgstr ""

1446

1420 -#: commit-graph.c:1097

1447 +#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251

1448 +#, c-format

1449 +msgid "unable to create '%s'"

1450 +msgstr ""

1451 +

1452 +#: commit-graph.c:1436

1453 #, c-format

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

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

1456 msgstr[0] ""

1457 msgstr[1] ""

1458

1427 -#: commit-graph.c:1162

1459 +#: commit-graph.c:1477

1460 +msgid "unable to open commit-graph chain file"

1461 +msgstr ""

1462 +

1463 +#: commit-graph.c:1489

1464 +msgid "failed to rename base commit-graph file"

1465 +msgstr ""

1466 +

1467 +#: commit-graph.c:1509

1468 +msgid "failed to rename temporary commit-graph file"

1469 +msgstr ""

1470 +

1471 +#: commit-graph.c:1620

1472 +msgid "Scanning merged commits"

1473 +msgstr ""

1474 +

1475 +#: commit-graph.c:1631

1476 +#, c-format

1477 +msgid "unexpected duplicate commit id %s"

1478 +msgstr ""

1479 +

1480 +#: commit-graph.c:1656

1481 +msgid "Merging commit-graph"

1482 +msgstr ""

1483 +

1484 +#: commit-graph.c:1842

1485 +#, c-format

1486 +msgid "the commit graph format cannot write %d commits"

1487 +msgstr ""

1488 +

1489 +#: commit-graph.c:1853

1490 +msgid "too many commits to write graph"

1491 +msgstr ""

1492 +

1493 +#: commit-graph.c:1943

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

1495 msgstr ""

1496

1431 -#: commit-graph.c:1172

1497 +#: commit-graph.c:1953

1498 #, c-format

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

1500 msgstr ""

1501

1436 -#: commit-graph.c:1182 commit-graph.c:1197

1502 +#: commit-graph.c:1963 commit-graph.c:1978

1503 #, c-format

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

1505 msgstr ""

1506

1441 -#: commit-graph.c:1189

1507 +#: commit-graph.c:1970

1508 #, c-format

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

1510 msgstr ""

1511

1446 -#: commit-graph.c:1206

1512 +#: commit-graph.c:1987

1513 msgid "Verifying commits in commit graph"

1514 msgstr ""

1515

1450 -#: commit-graph.c:1219

1516 +#: commit-graph.c:2000

1517 #, c-format

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

1519 msgstr ""

1520

1455 -#: commit-graph.c:1226

1521 +#: commit-graph.c:2007

1522 #, c-format

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

1524 msgstr ""

1525

1460 -#: commit-graph.c:1236

1526 +#: commit-graph.c:2017

1527 #, c-format

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

1529 msgstr ""

1530

1465 -#: commit-graph.c:1242

1531 +#: commit-graph.c:2026

1532 #, c-format

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

1534 msgstr ""

1535

1470 -#: commit-graph.c:1255

1536 +#: commit-graph.c:2039

1537 #, c-format

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

1539 msgstr ""

1540

1475 -#: commit-graph.c:1260

1541 +#: commit-graph.c:2044

1542 #, c-format

1543 msgid ""

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

1545 msgstr ""

1546

1481 -#: commit-graph.c:1264

1547 +#: commit-graph.c:2048

1548 #, c-format

1549 msgid ""

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

1551 msgstr ""

1552

1487 -#: commit-graph.c:1279

1553 +#: commit-graph.c:2063

1554 #, c-format

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

1556 msgstr ""

1557

1492 -#: commit-graph.c:1285

1558 +#: commit-graph.c:2069

1559 #, c-format

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

1561 msgstr ""

@@ -1498,7 +1564,7 @@ msgstr ""

1564 msgid "memory exhausted"

1565 msgstr ""

1566

1501 -#: config.c:123

1567 +#: config.c:124

1568 #, c-format

1569 msgid ""

1570 "exceeded maximum include depth (%d) while including\n"

@@ -1508,294 +1574,294 @@ msgid ""

1574 "This might be due to circular includes."

1575 msgstr ""

1576

1511 -#: config.c:139

1577 +#: config.c:140

1578 #, c-format

1579 msgid "could not expand include path '%s'"

1580 msgstr ""

1581

1516 -#: config.c:150

1582 +#: config.c:151

1583 msgid "relative config includes must come from files"

1584 msgstr ""

1585

1520 -#: config.c:190

1586 +#: config.c:197

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

1588 msgstr ""

1589

1524 -#: config.c:348

1590 +#: config.c:375

1591 #, c-format

1592 msgid "key does not contain a section: %s"

1593 msgstr ""

1594

1529 -#: config.c:354

1595 +#: config.c:381

1596 #, c-format

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

1598 msgstr ""

1599

1534 -#: config.c:378 sequencer.c:2459

1600 +#: config.c:405 sequencer.c:2463

1601 #, c-format

1602 msgid "invalid key: %s"

1603 msgstr ""

1604

1539 -#: config.c:384

1605 +#: config.c:411

1606 #, c-format

1607 msgid "invalid key (newline): %s"

1608 msgstr ""

1609

1544 -#: config.c:420 config.c:432

1610 +#: config.c:447 config.c:459

1611 #, c-format

1612 msgid "bogus config parameter: %s"

1613 msgstr ""

1614

1549 -#: config.c:467

1615 +#: config.c:494

1616 #, c-format

1617 msgid "bogus format in %s"

1618 msgstr ""

1619

1554 -#: config.c:793

1620 +#: config.c:820

1621 #, c-format

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

1623 msgstr ""

1624

1559 -#: config.c:797

1625 +#: config.c:824

1626 #, c-format

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

1628 msgstr ""

1629

1564 -#: config.c:801

1630 +#: config.c:828

1631 #, c-format

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

1633 msgstr ""

1634

1569 -#: config.c:805

1635 +#: config.c:832

1636 #, c-format

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

1638 msgstr ""

1639

1574 -#: config.c:809

1640 +#: config.c:836

1641 #, c-format

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

1643 msgstr ""

1644

1579 -#: config.c:813

1645 +#: config.c:840

1646 #, c-format

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

1648 msgstr ""

1649

1584 -#: config.c:952

1650 +#: config.c:977

1651 msgid "out of range"

1652 msgstr ""

1653

1588 -#: config.c:952

1654 +#: config.c:977

1655 msgid "invalid unit"

1656 msgstr ""

1657

1592 -#: config.c:958

1658 +#: config.c:978

1659 #, c-format

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

1661 msgstr ""

1662

1597 -#: config.c:963

1663 +#: config.c:997

1664 #, c-format

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

1666 msgstr ""

1667

1602 -#: config.c:966

1668 +#: config.c:1000

1669 #, c-format

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

1671 msgstr ""

1672

1607 -#: config.c:969

1673 +#: config.c:1003

1674 #, c-format

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

1676 msgstr ""

1677

1612 -#: config.c:972

1678 +#: config.c:1006

1679 #, c-format

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

1681 msgstr ""

1682

1617 -#: config.c:975

1683 +#: config.c:1009

1684 #, c-format

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

1686 msgstr ""

1687

1622 -#: config.c:978

1688 +#: config.c:1012

1689 #, c-format

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

1691 msgstr ""

1692

1627 -#: config.c:1073

1693 +#: config.c:1107

1694 #, c-format

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

1696 msgstr ""

1697

1632 -#: config.c:1082

1698 +#: config.c:1116

1699 #, c-format

1700 msgid "'%s' for '%s' is not a valid timestamp"

1701 msgstr ""

1702

1637 -#: config.c:1173

1703 +#: config.c:1207

1704 #, c-format

1705 msgid "abbrev length out of range: %d"

1706 msgstr ""

1707

1642 -#: config.c:1187 config.c:1198

1708 +#: config.c:1221 config.c:1232

1709 #, c-format

1710 msgid "bad zlib compression level %d"

1711 msgstr ""

1712

1647 -#: config.c:1290

1713 +#: config.c:1324

1714 msgid "core.commentChar should only be one character"

1715 msgstr ""

1716

1651 -#: config.c:1323

1717 +#: config.c:1357

1718 #, c-format

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

1720 msgstr ""

1721

1656 -#: config.c:1395

1722 +#: config.c:1429

1723 #, c-format

1724 msgid "malformed value for %s"

1725 msgstr ""

1726

1661 -#: config.c:1421

1727 +#: config.c:1455

1728 #, c-format

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

1730 msgstr ""

1731

1666 -#: config.c:1422

1732 +#: config.c:1456

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

1734 msgstr ""

1735

1670 -#: config.c:1483 builtin/pack-objects.c:3397

1736 +#: config.c:1517 builtin/pack-objects.c:3399

1737 #, c-format

1738 msgid "bad pack compression level %d"

1739 msgstr ""

1740

1675 -#: config.c:1604

1741 +#: config.c:1638

1742 #, c-format

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

1744 msgstr ""

1745

1680 -#: config.c:1607

1746 +#: config.c:1641

1747 #, c-format

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

1749 msgstr ""

1750

1685 -#: config.c:1624

1751 +#: config.c:1658

1752 #, c-format

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

1754 msgstr ""

1755

1690 -#: config.c:1654

1756 +#: config.c:1688

1757 #, c-format

1758 msgid "failed to parse %s"

1759 msgstr ""

1760

1695 -#: config.c:1710

1761 +#: config.c:1744

1762 msgid "unable to parse command-line config"

1763 msgstr ""

1764

1699 -#: config.c:2059

1765 +#: config.c:2093

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

1767 msgstr ""

1768

1703 -#: config.c:2229

1769 +#: config.c:2263

1770 #, c-format

1771 msgid "Invalid %s: '%s'"

1772 msgstr ""

1773

1708 -#: config.c:2272

1774 +#: config.c:2306

1775 #, c-format

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

1777 msgstr ""

1778

1713 -#: config.c:2298

1779 +#: config.c:2332

1780 #, c-format

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

1782 msgstr ""

1783

1718 -#: config.c:2344

1784 +#: config.c:2378

1785 #, c-format

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

1787 msgstr ""

1788

1723 -#: config.c:2346

1789 +#: config.c:2380

1790 #, c-format

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

1792 msgstr ""

1793

1728 -#: config.c:2427

1794 +#: config.c:2461

1795 #, c-format

1796 msgid "invalid section name '%s'"

1797 msgstr ""

1798

1733 -#: config.c:2459

1799 +#: config.c:2493

1800 #, c-format

1801 msgid "%s has multiple values"

1802 msgstr ""

1803

1738 -#: config.c:2488

1804 +#: config.c:2522

1805 #, c-format

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

1807 msgstr ""

1808

1743 -#: config.c:2740 config.c:3064

1809 +#: config.c:2774 config.c:3098

1810 #, c-format

1811 msgid "could not lock config file %s"

1812 msgstr ""

1813

1748 -#: config.c:2751

1814 +#: config.c:2785

1815 #, c-format

1816 msgid "opening %s"

1817 msgstr ""

1818

1753 -#: config.c:2786 builtin/config.c:328

1819 +#: config.c:2820 builtin/config.c:328

1820 #, c-format

1821 msgid "invalid pattern: %s"

1822 msgstr ""

1823

1758 -#: config.c:2811

1824 +#: config.c:2845

1825 #, c-format

1826 msgid "invalid config file %s"

1827 msgstr ""

1828

1763 -#: config.c:2824 config.c:3077

1829 +#: config.c:2858 config.c:3111

1830 #, c-format

1831 msgid "fstat on %s failed"

1832 msgstr ""

1833

1768 -#: config.c:2835

1834 +#: config.c:2869

1835 #, c-format

1836 msgid "unable to mmap '%s'"

1837 msgstr ""

1838

1773 -#: config.c:2844 config.c:3082

1839 +#: config.c:2878 config.c:3116

1840 #, c-format

1841 msgid "chmod on %s failed"

1842 msgstr ""

1843

1778 -#: config.c:2929 config.c:3179

1844 +#: config.c:2963 config.c:3213

1845 #, c-format

1846 msgid "could not write config file %s"

1847 msgstr ""

1848

1783 -#: config.c:2963

1849 +#: config.c:2997

1850 #, c-format

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

1852 msgstr ""

1853

1788 -#: config.c:2965 builtin/remote.c:782

1854 +#: config.c:2999 builtin/remote.c:782

1855 #, c-format

1856 msgid "could not unset '%s'"

1857 msgstr ""

1858

1793 -#: config.c:3055

1859 +#: config.c:3089

1860 #, c-format

1861 msgid "invalid section name: %s"

1862 msgstr ""

1863

1798 -#: config.c:3222

1864 +#: config.c:3256

1865 #, c-format

1866 msgid "missing value for '%s'"

1867 msgstr ""

@@ -1951,19 +2017,19 @@ msgstr ""

2017 msgid "unable to fork"

2018 msgstr ""

2019

1954 -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43

2020 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2021 msgid "Checking connectivity"

2022 msgstr ""

2023

1958 -#: connected.c:97

2024 +#: connected.c:98

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

2026 msgstr ""

2027

1962 -#: connected.c:117

2028 +#: connected.c:118

2029 msgid "failed write to rev-list"

2030 msgstr ""

2031

1966 -#: connected.c:124

2032 +#: connected.c:125

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

2034 msgstr ""

2035

@@ -2171,7 +2237,7 @@ msgstr ""

2237 msgid "island regex from config has too many capture groups (max=%d)"

2238 msgstr ""

2239

2174 -#: delta-islands.c:466

2240 +#: delta-islands.c:467

2241 #, c-format

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

2243 msgstr ""

@@ -2236,523 +2302,523 @@ msgid ""

2302 "%s"

2303 msgstr ""

2304

2239 -#: diff.c:4210

2305 +#: diff.c:4215

2306 #, c-format

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

2308 msgstr ""

2309

2244 -#: diff.c:4555

2310 +#: diff.c:4560

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

2312 msgstr ""

2313

2248 -#: diff.c:4558

2314 +#: diff.c:4563

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

2316 msgstr ""

2317

2252 -#: diff.c:4636

2318 +#: diff.c:4641

2319 msgid "--follow requires exactly one pathspec"

2320 msgstr ""

2321

2256 -#: diff.c:4684

2322 +#: diff.c:4689

2323 #, c-format

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

2325 msgstr ""

2326

2261 -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217

2327 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

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

2329 #, c-format

2330 msgid "%s expects a numerical value"

2331 msgstr ""

2332

2267 -#: diff.c:4721

2333 +#: diff.c:4726

2334 #, c-format

2335 msgid ""

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

2337 "%s"

2338 msgstr ""

2339

2274 -#: diff.c:4806

2340 +#: diff.c:4811

2341 #, c-format

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

2343 msgstr ""

2344

2279 -#: diff.c:4830

2345 +#: diff.c:4835

2346 #, c-format

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

2348 msgstr ""

2349

2284 -#: diff.c:4844

2350 +#: diff.c:4849

2351 #, c-format

2352 msgid "unable to resolve '%s'"

2353 msgstr ""

2354

2289 -#: diff.c:4894 diff.c:4900

2355 +#: diff.c:4899 diff.c:4905

2356 #, c-format

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

2358 msgstr ""

2359

2294 -#: diff.c:4912

2360 +#: diff.c:4917

2361 #, c-format

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

2363 msgstr ""

2364

2299 -#: diff.c:4933

2365 +#: diff.c:4938

2366 #, c-format

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

2368 msgstr ""

2369

2304 -#: diff.c:4952

2370 +#: diff.c:4957

2371 #, c-format

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

2373 msgstr ""

2374

2309 -#: diff.c:4992

2375 +#: diff.c:4997

2376 msgid ""

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

2378 "\"histogram\""

2379 msgstr ""

2380

2315 -#: diff.c:5028 diff.c:5048

2381 +#: diff.c:5033 diff.c:5053

2382 #, c-format

2383 msgid "invalid argument to %s"

2384 msgstr ""

2385

2320 -#: diff.c:5186

2386 +#: diff.c:5191

2387 #, c-format

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

2389 msgstr ""

2390

2325 -#: diff.c:5242

2391 +#: diff.c:5247

2392 #, c-format

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

2394 msgstr ""

2395

2330 -#: diff.c:5265

2396 +#: diff.c:5270

2397 msgid "Diff output format options"

2398 msgstr ""

2399

2334 -#: diff.c:5267 diff.c:5273

2400 +#: diff.c:5272 diff.c:5278

2401 msgid "generate patch"

2402 msgstr ""

2403

2338 -#: diff.c:5270 builtin/log.c:167

2404 +#: diff.c:5275 builtin/log.c:182

2405 msgid "suppress diff output"

2406 msgstr ""

2407

2342 -#: diff.c:5275 diff.c:5389 diff.c:5396

2408 +#: diff.c:5280 diff.c:5394 diff.c:5401

2409 msgid "<n>"

2410 msgstr ""

2411

2346 -#: diff.c:5276 diff.c:5279

2412 +#: diff.c:5281 diff.c:5284

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

2414 msgstr ""

2415

2350 -#: diff.c:5281

2416 +#: diff.c:5286

2417 msgid "generate the diff in raw format"

2418 msgstr ""

2419

2354 -#: diff.c:5284

2420 +#: diff.c:5289

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

2422 msgstr ""

2423

2358 -#: diff.c:5288

2424 +#: diff.c:5293

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

2426 msgstr ""

2427

2362 -#: diff.c:5292

2428 +#: diff.c:5297

2429 msgid "machine friendly --stat"

2430 msgstr ""

2431

2366 -#: diff.c:5295

2432 +#: diff.c:5300

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

2434 msgstr ""

2435

2370 -#: diff.c:5297 diff.c:5305

2436 +#: diff.c:5302 diff.c:5310

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

2438 msgstr ""

2439

2374 -#: diff.c:5298

2440 +#: diff.c:5303

2441 msgid ""

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

2443 msgstr ""

2444

2379 -#: diff.c:5302

2445 +#: diff.c:5307

2446 msgid "synonym for --dirstat=cumulative"

2447 msgstr ""

2448

2383 -#: diff.c:5306

2449 +#: diff.c:5311

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

2451 msgstr ""

2452

2387 -#: diff.c:5310

2453 +#: diff.c:5315

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

2455 msgstr ""

2456

2391 -#: diff.c:5313

2457 +#: diff.c:5318

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

2459 msgstr ""

2460

2395 -#: diff.c:5316

2461 +#: diff.c:5321

2462 msgid "show only names of changed files"

2463 msgstr ""

2464

2399 -#: diff.c:5319

2465 +#: diff.c:5324

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

2467 msgstr ""

2468

2403 -#: diff.c:5321

2469 +#: diff.c:5326

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

2471 msgstr ""

2472

2407 -#: diff.c:5322

2473 +#: diff.c:5327

2474 msgid "generate diffstat"

2475 msgstr ""

2476

2411 -#: diff.c:5324 diff.c:5327 diff.c:5330

2477 +#: diff.c:5329 diff.c:5332 diff.c:5335

2478 msgid "<width>"

2479 msgstr ""

2480

2415 -#: diff.c:5325

2481 +#: diff.c:5330

2482 msgid "generate diffstat with a given width"

2483 msgstr ""

2484

2419 -#: diff.c:5328

2485 +#: diff.c:5333

2486 msgid "generate diffstat with a given name width"

2487 msgstr ""

2488

2423 -#: diff.c:5331

2489 +#: diff.c:5336

2490 msgid "generate diffstat with a given graph width"

2491 msgstr ""

2492

2427 -#: diff.c:5333

2493 +#: diff.c:5338

2494 msgid "<count>"

2495 msgstr ""

2496

2431 -#: diff.c:5334

2497 +#: diff.c:5339

2498 msgid "generate diffstat with limited lines"

2499 msgstr ""

2500

2435 -#: diff.c:5337

2501 +#: diff.c:5342

2502 msgid "generate compact summary in diffstat"

2503 msgstr ""

2504

2439 -#: diff.c:5340

2505 +#: diff.c:5345

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

2507 msgstr ""

2508

2443 -#: diff.c:5343

2509 +#: diff.c:5348

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

2511 msgstr ""

2512

2447 -#: diff.c:5345

2513 +#: diff.c:5350

2514 msgid "show colored diff"

2515 msgstr ""

2516

2451 -#: diff.c:5346

2517 +#: diff.c:5351

2518 msgid "<kind>"

2519 msgstr ""

2520

2455 -#: diff.c:5347

2521 +#: diff.c:5352

2522 msgid ""

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

2524 "diff"

2525 msgstr ""

2526

2461 -#: diff.c:5350

2527 +#: diff.c:5355

2528 msgid ""

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

2530 "--numstat"

2531 msgstr ""

2532

2467 -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465

2533 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2534 msgid "<prefix>"

2535 msgstr ""

2536

2471 -#: diff.c:5354

2537 +#: diff.c:5359

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

2539 msgstr ""

2540

2475 -#: diff.c:5357

2541 +#: diff.c:5362

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

2543 msgstr ""

2544

2479 -#: diff.c:5360

2545 +#: diff.c:5365

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

2547 msgstr ""

2548

2483 -#: diff.c:5363

2549 +#: diff.c:5368

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

2551 msgstr ""

2552

2487 -#: diff.c:5366

2553 +#: diff.c:5371

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

2555 msgstr ""

2556

2491 -#: diff.c:5370 diff.c:5375 diff.c:5380

2557 +#: diff.c:5375 diff.c:5380 diff.c:5385

2558 msgid "<char>"

2559 msgstr ""

2560

2495 -#: diff.c:5371

2561 +#: diff.c:5376

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

2563 msgstr ""

2564

2499 -#: diff.c:5376

2565 +#: diff.c:5381

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

2567 msgstr ""

2568

2503 -#: diff.c:5381

2569 +#: diff.c:5386

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

2571 msgstr ""

2572

2507 -#: diff.c:5384

2573 +#: diff.c:5389

2574 msgid "Diff rename options"

2575 msgstr ""

2576

2511 -#: diff.c:5385

2577 +#: diff.c:5390

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

2579 msgstr ""

2580

2515 -#: diff.c:5386

2581 +#: diff.c:5391

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

2583 msgstr ""

2584

2519 -#: diff.c:5390

2585 +#: diff.c:5395

2586 msgid "detect renames"

2587 msgstr ""

2588

2523 -#: diff.c:5394

2589 +#: diff.c:5399

2590 msgid "omit the preimage for deletes"

2591 msgstr ""

2592

2527 -#: diff.c:5397

2593 +#: diff.c:5402

2594 msgid "detect copies"

2595 msgstr ""

2596

2531 -#: diff.c:5401

2597 +#: diff.c:5406

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

2599 msgstr ""

2600

2535 -#: diff.c:5403

2601 +#: diff.c:5408

2602 msgid "disable rename detection"

2603 msgstr ""

2604

2539 -#: diff.c:5406

2605 +#: diff.c:5411

2606 msgid "use empty blobs as rename source"

2607 msgstr ""

2608

2543 -#: diff.c:5408

2609 +#: diff.c:5413

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

2611 msgstr ""

2612

2547 -#: diff.c:5411

2613 +#: diff.c:5416

2614 msgid ""

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

2616 "given limit"

2617 msgstr ""

2618

2553 -#: diff.c:5413

2619 +#: diff.c:5418

2620 msgid "Diff algorithm options"

2621 msgstr ""

2622

2557 -#: diff.c:5415

2623 +#: diff.c:5420

2624 msgid "produce the smallest possible diff"

2625 msgstr ""

2626

2561 -#: diff.c:5418

2627 +#: diff.c:5423

2628 msgid "ignore whitespace when comparing lines"

2629 msgstr ""

2630

2565 -#: diff.c:5421

2631 +#: diff.c:5426

2632 msgid "ignore changes in amount of whitespace"

2633 msgstr ""

2634

2569 -#: diff.c:5424

2635 +#: diff.c:5429

2636 msgid "ignore changes in whitespace at EOL"

2637 msgstr ""

2638

2573 -#: diff.c:5427

2639 +#: diff.c:5432

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

2641 msgstr ""

2642

2577 -#: diff.c:5430

2643 +#: diff.c:5435

2644 msgid "ignore changes whose lines are all blank"

2645 msgstr ""

2646

2581 -#: diff.c:5433

2647 +#: diff.c:5438

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

2649 msgstr ""

2650

2585 -#: diff.c:5436

2651 +#: diff.c:5441

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

2653 msgstr ""

2654

2589 -#: diff.c:5440

2655 +#: diff.c:5445

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

2657 msgstr ""

2658

2593 -#: diff.c:5442

2659 +#: diff.c:5447

2660 msgid "<algorithm>"

2661 msgstr ""

2662

2597 -#: diff.c:5443

2663 +#: diff.c:5448

2664 msgid "choose a diff algorithm"

2665 msgstr ""

2666

2601 -#: diff.c:5445

2667 +#: diff.c:5450

2668 msgid "<text>"

2669 msgstr ""

2670

2605 -#: diff.c:5446

2671 +#: diff.c:5451

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

2673 msgstr ""

2674

2609 -#: diff.c:5448 diff.c:5457 diff.c:5460

2675 +#: diff.c:5453 diff.c:5462 diff.c:5465

2676 msgid "<mode>"

2677 msgstr ""

2678

2613 -#: diff.c:5449

2679 +#: diff.c:5454

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

2681 msgstr ""

2682

2617 -#: diff.c:5451 diff.c:5454 diff.c:5499

2683 +#: diff.c:5456 diff.c:5459 diff.c:5504

2684 msgid "<regex>"

2685 msgstr ""

2686

2621 -#: diff.c:5452

2687 +#: diff.c:5457

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

2689 msgstr ""

2690

2625 -#: diff.c:5455

2691 +#: diff.c:5460

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

2693 msgstr ""

2694

2629 -#: diff.c:5458

2695 +#: diff.c:5463

2696 msgid "moved lines of code are colored differently"

2697 msgstr ""

2698

2633 -#: diff.c:5461

2699 +#: diff.c:5466

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

2701 msgstr ""

2702

2637 -#: diff.c:5464

2703 +#: diff.c:5469

2704 msgid "Other diff options"

2705 msgstr ""

2706

2641 -#: diff.c:5466

2707 +#: diff.c:5471

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

2709 msgstr ""

2710

2645 -#: diff.c:5470

2711 +#: diff.c:5475

2712 msgid "treat all files as text"

2713 msgstr ""

2714

2649 -#: diff.c:5472

2715 +#: diff.c:5477

2716 msgid "swap two inputs, reverse the diff"

2717 msgstr ""

2718

2653 -#: diff.c:5474

2719 +#: diff.c:5479

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

2721 msgstr ""

2722

2657 -#: diff.c:5476

2723 +#: diff.c:5481

2724 msgid "disable all output of the program"

2725 msgstr ""

2726

2661 -#: diff.c:5478

2727 +#: diff.c:5483

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

2729 msgstr ""

2730

2665 -#: diff.c:5480

2731 +#: diff.c:5485

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

2733 msgstr ""

2734

2669 -#: diff.c:5482

2735 +#: diff.c:5487

2736 msgid "<when>"

2737 msgstr ""

2738

2673 -#: diff.c:5483

2739 +#: diff.c:5488

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

2741 msgstr ""

2742

2677 -#: diff.c:5486

2743 +#: diff.c:5491

2744 msgid "<format>"

2745 msgstr ""

2746

2681 -#: diff.c:5487

2747 +#: diff.c:5492

2748 msgid "specify how differences in submodules are shown"

2749 msgstr ""

2750

2685 -#: diff.c:5491

2751 +#: diff.c:5496

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

2753 msgstr ""

2754

2689 -#: diff.c:5494

2755 +#: diff.c:5499

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

2757 msgstr ""

2758

2693 -#: diff.c:5496

2759 +#: diff.c:5501

2760 msgid "<string>"

2761 msgstr ""

2762

2697 -#: diff.c:5497

2763 +#: diff.c:5502

2764 msgid ""

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

2766 "string"

2767 msgstr ""

2768

2703 -#: diff.c:5500

2769 +#: diff.c:5505

2770 msgid ""

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

2772 "regex"

2773 msgstr ""

2774

2709 -#: diff.c:5503

2775 +#: diff.c:5508

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

2777 msgstr ""

2778

2713 -#: diff.c:5506

2779 +#: diff.c:5511

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

2781 msgstr ""

2782

2717 -#: diff.c:5509

2783 +#: diff.c:5514

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

2785 msgstr ""

2786

2721 -#: diff.c:5510

2787 +#: diff.c:5515

2788 msgid "<object-id>"

2789 msgstr ""

2790

2725 -#: diff.c:5511

2791 +#: diff.c:5516

2792 msgid ""

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

2794 "object"

2795 msgstr ""

2796

2731 -#: diff.c:5513

2797 +#: diff.c:5518

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

2799 msgstr ""

2800

2735 -#: diff.c:5514

2801 +#: diff.c:5519

2802 msgid "select files by diff type"

2803 msgstr ""

2804

2739 -#: diff.c:5516

2805 +#: diff.c:5521

2806 msgid "<file>"

2807 msgstr ""

2808

2743 -#: diff.c:5517

2809 +#: diff.c:5522

2810 msgid "Output to a specific file"

2811 msgstr ""

2812

2747 -#: diff.c:6150

2813 +#: diff.c:6177

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

2815 msgstr ""

2816

2751 -#: diff.c:6153

2817 +#: diff.c:6180

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

2819 msgstr ""

2820

2755 -#: diff.c:6156

2821 +#: diff.c:6183

2822 #, c-format

2823 msgid ""

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

@@ -2854,32 +2920,32 @@ msgstr ""

2920 msgid "--stateless-rpc requires multi_ack_detailed"

2921 msgstr ""

2922

2857 -#: fetch-pack.c:360 fetch-pack.c:1271

2923 +#: fetch-pack.c:360 fetch-pack.c:1284

2924 #, c-format

2925 msgid "invalid shallow line: %s"

2926 msgstr ""

2927

2862 -#: fetch-pack.c:366 fetch-pack.c:1277

2928 +#: fetch-pack.c:366 fetch-pack.c:1290

2929 #, c-format

2930 msgid "invalid unshallow line: %s"

2931 msgstr ""

2932

2867 -#: fetch-pack.c:368 fetch-pack.c:1279

2933 +#: fetch-pack.c:368 fetch-pack.c:1292

2934 #, c-format

2935 msgid "object not found: %s"

2936 msgstr ""

2937

2872 -#: fetch-pack.c:371 fetch-pack.c:1282

2938 +#: fetch-pack.c:371 fetch-pack.c:1295

2939 #, c-format

2940 msgid "error in object: %s"

2941 msgstr ""

2942

2877 -#: fetch-pack.c:373 fetch-pack.c:1284

2943 +#: fetch-pack.c:373 fetch-pack.c:1297

2944 #, c-format

2945 msgid "no shallow found: %s"

2946 msgstr ""

2947

2882 -#: fetch-pack.c:376 fetch-pack.c:1288

2948 +#: fetch-pack.c:376 fetch-pack.c:1301

2949 #, c-format

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

2951 msgstr ""

@@ -2898,7 +2964,7 @@ msgstr ""

2964 msgid "giving up"

2965 msgstr ""

2966

2901 -#: fetch-pack.c:477 progress.c:284

2967 +#: fetch-pack.c:477 progress.c:277

2968 msgid "done"

2969 msgstr ""

2970

@@ -2939,154 +3005,130 @@ msgstr ""

3005 msgid "error in sideband demultiplexer"

3006 msgstr ""

3007

2942 -#: fetch-pack.c:906

2943 -msgid "Server does not support shallow clients"

2944 -msgstr ""

2945 -

2946 -#: fetch-pack.c:910

2947 -msgid "Server supports multi_ack_detailed"

2948 -msgstr ""

2949 -

2950 -#: fetch-pack.c:913

2951 -msgid "Server supports no-done"

2952 -msgstr ""

2953 -

2954 -#: fetch-pack.c:919

2955 -msgid "Server supports multi_ack"

2956 -msgstr ""

2957 -

2958 -#: fetch-pack.c:923

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

2960 -msgstr ""

2961 -

2962 -#: fetch-pack.c:927

2963 -msgid "Server supports side-band"

2964 -msgstr ""

2965 -

2966 -#: fetch-pack.c:931

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

2968 -msgstr ""

2969 -

2970 -#: fetch-pack.c:935

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

2972 -msgstr ""

2973 -

2974 -#: fetch-pack.c:945

2975 -msgid "Server supports ofs-delta"

3008 +#: fetch-pack.c:908

3009 +#, c-format

3010 +msgid "Server version is %.*s"

3011 msgstr ""

3012

2978 -#: fetch-pack.c:951 fetch-pack.c:1144

2979 -msgid "Server supports filter"

3013 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3014 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3015 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3016 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3017 +#, c-format

3018 +msgid "Server supports %s"

3019 msgstr ""

3020

2982 -#: fetch-pack.c:959

2983 -#, c-format

2984 -msgid "Server version is %.*s"

3021 +#: fetch-pack.c:915

3022 +msgid "Server does not support shallow clients"

3023 msgstr ""

3024

2987 -#: fetch-pack.c:965

3025 +#: fetch-pack.c:975

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

3027 msgstr ""

3028

2991 -#: fetch-pack.c:969

3029 +#: fetch-pack.c:980

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

3031 msgstr ""

3032

2995 -#: fetch-pack.c:971

3033 +#: fetch-pack.c:984

3034 msgid "Server does not support --deepen"

3035 msgstr ""

3036

2999 -#: fetch-pack.c:988

3037 +#: fetch-pack.c:1001

3038 msgid "no common commits"

3039 msgstr ""

3040

3003 -#: fetch-pack.c:1000 fetch-pack.c:1449

3041 +#: fetch-pack.c:1013 fetch-pack.c:1462

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

3043 msgstr ""

3044

3007 -#: fetch-pack.c:1138

3045 +#: fetch-pack.c:1151

3046 msgid "Server does not support shallow requests"

3047 msgstr ""

3048

3011 -#: fetch-pack.c:1171

3049 +#: fetch-pack.c:1157

3050 +msgid "Server supports filter"

3051 +msgstr ""

3052 +

3053 +#: fetch-pack.c:1184

3054 msgid "unable to write request to remote"

3055 msgstr ""

3056

3015 -#: fetch-pack.c:1189

3057 +#: fetch-pack.c:1202

3058 #, c-format

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

3060 msgstr ""

3061

3020 -#: fetch-pack.c:1195

3062 +#: fetch-pack.c:1208

3063 #, c-format

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

3065 msgstr ""

3066

3025 -#: fetch-pack.c:1234

3067 +#: fetch-pack.c:1247

3068 #, c-format

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

3070 msgstr ""

3071

3030 -#: fetch-pack.c:1239

3072 +#: fetch-pack.c:1252

3073 #, c-format

3074 msgid "error processing acks: %d"

3075 msgstr ""

3076

3035 -#: fetch-pack.c:1249

3077 +#: fetch-pack.c:1262

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

3079 msgstr ""

3080

3039 -#: fetch-pack.c:1251

3081 +#: fetch-pack.c:1264

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

3083 msgstr ""

3084

3043 -#: fetch-pack.c:1293

3085 +#: fetch-pack.c:1306

3086 #, c-format

3087 msgid "error processing shallow info: %d"

3088 msgstr ""

3089

3048 -#: fetch-pack.c:1340

3090 +#: fetch-pack.c:1353

3091 #, c-format

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

3093 msgstr ""

3094

3053 -#: fetch-pack.c:1345

3095 +#: fetch-pack.c:1358

3096 #, c-format

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

3098 msgstr ""

3099

3058 -#: fetch-pack.c:1350

3100 +#: fetch-pack.c:1363

3101 #, c-format

3102 msgid "error processing wanted refs: %d"

3103 msgstr ""

3104

3063 -#: fetch-pack.c:1676

3105 +#: fetch-pack.c:1689

3106 msgid "no matching remote head"

3107 msgstr ""

3108

3067 -#: fetch-pack.c:1699 builtin/clone.c:673

3109 +#: fetch-pack.c:1712 builtin/clone.c:686

3110 msgid "remote did not send all necessary objects"

3111 msgstr ""

3112

3071 -#: fetch-pack.c:1726

3113 +#: fetch-pack.c:1739

3114 #, c-format

3115 msgid "no such remote ref %s"

3116 msgstr ""

3117

3076 -#: fetch-pack.c:1729

3118 +#: fetch-pack.c:1742

3119 #, c-format

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

3121 msgstr ""

3122

3081 -#: gpg-interface.c:318

3123 +#: gpg-interface.c:321

3124 msgid "gpg failed to sign the data"

3125 msgstr ""

3126

3085 -#: gpg-interface.c:344

3127 +#: gpg-interface.c:347

3128 msgid "could not create temporary file"

3129 msgstr ""

3130

3089 -#: gpg-interface.c:347

3131 +#: gpg-interface.c:350

3132 #, c-format

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

3134 msgstr ""

@@ -3096,18 +3138,18 @@ msgstr ""

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

3139 msgstr ""

3140

3099 -#: grep.c:2113

3141 +#: grep.c:2117

3142 #, c-format

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

3144 msgstr ""

3145

3104 -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

3146 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3147 #: builtin/rm.c:135

3148 #, c-format

3149 msgid "failed to stat '%s'"

3150 msgstr ""

3151

3110 -#: grep.c:2141

3152 +#: grep.c:2145

3153 #, c-format

3154 msgid "'%s': short read"

3155 msgstr ""

@@ -3177,7 +3219,7 @@ msgstr ""

3219 msgid "These are common Git commands used in various situations:"

3220 msgstr ""

3221

3180 -#: help.c:363 git.c:97

3222 +#: help.c:363 git.c:98

3223 #, c-format

3224 msgid "unsupported command listing type '%s'"

3225 msgstr ""

@@ -3301,7 +3343,7 @@ msgstr ""

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

3344 msgstr ""

3345

3304 -#: ident.c:436 builtin/commit.c:608

3346 +#: ident.c:436 builtin/commit.c:611

3347 #, c-format

3348 msgid "invalid date format: %s"

3349 msgstr ""

@@ -3333,6 +3375,11 @@ msgstr ""

3375 msgid "sparse:path filters support has been dropped"

3376 msgstr ""

3377

3378 +#: list-objects-filter-options.c:94

3379 +#, c-format

3380 +msgid "invalid filter-spec '%s'"

3381 +msgstr ""

3382 +

3383 #: list-objects-filter-options.c:158

3384 msgid "cannot change partial clone promisor remote"

3385 msgstr ""

@@ -3358,8 +3405,8 @@ msgstr ""

3405 msgid "failed to read the cache"

3406 msgstr ""

3407

3361 -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3362 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3408 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3409 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3410 #: builtin/stash.c:264

3411 msgid "unable to write new index file"

3412 msgstr ""

@@ -3382,90 +3429,90 @@ msgstr ""

3429 msgid "error building trees"

3430 msgstr ""

3431

3385 -#: merge-recursive.c:861

3432 +#: merge-recursive.c:863

3433 #, c-format

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

3435 msgstr ""

3436

3390 -#: merge-recursive.c:872

3437 +#: merge-recursive.c:874

3438 #, c-format

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

3440 msgstr ""

3441

3395 -#: merge-recursive.c:886 merge-recursive.c:905

3442 +#: merge-recursive.c:888 merge-recursive.c:907

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

3444 msgstr ""

3445

3399 -#: merge-recursive.c:895

3446 +#: merge-recursive.c:897

3447 #, c-format

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

3449 msgstr ""

3450

3404 -#: merge-recursive.c:936 builtin/cat-file.c:40

3451 +#: merge-recursive.c:938 builtin/cat-file.c:40

3452 #, c-format

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

3454 msgstr ""

3455

3409 -#: merge-recursive.c:939

3456 +#: merge-recursive.c:941

3457 #, c-format

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

3459 msgstr ""

3460

3414 -#: merge-recursive.c:963

3461 +#: merge-recursive.c:965

3462 #, c-format

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

3464 msgstr ""

3465

3419 -#: merge-recursive.c:974

3466 +#: merge-recursive.c:976

3467 #, c-format

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

3469 msgstr ""

3470

3424 -#: merge-recursive.c:979

3471 +#: merge-recursive.c:981

3472 #, c-format

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

3474 msgstr ""

3475

3429 -#: merge-recursive.c:1175

3476 +#: merge-recursive.c:1177

3477 #, c-format

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

3479 msgstr ""

3480

3434 -#: merge-recursive.c:1182

3481 +#: merge-recursive.c:1184

3482 #, c-format

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

3484 msgstr ""

3485

3439 -#: merge-recursive.c:1189

3486 +#: merge-recursive.c:1191

3487 #, c-format

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

3489 msgstr ""

3490

3444 -#: merge-recursive.c:1197 merge-recursive.c:1209

3491 +#: merge-recursive.c:1199 merge-recursive.c:1211

3492 #, c-format

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

3494 msgstr ""

3495

3449 -#: merge-recursive.c:1200 merge-recursive.c:1212

3496 +#: merge-recursive.c:1202 merge-recursive.c:1214

3497 #, c-format

3498 msgid "Fast-forwarding submodule %s"

3499 msgstr ""

3500

3454 -#: merge-recursive.c:1235

3501 +#: merge-recursive.c:1237

3502 #, c-format

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

3504 msgstr ""

3505

3459 -#: merge-recursive.c:1239

3506 +#: merge-recursive.c:1241

3507 #, c-format

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

3509 msgstr ""

3510

3464 -#: merge-recursive.c:1240

3511 +#: merge-recursive.c:1242

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

3513 msgstr ""

3514

3468 -#: merge-recursive.c:1243

3515 +#: merge-recursive.c:1245

3516 #, c-format

3517 msgid ""

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

@@ -3476,108 +3523,108 @@ msgid ""

3523 "which will accept this suggestion.\n"

3524 msgstr ""

3525

3479 -#: merge-recursive.c:1252

3526 +#: merge-recursive.c:1254

3527 #, c-format

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

3529 msgstr ""

3530

3484 -#: merge-recursive.c:1325

3531 +#: merge-recursive.c:1327

3532 msgid "Failed to execute internal merge"

3533 msgstr ""

3534

3488 -#: merge-recursive.c:1330

3535 +#: merge-recursive.c:1332

3536 #, c-format

3537 msgid "Unable to add %s to database"

3538 msgstr ""

3539

3493 -#: merge-recursive.c:1362

3540 +#: merge-recursive.c:1364

3541 #, c-format

3542 msgid "Auto-merging %s"

3543 msgstr ""

3544

3498 -#: merge-recursive.c:1385

3545 +#: merge-recursive.c:1387

3546 #, c-format

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

3548 msgstr ""

3549

3503 -#: merge-recursive.c:1457

3550 +#: merge-recursive.c:1459

3551 #, c-format

3552 msgid ""

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

3554 "in tree."

3555 msgstr ""

3556

3510 -#: merge-recursive.c:1462

3557 +#: merge-recursive.c:1464

3558 #, c-format

3559 msgid ""

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

3561 "left in tree."

3562 msgstr ""

3563

3517 -#: merge-recursive.c:1469

3564 +#: merge-recursive.c:1471

3565 #, c-format

3566 msgid ""

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

3568 "in tree at %s."

3569 msgstr ""

3570

3524 -#: merge-recursive.c:1474

3571 +#: merge-recursive.c:1476

3572 #, c-format

3573 msgid ""

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

3575 "left in tree at %s."

3576 msgstr ""

3577

3531 -#: merge-recursive.c:1509

3578 +#: merge-recursive.c:1511

3579 msgid "rename"

3580 msgstr ""

3581

3535 -#: merge-recursive.c:1509

3582 +#: merge-recursive.c:1511

3583 msgid "renamed"

3584 msgstr ""

3585

3539 -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3586 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093

3587 #, c-format

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

3589 msgstr ""

3590

3544 -#: merge-recursive.c:1599

3591 +#: merge-recursive.c:1601

3592 #, c-format

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

3594 msgstr ""

3595

3549 -#: merge-recursive.c:1657

3596 +#: merge-recursive.c:1659

3597 #, c-format

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

3599 msgstr ""

3600

3554 -#: merge-recursive.c:1687

3601 +#: merge-recursive.c:1690

3602 #, c-format

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

3604 msgstr ""

3605

3559 -#: merge-recursive.c:1692

3606 +#: merge-recursive.c:1695

3607 #, c-format

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

3609 msgstr ""

3610

3564 -#: merge-recursive.c:1711

3611 +#: merge-recursive.c:1714

3612 #, c-format

3613 msgid ""

3614 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

3615 "\"->\"%s\" in \"%s\"%s"

3616 msgstr ""

3617

3571 -#: merge-recursive.c:1716

3618 +#: merge-recursive.c:1719

3619 msgid " (left unresolved)"

3620 msgstr ""

3621

3575 -#: merge-recursive.c:1825

3622 +#: merge-recursive.c:1828

3623 #, c-format

3624 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

3625 msgstr ""

3626

3580 -#: merge-recursive.c:2030

3627 +#: merge-recursive.c:2035

3628 #, c-format

3629 msgid ""

3630 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3585,310 +3632,323 @@ msgid ""

3632 "getting a majority of the files."

3633 msgstr ""

3634

3588 -#: merge-recursive.c:2062

3635 +#: merge-recursive.c:2067

3636 #, c-format

3637 msgid ""

3638 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

3639 "implicit directory rename(s) putting the following path(s) there: %s."

3640 msgstr ""

3641

3595 -#: merge-recursive.c:2072

3642 +#: merge-recursive.c:2077

3643 #, c-format

3644 msgid ""

3645 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

3646 "implicit directory renames tried to put these paths there: %s"

3647 msgstr ""

3648

3602 -#: merge-recursive.c:2164

3649 +#: merge-recursive.c:2169

3650 #, c-format

3651 msgid ""

3652 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

3653 ">%s in %s"

3654 msgstr ""

3655

3609 -#: merge-recursive.c:2408

3656 +#: merge-recursive.c:2413

3657 #, c-format

3658 msgid ""

3659 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3660 "renamed."

3661 msgstr ""

3662

3616 -#: merge-recursive.c:2929

3663 +#: merge-recursive.c:2937

3664 #, c-format

3665 msgid "cannot read object %s"

3666 msgstr ""

3667

3621 -#: merge-recursive.c:2932

3668 +#: merge-recursive.c:2940

3669 #, c-format

3670 msgid "object %s is not a blob"

3671 msgstr ""

3672

3626 -#: merge-recursive.c:2996

3673 +#: merge-recursive.c:3004

3674 msgid "modify"

3675 msgstr ""

3676

3630 -#: merge-recursive.c:2996

3677 +#: merge-recursive.c:3004

3678 msgid "modified"

3679 msgstr ""

3680

3634 -#: merge-recursive.c:3008

3681 +#: merge-recursive.c:3016

3682 msgid "content"

3683 msgstr ""

3684

3638 -#: merge-recursive.c:3012

3685 +#: merge-recursive.c:3020

3686 msgid "add/add"

3687 msgstr ""

3688

3642 -#: merge-recursive.c:3035

3689 +#: merge-recursive.c:3043

3690 #, c-format

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

3692 msgstr ""

3693

3647 -#: merge-recursive.c:3057 git-submodule.sh:937

3694 +#: merge-recursive.c:3065 git-submodule.sh:937

3695 msgid "submodule"

3696 msgstr ""

3697

3651 -#: merge-recursive.c:3058

3698 +#: merge-recursive.c:3066

3699 #, c-format

3700 msgid "CONFLICT (%s): Merge conflict in %s"

3701 msgstr ""

3702

3656 -#: merge-recursive.c:3088

3703 +#: merge-recursive.c:3096

3704 #, c-format

3705 msgid "Adding as %s instead"

3706 msgstr ""

3707

3661 -#: merge-recursive.c:3170

3708 +#: merge-recursive.c:3178

3709 #, c-format

3710 msgid ""

3711 "Path updated: %s added in %s inside a directory that was renamed in %s; "

3712 "moving it to %s."

3713 msgstr ""

3714

3668 -#: merge-recursive.c:3173

3715 +#: merge-recursive.c:3181

3716 #, c-format

3717 msgid ""

3718 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

3719 "in %s, suggesting it should perhaps be moved to %s."

3720 msgstr ""

3721

3675 -#: merge-recursive.c:3177

3722 +#: merge-recursive.c:3185

3723 #, c-format

3724 msgid ""

3725 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

3726 "%s; moving it to %s."

3727 msgstr ""

3728

3682 -#: merge-recursive.c:3180

3729 +#: merge-recursive.c:3188

3730 #, c-format

3731 msgid ""

3732 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

3733 "was renamed in %s, suggesting it should perhaps be moved to %s."

3734 msgstr ""

3735

3689 -#: merge-recursive.c:3294

3736 +#: merge-recursive.c:3302

3737 #, c-format

3738 msgid "Removing %s"

3739 msgstr ""

3740

3694 -#: merge-recursive.c:3317

3741 +#: merge-recursive.c:3325

3742 msgid "file/directory"

3743 msgstr ""

3744

3698 -#: merge-recursive.c:3322

3745 +#: merge-recursive.c:3330

3746 msgid "directory/file"

3747 msgstr ""

3748

3702 -#: merge-recursive.c:3329

3749 +#: merge-recursive.c:3337

3750 #, c-format

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

3752 msgstr ""

3753

3707 -#: merge-recursive.c:3338

3754 +#: merge-recursive.c:3346

3755 #, c-format

3756 msgid "Adding %s"

3757 msgstr ""

3758

3712 -#: merge-recursive.c:3347

3759 +#: merge-recursive.c:3355

3760 #, c-format

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

3762 msgstr ""

3763

3717 -#: merge-recursive.c:3385

3764 +#: merge-recursive.c:3393

3765 #, c-format

3766 msgid ""

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

3768 " %s"

3769 msgstr ""

3770

3724 -#: merge-recursive.c:3396

3771 +#: merge-recursive.c:3404

3772 msgid "Already up to date!"

3773 msgstr ""

3774

3728 -#: merge-recursive.c:3405

3775 +#: merge-recursive.c:3413

3776 #, c-format

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

3778 msgstr ""

3779

3733 -#: merge-recursive.c:3504

3780 +#: merge-recursive.c:3512

3781 msgid "Merging:"

3782 msgstr ""

3783

3737 -#: merge-recursive.c:3517

3784 +#: merge-recursive.c:3525

3785 #, c-format

3786 msgid "found %u common ancestor:"

3787 msgid_plural "found %u common ancestors:"

3788 msgstr[0] ""

3789 msgstr[1] ""

3790

3744 -#: merge-recursive.c:3556

3791 +#: merge-recursive.c:3564

3792 msgid "merge returned no commit"

3793 msgstr ""

3794

3748 -#: merge-recursive.c:3622

3795 +#: merge-recursive.c:3630

3796 #, c-format

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

3798 msgstr ""

3799

3753 -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

3800 +#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869

3801 msgid "Unable to write index."

3802 msgstr ""

3803

3757 -#: midx.c:66

3804 +#: midx.c:69

3805 #, c-format

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

3807 msgstr ""

3808

3762 -#: midx.c:82

3809 +#: midx.c:85

3810 #, c-format

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

3812 msgstr ""

3813

3767 -#: midx.c:87

3814 +#: midx.c:90

3815 #, c-format

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

3817 msgstr ""

3818

3772 -#: midx.c:92

3819 +#: midx.c:95

3820 #, c-format

3821 msgid "hash version %u does not match"

3822 msgstr ""

3823

3777 -#: midx.c:106

3824 +#: midx.c:109

3825 msgid "invalid chunk offset (too large)"

3826 msgstr ""

3827

3781 -#: midx.c:130

3828 +#: midx.c:133

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

3830 msgstr ""

3831

3785 -#: midx.c:143

3832 +#: midx.c:146

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

3834 msgstr ""

3835

3789 -#: midx.c:145

3836 +#: midx.c:148

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

3838 msgstr ""

3839

3793 -#: midx.c:147

3840 +#: midx.c:150

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

3842 msgstr ""

3843

3797 -#: midx.c:149

3844 +#: midx.c:152

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

3846 msgstr ""

3847

3801 -#: midx.c:163

3848 +#: midx.c:166

3849 #, c-format

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

3851 msgstr ""

3852

3806 -#: midx.c:208

3853 +#: midx.c:211

3854 #, c-format

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

3856 msgstr ""

3857

3811 -#: midx.c:258

3858 +#: midx.c:261

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

3860 msgstr ""

3861

3815 -#: midx.c:286

3862 +#: midx.c:289

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

3864 msgstr ""

3865

3819 -#: midx.c:457

3866 +#: midx.c:470

3867 #, c-format

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

3869 msgstr ""

3870

3824 -#: midx.c:463

3871 +#: midx.c:476

3872 #, c-format

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

3874 msgstr ""

3875

3829 -#: midx.c:557

3876 +#: midx.c:536

3877 #, c-format

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

3879 msgstr ""

3880

3834 -#: midx.c:993

3881 +#: midx.c:865

3882 +#, c-format

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

3884 +msgstr ""

3885 +

3886 +#: midx.c:1036

3887 #, c-format

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

3889 msgstr ""

3890

3839 -#: midx.c:1048

3891 +#: midx.c:1091

3892 msgid "Looking for referenced packfiles"

3893 msgstr ""

3894

3843 -#: midx.c:1063

3895 +#: midx.c:1106

3896 #, c-format

3897 msgid ""

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

3899 msgstr ""

3900

3849 -#: midx.c:1067

3901 +#: midx.c:1110

3902 msgid "Verifying OID order in MIDX"

3903 msgstr ""

3904

3853 -#: midx.c:1076

3905 +#: midx.c:1119

3906 #, c-format

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

3908 msgstr ""

3909

3858 -#: midx.c:1095

3910 +#: midx.c:1138

3911 msgid "Sorting objects by packfile"

3912 msgstr ""

3913

3862 -#: midx.c:1101

3914 +#: midx.c:1144

3915 msgid "Verifying object offsets"

3916 msgstr ""

3917

3866 -#: midx.c:1117

3918 +#: midx.c:1160

3919 #, c-format

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

3921 msgstr ""

3922

3871 -#: midx.c:1123

3923 +#: midx.c:1166

3924 #, c-format

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

3926 msgstr ""

3927

3876 -#: midx.c:1132

3928 +#: midx.c:1175

3929 #, c-format

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

3931 msgstr ""

3932

3881 -#: name-hash.c:531

3933 +#: midx.c:1350

3934 +msgid "could not start pack-objects"

3935 +msgstr ""

3936 +

3937 +#: midx.c:1369

3938 +msgid "could not finish pack-objects"

3939 +msgstr ""

3940 +

3941 +#: name-hash.c:532

3942 #, c-format

3943 msgid "unable to create lazy_dir thread: %s"

3944 msgstr ""

3945

3886 -#: name-hash.c:553

3946 +#: name-hash.c:554

3947 #, c-format

3948 msgid "unable to create lazy_name thread: %s"

3949 msgstr ""

3950

3891 -#: name-hash.c:559

3951 +#: name-hash.c:560

3952 #, c-format

3953 msgid "unable to join lazy_name thread: %s"

3954 msgstr ""

@@ -3954,16 +4014,16 @@ msgstr ""

4014 msgid "hash mismatch %s"

4015 msgstr ""

4016

3957 -#: packfile.c:617

4017 +#: packfile.c:648

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

4019 msgstr ""

4020

3961 -#: packfile.c:1868

4021 +#: packfile.c:1899

4022 #, c-format

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

4024 msgstr ""

4025

3966 -#: packfile.c:1872

4026 +#: packfile.c:1903

4027 #, c-format

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

4029 msgstr ""

@@ -4214,24 +4274,29 @@ msgstr ""

4274 msgid "unable to parse --pretty format"

4275 msgstr ""

4276

4217 -#: range-diff.c:56

4277 +#: range-diff.c:70

4278 msgid "could not start `log`"

4279 msgstr ""

4280

4221 -#: range-diff.c:59

4281 +#: range-diff.c:72

4282 msgid "could not read `log` output"

4283 msgstr ""

4284

4225 -#: range-diff.c:74 sequencer.c:4897

4285 +#: range-diff.c:91 sequencer.c:5021

4286 #, c-format

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

4288 msgstr ""

4289

4230 -#: range-diff.c:224

4290 +#: range-diff.c:117

4291 +#, c-format

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

4293 +msgstr ""

4294 +

4295 +#: range-diff.c:274

4296 msgid "failed to generate diff"

4297 msgstr ""

4298

4234 -#: range-diff.c:455 range-diff.c:457

4299 +#: range-diff.c:506 range-diff.c:508

4300 #, c-format

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

4302 msgstr ""

@@ -4342,11 +4407,10 @@ msgid "unordered stage entries for '%s'"

4407 msgstr ""

4408

4409 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4345 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4346 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4347 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4348 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4349 -#: builtin/submodule--helper.c:330

4410 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4411 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

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

4413 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4414 msgid "index file corrupt"

4415 msgstr ""

4416

@@ -4400,12 +4464,12 @@ msgstr ""

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

4465 msgstr ""

4466

4403 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4467 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4468 #, c-format

4469 msgid "could not close '%s'"

4470 msgstr ""

4471

4408 -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4472 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4473 #, c-format

4474 msgid "could not stat '%s'"

4475 msgstr ""

@@ -4465,19 +4529,19 @@ msgid_plural "Rebase %s onto %s (%d commands)"

4529 msgstr[0] ""

4530 msgstr[1] ""

4531

4468 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

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

4533 msgid ""

4534 "\n"

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

4536 msgstr ""

4537

4474 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

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

4539 msgid ""

4540 "\n"

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

4542 msgstr ""

4543

4480 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

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

4545 msgid ""

4546 "\n"

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

@@ -4486,19 +4550,19 @@ msgid ""

4550 "\n"

4551 msgstr ""

4552

4489 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

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

4554 msgid ""

4555 "\n"

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

4557 "\n"

4558 msgstr ""

4559

4496 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

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

4561 msgid "Note that empty commits are commented out"

4562 msgstr ""

4563

4500 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4501 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4564 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4565 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4566 #, c-format

4567 msgid "could not write '%s'"

4568 msgstr ""

@@ -4526,97 +4590,98 @@ msgid ""

4590 "\n"

4591 msgstr ""

4592

4529 -#: refs.c:192

4593 +#: refs.c:262

4594 #, c-format

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

4596 msgstr ""

4597

4534 -#: refs.c:597

4598 +#: refs.c:667

4599 #, c-format

4600 msgid "ignoring dangling symref %s"

4601 msgstr ""

4602

4539 -#: refs.c:599 ref-filter.c:1982

4603 +#: refs.c:669 ref-filter.c:2092

4604 #, c-format

4605 msgid "ignoring broken ref %s"

4606 msgstr ""

4607

4544 -#: refs.c:734

4608 +#: refs.c:804

4609 #, c-format

4610 msgid "could not open '%s' for writing: %s"

4611 msgstr ""

4612

4549 -#: refs.c:744 refs.c:795

4613 +#: refs.c:814 refs.c:865

4614 #, c-format

4615 msgid "could not read ref '%s'"

4616 msgstr ""

4617

4554 -#: refs.c:750

4618 +#: refs.c:820

4619 #, c-format

4620 msgid "ref '%s' already exists"

4621 msgstr ""

4622

4559 -#: refs.c:755

4623 +#: refs.c:825

4624 #, c-format

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

4626 msgstr ""

4627

4564 -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4565 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4628 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4629 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4630 #, c-format

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

4632 msgstr ""

4633

4570 -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4634 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4635 +#: builtin/rebase.c:1003

4636 #, c-format

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

4638 msgstr ""

4639

4575 -#: refs.c:797

4640 +#: refs.c:867

4641 #, c-format

4642 msgid "unexpected object ID when deleting '%s'"

4643 msgstr ""

4644

4580 -#: refs.c:928

4645 +#: refs.c:998

4646 #, c-format

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

4648 msgstr ""

4649

4585 -#: refs.c:934

4650 +#: refs.c:1004

4651 #, c-format

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

4653 msgstr ""

4654

4590 -#: refs.c:993

4655 +#: refs.c:1063

4656 #, c-format

4657 msgid "log for %s is empty"

4658 msgstr ""

4659

4595 -#: refs.c:1085

4660 +#: refs.c:1155

4661 #, c-format

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

4663 msgstr ""

4664

4600 -#: refs.c:1161

4665 +#: refs.c:1231

4666 #, c-format

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

4668 msgstr ""

4669

4605 -#: refs.c:1942

4670 +#: refs.c:2012

4671 #, c-format

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

4673 msgstr ""

4674

4610 -#: refs.c:1974

4675 +#: refs.c:2044

4676 msgid "ref updates forbidden inside quarantine environment"

4677 msgstr ""

4678

4614 -#: refs.c:2070 refs.c:2100

4679 +#: refs.c:2140 refs.c:2170

4680 #, c-format

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

4682 msgstr ""

4683

4619 -#: refs.c:2076 refs.c:2111

4684 +#: refs.c:2146 refs.c:2181

4685 #, c-format

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

4687 msgstr ""

@@ -4642,267 +4707,251 @@ msgstr ""

4707 msgid "invalid refspec '%s'"

4708 msgstr ""

4709

4645 -#: ref-filter.c:39 wt-status.c:1909

4710 +#: ref-filter.c:42 wt-status.c:1934

4711 msgid "gone"

4712 msgstr ""

4713

4649 -#: ref-filter.c:40

4714 +#: ref-filter.c:43

4715 #, c-format

4716 msgid "ahead %d"

4717 msgstr ""

4718

4654 -#: ref-filter.c:41

4719 +#: ref-filter.c:44

4720 #, c-format

4721 msgid "behind %d"

4722 msgstr ""

4723

4659 -#: ref-filter.c:42

4724 +#: ref-filter.c:45

4725 #, c-format

4726 msgid "ahead %d, behind %d"

4727 msgstr ""

4728

4664 -#: ref-filter.c:138

4729 +#: ref-filter.c:162

4730 #, c-format

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

4732 msgstr ""

4733

4669 -#: ref-filter.c:140

4734 +#: ref-filter.c:164

4735 #, c-format

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

4737 msgstr ""

4738

4674 -#: ref-filter.c:162

4739 +#: ref-filter.c:186

4740 #, c-format

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

4742 msgstr ""

4743

4679 -#: ref-filter.c:166

4744 +#: ref-filter.c:190

4745 #, c-format

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

4747 msgstr ""

4748

4684 -#: ref-filter.c:168

4749 +#: ref-filter.c:192

4750 #, c-format

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

4752 msgstr ""

4753

4689 -#: ref-filter.c:223

4754 +#: ref-filter.c:247

4755 #, c-format

4756 msgid "%%(objecttype) does not take arguments"

4757 msgstr ""

4758

4694 -#: ref-filter.c:245

4759 +#: ref-filter.c:269

4760 #, c-format

4761 msgid "unrecognized %%(objectsize) argument: %s"

4762 msgstr ""

4763

4699 -#: ref-filter.c:253

4764 +#: ref-filter.c:277

4765 #, c-format

4766 msgid "%%(deltabase) does not take arguments"

4767 msgstr ""

4768

4704 -#: ref-filter.c:265

4769 +#: ref-filter.c:289

4770 #, c-format

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

4772 msgstr ""

4773

4709 -#: ref-filter.c:274

4774 +#: ref-filter.c:298

4775 #, c-format

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

4777 msgstr ""

4778

4714 -#: ref-filter.c:296

4779 +#: ref-filter.c:320

4780 #, c-format

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

4782 msgstr ""

4783

4719 -#: ref-filter.c:325

4784 +#: ref-filter.c:349

4785 #, c-format

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

4787 msgstr ""

4788

4724 -#: ref-filter.c:327

4789 +#: ref-filter.c:351

4790 #, c-format

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

4792 msgstr ""

4793

4729 -#: ref-filter.c:342

4794 +#: ref-filter.c:366

4795 #, c-format

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

4797 msgstr ""

4798

4734 -#: ref-filter.c:346

4799 +#: ref-filter.c:370

4800 #, c-format

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

4802 msgstr ""

4803

4739 -#: ref-filter.c:376

4804 +#: ref-filter.c:400

4805 #, c-format

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

4807 msgstr ""

4808

4744 -#: ref-filter.c:388

4809 +#: ref-filter.c:412

4810 #, c-format

4811 msgid "unrecognized position:%s"

4812 msgstr ""

4813

4749 -#: ref-filter.c:395

4814 +#: ref-filter.c:419

4815 #, c-format

4816 msgid "unrecognized width:%s"

4817 msgstr ""

4818

4754 -#: ref-filter.c:404

4819 +#: ref-filter.c:428

4820 #, c-format

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

4822 msgstr ""

4823

4759 -#: ref-filter.c:412

4824 +#: ref-filter.c:436

4825 #, c-format

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

4827 msgstr ""

4828

4764 -#: ref-filter.c:430

4829 +#: ref-filter.c:454

4830 #, c-format

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

4832 msgstr ""

4833

4769 -#: ref-filter.c:531

4834 +#: ref-filter.c:556

4835 #, c-format

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

4837 msgstr ""

4838

4774 -#: ref-filter.c:558

4839 +#: ref-filter.c:583

4840 #, c-format

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

4842 msgstr ""

4843

4779 -#: ref-filter.c:562

4844 +#: ref-filter.c:587

4845 #, c-format

4846 msgid ""

4847 "not a git repository, but the field '%.*s' requires access to object data"

4848 msgstr ""

4849

4785 -#: ref-filter.c:686

4850 +#: ref-filter.c:711

4851 #, c-format

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

4853 msgstr ""

4854

4790 -#: ref-filter.c:749

4855 +#: ref-filter.c:774

4856 #, c-format

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

4858 msgstr ""

4859

4795 -#: ref-filter.c:751

4860 +#: ref-filter.c:776

4861 #, c-format

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

4863 msgstr ""

4864

4800 -#: ref-filter.c:753

4865 +#: ref-filter.c:778

4866 #, c-format

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

4868 msgstr ""

4869

4805 -#: ref-filter.c:781

4870 +#: ref-filter.c:806

4871 #, c-format

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

4873 msgstr ""

4874

4810 -#: ref-filter.c:783

4875 +#: ref-filter.c:808

4876 #, c-format

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

4878 msgstr ""

4879

4815 -#: ref-filter.c:785

4880 +#: ref-filter.c:810

4881 #, c-format

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

4883 msgstr ""

4884

4820 -#: ref-filter.c:800

4885 +#: ref-filter.c:825

4886 #, c-format

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

4888 msgstr ""

4889

4825 -#: ref-filter.c:857

4890 +#: ref-filter.c:882

4891 #, c-format

4892 msgid "malformed format string %s"

4893 msgstr ""

4894

4830 -#: ref-filter.c:1453

4895 +#: ref-filter.c:1485

4896 #, c-format

4832 -msgid "(no branch, rebasing %s)"

4897 +msgid "no branch, rebasing %s"

4898 msgstr ""

4899

4835 -#: ref-filter.c:1456

4900 +#: ref-filter.c:1488

4901 #, c-format

4837 -msgid "(no branch, rebasing detached HEAD %s)"

4902 +msgid "no branch, rebasing detached HEAD %s"

4903 msgstr ""

4904

4840 -#: ref-filter.c:1459

4841 -#, c-format

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

4843 -msgstr ""

4844 -

4845 -#. TRANSLATORS: make sure this matches "HEAD

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

4847 -#.

4848 -#: ref-filter.c:1467

4849 -#, c-format

4850 -msgid "(HEAD detached at %s)"

4851 -msgstr ""

4852 -

4853 -#. TRANSLATORS: make sure this matches "HEAD

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

4855 -#.

4856 -#: ref-filter.c:1474

4905 +#: ref-filter.c:1491

4906 #, c-format

4858 -msgid "(HEAD detached from %s)"

4907 +msgid "no branch, bisect started on %s"

4908 msgstr ""

4909

4861 -#: ref-filter.c:1478

4862 -msgid "(no branch)"

4910 +#: ref-filter.c:1501

4911 +msgid "no branch"

4912 msgstr ""

4913

4865 -#: ref-filter.c:1512 ref-filter.c:1669

4914 +#: ref-filter.c:1537 ref-filter.c:1743

4915 #, c-format

4916 msgid "missing object %s for %s"

4917 msgstr ""

4918

4870 -#: ref-filter.c:1522

4919 +#: ref-filter.c:1547

4920 #, c-format

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

4922 msgstr ""

4923

4875 -#: ref-filter.c:1888

4924 +#: ref-filter.c:1998

4925 #, c-format

4926 msgid "malformed object at '%s'"

4927 msgstr ""

4928

4880 -#: ref-filter.c:1977

4929 +#: ref-filter.c:2087

4930 #, c-format

4931 msgid "ignoring ref with broken name %s"

4932 msgstr ""

4933

4885 -#: ref-filter.c:2263

4934 +#: ref-filter.c:2382

4935 #, c-format

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

4937 msgstr ""

4938

4890 -#: ref-filter.c:2363

4939 +#: ref-filter.c:2482

4940 #, c-format

4941 msgid "option `%s' is incompatible with --merged"

4942 msgstr ""

4943

4895 -#: ref-filter.c:2366

4944 +#: ref-filter.c:2485

4945 #, c-format

4946 msgid "option `%s' is incompatible with --no-merged"

4947 msgstr ""

4948

4900 -#: ref-filter.c:2376

4949 +#: ref-filter.c:2495

4950 #, c-format

4951 msgid "malformed object name %s"

4952 msgstr ""

4953

4905 -#: ref-filter.c:2381

4954 +#: ref-filter.c:2500

4955 #, c-format

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

4957 msgstr ""

@@ -5217,8 +5266,8 @@ msgstr ""

5266 msgid "Recorded preimage for '%s'"

5267 msgstr ""

5268

5220 -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5221 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5269 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5270 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5271 #, c-format

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

5273 msgstr ""

@@ -5252,20 +5301,20 @@ msgstr ""

5301 msgid "unable to open rr-cache directory"

5302 msgstr ""

5303

5255 -#: revision.c:2476

5304 +#: revision.c:2507

5305 msgid "your current branch appears to be broken"

5306 msgstr ""

5307

5259 -#: revision.c:2479

5308 +#: revision.c:2510

5309 #, c-format

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

5311 msgstr ""

5312

5264 -#: revision.c:2679

5313 +#: revision.c:2710

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

5315 msgstr ""

5316

5268 -#: revision.c:2683

5317 +#: revision.c:2714

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

5319 msgstr ""

5320

@@ -5331,74 +5380,79 @@ msgstr ""

5380 msgid "could not delete '%s'"

5381 msgstr ""

5382

5334 -#: sequencer.c:318

5383 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5384 +#, c-format

5385 +msgid "could not remove '%s'"

5386 +msgstr ""

5387 +

5388 +#: sequencer.c:321

5389 msgid "revert"

5390 msgstr ""

5391

5338 -#: sequencer.c:320

5392 +#: sequencer.c:323

5393 msgid "cherry-pick"

5394 msgstr ""

5395

5342 -#: sequencer.c:322

5396 +#: sequencer.c:325

5397 msgid "rebase -i"

5398 msgstr ""

5399

5346 -#: sequencer.c:324

5400 +#: sequencer.c:327

5401 #, c-format

5402 msgid "unknown action: %d"

5403 msgstr ""

5404

5351 -#: sequencer.c:382

5405 +#: sequencer.c:385

5406 msgid ""

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

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

5409 msgstr ""

5410

5357 -#: sequencer.c:385

5411 +#: sequencer.c:388

5412 msgid ""

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

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

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

5416 msgstr ""

5417

5364 -#: sequencer.c:398 sequencer.c:2801

5418 +#: sequencer.c:401 sequencer.c:2909

5419 #, c-format

5420 msgid "could not lock '%s'"

5421 msgstr ""

5422

5369 -#: sequencer.c:405

5423 +#: sequencer.c:408

5424 #, c-format

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

5426 msgstr ""

5427

5374 -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5375 -#: sequencer.c:3084

5428 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5429 +#: sequencer.c:3192

5430 #, c-format

5431 msgid "failed to finalize '%s'"

5432 msgstr ""

5433

5380 -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5381 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5382 -#: builtin/merge.c:1115 builtin/rebase.c:567

5434 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5435 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5436 +#: builtin/merge.c:1112 builtin/rebase.c:567

5437 #, c-format

5438 msgid "could not read '%s'"

5439 msgstr ""

5440

5387 -#: sequencer.c:459

5441 +#: sequencer.c:462

5442 #, c-format

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

5444 msgstr ""

5445

5392 -#: sequencer.c:463

5446 +#: sequencer.c:466

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

5448 msgstr ""

5449

5396 -#: sequencer.c:495

5450 +#: sequencer.c:498

5451 #, c-format

5452 msgid "%s: fast-forward"

5453 msgstr ""

5454

5401 -#: sequencer.c:534 builtin/tag.c:555

5455 +#: sequencer.c:537 builtin/tag.c:565

5456 #, c-format

5457 msgid "Invalid cleanup mode %s"

5458 msgstr ""

@@ -5406,70 +5460,70 @@ msgstr ""

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

5461 #. "rebase -i".

5462 #.

5409 -#: sequencer.c:629

5463 +#: sequencer.c:632

5464 #, c-format

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

5466 msgstr ""

5467

5414 -#: sequencer.c:646

5468 +#: sequencer.c:649

5469 msgid "unable to update cache tree"

5470 msgstr ""

5471

5418 -#: sequencer.c:660

5472 +#: sequencer.c:663

5473 msgid "could not resolve HEAD commit"

5474 msgstr ""

5475

5422 -#: sequencer.c:740

5476 +#: sequencer.c:743

5477 #, c-format

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

5479 msgstr ""

5480

5427 -#: sequencer.c:751

5481 +#: sequencer.c:754

5482 #, c-format

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

5484 msgstr ""

5485

5432 -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5433 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5486 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5487 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5488 #, c-format

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

5490 msgstr ""

5491

5438 -#: sequencer.c:798

5492 +#: sequencer.c:801

5493 msgid "'GIT_AUTHOR_NAME' already given"

5494 msgstr ""

5495

5442 -#: sequencer.c:803

5496 +#: sequencer.c:806

5497 msgid "'GIT_AUTHOR_EMAIL' already given"

5498 msgstr ""

5499

5446 -#: sequencer.c:808

5500 +#: sequencer.c:811

5501 msgid "'GIT_AUTHOR_DATE' already given"

5502 msgstr ""

5503

5450 -#: sequencer.c:812

5504 +#: sequencer.c:815

5505 #, c-format

5506 msgid "unknown variable '%s'"

5507 msgstr ""

5508

5455 -#: sequencer.c:817

5509 +#: sequencer.c:820

5510 msgid "missing 'GIT_AUTHOR_NAME'"

5511 msgstr ""

5512

5459 -#: sequencer.c:819

5513 +#: sequencer.c:822

5514 msgid "missing 'GIT_AUTHOR_EMAIL'"

5515 msgstr ""

5516

5463 -#: sequencer.c:821

5517 +#: sequencer.c:824

5518 msgid "missing 'GIT_AUTHOR_DATE'"

5519 msgstr ""

5520

5467 -#: sequencer.c:881

5521 +#: sequencer.c:884

5522 #, c-format

5523 msgid "invalid date format '%s' in '%s'"

5524 msgstr ""

5525

5472 -#: sequencer.c:898

5526 +#: sequencer.c:901

5527 #, c-format

5528 msgid ""

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

@@ -5486,15 +5540,15 @@ msgid ""

5540 " git rebase --continue\n"

5541 msgstr ""

5542

5489 -#: sequencer.c:992

5543 +#: sequencer.c:995

5544 msgid "writing root commit"

5545 msgstr ""

5546

5493 -#: sequencer.c:1213

5547 +#: sequencer.c:1216

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

5549 msgstr ""

5550

5497 -#: sequencer.c:1220

5551 +#: sequencer.c:1223

5552 msgid ""

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

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

@@ -5509,7 +5563,7 @@ msgid ""

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

5564 msgstr ""

5565

5512 -#: sequencer.c:1233

5566 +#: sequencer.c:1236

5567 msgid ""

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

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

@@ -5523,305 +5577,346 @@ msgid ""

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

5578 msgstr ""

5579

5526 -#: sequencer.c:1275

5580 +#: sequencer.c:1278

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

5582 msgstr ""

5583

5530 -#: sequencer.c:1277

5584 +#: sequencer.c:1280

5585 msgid "could not parse newly created commit"

5586 msgstr ""

5587

5534 -#: sequencer.c:1323

5588 +#: sequencer.c:1326

5589 msgid "unable to resolve HEAD after creating commit"

5590 msgstr ""

5591

5538 -#: sequencer.c:1325

5592 +#: sequencer.c:1328

5593 msgid "detached HEAD"

5594 msgstr ""

5595

5542 -#: sequencer.c:1329

5596 +#: sequencer.c:1332

5597 msgid " (root-commit)"

5598 msgstr ""

5599

5546 -#: sequencer.c:1350

5600 +#: sequencer.c:1353

5601 msgid "could not parse HEAD"

5602 msgstr ""

5603

5550 -#: sequencer.c:1352

5604 +#: sequencer.c:1355

5605 #, c-format

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

5607 msgstr ""

5608

5555 -#: sequencer.c:1356 builtin/commit.c:1551

5609 +#: sequencer.c:1359 builtin/commit.c:1571

5610 msgid "could not parse HEAD commit"

5611 msgstr ""

5612

5559 -#: sequencer.c:1408 sequencer.c:2001

5613 +#: sequencer.c:1411 sequencer.c:2004

5614 msgid "unable to parse commit author"

5615 msgstr ""

5616

5563 -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

5617 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

5618 msgid "git write-tree failed to write a tree"

5619 msgstr ""

5620

5567 -#: sequencer.c:1435 sequencer.c:1496

5621 +#: sequencer.c:1438 sequencer.c:1499

5622 #, c-format

5623 msgid "unable to read commit message from '%s'"

5624 msgstr ""

5625

5572 -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5573 -#: builtin/merge.c:906

5626 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

5627 +#: builtin/merge.c:903

5628 msgid "failed to write commit object"

5629 msgstr ""

5630

5577 -#: sequencer.c:1523

5631 +#: sequencer.c:1526

5632 #, c-format

5633 msgid "could not parse commit %s"

5634 msgstr ""

5635

5582 -#: sequencer.c:1528

5636 +#: sequencer.c:1531

5637 #, c-format

5638 msgid "could not parse parent commit %s"

5639 msgstr ""

5640

5587 -#: sequencer.c:1602 sequencer.c:1712

5641 +#: sequencer.c:1605 sequencer.c:1715

5642 #, c-format

5643 msgid "unknown command: %d"

5644 msgstr ""

5645

5592 -#: sequencer.c:1659 sequencer.c:1684

5646 +#: sequencer.c:1662 sequencer.c:1687

5647 #, c-format

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

5649 msgstr ""

5650

5597 -#: sequencer.c:1669

5651 +#: sequencer.c:1672

5652 msgid "need a HEAD to fixup"

5653 msgstr ""

5654

5601 -#: sequencer.c:1671 sequencer.c:3111

5655 +#: sequencer.c:1674 sequencer.c:3219

5656 msgid "could not read HEAD"

5657 msgstr ""

5658

5605 -#: sequencer.c:1673

5659 +#: sequencer.c:1676

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

5661 msgstr ""

5662

5609 -#: sequencer.c:1679

5663 +#: sequencer.c:1682

5664 #, c-format

5665 msgid "cannot write '%s'"

5666 msgstr ""

5667

5614 -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

5668 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

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

5670 msgstr ""

5671

5618 -#: sequencer.c:1694

5672 +#: sequencer.c:1697

5673 #, c-format

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

5675 msgstr ""

5676

5623 -#: sequencer.c:1701

5677 +#: sequencer.c:1704

5678 #, c-format

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

5680 msgstr ""

5681

5628 -#: sequencer.c:1707

5682 +#: sequencer.c:1710

5683 #, c-format

5684 msgid "The commit message #%d will be skipped:"

5685 msgstr ""

5686

5633 -#: sequencer.c:1795

5687 +#: sequencer.c:1798

5688 msgid "your index file is unmerged."

5689 msgstr ""

5690

5637 -#: sequencer.c:1802

5691 +#: sequencer.c:1805

5692 msgid "cannot fixup root commit"

5693 msgstr ""

5694

5641 -#: sequencer.c:1821

5695 +#: sequencer.c:1824

5696 #, c-format

5697 msgid "commit %s is a merge but no -m option was given."

5698 msgstr ""

5699

5646 -#: sequencer.c:1829 sequencer.c:1837

5700 +#: sequencer.c:1832 sequencer.c:1840

5701 #, c-format

5702 msgid "commit %s does not have parent %d"

5703 msgstr ""

5704

5651 -#: sequencer.c:1843

5705 +#: sequencer.c:1846

5706 #, c-format

5707 msgid "cannot get commit message for %s"

5708 msgstr ""

5709

5710 #. TRANSLATORS: The first %s will be a "todo" command like

5711 #. "revert" or "pick", the second %s a SHA1.

5658 -#: sequencer.c:1862

5712 +#: sequencer.c:1865

5713 #, c-format

5714 msgid "%s: cannot parse parent commit %s"

5715 msgstr ""

5716

5663 -#: sequencer.c:1927

5717 +#: sequencer.c:1930

5718 #, c-format

5719 msgid "could not rename '%s' to '%s'"

5720 msgstr ""

5721

5668 -#: sequencer.c:1982

5722 +#: sequencer.c:1985

5723 #, c-format

5724 msgid "could not revert %s... %s"

5725 msgstr ""

5726

5673 -#: sequencer.c:1983

5727 +#: sequencer.c:1986

5728 #, c-format

5729 msgid "could not apply %s... %s"

5730 msgstr ""

5731

5678 -#: sequencer.c:2042

5732 +#: sequencer.c:2045

5733 #, c-format

5734 msgid "git %s: failed to read the index"

5735 msgstr ""

5736

5683 -#: sequencer.c:2049

5737 +#: sequencer.c:2052

5738 #, c-format

5739 msgid "git %s: failed to refresh the index"

5740 msgstr ""

5741

5688 -#: sequencer.c:2118

5742 +#: sequencer.c:2128

5743 #, c-format

5744 msgid "%s does not accept arguments: '%s'"

5745 msgstr ""

5746

5693 -#: sequencer.c:2127

5747 +#: sequencer.c:2137

5748 #, c-format

5749 msgid "missing arguments for %s"

5750 msgstr ""

5751

5698 -#: sequencer.c:2164

5752 +#: sequencer.c:2174

5753 #, c-format

5754 msgid "could not parse '%.*s'"

5755 msgstr ""

5756

5703 -#: sequencer.c:2226

5757 +#: sequencer.c:2228

5758 #, c-format

5759 msgid "invalid line %d: %.*s"

5760 msgstr ""

5761

5708 -#: sequencer.c:2237

5762 +#: sequencer.c:2239

5763 #, c-format

5764 msgid "cannot '%s' without a previous commit"

5765 msgstr ""

5766

5713 -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

5767 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

5768 #: builtin/rebase.c:204 builtin/rebase.c:229

5769 #, c-format

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

5771 msgstr ""

5772

5719 -#: sequencer.c:2360

5773 +#: sequencer.c:2323

5774 +msgid "cancelling a cherry picking in progress"

5775 +msgstr ""

5776 +

5777 +#: sequencer.c:2330

5778 +msgid "cancelling a revert in progress"

5779 +msgstr ""

5780 +

5781 +#: sequencer.c:2364

5782 msgid "please fix this using 'git rebase --edit-todo'."

5783 msgstr ""

5784

5723 -#: sequencer.c:2362

5785 +#: sequencer.c:2366

5786 #, c-format

5787 msgid "unusable instruction sheet: '%s'"

5788 msgstr ""

5789

5728 -#: sequencer.c:2367

5790 +#: sequencer.c:2371

5791 msgid "no commits parsed."

5792 msgstr ""

5793

5732 -#: sequencer.c:2378

5794 +#: sequencer.c:2382

5795 msgid "cannot cherry-pick during a revert."

5796 msgstr ""

5797

5736 -#: sequencer.c:2380

5798 +#: sequencer.c:2384

5799 msgid "cannot revert during a cherry-pick."

5800 msgstr ""

5801

5740 -#: sequencer.c:2462

5802 +#: sequencer.c:2466

5803 #, c-format

5804 msgid "invalid value for %s: %s"

5805 msgstr ""

5806

5745 -#: sequencer.c:2549

5807 +#: sequencer.c:2553

5808 msgid "unusable squash-onto"

5809 msgstr ""

5810

5749 -#: sequencer.c:2565

5811 +#: sequencer.c:2569

5812 #, c-format

5813 msgid "malformed options sheet: '%s'"

5814 msgstr ""

5815

5754 -#: sequencer.c:2648 sequencer.c:4227

5816 +#: sequencer.c:2652 sequencer.c:4351

5817 msgid "empty commit set passed"

5818 msgstr ""

5819

5758 -#: sequencer.c:2656

5759 -msgid "a cherry-pick or revert is already in progress"

5820 +#: sequencer.c:2668

5821 +msgid "revert is already in progress"

5822 +msgstr ""

5823 +

5824 +#: sequencer.c:2670

5825 +#, c-format

5826 +msgid "try \"git revert (--continue | %s--abort | --quit)\""

5827 +msgstr ""

5828 +

5829 +#: sequencer.c:2673

5830 +msgid "cherry-pick is already in progress"

5831 msgstr ""

5832

5762 -#: sequencer.c:2657

5763 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

5833 +#: sequencer.c:2675

5834 +#, c-format

5835 +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

5836 msgstr ""

5837

5766 -#: sequencer.c:2660

5838 +#: sequencer.c:2689

5839 #, c-format

5840 msgid "could not create sequencer directory '%s'"

5841 msgstr ""

5842

5771 -#: sequencer.c:2674

5843 +#: sequencer.c:2704

5844 msgid "could not lock HEAD"

5845 msgstr ""

5846

5775 -#: sequencer.c:2729 sequencer.c:3979

5847 +#: sequencer.c:2764 sequencer.c:4103

5848 msgid "no cherry-pick or revert in progress"

5849 msgstr ""

5850

5779 -#: sequencer.c:2731

5851 +#: sequencer.c:2766 sequencer.c:2777

5852 msgid "cannot resolve HEAD"

5853 msgstr ""

5854

5783 -#: sequencer.c:2733 sequencer.c:2768

5855 +#: sequencer.c:2768 sequencer.c:2812

5856 msgid "cannot abort from a branch yet to be born"

5857 msgstr ""

5858

5787 -#: sequencer.c:2754 builtin/grep.c:732

5859 +#: sequencer.c:2798 builtin/grep.c:734

5860 #, c-format

5861 msgid "cannot open '%s'"

5862 msgstr ""

5863

5792 -#: sequencer.c:2756

5864 +#: sequencer.c:2800

5865 #, c-format

5866 msgid "cannot read '%s': %s"

5867 msgstr ""

5868

5797 -#: sequencer.c:2757

5869 +#: sequencer.c:2801

5870 msgid "unexpected end of file"

5871 msgstr ""

5872

5801 -#: sequencer.c:2763

5873 +#: sequencer.c:2807

5874 #, c-format

5875 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5876 msgstr ""

5877

5806 -#: sequencer.c:2774

5878 +#: sequencer.c:2818

5879 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5880 msgstr ""

5881

5810 -#: sequencer.c:2903 sequencer.c:3894

5882 +#: sequencer.c:2859

5883 +msgid "no revert in progress"

5884 +msgstr ""

5885 +

5886 +#: sequencer.c:2867

5887 +msgid "no cherry-pick in progress"

5888 +msgstr ""

5889 +

5890 +#: sequencer.c:2877

5891 +msgid "failed to skip the commit"

5892 +msgstr ""

5893 +

5894 +#: sequencer.c:2884

5895 +msgid "there is nothing to skip"

5896 +msgstr ""

5897 +

5898 +#: sequencer.c:2887

5899 +#, c-format

5900 +msgid ""

5901 +"have you committed already?\n"

5902 +"try \"git %s --continue\""

5903 +msgstr ""

5904 +

5905 +#: sequencer.c:3011 sequencer.c:4015

5906 #, c-format

5907 msgid "could not update %s"

5908 msgstr ""

5909

5815 -#: sequencer.c:2941 sequencer.c:3874

5910 +#: sequencer.c:3049 sequencer.c:3995

5911 msgid "cannot read HEAD"

5912 msgstr ""

5913

5819 -#: sequencer.c:2958

5914 +#: sequencer.c:3066

5915 #, c-format

5916 msgid "unable to copy '%s' to '%s'"

5917 msgstr ""

5918

5824 -#: sequencer.c:2966

5919 +#: sequencer.c:3074

5920 #, c-format

5921 msgid ""

5922 "You can amend the commit now, with\n"

@@ -5833,27 +5928,27 @@ msgid ""

5928 " git rebase --continue\n"

5929 msgstr ""

5930

5836 -#: sequencer.c:2976

5931 +#: sequencer.c:3084

5932 #, c-format

5933 msgid "Could not apply %s... %.*s"

5934 msgstr ""

5935

5841 -#: sequencer.c:2983

5936 +#: sequencer.c:3091

5937 #, c-format

5938 msgid "Could not merge %.*s"

5939 msgstr ""

5940

5846 -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633

5941 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633

5942 #, c-format

5943 msgid "could not copy '%s' to '%s'"

5944 msgstr ""

5945

5851 -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580

5852 -#: builtin/rebase.c:1940 builtin/rebase.c:1995

5946 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582

5947 +#: builtin/rebase.c:1953 builtin/rebase.c:2008

5948 msgid "could not read index"

5949 msgstr ""

5950

5856 -#: sequencer.c:3028

5951 +#: sequencer.c:3136

5952 #, c-format

5953 msgid ""

5954 "execution failed: %s\n"

@@ -5863,11 +5958,11 @@ msgid ""

5958 "\n"

5959 msgstr ""

5960

5866 -#: sequencer.c:3034

5961 +#: sequencer.c:3142

5962 msgid "and made changes to the index and/or the working tree\n"

5963 msgstr ""

5964

5870 -#: sequencer.c:3040

5965 +#: sequencer.c:3148

5966 #, c-format

5967 msgid ""

5968 "execution succeeded: %s\n"

@@ -5878,76 +5973,76 @@ msgid ""

5973 "\n"

5974 msgstr ""

5975

5881 -#: sequencer.c:3101

5976 +#: sequencer.c:3209

5977 #, c-format

5978 msgid "illegal label name: '%.*s'"

5979 msgstr ""

5980

5886 -#: sequencer.c:3155

5981 +#: sequencer.c:3263

5982 msgid "writing fake root commit"

5983 msgstr ""

5984

5890 -#: sequencer.c:3160

5985 +#: sequencer.c:3268

5986 msgid "writing squash-onto"

5987 msgstr ""

5988

5894 -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850

5989 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860

5990 #, c-format

5991 msgid "failed to find tree of %s"

5992 msgstr ""

5993

5899 -#: sequencer.c:3216 builtin/rebase.c:863

5994 +#: sequencer.c:3324 builtin/rebase.c:873

5995 msgid "could not write index"

5996 msgstr ""

5997

5903 -#: sequencer.c:3243

5998 +#: sequencer.c:3351

5999 #, c-format

6000 msgid "could not resolve '%s'"

6001 msgstr ""

6002

5908 -#: sequencer.c:3271

6003 +#: sequencer.c:3379

6004 msgid "cannot merge without a current revision"

6005 msgstr ""

6006

5912 -#: sequencer.c:3293

6007 +#: sequencer.c:3401

6008 #, c-format

6009 msgid "unable to parse '%.*s'"

6010 msgstr ""

6011

5917 -#: sequencer.c:3302

6012 +#: sequencer.c:3410

6013 #, c-format

6014 msgid "nothing to merge: '%.*s'"

6015 msgstr ""

6016

5922 -#: sequencer.c:3314

6017 +#: sequencer.c:3422

6018 msgid "octopus merge cannot be executed on top of a [new root]"

6019 msgstr ""

6020

5926 -#: sequencer.c:3329

6021 +#: sequencer.c:3437

6022 #, c-format

6023 msgid "could not get commit message of '%s'"

6024 msgstr ""

6025

5931 -#: sequencer.c:3478

6026 +#: sequencer.c:3590

6027 #, c-format

6028 msgid "could not even attempt to merge '%.*s'"

6029 msgstr ""

6030

5936 -#: sequencer.c:3494

6031 +#: sequencer.c:3606

6032 msgid "merge: Unable to write new index file"

6033 msgstr ""

6034

5940 -#: sequencer.c:3562 builtin/rebase.c:711

6035 +#: sequencer.c:3675 builtin/rebase.c:711

6036 #, c-format

6037 msgid "Applied autostash.\n"

6038 msgstr ""

6039

5945 -#: sequencer.c:3574

6040 +#: sequencer.c:3687

6041 #, c-format

6042 msgid "cannot store %s"

6043 msgstr ""

6044

5950 -#: sequencer.c:3577 builtin/rebase.c:727

6045 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113

6046 #, c-format

6047 msgid ""

6048 "Applying autostash resulted in conflicts.\n"

@@ -5955,31 +6050,31 @@ msgid ""

6050 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

6051 msgstr ""

6052

5958 -#: sequencer.c:3638

6053 +#: sequencer.c:3751

6054 #, c-format

6055 msgid "could not checkout %s"

6056 msgstr ""

6057

5963 -#: sequencer.c:3652

6058 +#: sequencer.c:3765

6059 #, c-format

6060 msgid "%s: not a valid OID"

6061 msgstr ""

6062

5968 -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724

6063 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779

6064 msgid "could not detach HEAD"

6065 msgstr ""

6066

5972 -#: sequencer.c:3672

6067 +#: sequencer.c:3785

6068 #, c-format

6069 msgid "Stopped at HEAD\n"

6070 msgstr ""

6071

5977 -#: sequencer.c:3674

6072 +#: sequencer.c:3787

6073 #, c-format

6074 msgid "Stopped at %s\n"

6075 msgstr ""

6076

5982 -#: sequencer.c:3682

6077 +#: sequencer.c:3795

6078 #, c-format

6079 msgid ""

6080 "Could not execute the todo command\n"

@@ -5992,105 +6087,105 @@ msgid ""

6087 " git rebase --continue\n"

6088 msgstr ""

6089

5995 -#: sequencer.c:3759

6090 +#: sequencer.c:3877

6091 #, c-format

6092 msgid "Stopped at %s... %.*s\n"

6093 msgstr ""

6094

6000 -#: sequencer.c:3837

6095 +#: sequencer.c:3958

6096 #, c-format

6097 msgid "unknown command %d"

6098 msgstr ""

6099

6005 -#: sequencer.c:3882

6100 +#: sequencer.c:4003

6101 msgid "could not read orig-head"

6102 msgstr ""

6103

6009 -#: sequencer.c:3887

6104 +#: sequencer.c:4008

6105 msgid "could not read 'onto'"

6106 msgstr ""

6107

6013 -#: sequencer.c:3901

6108 +#: sequencer.c:4022

6109 #, c-format

6110 msgid "could not update HEAD to %s"

6111 msgstr ""

6112

6018 -#: sequencer.c:3991

6113 +#: sequencer.c:4115

6114 msgid "cannot rebase: You have unstaged changes."

6115 msgstr ""

6116

6022 -#: sequencer.c:4000

6117 +#: sequencer.c:4124

6118 msgid "cannot amend non-existing commit"

6119 msgstr ""

6120

6026 -#: sequencer.c:4002

6121 +#: sequencer.c:4126

6122 #, c-format

6123 msgid "invalid file: '%s'"

6124 msgstr ""

6125

6031 -#: sequencer.c:4004

6126 +#: sequencer.c:4128

6127 #, c-format

6128 msgid "invalid contents: '%s'"

6129 msgstr ""

6130

6036 -#: sequencer.c:4007

6131 +#: sequencer.c:4131

6132 msgid ""

6133 "\n"

6134 "You have uncommitted changes in your working tree. Please, commit them\n"

6135 "first and then run 'git rebase --continue' again."

6136 msgstr ""

6137

6043 -#: sequencer.c:4043 sequencer.c:4081

6138 +#: sequencer.c:4167 sequencer.c:4205

6139 #, c-format

6140 msgid "could not write file: '%s'"

6141 msgstr ""

6142

6048 -#: sequencer.c:4096

6143 +#: sequencer.c:4220

6144 msgid "could not remove CHERRY_PICK_HEAD"

6145 msgstr ""

6146

6052 -#: sequencer.c:4103

6147 +#: sequencer.c:4227

6148 msgid "could not commit staged changes."

6149 msgstr ""

6150

6056 -#: sequencer.c:4204

6151 +#: sequencer.c:4328

6152 #, c-format

6153 msgid "%s: can't cherry-pick a %s"

6154 msgstr ""

6155

6061 -#: sequencer.c:4208

6156 +#: sequencer.c:4332

6157 #, c-format

6158 msgid "%s: bad revision"

6159 msgstr ""

6160

6066 -#: sequencer.c:4243

6161 +#: sequencer.c:4367

6162 msgid "can't revert as initial commit"

6163 msgstr ""

6164

6070 -#: sequencer.c:4686

6165 +#: sequencer.c:4810

6166 msgid "make_script: unhandled options"

6167 msgstr ""

6168

6074 -#: sequencer.c:4689

6169 +#: sequencer.c:4813

6170 msgid "make_script: error preparing revisions"

6171 msgstr ""

6172

6078 -#: sequencer.c:4847

6173 +#: sequencer.c:4971

6174 msgid ""

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

6176 "continue'.\n"

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

6178 msgstr ""

6179

6085 -#: sequencer.c:4959 sequencer.c:4976

6180 +#: sequencer.c:5083 sequencer.c:5100

6181 msgid "nothing to do"

6182 msgstr ""

6183

6089 -#: sequencer.c:4990

6184 +#: sequencer.c:5114

l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed)