dba9f13c6a · 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: 2018-06-16 22:06+0800\n"

11 +"POT-Creation-Date: 2018-08-21 08:28+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,59 +18,59 @@ msgstr ""

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

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

20

21 -#: advice.c:92

21 +#: advice.c:97

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:137

26 +#: advice.c:150

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

28 msgstr ""

29

30 -#: advice.c:139

30 +#: advice.c:152

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

32 msgstr ""

33

34 -#: advice.c:141

34 +#: advice.c:154

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

36 msgstr ""

37

38 -#: advice.c:143

38 +#: advice.c:156

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

40 msgstr ""

41

42 -#: advice.c:145

42 +#: advice.c:158

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

44 msgstr ""

45

46 -#: advice.c:147

46 +#: advice.c:160

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:155

51 +#: advice.c:168

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:163

57 +#: advice.c:176

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:168 builtin/merge.c:1250

61 +#: advice.c:181 builtin/merge.c:1286

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

63 msgstr ""

64

65 -#: advice.c:170

65 +#: advice.c:183

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

67 msgstr ""

68

69 -#: advice.c:171

69 +#: advice.c:184

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:177

73 +#: advice.c:190

74 #, c-format

75 msgid ""

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

@@ -86,92 +86,92 @@ msgid ""

86 "\n"

87 msgstr ""

88

89 -#: apply.c:58

89 +#: apply.c:59

90 #, c-format

91 msgid "unrecognized whitespace option '%s'"

92 msgstr ""

93

94 -#: apply.c:74

94 +#: apply.c:75

95 #, c-format

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

97 msgstr ""

98

99 -#: apply.c:122

99 +#: apply.c:125

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

101 msgstr ""

102

103 -#: apply.c:124

103 +#: apply.c:127

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

105 msgstr ""

106

107 -#: apply.c:127

107 +#: apply.c:130

108 msgid "--3way outside a repository"

109 msgstr ""

110

111 -#: apply.c:138

111 +#: apply.c:141

112 msgid "--index outside a repository"

113 msgstr ""

114

115 -#: apply.c:141

115 +#: apply.c:144

116 msgid "--cached outside a repository"

117 msgstr ""

118

119 -#: apply.c:821

119 +#: apply.c:826

120 #, c-format

121 msgid "Cannot prepare timestamp regexp %s"

122 msgstr ""

123

124 -#: apply.c:830

124 +#: apply.c:835

125 #, c-format

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

127 msgstr ""

128

129 -#: apply.c:904

129 +#: apply.c:909

130 #, c-format

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

132 msgstr ""

133

134 -#: apply.c:942

134 +#: apply.c:947

135 #, c-format

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

137 msgstr ""

138

139 -#: apply.c:948

139 +#: apply.c:953

140 #, c-format

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

142 msgstr ""

143

144 -#: apply.c:949

144 +#: apply.c:954

145 #, c-format

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

147 msgstr ""

148

149 -#: apply.c:954

149 +#: apply.c:959

150 #, c-format

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

152 msgstr ""

153

154 -#: apply.c:983

154 +#: apply.c:988

155 #, c-format

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

157 msgstr ""

158

159 -#: apply.c:1301

159 +#: apply.c:1306

160 #, c-format

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

162 msgstr ""

163

164 -#: apply.c:1473

164 +#: apply.c:1478

165 #, c-format

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

167 msgstr ""

168

169 -#: apply.c:1542

169 +#: apply.c:1547

170 #, c-format

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

172 msgstr ""

173

174 -#: apply.c:1562

174 +#: apply.c:1567

175 #, c-format

176 msgid ""

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

@@ -182,638 +182,692 @@ msgid_plural ""

182 msgstr[0] ""

183 msgstr[1] ""

184

185 -#: apply.c:1575

185 +#: apply.c:1580

186 #, c-format

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

188 msgstr ""

189

190 -#: apply.c:1763

190 +#: apply.c:1768

191 msgid "new file depends on old contents"

192 msgstr ""

193

194 -#: apply.c:1765

194 +#: apply.c:1770

195 msgid "deleted file still has contents"

196 msgstr ""

197

198 -#: apply.c:1799

198 +#: apply.c:1804

199 #, c-format

200 msgid "corrupt patch at line %d"

201 msgstr ""

202

203 -#: apply.c:1836

203 +#: apply.c:1841

204 #, c-format

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

206 msgstr ""

207

208 -#: apply.c:1838

208 +#: apply.c:1843

209 #, c-format

210 msgid "deleted file %s still has contents"

211 msgstr ""

212

213 -#: apply.c:1841

213 +#: apply.c:1846

214 #, c-format

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

216 msgstr ""

217

218 -#: apply.c:1988

218 +#: apply.c:1993

219 #, c-format

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

221 msgstr ""

222

223 -#: apply.c:2025

223 +#: apply.c:2030

224 #, c-format

225 msgid "unrecognized binary patch at line %d"

226 msgstr ""

227

228 -#: apply.c:2185

228 +#: apply.c:2190

229 #, c-format

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

231 msgstr ""

232

233 -#: apply.c:2271

233 +#: apply.c:2276

234 #, c-format

235 msgid "unable to read symlink %s"

236 msgstr ""

237

238 -#: apply.c:2275

238 +#: apply.c:2280

239 #, c-format

240 msgid "unable to open or read %s"

241 msgstr ""

242

243 -#: apply.c:2934

243 +#: apply.c:2939

244 #, c-format

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

246 msgstr ""

247

248 -#: apply.c:3055

248 +#: apply.c:3060

249 #, c-format

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

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

252 msgstr[0] ""

253 msgstr[1] ""

254

255 -#: apply.c:3067

255 +#: apply.c:3072

256 #, c-format

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

258 msgstr ""

259

260 -#: apply.c:3073

260 +#: apply.c:3078

261 #, c-format

262 msgid ""

263 "while searching for:\n"

264 "%.*s"

265 msgstr ""

266

267 -#: apply.c:3095

267 +#: apply.c:3100

268 #, c-format

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

270 msgstr ""

271

272 -#: apply.c:3103

272 +#: apply.c:3108

273 #, c-format

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

275 msgstr ""

276

277 -#: apply.c:3149

277 +#: apply.c:3154

278 #, c-format

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

280 msgstr ""

281

282 -#: apply.c:3159

282 +#: apply.c:3164

283 #, c-format

284 msgid ""

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

286 msgstr ""

287

288 -#: apply.c:3167

288 +#: apply.c:3172

289 #, c-format

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

291 msgstr ""

292

293 -#: apply.c:3185

293 +#: apply.c:3190

294 #, c-format

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

296 msgstr ""

297

298 -#: apply.c:3198

298 +#: apply.c:3203

299 #, c-format

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

301 msgstr ""

302

303 -#: apply.c:3204

303 +#: apply.c:3209

304 #, c-format

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

306 msgstr ""

307

308 -#: apply.c:3225

308 +#: apply.c:3230

309 #, c-format

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

311 msgstr ""

312

313 -#: apply.c:3347

313 +#: apply.c:3352

314 #, c-format

315 msgid "cannot checkout %s"

316 msgstr ""

317

318 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

318 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

322

323 -#: apply.c:3404

323 +#: apply.c:3412

324 #, c-format

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

326 msgstr ""

327

328 -#: apply.c:3433 apply.c:3673

328 +#: apply.c:3441 apply.c:3681

329 #, c-format

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

331 msgstr ""

332

333 -#: apply.c:3516 apply.c:3687

333 +#: apply.c:3524 apply.c:3696

334 #, c-format

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

336 msgstr ""

337

338 -#: apply.c:3525 apply.c:3695

338 +#: apply.c:3533 apply.c:3704

339 #, c-format

340 msgid "%s: does not match index"

341 msgstr ""

342

343 -#: apply.c:3560

343 +#: apply.c:3568

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

345 msgstr ""

346

347 -#: apply.c:3563

347 +#: apply.c:3571

348 #, c-format

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

350 msgstr ""

351

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

352 +#: apply.c:3587 apply.c:3591

353 #, c-format

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

355 msgstr ""

356

357 -#: apply.c:3595

357 +#: apply.c:3603

358 #, c-format

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

360 msgstr ""

361

362 -#: apply.c:3609

362 +#: apply.c:3617

363 #, c-format

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

365 msgstr ""

366

367 -#: apply.c:3614

367 +#: apply.c:3622

368 #, c-format

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

370 msgstr ""

371

372 -#: apply.c:3640

372 +#: apply.c:3648

373 msgid "removal patch leaves file contents"

374 msgstr ""

375

376 -#: apply.c:3712

376 +#: apply.c:3721

377 #, c-format

378 msgid "%s: wrong type"

379 msgstr ""

380

381 -#: apply.c:3714

381 +#: apply.c:3723

382 #, c-format

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

384 msgstr ""

385

386 -#: apply.c:3864 apply.c:3866

386 +#: apply.c:3874 apply.c:3876

387 #, c-format

388 msgid "invalid path '%s'"

389 msgstr ""

390

391 -#: apply.c:3922

391 +#: apply.c:3932

392 #, c-format

393 msgid "%s: already exists in index"

394 msgstr ""

395

396 -#: apply.c:3925

396 +#: apply.c:3935

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3945

401 +#: apply.c:3955

402 #, c-format

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

404 msgstr ""

405

406 -#: apply.c:3950

406 +#: apply.c:3960

407 #, c-format

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

409 msgstr ""

410

411 -#: apply.c:3970

411 +#: apply.c:3980

412 #, c-format

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

414 msgstr ""

415

416 -#: apply.c:3974

416 +#: apply.c:3984

417 #, c-format

418 msgid "%s: patch does not apply"

419 msgstr ""

420

421 -#: apply.c:3989

421 +#: apply.c:3999

422 #, c-format

423 msgid "Checking patch %s..."

424 msgstr ""

425

426 -#: apply.c:4080

426 +#: apply.c:4091

427 #, c-format

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

429 msgstr ""

430

431 -#: apply.c:4087

431 +#: apply.c:4098

432 #, c-format

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

434 msgstr ""

435

436 -#: apply.c:4090

436 +#: apply.c:4101

437 #, c-format

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

439 msgstr ""

440

441 -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

441 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

442 #, c-format

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

444 msgstr ""

445

446 -#: apply.c:4099

446 +#: apply.c:4110

447 #, c-format

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

449 msgstr ""

450

451 -#: apply.c:4109

451 +#: apply.c:4120

452 #, c-format

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

454 msgstr ""

455

456 -#: apply.c:4247

456 +#: apply.c:4258

457 #, c-format

458 msgid "unable to remove %s from index"

459 msgstr ""

460

461 -#: apply.c:4282

461 +#: apply.c:4292

462 #, c-format

463 msgid "corrupt patch for submodule %s"

464 msgstr ""

465

466 -#: apply.c:4288

466 +#: apply.c:4298

467 #, c-format

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

469 msgstr ""

470

471 -#: apply.c:4296

471 +#: apply.c:4306

472 #, c-format

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

474 msgstr ""

475

476 -#: apply.c:4302 apply.c:4446

476 +#: apply.c:4312 apply.c:4457

477 #, c-format

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

479 msgstr ""

480

481 -#: apply.c:4343

481 +#: apply.c:4355

482 #, c-format

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

484 msgstr ""

485

486 -#: apply.c:4347

486 +#: apply.c:4359

487 #, c-format

488 msgid "closing file '%s'"

489 msgstr ""

490

491 -#: apply.c:4417

491 +#: apply.c:4429

492 #, c-format

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

494 msgstr ""

495

496 -#: apply.c:4515

496 +#: apply.c:4527

497 #, c-format

498 msgid "Applied patch %s cleanly."

499 msgstr ""

500

501 -#: apply.c:4523

501 +#: apply.c:4535

502 msgid "internal error"

503 msgstr ""

504

505 -#: apply.c:4526

505 +#: apply.c:4538

506 #, c-format

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

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

509 msgstr[0] ""

510 msgstr[1] ""

511

512 -#: apply.c:4537

512 +#: apply.c:4549

513 #, c-format

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

515 msgstr ""

516

517 -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

517 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

521

522 -#: apply.c:4559

522 +#: apply.c:4571

523 #, c-format

524 msgid "Hunk #%d applied cleanly."

525 msgstr ""

526

527 -#: apply.c:4563

527 +#: apply.c:4575

528 #, c-format

529 msgid "Rejected hunk #%d."

530 msgstr ""

531

532 -#: apply.c:4673

532 +#: apply.c:4685

533 #, c-format

534 msgid "Skipped patch '%s'."

535 msgstr ""

536

537 -#: apply.c:4681

537 +#: apply.c:4693

538 msgid "unrecognized input"

539 msgstr ""

540

541 -#: apply.c:4700

541 +#: apply.c:4712

542 msgid "unable to read index file"

543 msgstr ""

544

545 -#: apply.c:4837

545 +#: apply.c:4849

546 #, c-format

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

548 msgstr ""

549

550 -#: apply.c:4864

550 +#: apply.c:4876

551 #, c-format

552 msgid "squelched %d whitespace error"

553 msgid_plural "squelched %d whitespace errors"

554 msgstr[0] ""

555 msgstr[1] ""

556

557 -#: apply.c:4870 apply.c:4885

557 +#: apply.c:4882 apply.c:4897

558 #, c-format

559 msgid "%d line adds whitespace errors."

560 msgid_plural "%d lines add whitespace errors."

561 msgstr[0] ""

562 msgstr[1] ""

563

564 -#: apply.c:4878

564 +#: apply.c:4890

565 #, c-format

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

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

568 msgstr[0] ""

569 msgstr[1] ""

570

571 -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

571 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

576 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

577 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

578 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

579 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

580 -#: git-add--interactive.perl:197

575 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

576 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

577 +#: builtin/pull.c:198 builtin/submodule--helper.c:406

578 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

579 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

580 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

581 msgid "path"

582 msgstr ""

583

584 -#: apply.c:4922

584 +#: apply.c:4934

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

586 msgstr ""

587

588 -#: apply.c:4925

588 +#: apply.c:4937

589 msgid "apply changes matching the given path"

590 msgstr ""

591

592 -#: apply.c:4927 builtin/am.c:2263

592 +#: apply.c:4939 builtin/am.c:2263

593 msgid "num"

594 msgstr ""

595

596 -#: apply.c:4928

596 +#: apply.c:4940

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

598 msgstr ""

599

600 -#: apply.c:4931

600 +#: apply.c:4943

601 msgid "ignore additions made by the patch"

602 msgstr ""

603

604 -#: apply.c:4933

604 +#: apply.c:4945

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

606 msgstr ""

607

608 -#: apply.c:4937

608 +#: apply.c:4949

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

610 msgstr ""

611

612 -#: apply.c:4939

612 +#: apply.c:4951

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

614 msgstr ""

615

616 -#: apply.c:4941

616 +#: apply.c:4953

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

618 msgstr ""

619

620 -#: apply.c:4943

620 +#: apply.c:4955

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

622 msgstr ""

623

624 -#: apply.c:4945

624 +#: apply.c:4957

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

626 +msgstr ""

627 +

628 +#: apply.c:4959

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

630 msgstr ""

631

628 -#: apply.c:4947

632 +#: apply.c:4961

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

634 msgstr ""

635

632 -#: apply.c:4950

636 +#: apply.c:4964

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

638 msgstr ""

639

636 -#: apply.c:4952

640 +#: apply.c:4966

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

642 msgstr ""

643

640 -#: apply.c:4954

644 +#: apply.c:4968

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

646 msgstr ""

647

644 -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

648 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

649 msgid "paths are separated with NUL character"

650 msgstr ""

651

648 -#: apply.c:4959

652 +#: apply.c:4973

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

654 msgstr ""

655

652 -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

656 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

657 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

654 -#: builtin/pack-objects.c:3177

658 +#: builtin/pack-objects.c:3205

659 msgid "action"

660 msgstr ""

661

658 -#: apply.c:4961

662 +#: apply.c:4975

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

664 msgstr ""

665

662 -#: apply.c:4964 apply.c:4967

666 +#: apply.c:4978 apply.c:4981

667 msgid "ignore changes in whitespace when finding context"

668 msgstr ""

669

666 -#: apply.c:4970

670 +#: apply.c:4984

671 msgid "apply the patch in reverse"

672 msgstr ""

673

670 -#: apply.c:4972

674 +#: apply.c:4986

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

676 msgstr ""

677

674 -#: apply.c:4974

678 +#: apply.c:4988

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

680 msgstr ""

681

678 -#: apply.c:4976

682 +#: apply.c:4990

683 msgid "allow overlapping hunks"

684 msgstr ""

685

682 -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

683 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

684 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

686 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

687 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

688 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

689 msgid "be verbose"

690 msgstr ""

691

688 -#: apply.c:4979

692 +#: apply.c:4993

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

694 msgstr ""

695

692 -#: apply.c:4982

696 +#: apply.c:4996

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

698 msgstr ""

699

696 -#: apply.c:4984 builtin/am.c:2251

700 +#: apply.c:4998 builtin/am.c:2251

701 msgid "root"

702 msgstr ""

703

700 -#: apply.c:4985

704 +#: apply.c:4999

705 msgid "prepend <root> to all filenames"

706 msgstr ""

707

704 -#: archive.c:13

708 +#: archive.c:14

709 msgid "git archive [<options>] <tree-ish> [<path>...]"

710 msgstr ""

711

708 -#: archive.c:14

712 +#: archive.c:15

713 msgid "git archive --list"

714 msgstr ""

715

712 -#: archive.c:15

716 +#: archive.c:16

717 msgid ""

718 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

719 msgstr ""

720

717 -#: archive.c:16

721 +#: archive.c:17

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

723 msgstr ""

724

721 -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

725 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

726 #, c-format

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

728 msgstr ""

729

726 -#: archive.c:434

730 +#: archive.c:446

731 msgid "fmt"

732 msgstr ""

733

730 -#: archive.c:434

734 +#: archive.c:446

735 msgid "archive format"

736 msgstr ""

737

734 -#: archive.c:435 builtin/log.c:1462

738 +#: archive.c:447 builtin/log.c:1473

739 msgid "prefix"

740 msgstr ""

741

738 -#: archive.c:436

742 +#: archive.c:448

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

744 msgstr ""

745

742 -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

743 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

744 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

745 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

746 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

747 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

748 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

749 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

750 #: parse-options.h:165

751 msgid "file"

752 msgstr ""

753

750 -#: archive.c:438 builtin/archive.c:89

754 +#: archive.c:450 builtin/archive.c:89

755 msgid "write the archive to this file"

756 msgstr ""

757

754 -#: archive.c:440

758 +#: archive.c:452

759 msgid "read .gitattributes in working directory"

760 msgstr ""

761

758 -#: archive.c:441

762 +#: archive.c:453

763 msgid "report archived files on stderr"

764 msgstr ""

765

762 -#: archive.c:442

766 +#: archive.c:454

767 msgid "store only"

768 msgstr ""

769

766 -#: archive.c:443

770 +#: archive.c:455

771 msgid "compress faster"

772 msgstr ""

773

770 -#: archive.c:451

774 +#: archive.c:463

775 msgid "compress better"

776 msgstr ""

777

774 -#: archive.c:454

778 +#: archive.c:466

779 msgid "list supported archive formats"

780 msgstr ""

781

778 -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

779 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

782 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

783 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

784 msgid "repo"

785 msgstr ""

786

783 -#: archive.c:457 builtin/archive.c:91

787 +#: archive.c:469 builtin/archive.c:91

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

789 msgstr ""

790

787 -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

791 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

792 +#: builtin/notes.c:491

793 msgid "command"

794 msgstr ""

795

791 -#: archive.c:459 builtin/archive.c:93

796 +#: archive.c:471 builtin/archive.c:93

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

798 msgstr ""

799

795 -#: archive.c:466

800 +#: archive.c:478

801 msgid "Unexpected option --remote"

802 msgstr ""

803

799 -#: archive.c:468

804 +#: archive.c:480

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

806 msgstr ""

807

803 -#: archive.c:470

808 +#: archive.c:482

809 msgid "Unexpected option --output"

810 msgstr ""

811

807 -#: archive.c:492

812 +#: archive.c:504

813 #, c-format

814 msgid "Unknown archive format '%s'"

815 msgstr ""

816

812 -#: archive.c:499

817 +#: archive.c:511

818 #, c-format

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

820 msgstr ""

821

822 +#: archive-tar.c:125 archive-zip.c:344

823 +#, c-format

824 +msgid "cannot stream blob %s"

825 +msgstr ""

826 +

827 +#: archive-tar.c:260 archive-zip.c:361

828 +#, c-format

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

830 +msgstr ""

831 +

832 +#: archive-tar.c:287 archive-zip.c:352

833 +#, c-format

834 +msgid "cannot read %s"

835 +msgstr ""

836 +

837 +#: archive-tar.c:458

838 +#, c-format

839 +msgid "unable to start '%s' filter"

840 +msgstr ""

841 +

842 +#: archive-tar.c:461

843 +msgid "unable to redirect descriptor"

844 +msgstr ""

845 +

846 +#: archive-tar.c:468

847 +#, c-format

848 +msgid "'%s' filter reported error"

849 +msgstr ""

850 +

851 +#: archive-zip.c:313

852 +#, c-format

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

854 +msgstr ""

855 +

856 +#: archive-zip.c:317

857 +#, c-format

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

859 +msgstr ""

860 +

861 +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

862 +#, c-format

863 +msgid "deflate error (%d)"

864 +msgstr ""

865 +

866 +#: archive-zip.c:605

867 +#, c-format

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

869 +msgstr ""

870 +

871 #: attr.c:218

872 #, c-format

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

@@ -825,43 +879,43 @@ msgid ""

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

880 msgstr ""

881

828 -#: bisect.c:461

882 +#: bisect.c:467

883 #, c-format

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

885 msgstr ""

886

833 -#: bisect.c:669

887 +#: bisect.c:675

888 #, c-format

889 msgid "We cannot bisect more!\n"

890 msgstr ""

891

838 -#: bisect.c:723

892 +#: bisect.c:729

893 #, c-format

894 msgid "Not a valid commit name %s"

895 msgstr ""

896

843 -#: bisect.c:747

897 +#: bisect.c:753

898 #, c-format

899 msgid ""

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

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

902 msgstr ""

903

850 -#: bisect.c:752

904 +#: bisect.c:758

905 #, c-format

906 msgid ""

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

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

909 msgstr ""

910

857 -#: bisect.c:757

911 +#: bisect.c:763

912 #, c-format

913 msgid ""

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

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

916 msgstr ""

917

864 -#: bisect.c:765

918 +#: bisect.c:771

919 #, c-format

920 msgid ""

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

@@ -869,7 +923,7 @@ msgid ""

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

924 msgstr ""

925

872 -#: bisect.c:778

926 +#: bisect.c:784

927 #, c-format

928 msgid ""

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

@@ -877,43 +931,43 @@ msgid ""

931 "We continue anyway."

932 msgstr ""

933

880 -#: bisect.c:811

934 +#: bisect.c:817

935 #, c-format

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

937 msgstr ""

938

885 -#: bisect.c:851

939 +#: bisect.c:857

940 #, c-format

941 msgid "a %s revision is needed"

942 msgstr ""

943

890 -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

944 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

945 #, c-format

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

947 msgstr ""

948

895 -#: bisect.c:921

949 +#: bisect.c:927 builtin/merge.c:137

950 #, c-format

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

952 msgstr ""

953

900 -#: bisect.c:951

954 +#: bisect.c:957

955 msgid "reading bisect refs failed"

956 msgstr ""

957

904 -#: bisect.c:970

958 +#: bisect.c:976

959 #, c-format

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

961 msgstr ""

962

909 -#: bisect.c:978

963 +#: bisect.c:984

964 #, c-format

965 msgid ""

966 "No testable commit found.\n"

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

968 msgstr ""

969

916 -#: bisect.c:997

970 +#: bisect.c:1003

971 #, c-format

972 msgid "(roughly %d step)"

973 msgid_plural "(roughly %d steps)"

@@ -923,43 +977,44 @@ msgstr[1] ""

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

978 #. steps)" translation.

979 #.

926 -#: bisect.c:1003

980 +#: bisect.c:1009

981 #, c-format

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

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

984 msgstr[0] ""

985 msgstr[1] ""

986

933 -#: blame.c:1756

987 +#: blame.c:1786

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

989 msgstr ""

990

937 -#: blame.c:1767

991 +#: blame.c:1800

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

993 msgstr ""

994

941 -#: blame.c:1787

995 +#: blame.c:1821

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

997 msgstr ""

998

945 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

946 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

947 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

999 +#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1000 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1001 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1002 +#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047

1003 #: builtin/shortlog.c:192

1004 msgid "revision walk setup failed"

1005 msgstr ""

1006

952 -#: blame.c:1814

1007 +#: blame.c:1848

1008 msgid ""

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

1010 msgstr ""

1011

957 -#: blame.c:1825

1012 +#: blame.c:1859

1013 #, c-format

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

1015 msgstr ""

1016

962 -#: blame.c:1836

1017 +#: blame.c:1870

1018 #, c-format

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

1020 msgstr ""

@@ -1088,75 +1143,75 @@ msgstr ""

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

1144 msgstr ""

1145

1091 -#: bundle.c:34

1146 +#: bundle.c:36

1147 #, c-format

1148 msgid "'%s' does not look like a v2 bundle file"

1149 msgstr ""

1150

1096 -#: bundle.c:62

1151 +#: bundle.c:64

1152 #, c-format

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

1154 msgstr ""

1155

1101 -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1156 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1157 #, c-format

1158 msgid "could not open '%s'"

1159 msgstr ""

1160

1106 -#: bundle.c:139

1161 +#: bundle.c:141

1162 msgid "Repository lacks these prerequisite commits:"

1163 msgstr ""

1164

1110 -#: bundle.c:190

1165 +#: bundle.c:192

1166 #, c-format

1167 msgid "The bundle contains this ref:"

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

1169 msgstr[0] ""

1170 msgstr[1] ""

1171

1117 -#: bundle.c:197

1172 +#: bundle.c:199

1173 msgid "The bundle records a complete history."

1174 msgstr ""

1175

1121 -#: bundle.c:199

1176 +#: bundle.c:201

1177 #, c-format

1178 msgid "The bundle requires this ref:"

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

1180 msgstr[0] ""

1181 msgstr[1] ""

1182

1128 -#: bundle.c:258

1183 +#: bundle.c:260

1184 msgid "Could not spawn pack-objects"

1185 msgstr ""

1186

1132 -#: bundle.c:269

1187 +#: bundle.c:271

1188 msgid "pack-objects died"

1189 msgstr ""

1190

1136 -#: bundle.c:311

1191 +#: bundle.c:313

1192 msgid "rev-list died"

1193 msgstr ""

1194

1140 -#: bundle.c:360

1195 +#: bundle.c:362

1196 #, c-format

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

1198 msgstr ""

1199

1145 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1200 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1201 #, c-format

1202 msgid "unrecognized argument: %s"

1203 msgstr ""

1204

1150 -#: bundle.c:458

1205 +#: bundle.c:461

1206 msgid "Refusing to create empty bundle."

1207 msgstr ""

1208

1154 -#: bundle.c:470

1209 +#: bundle.c:473

1210 #, c-format

1211 msgid "cannot create '%s'"

1212 msgstr ""

1213

1159 -#: bundle.c:498

1214 +#: bundle.c:501

1215 msgid "index-pack died"

1216 msgstr ""

1217

@@ -1165,19 +1220,19 @@ msgstr ""

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

1221 msgstr ""

1222

1168 -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1169 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1223 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1224 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1225 #: builtin/replace.c:448

1226 #, c-format

1227 msgid "could not parse %s"

1228 msgstr ""

1229

1175 -#: commit.c:45

1230 +#: commit.c:50

1231 #, c-format

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

1233 msgstr ""

1234

1180 -#: commit.c:182

1235 +#: commit.c:191

1236 msgid ""

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

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

@@ -1189,188 +1244,389 @@ msgid ""

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

1245 msgstr ""

1246

1192 -#: commit.c:1540

1247 +#: commit.c:1629

1248 msgid ""

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

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

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

1252 msgstr ""

1253

1199 -#: commit-graph.c:669

1254 +#: commit-graph.c:83

1255 +#, c-format

1256 +msgid "graph file %s is too small"

1257 +msgstr ""

1258 +

1259 +#: commit-graph.c:90

1260 +#, c-format

1261 +msgid "graph signature %X does not match signature %X"

1262 +msgstr ""

1263 +

1264 +#: commit-graph.c:97

1265 +#, c-format

1266 +msgid "graph version %X does not match version %X"

1267 +msgstr ""

1268 +

1269 +#: commit-graph.c:104

1270 +#, c-format

1271 +msgid "hash version %X does not match version %X"

1272 +msgstr ""

1273 +

1274 +#: commit-graph.c:128

1275 +#, c-format

1276 +msgid "improper chunk offset %08x%08x"

1277 +msgstr ""

1278 +

1279 +#: commit-graph.c:164

1280 +#, c-format

1281 +msgid "chunk id %08x appears multiple times"

1282 +msgstr ""

1283 +

1284 +#: commit-graph.c:261

1285 +#, c-format

1286 +msgid "could not find commit %s"

1287 +msgstr ""

1288 +

1289 +#: commit-graph.c:565 builtin/pack-objects.c:2571

1290 +#, c-format

1291 +msgid "unable to get type of object %s"

1292 +msgstr ""

1293 +

1294 +#: commit-graph.c:730

1295 +#, c-format

1296 +msgid "error adding pack %s"

1297 +msgstr ""

1298 +

1299 +#: commit-graph.c:732

1300 +#, c-format

1301 +msgid "error opening index for %s"

1302 +msgstr ""

1303 +

1304 +#: commit-graph.c:773

1305 #, c-format

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

1307 msgstr ""

1308

1204 -#: commit-graph.c:696

1309 +#: commit-graph.c:800

1310 msgid "too many commits to write graph"

1311 msgstr ""

1312

1208 -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1313 +#: commit-graph.c:806

1314 #, c-format

1210 -msgid "cannot mkdir %s"

1315 +msgid "unable to create leading directories of %s"

1316 +msgstr ""

1317 +

1318 +#: commit-graph.c:904

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

1320 msgstr ""

1321

1322 #: compat/obstack.c:405 compat/obstack.c:407

1323 msgid "memory exhausted"

1324 msgstr ""

1325

1217 -#: config.c:187

1326 +#: config.c:123

1327 +#, c-format

1328 +msgid ""

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

1330 +"\t%s\n"

1331 +"from\n"

1332 +"\t%s\n"

1333 +"Do you have circular includes?"

1334 +msgstr ""

1335 +

1336 +#: config.c:139

1337 +#, c-format

1338 +msgid "could not expand include path '%s'"

1339 +msgstr ""

1340 +

1341 +#: config.c:150

1342 +msgid "relative config includes must come from files"

1343 +msgstr ""

1344 +

1345 +#: config.c:190

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

1347 msgstr ""

1348

1221 -#: config.c:788

1349 +#: config.c:348

1350 +#, c-format

1351 +msgid "key does not contain a section: %s"

1352 +msgstr ""

1353 +

1354 +#: config.c:354

1355 +#, c-format

1356 +msgid "key does not contain variable name: %s"

1357 +msgstr ""

1358 +

1359 +#: config.c:378 sequencer.c:2206

1360 +#, c-format

1361 +msgid "invalid key: %s"

1362 +msgstr ""

1363 +

1364 +#: config.c:384

1365 +#, c-format

1366 +msgid "invalid key (newline): %s"

1367 +msgstr ""

1368 +

1369 +#: config.c:420 config.c:432

1370 +#, c-format

1371 +msgid "bogus config parameter: %s"

1372 +msgstr ""

1373 +

1374 +#: config.c:467

1375 +#, c-format

1376 +msgid "bogus format in %s"

1377 +msgstr ""

1378 +

1379 +#: config.c:793

1380 #, c-format

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

1382 msgstr ""

1383

1226 -#: config.c:792

1384 +#: config.c:797

1385 #, c-format

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

1387 msgstr ""

1388

1231 -#: config.c:796

1389 +#: config.c:801

1390 #, c-format

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

1392 msgstr ""

1393

1236 -#: config.c:800

1394 +#: config.c:805

1395 #, c-format

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

1397 msgstr ""

1398

1241 -#: config.c:804

1399 +#: config.c:809

1400 #, c-format

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

1402 msgstr ""

1403

1246 -#: config.c:808

1404 +#: config.c:813

1405 #, c-format

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

1407 msgstr ""

1408

1251 -#: config.c:936

1409 +#: config.c:952

1410 msgid "out of range"

1411 msgstr ""

1412

1255 -#: config.c:936

1413 +#: config.c:952

1414 msgid "invalid unit"

1415 msgstr ""

1416

1259 -#: config.c:942

1417 +#: config.c:958

1418 #, c-format

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

1420 msgstr ""

1421

1264 -#: config.c:947

1422 +#: config.c:963

1423 #, c-format

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

1425 msgstr ""

1426

1269 -#: config.c:950

1427 +#: config.c:966

1428 #, c-format

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

1430 msgstr ""

1431

1274 -#: config.c:953

1432 +#: config.c:969

1433 #, c-format

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

1435 msgstr ""

1436

1279 -#: config.c:956

1437 +#: config.c:972

1438 #, c-format

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

1440 msgstr ""

1441

1284 -#: config.c:959

1442 +#: config.c:975

1443 #, c-format

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

1445 msgstr ""

1446

1289 -#: config.c:962

1447 +#: config.c:978

1448 #, c-format

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

1450 msgstr ""

1451

1294 -#: config.c:1057

1452 +#: config.c:1073

1453 #, c-format

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

1455 msgstr ""

1456

1299 -#: config.c:1066

1457 +#: config.c:1082

1458 #, c-format

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

1460 msgstr ""

1461

1304 -#: config.c:1171 config.c:1182

1462 +#: config.c:1173

1463 +#, c-format

1464 +msgid "abbrev length out of range: %d"

1465 +msgstr ""

1466 +

1467 +#: config.c:1187 config.c:1198

1468 #, c-format

1469 msgid "bad zlib compression level %d"

1470 msgstr ""

1471

1309 -#: config.c:1307

1472 +#: config.c:1290

1473 +msgid "core.commentChar should only be one character"

1474 +msgstr ""

1475 +

1476 +#: config.c:1323

1477 #, c-format

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

1479 msgstr ""

1480

1314 -#: config.c:1473

1481 +#: config.c:1403

1482 +#, c-format

1483 +msgid "malformed value for %s"

1484 +msgstr ""

1485 +

1486 +#: config.c:1429

1487 +#, c-format

1488 +msgid "malformed value for %s: %s"

1489 +msgstr ""

1490 +

1491 +#: config.c:1430

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

1493 +msgstr ""

1494 +

1495 +#: config.c:1489 builtin/pack-objects.c:3282

1496 #, c-format

1497 msgid "bad pack compression level %d"

1498 msgstr ""

1499

1319 -#: config.c:1681

1500 +#: config.c:1610

1501 +#, c-format

1502 +msgid "unable to load config blob object '%s'"

1503 +msgstr ""

1504 +

1505 +#: config.c:1613

1506 +#, c-format

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

1508 +msgstr ""

1509 +

1510 +#: config.c:1630

1511 +#, c-format

1512 +msgid "unable to resolve config blob '%s'"

1513 +msgstr ""

1514 +

1515 +#: config.c:1660

1516 +#, c-format

1517 +msgid "failed to parse %s"

1518 +msgstr ""

1519 +

1520 +#: config.c:1700

1521 msgid "unable to parse command-line config"

1522 msgstr ""

1523

1323 -#: config.c:2013

1524 +#: config.c:2032

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

1526 msgstr ""

1527

1327 -#: config.c:2200

1528 +#: config.c:2202

1529 #, c-format

1530 msgid "Invalid %s: '%s'"

1531 msgstr ""

1532

1332 -#: config.c:2243

1533 +#: config.c:2245

1534 #, c-format

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

1536 msgstr ""

1537

1337 -#: config.c:2269

1538 +#: config.c:2271

1539 #, c-format

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

1541 msgstr ""

1542

1342 -#: config.c:2294

1543 +#: config.c:2296

1544 #, c-format

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

1546 msgstr ""

1547

1347 -#: config.c:2296

1548 +#: config.c:2298

1549 #, c-format

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

1551 msgstr ""

1552

1352 -#: config.c:2402

1553 +#: config.c:2379

1554 +#, c-format

1555 +msgid "invalid section name '%s'"

1556 +msgstr ""

1557 +

1558 +#: config.c:2411

1559 #, c-format

1560 msgid "%s has multiple values"

1561 msgstr ""

1562

1357 -#: config.c:2766 config.c:3019

1563 +#: config.c:2440

1564 +#, c-format

1565 +msgid "failed to write new configuration file %s"

1566 +msgstr ""

1567 +

1568 +#: config.c:2691 config.c:3015

1569 +#, c-format

1570 +msgid "could not lock config file %s"

1571 +msgstr ""

1572 +

1573 +#: config.c:2702

1574 +#, c-format

1575 +msgid "opening %s"

1576 +msgstr ""

1577 +

1578 +#: config.c:2737 builtin/config.c:324

1579 +#, c-format

1580 +msgid "invalid pattern: %s"

1581 +msgstr ""

1582 +

1583 +#: config.c:2762

1584 +#, c-format

1585 +msgid "invalid config file %s"

1586 +msgstr ""

1587 +

1588 +#: config.c:2775 config.c:3028

1589 #, c-format

1590 msgid "fstat on %s failed"

1591 msgstr ""

1592

1362 -#: config.c:2905

1593 +#: config.c:2786

1594 +#, c-format

1595 +msgid "unable to mmap '%s'"

1596 +msgstr ""

1597 +

1598 +#: config.c:2795 config.c:3033

1599 +#, c-format

1600 +msgid "chmod on %s failed"

1601 +msgstr ""

1602 +

1603 +#: config.c:2880 config.c:3130

1604 +#, c-format

1605 +msgid "could not write config file %s"

1606 +msgstr ""

1607 +

1608 +#: config.c:2914

1609 #, c-format

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

1611 msgstr ""

1612

1367 -#: config.c:2907 builtin/remote.c:779

1613 +#: config.c:2916 builtin/remote.c:781

1614 #, c-format

1615 msgid "could not unset '%s'"

1616 msgstr ""

1617

1618 +#: config.c:3006

1619 +#, c-format

1620 +msgid "invalid section name: %s"

1621 +msgstr ""

1622 +

1623 +#: config.c:3173

1624 +#, c-format

1625 +msgid "missing value for '%s'"

1626 +msgstr ""

1627 +

1628 #: connect.c:61

1373 -msgid "The remote end hung up upon initial contact"

1629 +msgid "the remote end hung up upon initial contact"

1630 msgstr ""

1631

1632 #: connect.c:63

@@ -1381,122 +1637,321 @@ msgid ""

1637 "and the repository exists."

1638 msgstr ""

1639

1384 -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1385 -msgid "Checking connectivity"

1640 +#: connect.c:81

1641 +#, c-format

1642 +msgid "server doesn't support '%s'"

1643 msgstr ""

1644

1388 -#: connected.c:78

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

1645 +#: connect.c:103

1646 +#, c-format

1647 +msgid "server doesn't support feature '%s'"

1648 msgstr ""

1649

1392 -#: connected.c:98

1393 -msgid "failed write to rev-list"

1650 +#: connect.c:114

1651 +msgid "expected flush after capabilities"

1652 msgstr ""

1653

1396 -#: connected.c:105

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

1654 +#: connect.c:233

1655 +#, c-format

1656 +msgid "ignoring capabilities after first line '%s'"

1657 msgstr ""

1658

1400 -#: convert.c:206

1401 -#, c-format

1402 -msgid "CRLF would be replaced by LF in %s."

1659 +#: connect.c:252

1660 +msgid "protocol error: unexpected capabilities^{}"

1661 msgstr ""

1662

1405 -#: convert.c:208

1663 +#: connect.c:273

1664 #, c-format

1407 -msgid ""

1408 -"CRLF will be replaced by LF in %s.\n"

1409 -"The file will have its original line endings in your working directory."

1665 +msgid "protocol error: expected shallow sha-1, got '%s'"

1666 msgstr ""

1667

1412 -#: convert.c:216

1413 -#, c-format

1414 -msgid "LF would be replaced by CRLF in %s"

1668 +#: connect.c:275

1669 +msgid "repository on the other end cannot be shallow"

1670 msgstr ""

1671

1417 -#: convert.c:218

1672 +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1673 #, c-format

1419 -msgid ""

1420 -"LF will be replaced by CRLF in %s.\n"

1421 -"The file will have its original line endings in your working directory."

1674 +msgid "remote error: %s"

1675 msgstr ""

1676

1424 -#: convert.c:279

1677 +#: connect.c:316

1678 +msgid "invalid packet"

1679 +msgstr ""

1680 +

1681 +#: connect.c:336

1682 #, c-format

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

1683 +msgid "protocol error: unexpected '%s'"

1684 msgstr ""

1685

1429 -#: convert.c:286

1686 +#: connect.c:444

1687 #, c-format

1431 -msgid ""

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

1433 -"tree-encoding."

1688 +msgid "invalid ls-refs response: %s"

1689 +msgstr ""

1690 +

1691 +#: connect.c:448

1692 +msgid "expected flush after ref listing"

1693 msgstr ""

1694

1436 -#: convert.c:304

1695 +#: connect.c:547

1696 #, c-format

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

1697 +msgid "protocol '%s' is not supported"

1698 +msgstr ""

1699 +

1700 +#: connect.c:598

1701 +msgid "unable to set SO_KEEPALIVE on socket"

1702 msgstr ""

1703

1441 -#: convert.c:306

1704 +#: connect.c:638 connect.c:701

1705 #, c-format

1443 -msgid ""

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

1445 -"%sLE (depending on the byte order) as working-tree-encoding."

1706 +msgid "Looking up %s ... "

1707 msgstr ""

1708

1448 -#: convert.c:424

1709 +#: connect.c:642

1710 #, c-format

1450 -msgid "failed to encode '%s' from %s to %s"

1711 +msgid "unable to look up %s (port %s) (%s)"

1712 msgstr ""

1713

1453 -#: convert.c:467

1714 +#. TRANSLATORS: this is the end of "Looking up %s ... "

1715 +#: connect.c:646 connect.c:717

1716 #, c-format

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

1717 +msgid ""

1718 +"done.\n"

1719 +"Connecting to %s (port %s) ... "

1720 msgstr ""

1721

1458 -#: convert.c:1225

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

1722 +#: connect.c:668 connect.c:745

1723 +#, c-format

1724 +msgid ""

1725 +"unable to connect to %s:\n"

1726 +"%s"

1727 msgstr ""

1728

1462 -#: date.c:116

1463 -msgid "in the future"

1729 +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1730 +#: connect.c:674 connect.c:751

1731 +msgid "done."

1732 msgstr ""

1733

1466 -#: date.c:122

1734 +#: connect.c:705

1735 #, c-format

1468 -msgid "%<PRIuMAX> second ago"

1469 -msgid_plural "%<PRIuMAX> seconds ago"

1470 -msgstr[0] ""

1471 -msgstr[1] ""

1736 +msgid "unable to look up %s (%s)"

1737 +msgstr ""

1738

1473 -#: date.c:129

1739 +#: connect.c:711

1740 #, c-format

1475 -msgid "%<PRIuMAX> minute ago"

1476 -msgid_plural "%<PRIuMAX> minutes ago"

1477 -msgstr[0] ""

1478 -msgstr[1] ""

1741 +msgid "unknown port %s"

1742 +msgstr ""

1743

1480 -#: date.c:136

1744 +#: connect.c:848 connect.c:1174

1745 #, c-format

1482 -msgid "%<PRIuMAX> hour ago"

1483 -msgid_plural "%<PRIuMAX> hours ago"

1484 -msgstr[0] ""

1485 -msgstr[1] ""

1746 +msgid "strange hostname '%s' blocked"

1747 +msgstr ""

1748

1487 -#: date.c:143

1749 +#: connect.c:850

1750 #, c-format

1489 -msgid "%<PRIuMAX> day ago"

1490 -msgid_plural "%<PRIuMAX> days ago"

1491 -msgstr[0] ""

1492 -msgstr[1] ""

1751 +msgid "strange port '%s' blocked"

1752 +msgstr ""

1753

1494 -#: date.c:149

1754 +#: connect.c:860

1755 #, c-format

1496 -msgid "%<PRIuMAX> week ago"

1497 -msgid_plural "%<PRIuMAX> weeks ago"

1498 -msgstr[0] ""

1499 -msgstr[1] ""

1756 +msgid "cannot start proxy %s"

1757 +msgstr ""

1758 +

1759 +#: connect.c:927

1760 +msgid "no path specified; see 'git help pull' for valid url syntax"

1761 +msgstr ""

1762 +

1763 +#: connect.c:1122

1764 +msgid "ssh variant 'simple' does not support -4"

1765 +msgstr ""

1766 +

1767 +#: connect.c:1134

1768 +msgid "ssh variant 'simple' does not support -6"

1769 +msgstr ""

1770 +

1771 +#: connect.c:1151

1772 +msgid "ssh variant 'simple' does not support setting port"

1773 +msgstr ""

1774 +

1775 +#: connect.c:1262

1776 +#, c-format

1777 +msgid "strange pathname '%s' blocked"

1778 +msgstr ""

1779 +

1780 +#: connect.c:1307

1781 +msgid "unable to fork"

1782 +msgstr ""

1783 +

1784 +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1785 +msgid "Checking connectivity"

1786 +msgstr ""

1787 +

1788 +#: connected.c:80

1789 +msgid "Could not run 'git rev-list'"

1790 +msgstr ""

1791 +

1792 +#: connected.c:100

1793 +msgid "failed write to rev-list"

1794 +msgstr ""

1795 +

1796 +#: connected.c:107

1797 +msgid "failed to close rev-list's stdin"

1798 +msgstr ""

1799 +

1800 +#: convert.c:194

1801 +#, c-format

1802 +msgid "illegal crlf_action %d"

1803 +msgstr ""

1804 +

1805 +#: convert.c:207

1806 +#, c-format

1807 +msgid "CRLF would be replaced by LF in %s"

1808 +msgstr ""

1809 +

1810 +#: convert.c:209

1811 +#, c-format

1812 +msgid ""

1813 +"CRLF will be replaced by LF in %s.\n"

1814 +"The file will have its original line endings in your working directory"

1815 +msgstr ""

1816 +

1817 +#: convert.c:217

1818 +#, c-format

1819 +msgid "LF would be replaced by CRLF in %s"

1820 +msgstr ""

1821 +

1822 +#: convert.c:219

1823 +#, c-format

1824 +msgid ""

1825 +"LF will be replaced by CRLF in %s.\n"

1826 +"The file will have its original line endings in your working directory"

1827 +msgstr ""

1828 +

1829 +#: convert.c:280

1830 +#, c-format

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

1832 +msgstr ""

1833 +

1834 +#: convert.c:287

1835 +#, c-format

1836 +msgid ""

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

1838 +"tree-encoding."

1839 +msgstr ""

1840 +

1841 +#: convert.c:305

1842 +#, c-format

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

1844 +msgstr ""

1845 +

1846 +#: convert.c:307

1847 +#, c-format

1848 +msgid ""

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

1850 +"%sLE (depending on the byte order) as working-tree-encoding."

1851 +msgstr ""

1852 +

1853 +#: convert.c:425 convert.c:496

1854 +#, c-format

1855 +msgid "failed to encode '%s' from %s to %s"

1856 +msgstr ""

1857 +

1858 +#: convert.c:468

1859 +#, c-format

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

1861 +msgstr ""

1862 +

1863 +#: convert.c:674

1864 +#, c-format

1865 +msgid "cannot fork to run external filter '%s'"

1866 +msgstr ""

1867 +

1868 +#: convert.c:694

1869 +#, c-format

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

1871 +msgstr ""

1872 +

1873 +#: convert.c:701

1874 +#, c-format

1875 +msgid "external filter '%s' failed %d"

1876 +msgstr ""

1877 +

1878 +#: convert.c:736 convert.c:739

1879 +#, c-format

1880 +msgid "read from external filter '%s' failed"

1881 +msgstr ""

1882 +

1883 +#: convert.c:742 convert.c:796

1884 +#, c-format

1885 +msgid "external filter '%s' failed"

1886 +msgstr ""

1887 +

1888 +#: convert.c:844

1889 +msgid "unexpected filter type"

1890 +msgstr ""

1891 +

1892 +#: convert.c:855

1893 +msgid "path name too long for external filter"

1894 +msgstr ""

1895 +

1896 +#: convert.c:929

1897 +#, c-format

1898 +msgid ""

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

1900 +"been filtered"

1901 +msgstr ""

1902 +

1903 +#: convert.c:1228

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

1905 +msgstr ""

1906 +

1907 +#: convert.c:1402 convert.c:1436

1908 +#, c-format

1909 +msgid "%s: clean filter '%s' failed"

1910 +msgstr ""

1911 +

1912 +#: convert.c:1480

1913 +#, c-format

1914 +msgid "%s: smudge filter %s failed"

1915 +msgstr ""

1916 +

1917 +#: date.c:116

1918 +msgid "in the future"

1919 +msgstr ""

1920 +

1921 +#: date.c:122

1922 +#, c-format

1923 +msgid "%<PRIuMAX> second ago"

1924 +msgid_plural "%<PRIuMAX> seconds ago"

1925 +msgstr[0] ""

1926 +msgstr[1] ""

1927 +

1928 +#: date.c:129

1929 +#, c-format

1930 +msgid "%<PRIuMAX> minute ago"

1931 +msgid_plural "%<PRIuMAX> minutes ago"

1932 +msgstr[0] ""

1933 +msgstr[1] ""

1934 +

1935 +#: date.c:136

1936 +#, c-format

1937 +msgid "%<PRIuMAX> hour ago"

1938 +msgid_plural "%<PRIuMAX> hours ago"

1939 +msgstr[0] ""

1940 +msgstr[1] ""

1941 +

1942 +#: date.c:143

1943 +#, c-format

1944 +msgid "%<PRIuMAX> day ago"

1945 +msgid_plural "%<PRIuMAX> days ago"

1946 +msgstr[0] ""

1947 +msgstr[1] ""

1948 +

1949 +#: date.c:149

1950 +#, c-format

1951 +msgid "%<PRIuMAX> week ago"

1952 +msgid_plural "%<PRIuMAX> weeks ago"

1953 +msgstr[0] ""

1954 +msgstr[1] ""

1955

1956 #: date.c:156

1957 #, c-format

@@ -1532,105 +1987,131 @@ msgstr[1] ""

1987 msgid "failed to read orderfile '%s'"

1988 msgstr ""

1989

1535 -#: diffcore-rename.c:535

1990 +#: diffcore-rename.c:536

1991 msgid "Performing inexact rename detection"

1992 msgstr ""

1993

1539 -#: diff.c:74

1994 +#: diff.c:108

1995 #, c-format

1996 msgid "option '%s' requires a value"

1997 msgstr ""

1998

1544 -#: diff.c:152

1999 +#: diff.c:158

2000 #, c-format

2001 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

2002 msgstr ""

2003

1549 -#: diff.c:157

2004 +#: diff.c:163

2005 #, c-format

2006 msgid " Unknown dirstat parameter '%s'\n"

2007 msgstr ""

2008

1554 -#: diff.c:281

2009 +#: diff.c:291

2010 msgid ""

1556 -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1557 -"'plain'"

2011 +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

2012 +"'dimmed-zebra', 'plain'"

2013 msgstr ""

2014

1560 -#: diff.c:341

2015 +#: diff.c:316

2016 +#, c-format

2017 +msgid "ignoring unknown color-moved-ws mode '%s'"

2018 +msgstr ""

2019 +

2020 +#: diff.c:323

2021 +msgid ""

2022 +"color-moved-ws: allow-indentation-change cannot be combined with other white "

2023 +"space modes"

2024 +msgstr ""

2025 +

2026 +#: diff.c:394

2027 #, c-format

2028 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

2029 msgstr ""

2030

1565 -#: diff.c:401

2031 +#: diff.c:454

2032 #, c-format

2033 msgid ""

2034 "Found errors in 'diff.dirstat' config variable:\n"

2035 "%s"

2036 msgstr ""

2037

1572 -#: diff.c:3823

2038 +#: diff.c:4096

2039 #, c-format

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

2041 msgstr ""

2042

1577 -#: diff.c:4153

2043 +#: diff.c:4427

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

2045 msgstr ""

2046

1581 -#: diff.c:4156

2047 +#: diff.c:4430

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

2049 msgstr ""

2050

1585 -#: diff.c:4244

2051 +#: diff.c:4508

2052 msgid "--follow requires exactly one pathspec"

2053 msgstr ""

2054

1589 -#: diff.c:4410

2055 +#: diff.c:4674

2056 #, c-format

2057 msgid ""

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

2059 "%s"

2060 msgstr ""

2061

1596 -#: diff.c:4424

2062 +#: diff.c:4688

2063 #, c-format

2064 msgid "Failed to parse --submodule option parameter: '%s'"

2065 msgstr ""

2066

1601 -#: diff.c:5500

2067 +#: diff.c:5766

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

2069 msgstr ""

2070

1605 -#: diff.c:5503

2071 +#: diff.c:5769

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

2073 msgstr ""

2074

1609 -#: diff.c:5506

2075 +#: diff.c:5772

2076 #, c-format

2077 msgid ""

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

2079 msgstr ""

2080

1615 -#: dir.c:1867

2081 +#: dir.c:569

2082 +#, c-format

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

2084 +msgstr ""

2085 +

2086 +#: dir.c:958

2087 +#, c-format

2088 +msgid "cannot use %s as an exclude file"

2089 +msgstr ""

2090 +

2091 +#: dir.c:1873

2092 #, c-format

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

2094 msgstr ""

2095

1620 -#: dir.c:2109

2096 +#: dir.c:2115

2097 msgid "failed to get kernel name and information"

2098 msgstr ""

2099

1624 -#: dir.c:2233

1625 -msgid "Untracked cache is disabled on this system or location."

2100 +#: dir.c:2239

2101 +msgid "untracked cache is disabled on this system or location"

2102 msgstr ""

2103

1628 -#: dir.c:3075 dir.c:3080

2104 +#: dir.c:3037

2105 +#, c-format

2106 +msgid "index file corrupt in repo %s"

2107 +msgstr ""

2108 +

2109 +#: dir.c:3082 dir.c:3087

2110 #, c-format

2111 msgid "could not create directories for %s"

2112 msgstr ""

2113

1633 -#: dir.c:3109

2114 +#: dir.c:3116

2115 #, c-format

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

2117 msgstr ""

@@ -1640,218 +2121,272 @@ msgstr ""

2121 msgid "hint: Waiting for your editor to close the file...%c"

2122 msgstr ""

2123

1643 -#: entry.c:177

2124 +#: entry.c:178

2125 msgid "Filtering content"

2126 msgstr ""

2127

1647 -#: entry.c:435

2128 +#: entry.c:437

2129 #, c-format

2130 msgid "could not stat file '%s'"

2131 msgstr ""

2132

2133 +#: environment.c:150

2134 +#, c-format

2135 +msgid "bad git namespace path \"%s\""

2136 +msgstr ""

2137 +

2138 +#: environment.c:332

2139 +#, c-format

2140 +msgid "could not set GIT_DIR to '%s'"

2141 +msgstr ""

2142 +

2143 +#: exec-cmd.c:361

2144 +#, c-format

2145 +msgid "too many args to run %s"

2146 +msgstr ""

2147 +

2148 #: fetch-object.c:17

2149 msgid "Remote with no URL"

2150 msgstr ""

2151

1656 -#: fetch-pack.c:254

2152 +#: fetch-pack.c:152

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

2154 msgstr ""

2155

1660 -#: fetch-pack.c:266

2156 +#: fetch-pack.c:164

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

2158 msgstr ""

2159

1664 -#: fetch-pack.c:285 builtin/archive.c:63

1665 -#, c-format

1666 -msgid "remote error: %s"

1667 -msgstr ""

1668 -

1669 -#: fetch-pack.c:286

2160 +#: fetch-pack.c:184

2161 #, c-format

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

2163 msgstr ""

2164

1674 -#: fetch-pack.c:338

2165 +#: fetch-pack.c:254

2166 msgid "--stateless-rpc requires multi_ack_detailed"

2167 msgstr ""

2168

1678 -#: fetch-pack.c:429 fetch-pack.c:1310

2169 +#: fetch-pack.c:342 fetch-pack.c:1257

2170 #, c-format

2171 msgid "invalid shallow line: %s"

2172 msgstr ""

2173

1683 -#: fetch-pack.c:435 fetch-pack.c:1316

2174 +#: fetch-pack.c:348 fetch-pack.c:1263

2175 #, c-format

2176 msgid "invalid unshallow line: %s"

2177 msgstr ""

2178

1688 -#: fetch-pack.c:437 fetch-pack.c:1318

2179 +#: fetch-pack.c:350 fetch-pack.c:1265

2180 #, c-format

2181 msgid "object not found: %s"

2182 msgstr ""

2183

1693 -#: fetch-pack.c:440 fetch-pack.c:1321

2184 +#: fetch-pack.c:353 fetch-pack.c:1268

2185 #, c-format

2186 msgid "error in object: %s"

2187 msgstr ""

2188

1698 -#: fetch-pack.c:442 fetch-pack.c:1323

2189 +#: fetch-pack.c:355 fetch-pack.c:1270

2190 #, c-format

2191 msgid "no shallow found: %s"

2192 msgstr ""

2193

1703 -#: fetch-pack.c:445 fetch-pack.c:1326

2194 +#: fetch-pack.c:358 fetch-pack.c:1273

2195 #, c-format

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

2197 msgstr ""

2198

1708 -#: fetch-pack.c:486

2199 +#: fetch-pack.c:399

2200 #, c-format

2201 msgid "got %s %d %s"

2202 msgstr ""

2203

1713 -#: fetch-pack.c:500

2204 +#: fetch-pack.c:416

2205 #, c-format

2206 msgid "invalid commit %s"

2207 msgstr ""

2208

1718 -#: fetch-pack.c:533

2209 +#: fetch-pack.c:447

2210 msgid "giving up"

2211 msgstr ""

2212

1722 -#: fetch-pack.c:543 progress.c:229

2213 +#: fetch-pack.c:459 progress.c:229

2214 msgid "done"

2215 msgstr ""

2216

1726 -#: fetch-pack.c:555

2217 +#: fetch-pack.c:471

2218 #, c-format

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

2220 msgstr ""

2221

1731 -#: fetch-pack.c:601

2222 +#: fetch-pack.c:517

2223 #, c-format

2224 msgid "Marking %s as complete"

2225 msgstr ""

2226

1736 -#: fetch-pack.c:828

2227 +#: fetch-pack.c:764

2228 #, c-format

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

2230 msgstr ""

2231

1741 -#: fetch-pack.c:869

2232 +#: fetch-pack.c:803

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

2234 msgstr ""

2235

1745 -#: fetch-pack.c:877

2236 +#: fetch-pack.c:811

2237 msgid "protocol error: bad pack header"

2238 msgstr ""

2239

1749 -#: fetch-pack.c:944

2240 +#: fetch-pack.c:879

2241 #, c-format

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

2243 msgstr ""

2244

1754 -#: fetch-pack.c:960

2245 +#: fetch-pack.c:895

2246 #, c-format

2247 msgid "%s failed"

2248 msgstr ""

2249

1759 -#: fetch-pack.c:962

2250 +#: fetch-pack.c:897

2251 msgid "error in sideband demultiplexer"

2252 msgstr ""

2253

1763 -#: fetch-pack.c:989

2254 +#: fetch-pack.c:926

2255 msgid "Server does not support shallow clients"

2256 msgstr ""

2257

1767 -#: fetch-pack.c:993

2258 +#: fetch-pack.c:930

2259 msgid "Server supports multi_ack_detailed"

2260 msgstr ""

2261

1771 -#: fetch-pack.c:996

2262 +#: fetch-pack.c:933

2263 msgid "Server supports no-done"

2264 msgstr ""

2265

1775 -#: fetch-pack.c:1002

2266 +#: fetch-pack.c:939

2267 msgid "Server supports multi_ack"

2268 msgstr ""

2269

1779 -#: fetch-pack.c:1006

2270 +#: fetch-pack.c:943

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

2272 msgstr ""

2273

1783 -#: fetch-pack.c:1010

2274 +#: fetch-pack.c:947

2275 msgid "Server supports side-band"

2276 msgstr ""

2277

1787 -#: fetch-pack.c:1014

2278 +#: fetch-pack.c:951

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

2280 msgstr ""

2281

1791 -#: fetch-pack.c:1018

2282 +#: fetch-pack.c:955

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

2284 msgstr ""

2285

1795 -#: fetch-pack.c:1028

2286 +#: fetch-pack.c:965

2287 msgid "Server supports ofs-delta"

2288 msgstr ""

2289

1799 -#: fetch-pack.c:1034 fetch-pack.c:1204

2290 +#: fetch-pack.c:971 fetch-pack.c:1150

2291 msgid "Server supports filter"

2292 msgstr ""

2293

1803 -#: fetch-pack.c:1042

2294 +#: fetch-pack.c:979

2295 #, c-format

2296 msgid "Server version is %.*s"

2297 msgstr ""

2298

1808 -#: fetch-pack.c:1048

2299 +#: fetch-pack.c:985

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

2301 msgstr ""

2302

1812 -#: fetch-pack.c:1052

2303 +#: fetch-pack.c:989

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

2305 msgstr ""

2306

1816 -#: fetch-pack.c:1054

2307 +#: fetch-pack.c:991

2308 msgid "Server does not support --deepen"

2309 msgstr ""

2310

1820 -#: fetch-pack.c:1065

2311 +#: fetch-pack.c:1004

2312 msgid "no common commits"

2313 msgstr ""

2314

1824 -#: fetch-pack.c:1077 fetch-pack.c:1414

2315 +#: fetch-pack.c:1016 fetch-pack.c:1393

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

2317 msgstr ""

2318

1828 -#: fetch-pack.c:1199

2319 +#: fetch-pack.c:1145

2320 msgid "Server does not support shallow requests"

2321 msgstr ""

2322

1832 -#: fetch-pack.c:1584

2323 +#: fetch-pack.c:1191

2324 +#, c-format

2325 +msgid "error reading section header '%s'"

2326 +msgstr ""

2327 +

2328 +#: fetch-pack.c:1197

2329 +#, c-format

2330 +msgid "expected '%s', received '%s'"

2331 +msgstr ""

2332 +

2333 +#: fetch-pack.c:1236

2334 +#, c-format

2335 +msgid "unexpected acknowledgment line: '%s'"

2336 +msgstr ""

2337 +

2338 +#: fetch-pack.c:1241

2339 +#, c-format

2340 +msgid "error processing acks: %d"

2341 +msgstr ""

2342 +

2343 +#: fetch-pack.c:1278

2344 +#, c-format

2345 +msgid "error processing shallow info: %d"

2346 +msgstr ""

2347 +

2348 +#: fetch-pack.c:1294

2349 +#, c-format

2350 +msgid "expected wanted-ref, got '%s'"

2351 +msgstr ""

2352 +

2353 +#: fetch-pack.c:1304

2354 +#, c-format

2355 +msgid "unexpected wanted-ref: '%s'"

2356 +msgstr ""

2357 +

2358 +#: fetch-pack.c:1308

2359 +#, c-format

2360 +msgid "error processing wanted refs: %d"

2361 +msgstr ""

2362 +

2363 +#: fetch-pack.c:1603

2364 msgid "no matching remote head"

2365 msgstr ""

2366

1836 -#: fetch-pack.c:1610

2367 +#: fetch-pack.c:1621 builtin/clone.c:664

2368 +msgid "remote did not send all necessary objects"

2369 +msgstr ""

2370 +

2371 +#: fetch-pack.c:1647

2372 #, c-format

2373 msgid "no such remote ref %s"

2374 msgstr ""

2375

1841 -#: fetch-pack.c:1613

2376 +#: fetch-pack.c:1650

2377 #, c-format

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

2379 msgstr ""

2380

1846 -#: gpg-interface.c:185

2381 +#: gpg-interface.c:253

2382 msgid "gpg failed to sign the data"

2383 msgstr ""

2384

1850 -#: gpg-interface.c:210

2385 +#: gpg-interface.c:279

2386 msgid "could not create temporary file"

2387 msgstr ""

2388

1854 -#: gpg-interface.c:213

2389 +#: gpg-interface.c:282

2390 #, c-format

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

2392 msgstr ""

@@ -1861,18 +2396,18 @@ msgstr ""

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

2397 msgstr ""

2398

1864 -#: grep.c:2020

2399 +#: grep.c:2115

2400 #, c-format

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

2402 msgstr ""

2403

1869 -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2404 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2405 #: builtin/rm.c:134

2406 #, c-format

2407 msgid "failed to stat '%s'"

2408 msgstr ""

2409

1875 -#: grep.c:2048

2410 +#: grep.c:2143

2411 #, c-format

2412 msgid "'%s': short read"

2413 msgstr ""

@@ -1951,38 +2486,38 @@ msgstr ""

2486 msgid "The common Git guides are:"

2487 msgstr ""

2488

1954 -#: help.c:467

2489 +#: help.c:552

2490 #, c-format

2491 msgid ""

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

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

2494 msgstr ""

2495

1961 -#: help.c:526

2496 +#: help.c:611

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

2498 msgstr ""

2499

1965 -#: help.c:548

2500 +#: help.c:633

2501 #, c-format

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

2503 msgstr ""

2504

1970 -#: help.c:553

2505 +#: help.c:638

2506 #, c-format

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

2508 msgstr ""

2509

1975 -#: help.c:558

2510 +#: help.c:643

2511 #, c-format

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

2513 msgstr ""

2514

1980 -#: help.c:566

2515 +#: help.c:651

2516 #, c-format

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

2518 msgstr ""

2519

1985 -#: help.c:570

2520 +#: help.c:655

2521 msgid ""

2522 "\n"

2523 "The most similar command is"

@@ -1992,16 +2527,16 @@ msgid_plural ""

2527 msgstr[0] ""

2528 msgstr[1] ""

2529

1995 -#: help.c:585

2530 +#: help.c:670

2531 msgid "git version [<options>]"

2532 msgstr ""

2533

1999 -#: help.c:652

2534 +#: help.c:738

2535 #, c-format

2536 msgid "%s: %s - %s"

2537 msgstr ""

2538

2004 -#: help.c:656

2539 +#: help.c:742

2540 msgid ""

2541 "\n"

2542 "Did you mean this?"

@@ -2054,7 +2589,7 @@ msgstr ""

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

2590 msgstr ""

2591

2057 -#: ident.c:416 builtin/commit.c:587

2592 +#: ident.c:416 builtin/commit.c:600

2593 #, c-format

2594 msgid "invalid date format: %s"

2595 msgstr ""

@@ -2084,117 +2619,117 @@ msgstr ""

2619 msgid "Unable to create '%s.lock': %s"

2620 msgstr ""

2621

2087 -#: merge.c:71

2622 +#: merge.c:40

2623 msgid "failed to read the cache"

2624 msgstr ""

2625

2091 -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2092 -#: builtin/checkout.c:606 builtin/clone.c:761

2626 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2627 +#: builtin/checkout.c:608 builtin/clone.c:763

2628 msgid "unable to write new index file"

2629 msgstr ""

2630

2096 -#: merge-recursive.c:298

2631 +#: merge-recursive.c:303

2632 msgid "(bad commit)\n"

2633 msgstr ""

2634

2100 -#: merge-recursive.c:320

2635 +#: merge-recursive.c:325

2636 #, c-format

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

2638 msgstr ""

2639

2105 -#: merge-recursive.c:328

2640 +#: merge-recursive.c:333

2641 #, c-format

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

2643 msgstr ""

2644

2110 -#: merge-recursive.c:410

2645 +#: merge-recursive.c:415

2646 msgid "error building trees"

2647 msgstr ""

2648

2114 -#: merge-recursive.c:881

2649 +#: merge-recursive.c:886

2650 #, c-format

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

2652 msgstr ""

2653

2119 -#: merge-recursive.c:892

2654 +#: merge-recursive.c:897

2655 #, c-format

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

2657 msgstr ""

2658

2124 -#: merge-recursive.c:906 merge-recursive.c:925

2659 +#: merge-recursive.c:911 merge-recursive.c:930

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

2661 msgstr ""

2662

2128 -#: merge-recursive.c:915

2663 +#: merge-recursive.c:920

2664 #, c-format

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

2666 msgstr ""

2667

2133 -#: merge-recursive.c:957 builtin/cat-file.c:37

2668 +#: merge-recursive.c:962 builtin/cat-file.c:39

2669 #, c-format

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

2671 msgstr ""

2672

2138 -#: merge-recursive.c:959

2673 +#: merge-recursive.c:964

2674 #, c-format

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

2676 msgstr ""

2677

2143 -#: merge-recursive.c:983

2678 +#: merge-recursive.c:988

2679 #, c-format

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

2681 msgstr ""

2682

2148 -#: merge-recursive.c:994

2683 +#: merge-recursive.c:999

2684 #, c-format

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

2686 msgstr ""

2687

2153 -#: merge-recursive.c:999

2688 +#: merge-recursive.c:1004

2689 #, c-format

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

2691 msgstr ""

2692

2158 -#: merge-recursive.c:1186

2693 +#: merge-recursive.c:1191

2694 #, c-format

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

2696 msgstr ""

2697

2163 -#: merge-recursive.c:1193

2698 +#: merge-recursive.c:1198

2699 #, c-format

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

2701 msgstr ""

2702

2168 -#: merge-recursive.c:1200

2703 +#: merge-recursive.c:1205

2704 #, c-format

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

2706 msgstr ""

2707

2173 -#: merge-recursive.c:1208 merge-recursive.c:1220

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

2709 #, c-format

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

2711 msgstr ""

2712

2178 -#: merge-recursive.c:1211 merge-recursive.c:1223

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

2714 #, c-format

2715 msgid "Fast-forwarding submodule %s"

2716 msgstr ""

2717

2183 -#: merge-recursive.c:1245

2718 +#: merge-recursive.c:1250

2719 #, c-format

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

2721 msgstr ""

2722

2188 -#: merge-recursive.c:1249

2723 +#: merge-recursive.c:1254

2724 #, c-format

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

2726 msgstr ""

2727

2193 -#: merge-recursive.c:1250

2728 +#: merge-recursive.c:1255

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

2730 msgstr ""

2731

2197 -#: merge-recursive.c:1253

2732 +#: merge-recursive.c:1258

2733 #, c-format

2734 msgid ""

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

@@ -2205,109 +2740,109 @@ msgid ""

2740 "which will accept this suggestion.\n"

2741 msgstr ""

2742

2208 -#: merge-recursive.c:1262

2743 +#: merge-recursive.c:1267

2744 #, c-format

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

2746 msgstr ""

2747

2213 -#: merge-recursive.c:1321

2748 +#: merge-recursive.c:1326

2749 msgid "Failed to execute internal merge"

2750 msgstr ""

2751

2217 -#: merge-recursive.c:1326

2752 +#: merge-recursive.c:1331

2753 #, c-format

2754 msgid "Unable to add %s to database"

2755 msgstr ""

2756

2222 -#: merge-recursive.c:1358

2757 +#: merge-recursive.c:1363

2758 #, c-format

2759 msgid "Auto-merging %s"

2760 msgstr ""

2761

2227 -#: merge-recursive.c:1423

2762 +#: merge-recursive.c:1434

2763 #, c-format

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

2765 msgstr ""

2766

2232 -#: merge-recursive.c:1475

2767 +#: merge-recursive.c:1501

2768 #, c-format

2769 msgid ""

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

2771 "in tree."

2772 msgstr ""

2773

2239 -#: merge-recursive.c:1480

2774 +#: merge-recursive.c:1506

2775 #, c-format

2776 msgid ""

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

2778 "left in tree."

2779 msgstr ""

2780

2246 -#: merge-recursive.c:1487

2781 +#: merge-recursive.c:1513

2782 #, c-format

2783 msgid ""

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

2785 "in tree at %s."

2786 msgstr ""

2787

2253 -#: merge-recursive.c:1492

2788 +#: merge-recursive.c:1518

2789 #, c-format

2790 msgid ""

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

2792 "left in tree at %s."

2793 msgstr ""

2794

2260 -#: merge-recursive.c:1526

2795 +#: merge-recursive.c:1552

2796 msgid "rename"

2797 msgstr ""

2798

2264 -#: merge-recursive.c:1526

2799 +#: merge-recursive.c:1552

2800 msgid "renamed"

2801 msgstr ""

2802

2268 -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2269 -#: merge-recursive.c:3086

2803 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

2804 +#: merge-recursive.c:3129

2805 #, c-format

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

2807 msgstr ""

2808

2274 -#: merge-recursive.c:1594

2809 +#: merge-recursive.c:1620

2810 #, c-format

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

2812 msgstr ""

2813

2279 -#: merge-recursive.c:1599

2814 +#: merge-recursive.c:1625

2815 #, c-format

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

2817 msgstr ""

2818

2284 -#: merge-recursive.c:1625

2819 +#: merge-recursive.c:1651

2820 #, c-format

2821 msgid ""

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

2823 "\"->\"%s\" in \"%s\"%s"

2824 msgstr ""

2825

2291 -#: merge-recursive.c:1630

2826 +#: merge-recursive.c:1656

2827 msgid " (left unresolved)"

2828 msgstr ""

2829

2295 -#: merge-recursive.c:1694

2830 +#: merge-recursive.c:1720

2831 #, c-format

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

2833 msgstr ""

2834

2300 -#: merge-recursive.c:1733

2835 +#: merge-recursive.c:1759

2836 #, c-format

2837 msgid "Renaming %s to %s and %s to %s instead"

2838 msgstr ""

2839

2305 -#: merge-recursive.c:1745

2840 +#: merge-recursive.c:1771

2841 #, c-format

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

2843 msgstr ""

2844

2310 -#: merge-recursive.c:1951

2845 +#: merge-recursive.c:1977

2846 #, c-format

2847 msgid ""

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

@@ -2315,151 +2850,153 @@ msgid ""

2850 "getting a majority of the files."

2851 msgstr ""

2852

2318 -#: merge-recursive.c:1983

2853 +#: merge-recursive.c:2009

2854 #, c-format

2855 msgid ""

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

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

2858 msgstr ""

2859

2325 -#: merge-recursive.c:1993

2860 +#: merge-recursive.c:2019

2861 #, c-format

2862 msgid ""

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

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

2865 msgstr ""

2866

2332 -#: merge-recursive.c:2085

2867 +#: merge-recursive.c:2111

2868 #, c-format

2869 msgid ""

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

2871 ">%s in %s"

2872 msgstr ""

2873

2339 -#: merge-recursive.c:2330

2874 +#: merge-recursive.c:2356

2875 #, c-format

2876 msgid ""

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

2878 "renamed."

2879 msgstr ""

2880

2346 -#: merge-recursive.c:2736

2881 +#: merge-recursive.c:2762

2882 #, c-format

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

2884 msgstr ""

2885

2351 -#: merge-recursive.c:2751

2886 +#: merge-recursive.c:2777

2887 #, c-format

2888 msgid "Adding merged %s"

2889 msgstr ""

2890

2356 -#: merge-recursive.c:2758 merge-recursive.c:3089

2891 +#: merge-recursive.c:2784 merge-recursive.c:3132

2892 #, c-format

2893 msgid "Adding as %s instead"

2894 msgstr ""

2895

2361 -#: merge-recursive.c:2914

2896 +#: merge-recursive.c:2941

2897 #, c-format

2898 msgid "cannot read object %s"

2899 msgstr ""

2900

2366 -#: merge-recursive.c:2917

2901 +#: merge-recursive.c:2944

2902 #, c-format

2903 msgid "object %s is not a blob"

2904 msgstr ""

2905

2371 -#: merge-recursive.c:2986

2906 +#: merge-recursive.c:3013

2907 msgid "modify"

2908 msgstr ""

2909

2375 -#: merge-recursive.c:2986

2910 +#: merge-recursive.c:3013

2911 msgid "modified"

2912 msgstr ""

2913

2379 -#: merge-recursive.c:2997

2914 +#: merge-recursive.c:3024

2915 msgid "content"

2916 msgstr ""

2917

2383 -#: merge-recursive.c:3004

2918 +#: merge-recursive.c:3031

2919 msgid "add/add"

2920 msgstr ""

2921

2387 -#: merge-recursive.c:3046

2922 +#: merge-recursive.c:3076

2923 #, c-format

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

2925 msgstr ""

2926

2392 -#: merge-recursive.c:3055 git-submodule.sh:895

2927 +#: merge-recursive.c:3098 git-submodule.sh:865

2928 msgid "submodule"

2929 msgstr ""

2930

2396 -#: merge-recursive.c:3056

2931 +#: merge-recursive.c:3099

2932 #, c-format

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

2934 msgstr ""

2935

2401 -#: merge-recursive.c:3178

2936 +#: merge-recursive.c:3221

2937 #, c-format

2938 msgid "Removing %s"

2939 msgstr ""

2940

2406 -#: merge-recursive.c:3204

2941 +#: merge-recursive.c:3247

2942 msgid "file/directory"

2943 msgstr ""

2944

2410 -#: merge-recursive.c:3210

2945 +#: merge-recursive.c:3253

2946 msgid "directory/file"

2947 msgstr ""

2948

2414 -#: merge-recursive.c:3217

2949 +#: merge-recursive.c:3260

2950 #, c-format

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

2952 msgstr ""

2953

2419 -#: merge-recursive.c:3226

2954 +#: merge-recursive.c:3269

2955 #, c-format

2956 msgid "Adding %s"

2957 msgstr ""

2958

2424 -#: merge-recursive.c:3267

2959 +#: merge-recursive.c:3303

2960 #, c-format

2426 -msgid "Dirty index: cannot merge (dirty: %s)"

2961 +msgid ""

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

2963 +" %s"

2964 msgstr ""

2965

2429 -#: merge-recursive.c:3271

2966 +#: merge-recursive.c:3314

2967 msgid "Already up to date!"

2968 msgstr ""

2969

2433 -#: merge-recursive.c:3280

2970 +#: merge-recursive.c:3323

2971 #, c-format

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

2973 msgstr ""

2974

2438 -#: merge-recursive.c:3379

2975 +#: merge-recursive.c:3422

2976 msgid "Merging:"

2977 msgstr ""

2978

2442 -#: merge-recursive.c:3392

2979 +#: merge-recursive.c:3435

2980 #, c-format

2981 msgid "found %u common ancestor:"

2982 msgid_plural "found %u common ancestors:"

2983 msgstr[0] ""

2984 msgstr[1] ""

2985

2449 -#: merge-recursive.c:3431

2986 +#: merge-recursive.c:3474

2987 msgid "merge returned no commit"

2988 msgstr ""

2989

2453 -#: merge-recursive.c:3495

2990 +#: merge-recursive.c:3540

2991 #, c-format

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

2993 msgstr ""

2994

2458 -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

2995 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

2996 msgid "Unable to write index."

2997 msgstr ""

2998

2462 -#: notes-merge.c:272

2999 +#: notes-merge.c:274

3000 #, c-format

3001 msgid ""

3002 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2467,21 +3004,21 @@ msgid ""

3004 "commit/abort the previous merge before you start a new notes merge."

3005 msgstr ""

3006

2470 -#: notes-merge.c:279

3007 +#: notes-merge.c:281

3008 #, c-format

3009 msgid "You have not concluded your notes merge (%s exists)."

3010 msgstr ""

3011

2475 -#: notes-utils.c:43

3012 +#: notes-utils.c:45

3013 msgid "Cannot commit uninitialized/unreferenced notes tree"

3014 msgstr ""

3015

2479 -#: notes-utils.c:102

3016 +#: notes-utils.c:104

3017 #, c-format

3018 msgid "Bad notes.rewriteMode value: '%s'"

3019 msgstr ""

3020

2484 -#: notes-utils.c:112

3021 +#: notes-utils.c:114

3022 #, c-format

3023 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3024 msgstr ""

@@ -2490,35 +3027,55 @@ msgstr ""

3027 #. the environment variable, the second %s is

3028 #. its value.

3029 #.

2493 -#: notes-utils.c:142

3030 +#: notes-utils.c:144

3031 #, c-format

3032 msgid "Bad %s value: '%s'"

3033 msgstr ""

3034

2498 -#: object.c:242

3035 +#: object.c:54

3036 +#, c-format

3037 +msgid "invalid object type \"%s\""

3038 +msgstr ""

3039 +

3040 +#: object.c:173

3041 +#, c-format

3042 +msgid "object %s is a %s, not a %s"

3043 +msgstr ""

3044 +

3045 +#: object.c:233

3046 +#, c-format

3047 +msgid "object %s has unknown type id %d"

3048 +msgstr ""

3049 +

3050 +#: object.c:246

3051 #, c-format

3052 msgid "unable to parse object: %s"

3053 msgstr ""

3054

3055 +#: object.c:266 object.c:277

3056 +#, c-format

3057 +msgid "sha1 mismatch %s"

3058 +msgstr ""

3059 +

3060 #: packfile.c:563

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

3062 msgstr ""

3063

2507 -#: packfile.c:1742

3064 +#: packfile.c:1745

3065 #, c-format

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

3067 msgstr ""

3068

2512 -#: packfile.c:1746

3069 +#: packfile.c:1749

3070 #, c-format

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

3072 msgstr ""

3073

2517 -#: parse-options.c:621

3074 +#: parse-options.c:672

3075 msgid "..."

3076 msgstr ""

3077

2521 -#: parse-options.c:640

3078 +#: parse-options.c:691

3079 #, c-format

3080 msgid "usage: %s"

3081 msgstr ""

@@ -2526,17 +3083,17 @@ msgstr ""

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

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

3085 #.

2529 -#: parse-options.c:646

3086 +#: parse-options.c:697

3087 #, c-format

3088 msgid " or: %s"

3089 msgstr ""

3090

2534 -#: parse-options.c:649

3091 +#: parse-options.c:700

3092 #, c-format

3093 msgid " %s"

3094 msgstr ""

3095

2539 -#: parse-options.c:688

3096 +#: parse-options.c:739

3097 msgid "-NUM"

3098 msgstr ""

3099

@@ -2626,52 +3183,199 @@ msgstr ""

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

3184 msgstr ""

3185

3186 +#: pkt-line.c:104

3187 +msgid "flush packet write failed"

3188 +msgstr ""

3189 +

3190 +#: pkt-line.c:142 pkt-line.c:228

3191 +msgid "protocol error: impossibly long line"

3192 +msgstr ""

3193 +

3194 +#: pkt-line.c:158 pkt-line.c:160

3195 +msgid "packet write with format failed"

3196 +msgstr ""

3197 +

3198 +#: pkt-line.c:192

3199 +msgid "packet write failed - data exceeds max packet size"

3200 +msgstr ""

3201 +

3202 +#: pkt-line.c:199 pkt-line.c:206

3203 +msgid "packet write failed"

3204 +msgstr ""

3205 +

3206 +#: pkt-line.c:291

3207 +msgid "read error"

3208 +msgstr ""

3209 +

3210 +#: pkt-line.c:299

3211 +msgid "the remote end hung up unexpectedly"

3212 +msgstr ""

3213 +

3214 +#: pkt-line.c:327

3215 +#, c-format

3216 +msgid "protocol error: bad line length character: %.4s"

3217 +msgstr ""

3218 +

3219 +#: pkt-line.c:337 pkt-line.c:342

3220 +#, c-format

3221 +msgid "protocol error: bad line length %d"

3222 +msgstr ""

3223 +

3224 #: pretty.c:962

3225 msgid "unable to parse --pretty format"

3226 msgstr ""

3227

2633 -#: read-cache.c:1500

3228 +#: range-diff.c:48

3229 +msgid "could not start `log`"

3230 +msgstr ""

3231 +

3232 +#: range-diff.c:51

3233 +msgid "could not read `log` output"

3234 +msgstr ""

3235 +

3236 +#: range-diff.c:66 sequencer.c:4540

3237 +#, c-format

3238 +msgid "could not parse commit '%s'"

3239 +msgstr ""

3240 +

3241 +#: range-diff.c:196

3242 +msgid "failed to generate diff"

3243 +msgstr ""

3244 +

3245 +#: range-diff.c:421 range-diff.c:423

3246 +#, c-format

3247 +msgid "could not parse log for '%s'"

3248 +msgstr ""

3249 +

3250 +#: read-cache.c:1579

3251 #, c-format

3252 msgid ""

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

3254 "Using version %i"

3255 msgstr ""

3256

2640 -#: read-cache.c:1510

3257 +#: read-cache.c:1589

3258 #, c-format

3259 msgid ""

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

3261 "Using version %i"

3262 msgstr ""

3263

2647 -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

3264 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3265 #, c-format

3266 msgid "could not close '%s'"

3267 msgstr ""

3268

2652 -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

3269 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3270 #, c-format

3271 msgid "could not stat '%s'"

3272 msgstr ""

3273

2657 -#: read-cache.c:2490

3274 +#: read-cache.c:2666

3275 #, c-format

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

3277 msgstr ""

3278

2662 -#: read-cache.c:2502

3279 +#: read-cache.c:2678

3280 #, c-format

3281 msgid "unable to unlink: %s"

3282 msgstr ""

3283

2667 -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2668 -#: builtin/am.c:779

3284 +#: refs.c:192

3285 +#, c-format

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

3287 +msgstr ""

3288 +

3289 +#: refs.c:579

3290 +#, c-format

3291 +msgid "ignoring dangling symref %s"

3292 +msgstr ""

3293 +

3294 +#: refs.c:581 ref-filter.c:2067

3295 +#, c-format

3296 +msgid "ignoring broken ref %s"

3297 +msgstr ""

3298 +

3299 +#: refs.c:685

3300 +#, c-format

3301 +msgid "could not open '%s' for writing: %s"

3302 +msgstr ""

3303 +

3304 +#: refs.c:695 refs.c:746

3305 +#, c-format

3306 +msgid "could not read ref '%s'"

3307 +msgstr ""

3308 +

3309 +#: refs.c:701

3310 +#, c-format

3311 +msgid "ref '%s' already exists"

3312 +msgstr ""

3313 +

3314 +#: refs.c:706

3315 +#, c-format

3316 +msgid "unexpected object ID when writing '%s'"

3317 +msgstr ""

3318 +

3319 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3320 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3321 +#: wrapper.c:656

3322 +#, c-format

3323 +msgid "could not write to '%s'"

3324 +msgstr ""

3325 +

3326 +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3327 +#: builtin/am.c:780

3328 +#, c-format

3329 +msgid "could not open '%s' for writing"

3330 +msgstr ""

3331 +

3332 +#: refs.c:748

3333 +#, c-format

3334 +msgid "unexpected object ID when deleting '%s'"

3335 +msgstr ""

3336 +

3337 +#: refs.c:879

3338 +#, c-format

3339 +msgid "log for ref %s has gap after %s"

3340 +msgstr ""

3341 +

3342 +#: refs.c:885

3343 +#, c-format

3344 +msgid "log for ref %s unexpectedly ended on %s"

3345 +msgstr ""

3346 +

3347 +#: refs.c:943

3348 +#, c-format

3349 +msgid "log for %s is empty"

3350 +msgstr ""

3351 +

3352 +#: refs.c:1035

3353 +#, c-format

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

3355 +msgstr ""

3356 +

3357 +#: refs.c:1111

3358 +#, c-format

3359 +msgid "update_ref failed for ref '%s': %s"

3360 +msgstr ""

3361 +

3362 +#: refs.c:1853

3363 +#, c-format

3364 +msgid "multiple updates for ref '%s' not allowed"

3365 +msgstr ""

3366 +

3367 +#: refs.c:1885

3368 +msgid "ref updates forbidden inside quarantine environment"

3369 +msgstr ""

3370 +

3371 +#: refs.c:1981 refs.c:2011

3372 #, c-format

2670 -msgid "could not open '%s' for writing"

3373 +msgid "'%s' exists; cannot create '%s'"

3374 msgstr ""

3375

2673 -#: refs.c:1880

2674 -msgid "ref updates forbidden inside quarantine environment"

3376 +#: refs.c:1987 refs.c:2022

3377 +#, c-format

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

3379 msgstr ""

3380

3381 #: refs/files-backend.c:1191

@@ -2679,192 +3383,207 @@ msgstr ""

3383 msgid "could not remove reference %s"

3384 msgstr ""

3385

2682 -#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2683 -#: refs/packed-backend.c:1541

3386 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3387 +#: refs/packed-backend.c:1542

3388 #, c-format

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

3390 msgstr ""

3391

2688 -#: refs/files-backend.c:1208 refs/packed-backend.c:1544

3392 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3393 #, c-format

3394 msgid "could not delete references: %s"

3395 msgstr ""

3396

2693 -#: ref-filter.c:35 wt-status.c:1850

3397 +#: refspec.c:137

3398 +#, c-format

3399 +msgid "invalid refspec '%s'"

3400 +msgstr ""

3401 +

3402 +#: ref-filter.c:38 wt-status.c:1850

3403 msgid "gone"

3404 msgstr ""

3405

2697 -#: ref-filter.c:36

3406 +#: ref-filter.c:39

3407 #, c-format

3408 msgid "ahead %d"

3409 msgstr ""

3410

2702 -#: ref-filter.c:37

3411 +#: ref-filter.c:40

3412 #, c-format

3413 msgid "behind %d"

3414 msgstr ""

3415

2707 -#: ref-filter.c:38

3416 +#: ref-filter.c:41

3417 #, c-format

3418 msgid "ahead %d, behind %d"

3419 msgstr ""

3420

2712 -#: ref-filter.c:121

3421 +#: ref-filter.c:137

3422 #, c-format

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

3424 msgstr ""

3425

2717 -#: ref-filter.c:123

3426 +#: ref-filter.c:139

3427 #, c-format

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

3429 msgstr ""

3430

2722 -#: ref-filter.c:145

3431 +#: ref-filter.c:161

3432 #, c-format

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

3434 msgstr ""

3435

2727 -#: ref-filter.c:149

3436 +#: ref-filter.c:165

3437 #, c-format

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

3439 msgstr ""

3440

2732 -#: ref-filter.c:151

3441 +#: ref-filter.c:167

3442 #, c-format

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

3444 msgstr ""

3445

2737 -#: ref-filter.c:206

3446 +#: ref-filter.c:222

3447 +#, c-format

3448 +msgid "%%(objecttype) does not take arguments"

3449 +msgstr ""

3450 +

3451 +#: ref-filter.c:234

3452 +#, c-format

3453 +msgid "%%(objectsize) does not take arguments"

3454 +msgstr ""

3455 +

3456 +#: ref-filter.c:246

3457 #, c-format

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

3459 msgstr ""

3460

2742 -#: ref-filter.c:215

3461 +#: ref-filter.c:255

3462 #, c-format

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

3464 msgstr ""

3465

2747 -#: ref-filter.c:235

3466 +#: ref-filter.c:275

3467 #, c-format

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

3469 msgstr ""

3470

2752 -#: ref-filter.c:264

3471 +#: ref-filter.c:304

3472 #, c-format

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

3474 msgstr ""

3475

2757 -#: ref-filter.c:266

3476 +#: ref-filter.c:306

3477 #, c-format

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

3479 msgstr ""

3480

2762 -#: ref-filter.c:281

3481 +#: ref-filter.c:321

3482 #, c-format

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

3484 msgstr ""

3485

2767 -#: ref-filter.c:285

3486 +#: ref-filter.c:325

3487 #, c-format

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

3489 msgstr ""

3490

2772 -#: ref-filter.c:315

3491 +#: ref-filter.c:355

3492 #, c-format

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

3494 msgstr ""

3495

2777 -#: ref-filter.c:327

3496 +#: ref-filter.c:367

3497 #, c-format

3498 msgid "unrecognized position:%s"

3499 msgstr ""

3500

2782 -#: ref-filter.c:334

3501 +#: ref-filter.c:374

3502 #, c-format

3503 msgid "unrecognized width:%s"

3504 msgstr ""

3505

2787 -#: ref-filter.c:343

3506 +#: ref-filter.c:383

3507 #, c-format

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

3509 msgstr ""

3510

2792 -#: ref-filter.c:351

3511 +#: ref-filter.c:391

3512 #, c-format

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

3514 msgstr ""

3515

2797 -#: ref-filter.c:369

3516 +#: ref-filter.c:409

3517 #, c-format

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

3519 msgstr ""

3520

2802 -#: ref-filter.c:464

3521 +#: ref-filter.c:505

3522 #, c-format

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

3524 msgstr ""

3525

2807 -#: ref-filter.c:491

3526 +#: ref-filter.c:532

3527 #, c-format

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

3529 msgstr ""

3530

2812 -#: ref-filter.c:608

3531 +#: ref-filter.c:656

3532 #, c-format

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

3534 msgstr ""

3535

2817 -#: ref-filter.c:671

3536 +#: ref-filter.c:719

3537 #, c-format

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

3539 msgstr ""

3540

2822 -#: ref-filter.c:673

3541 +#: ref-filter.c:721

3542 #, c-format

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

3544 msgstr ""

3545

2827 -#: ref-filter.c:675

3546 +#: ref-filter.c:723

3547 #, c-format

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

3549 msgstr ""

3550

2832 -#: ref-filter.c:703

3551 +#: ref-filter.c:751

3552 #, c-format

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

3554 msgstr ""

3555

2837 -#: ref-filter.c:705

3556 +#: ref-filter.c:753

3557 #, c-format

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

3559 msgstr ""

3560

2842 -#: ref-filter.c:707

3561 +#: ref-filter.c:755

3562 #, c-format

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

3564 msgstr ""

3565

2847 -#: ref-filter.c:722

3566 +#: ref-filter.c:770

3567 #, c-format

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

3569 msgstr ""

3570

2852 -#: ref-filter.c:779

3571 +#: ref-filter.c:827

3572 #, c-format

3573 msgid "malformed format string %s"

3574 msgstr ""

3575

2857 -#: ref-filter.c:1387

3576 +#: ref-filter.c:1416

3577 #, c-format

3578 msgid "(no branch, rebasing %s)"

3579 msgstr ""

3580

2862 -#: ref-filter.c:1390

3581 +#: ref-filter.c:1419

3582 #, c-format

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

3584 msgstr ""

3585

2867 -#: ref-filter.c:1393

3586 +#: ref-filter.c:1422

3587 #, c-format

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

3589 msgstr ""

@@ -2872,7 +3591,7 @@ msgstr ""

3591 #. TRANSLATORS: make sure this matches "HEAD

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

3593 #.

2875 -#: ref-filter.c:1401

3594 +#: ref-filter.c:1430

3595 #, c-format

3596 msgid "(HEAD detached at %s)"

3597 msgstr ""

@@ -2880,147 +3599,142 @@ msgstr ""

3599 #. TRANSLATORS: make sure this matches "HEAD

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

3601 #.

2883 -#: ref-filter.c:1408

3602 +#: ref-filter.c:1437

3603 #, c-format

3604 msgid "(HEAD detached from %s)"

3605 msgstr ""

3606

2888 -#: ref-filter.c:1412

3607 +#: ref-filter.c:1441

3608 msgid "(no branch)"

3609 msgstr ""

3610

2892 -#: ref-filter.c:1442

3611 +#: ref-filter.c:1475 ref-filter.c:1623

3612 #, c-format

3613 msgid "missing object %s for %s"

3614 msgstr ""

3615

2897 -#: ref-filter.c:1445

3616 +#: ref-filter.c:1483

3617 #, c-format

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

3619 msgstr ""

3620

2902 -#: ref-filter.c:1902

3621 +#: ref-filter.c:1980

3622 #, c-format

3623 msgid "malformed object at '%s'"

3624 msgstr ""

3625

2907 -#: ref-filter.c:1984

3626 +#: ref-filter.c:2062

3627 #, c-format

3628 msgid "ignoring ref with broken name %s"

3629 msgstr ""

3630

2912 -#: ref-filter.c:1989

2913 -#, c-format

2914 -msgid "ignoring broken ref %s"

2915 -msgstr ""

2916 -

2917 -#: ref-filter.c:2261

3631 +#: ref-filter.c:2340

3632 #, c-format

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

3634 msgstr ""

3635

2922 -#: ref-filter.c:2365

3636 +#: ref-filter.c:2444

3637 #, c-format

3638 msgid "malformed object name %s"

3639 msgstr ""

3640

2927 -#: remote.c:605

3641 +#: remote.c:606

3642 #, c-format

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

3644 msgstr ""

3645

2932 -#: remote.c:609

3646 +#: remote.c:610

3647 #, c-format

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

3649 msgstr ""

3650

2937 -#: remote.c:613

3651 +#: remote.c:614

3652 #, c-format

3653 msgid "%s tracks both %s and %s"

3654 msgstr ""

3655

2942 -#: remote.c:621

3656 +#: remote.c:622

3657 msgid "Internal error"

3658 msgstr ""

3659

2946 -#: remote.c:1534 remote.c:1635

3660 +#: remote.c:1536 remote.c:1637

3661 msgid "HEAD does not point to a branch"

3662 msgstr ""

3663

2950 -#: remote.c:1543

3664 +#: remote.c:1545

3665 #, c-format

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

3667 msgstr ""

3668

2955 -#: remote.c:1546

3669 +#: remote.c:1548

3670 #, c-format

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

3672 msgstr ""

3673

2960 -#: remote.c:1552

3674 +#: remote.c:1554

3675 #, c-format

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

3677 msgstr ""

3678

2965 -#: remote.c:1567

3679 +#: remote.c:1569

3680 #, c-format

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

3682 msgstr ""

3683

2970 -#: remote.c:1579

3684 +#: remote.c:1581

3685 #, c-format

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

3687 msgstr ""

3688

2975 -#: remote.c:1589

3689 +#: remote.c:1591

3690 #, c-format

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

3692 msgstr ""

3693

2980 -#: remote.c:1602

3694 +#: remote.c:1604

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

3696 msgstr ""

3697

2984 -#: remote.c:1624

3698 +#: remote.c:1626

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

3700 msgstr ""

3701

2988 -#: remote.c:1939

3702 +#: remote.c:1951

3703 #, c-format

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

3705 msgstr ""

3706

2993 -#: remote.c:1943

3707 +#: remote.c:1955

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

3709 msgstr ""

3710

2997 -#: remote.c:1946

3711 +#: remote.c:1958

3712 #, c-format

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

3714 msgstr ""

3715

3002 -#: remote.c:1950

3716 +#: remote.c:1962

3717 #, c-format

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

3719 msgstr ""

3720

3007 -#: remote.c:1953

3721 +#: remote.c:1965

3722 #, c-format

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

3724 msgstr ""

3725

3012 -#: remote.c:1957

3726 +#: remote.c:1969

3727 #, c-format

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

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

3730 msgstr[0] ""

3731 msgstr[1] ""

3732

3019 -#: remote.c:1963

3733 +#: remote.c:1975

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

3735 msgstr ""

3736

3023 -#: remote.c:1966

3737 +#: remote.c:1978

3738 #, c-format

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

3740 msgid_plural ""

@@ -3028,11 +3742,11 @@ msgid_plural ""

3742 msgstr[0] ""

3743 msgstr[1] ""

3744

3031 -#: remote.c:1974

3745 +#: remote.c:1986

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

3747 msgstr ""

3748

3035 -#: remote.c:1977

3749 +#: remote.c:1989

3750 #, c-format

3751 msgid ""

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

@@ -3043,20 +3757,35 @@ msgid_plural ""

3757 msgstr[0] ""

3758 msgstr[1] ""

3759

3046 -#: remote.c:1987

3760 +#: remote.c:1999

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

3762 msgstr ""

3763

3050 -#: revision.c:2289

3764 +#: replace-object.c:20

3765 +#, c-format

3766 +msgid "bad replace ref name: %s"

3767 +msgstr ""

3768 +

3769 +#: replace-object.c:29

3770 +#, c-format

3771 +msgid "duplicate replace ref: %s"

3772 +msgstr ""

3773 +

3774 +#: replace-object.c:72

3775 +#, c-format

3776 +msgid "replace depth too high for object %s"

3777 +msgstr ""

3778 +

3779 +#: revision.c:2305

3780 msgid "your current branch appears to be broken"

3781 msgstr ""

3782

3054 -#: revision.c:2292

3783 +#: revision.c:2308

3784 #, c-format

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

3786 msgstr ""

3787

3059 -#: revision.c:2489

3788 +#: revision.c:2505

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

3790 msgstr ""

3791

@@ -3071,121 +3800,115 @@ msgid ""

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

3801 msgstr ""

3802

3074 -#: send-pack.c:141

3803 +#: send-pack.c:142

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

3805 msgstr ""

3806

3078 -#: send-pack.c:143

3807 +#: send-pack.c:144

3808 #, c-format

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

3810 msgstr ""

3811

3083 -#: send-pack.c:145

3812 +#: send-pack.c:146

3813 #, c-format

3814 msgid "remote unpack failed: %s"

3815 msgstr ""

3816

3088 -#: send-pack.c:308

3817 +#: send-pack.c:309

3818 msgid "failed to sign the push certificate"

3819 msgstr ""

3820

3092 -#: send-pack.c:421

3821 +#: send-pack.c:422

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

3823 msgstr ""

3824

3096 -#: send-pack.c:423

3825 +#: send-pack.c:424

3826 msgid ""

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

3828 "signed push"

3829 msgstr ""

3830

3102 -#: send-pack.c:435

3831 +#: send-pack.c:436

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

3833 msgstr ""

3834

3106 -#: send-pack.c:440

3835 +#: send-pack.c:441

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

3837 msgstr ""

3838

3110 -#: sequencer.c:175

3839 +#: sequencer.c:177

3840 #, c-format

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

3842 msgstr ""

3843

3115 -#: sequencer.c:275

3844 +#: sequencer.c:278

3845 #, c-format

3846 msgid "could not delete '%s'"

3847 msgstr ""

3848

3120 -#: sequencer.c:301

3849 +#: sequencer.c:304

3850 msgid "revert"

3851 msgstr ""

3852

3124 -#: sequencer.c:303

3853 +#: sequencer.c:306

3854 msgid "cherry-pick"

3855 msgstr ""

3856

3128 -#: sequencer.c:305

3857 +#: sequencer.c:308

3858 msgid "rebase -i"

3859 msgstr ""

3860

3132 -#: sequencer.c:307

3861 +#: sequencer.c:310

3862 #, c-format

3134 -msgid "Unknown action: %d"

3863 +msgid "unknown action: %d"

3864 msgstr ""

3865

3137 -#: sequencer.c:364

3866 +#: sequencer.c:367

3867 msgid ""

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

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

3870 msgstr ""

3871

3143 -#: sequencer.c:367

3872 +#: sequencer.c:370

3873 msgid ""

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

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

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

3877 msgstr ""

3878

3150 -#: sequencer.c:380 sequencer.c:2468

3879 +#: sequencer.c:383 sequencer.c:2488

3880 #, c-format

3881 msgid "could not lock '%s'"

3882 msgstr ""

3883

3155 -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3156 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3157 -#, c-format

3158 -msgid "could not write to '%s'"

3159 -msgstr ""

3160 -

3161 -#: sequencer.c:387

3884 +#: sequencer.c:390

3885 #, c-format

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

3887 msgstr ""

3888

3166 -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3167 -#: sequencer.c:2702

3889 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

3890 +#: sequencer.c:2741

3891 #, c-format

3892 msgid "failed to finalize '%s'"

3893 msgstr ""

3894

3172 -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3173 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3174 -#: builtin/merge.c:1046

3895 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

3896 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

3897 +#: builtin/merge.c:1081

3898 #, c-format

3899 msgid "could not read '%s'"

3900 msgstr ""

3901

3179 -#: sequencer.c:441

3902 +#: sequencer.c:444

3903 #, c-format

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

3905 msgstr ""

3906

3184 -#: sequencer.c:445

3907 +#: sequencer.c:448

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

3909 msgstr ""

3910

3188 -#: sequencer.c:474

3911 +#: sequencer.c:477

3912 #, c-format

3913 msgid "%s: fast-forward"

3914 msgstr ""

@@ -3193,20 +3916,40 @@ msgstr ""

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

3917 #. "rebase -i".

3918 #.

3196 -#: sequencer.c:563

3919 +#: sequencer.c:566

3920 #, c-format

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

3922 msgstr ""

3923

3201 -#: sequencer.c:579

3924 +#: sequencer.c:582

3925 msgid "unable to update cache tree"

3926 msgstr ""

3927

3205 -#: sequencer.c:592

3928 +#: sequencer.c:595

3929 msgid "could not resolve HEAD commit"

3930 msgstr ""

3931

3209 -#: sequencer.c:749

3932 +#: sequencer.c:723

3933 +#, c-format

3934 +msgid "could not parse '%s' (looking for '%s'"

3935 +msgstr ""

3936 +

3937 +#: sequencer.c:731

3938 +#, c-format

3939 +msgid "bad quoting on %s value in '%s'"

3940 +msgstr ""

3941 +

3942 +#: sequencer.c:740

3943 +#, c-format

3944 +msgid "could not parse '%s' (looking for '%s')"

3945 +msgstr ""

3946 +

3947 +#: sequencer.c:747

3948 +#, c-format

3949 +msgid "invalid date format '%s' in '%s'"

3950 +msgstr ""

3951 +

3952 +#: sequencer.c:761

3953 #, c-format

3954 msgid ""

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

@@ -3223,15 +3966,15 @@ msgid ""

3966 " git rebase --continue\n"

3967 msgstr ""

3968

3226 -#: sequencer.c:818

3969 +#: sequencer.c:830

3970 msgid "writing root commit"

3971 msgstr ""

3972

3230 -#: sequencer.c:1043

3973 +#: sequencer.c:1055

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

3975 msgstr ""

3976

3234 -#: sequencer.c:1050

3977 +#: sequencer.c:1062

3978 msgid ""

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

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

@@ -3246,7 +3989,7 @@ msgid ""

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

3990 msgstr ""

3991

3249 -#: sequencer.c:1063

3992 +#: sequencer.c:1075

3993 msgid ""

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

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

@@ -3260,313 +4003,335 @@ msgid ""

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

4004 msgstr ""

4005

3263 -#: sequencer.c:1103

4006 +#: sequencer.c:1115

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

4008 msgstr ""

4009

3267 -#: sequencer.c:1105

4010 +#: sequencer.c:1117

4011 msgid "could not parse newly created commit"

4012 msgstr ""

4013

3271 -#: sequencer.c:1151

4014 +#: sequencer.c:1163

4015 msgid "unable to resolve HEAD after creating commit"

4016 msgstr ""

4017

3275 -#: sequencer.c:1153

4018 +#: sequencer.c:1165

4019 msgid "detached HEAD"

4020 msgstr ""

4021

3279 -#: sequencer.c:1157

4022 +#: sequencer.c:1169

4023 msgid " (root-commit)"

4024 msgstr ""

4025

3283 -#: sequencer.c:1178

4026 +#: sequencer.c:1190

4027 msgid "could not parse HEAD"

4028 msgstr ""

4029

3287 -#: sequencer.c:1180

4030 +#: sequencer.c:1192

4031 #, c-format

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

4033 msgstr ""

4034

3292 -#: sequencer.c:1184 builtin/commit.c:1528

4035 +#: sequencer.c:1196 builtin/commit.c:1528

4036 msgid "could not parse HEAD commit"

4037 msgstr ""

4038

3296 -#: sequencer.c:1235 sequencer.c:1832

4039 +#: sequencer.c:1247 sequencer.c:1845

4040 msgid "unable to parse commit author"

4041 msgstr ""

4042

3300 -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

4043 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4044 msgid "git write-tree failed to write a tree"

4045 msgstr ""

4046

3304 -#: sequencer.c:1262 sequencer.c:1317

4047 +#: sequencer.c:1274 sequencer.c:1329

4048 #, c-format

4049 msgid "unable to read commit message from '%s'"

4050 msgstr ""

4051

3309 -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3310 -#: builtin/merge.c:850

4052 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4053 +#: builtin/merge.c:880

4054 msgid "failed to write commit object"

4055 msgstr ""

4056

3314 -#: sequencer.c:1344

4057 +#: sequencer.c:1356

4058 #, c-format

4059 msgid "could not parse commit %s"

4060 msgstr ""

4061

3319 -#: sequencer.c:1349

4062 +#: sequencer.c:1361

4063 #, c-format

4064 msgid "could not parse parent commit %s"

4065 msgstr ""

4066

3324 -#: sequencer.c:1500 sequencer.c:1525

4067 +#: sequencer.c:1457 sequencer.c:1565

4068 +#, c-format

4069 +msgid "unknown command: %d"

4070 +msgstr ""

4071 +

4072 +#: sequencer.c:1512 sequencer.c:1537

4073 #, c-format

4074 msgid "This is a combination of %d commits."

4075 msgstr ""

4076

3329 -#: sequencer.c:1510 sequencer.c:4355

4077 +#: sequencer.c:1522 sequencer.c:4520

4078 msgid "need a HEAD to fixup"

4079 msgstr ""

4080

3333 -#: sequencer.c:1512 sequencer.c:2729

4081 +#: sequencer.c:1524 sequencer.c:2768

4082 msgid "could not read HEAD"

4083 msgstr ""

4084

3337 -#: sequencer.c:1514

4085 +#: sequencer.c:1526

4086 msgid "could not read HEAD's commit message"

4087 msgstr ""

4088

3341 -#: sequencer.c:1520

4089 +#: sequencer.c:1532

4090 #, c-format

4091 msgid "cannot write '%s'"

4092 msgstr ""

4093

3346 -#: sequencer.c:1527 git-rebase--interactive.sh:457

4094 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4095 msgid "This is the 1st commit message:"

4096 msgstr ""

4097

3350 -#: sequencer.c:1535

4098 +#: sequencer.c:1547

4099 #, c-format

4100 msgid "could not read commit message of %s"

4101 msgstr ""

4102

3355 -#: sequencer.c:1542

4103 +#: sequencer.c:1554

4104 #, c-format

4105 msgid "This is the commit message #%d:"

4106 msgstr ""

4107

3360 -#: sequencer.c:1548

4108 +#: sequencer.c:1560

4109 #, c-format

4110 msgid "The commit message #%d will be skipped:"

4111 msgstr ""

4112

3365 -#: sequencer.c:1553

3366 -#, c-format

3367 -msgid "unknown command: %d"

3368 -msgstr ""

3369 -

3370 -#: sequencer.c:1631

4113 +#: sequencer.c:1643

4114 msgid "your index file is unmerged."

4115 msgstr ""

4116

3374 -#: sequencer.c:1638

4117 +#: sequencer.c:1650

4118 msgid "cannot fixup root commit"

4119 msgstr ""

4120

3378 -#: sequencer.c:1657

4121 +#: sequencer.c:1669

4122 #, c-format

4123 msgid "commit %s is a merge but no -m option was given."

4124 msgstr ""

4125

3383 -#: sequencer.c:1665

4126 +#: sequencer.c:1677

4127 #, c-format

4128 msgid "commit %s does not have parent %d"

4129 msgstr ""

4130

3388 -#: sequencer.c:1669

4131 +#: sequencer.c:1681

4132 #, c-format

4133 msgid "mainline was specified but commit %s is not a merge."

4134 msgstr ""

4135

3393 -#: sequencer.c:1675

4136 +#: sequencer.c:1687

4137 #, c-format

4138 msgid "cannot get commit message for %s"

4139 msgstr ""

4140

4141 #. TRANSLATORS: The first %s will be a "todo" command like

4142 #. "revert" or "pick", the second %s a SHA1.

3400 -#: sequencer.c:1694

4143 +#: sequencer.c:1706

4144 #, c-format

4145 msgid "%s: cannot parse parent commit %s"

4146 msgstr ""

4147

3405 -#: sequencer.c:1759

4148 +#: sequencer.c:1771

4149 #, c-format

4150 msgid "could not rename '%s' to '%s'"

4151 msgstr ""

4152

3410 -#: sequencer.c:1813

4153 +#: sequencer.c:1826

4154 #, c-format

4155 msgid "could not revert %s... %s"

4156 msgstr ""

4157

3415 -#: sequencer.c:1814

4158 +#: sequencer.c:1827

4159 #, c-format

4160 msgid "could not apply %s... %s"

4161 msgstr ""

4162

3420 -#: sequencer.c:1864

3421 -msgid "empty commit set passed"

3422 -msgstr ""

3423 -

3424 -#: sequencer.c:1874

4163 +#: sequencer.c:1885

4164 #, c-format

4165 msgid "git %s: failed to read the index"

4166 msgstr ""

4167

3429 -#: sequencer.c:1881

4168 +#: sequencer.c:1892

4169 #, c-format

4170 msgid "git %s: failed to refresh the index"

4171 msgstr ""

4172

3434 -#: sequencer.c:1961

4173 +#: sequencer.c:1972

4174 #, c-format

4175 msgid "%s does not accept arguments: '%s'"

4176 msgstr ""

4177

3439 -#: sequencer.c:1970

4178 +#: sequencer.c:1981

4179 #, c-format

4180 msgid "missing arguments for %s"

4181 msgstr ""

4182

3444 -#: sequencer.c:2029

4183 +#: sequencer.c:2040

4184 #, c-format

4185 msgid "invalid line %d: %.*s"

4186 msgstr ""

4187

3449 -#: sequencer.c:2037

4188 +#: sequencer.c:2048

4189 #, c-format

4190 msgid "cannot '%s' without a previous commit"

4191 msgstr ""

4192

3454 -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

4193 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4194 #, c-format

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

4196 msgstr ""

4197

3459 -#: sequencer.c:2108

4198 +#: sequencer.c:2119

4199 msgid "please fix this using 'git rebase --edit-todo'."

4200 msgstr ""

4201

3463 -#: sequencer.c:2110

4202 +#: sequencer.c:2121

4203 #, c-format

4204 msgid "unusable instruction sheet: '%s'"

4205 msgstr ""

4206

3468 -#: sequencer.c:2115

4207 +#: sequencer.c:2126

4208 msgid "no commits parsed."

4209 msgstr ""

4210

3472 -#: sequencer.c:2126

4211 +#: sequencer.c:2137

4212 msgid "cannot cherry-pick during a revert."

4213 msgstr ""

4214

3476 -#: sequencer.c:2128

4215 +#: sequencer.c:2139

4216 msgid "cannot revert during a cherry-pick."

4217 msgstr ""

4218

3480 -#: sequencer.c:2195

3481 -#, c-format

3482 -msgid "invalid key: %s"

3483 -msgstr ""

3484 -

3485 -#: sequencer.c:2198

4219 +#: sequencer.c:2209

4220 #, c-format

4221 msgid "invalid value for %s: %s"

4222 msgstr ""

4223

3490 -#: sequencer.c:2269

4224 +#: sequencer.c:2285

4225 msgid "unusable squash-onto"

4226 msgstr ""

4227

3494 -#: sequencer.c:2285

4228 +#: sequencer.c:2301

4229 #, c-format

4230 msgid "malformed options sheet: '%s'"

4231 msgstr ""

4232

3499 -#: sequencer.c:2323

4233 +#: sequencer.c:2335 sequencer.c:3775

4234 +msgid "empty commit set passed"

4235 +msgstr ""

4236 +

4237 +#: sequencer.c:2343

4238 msgid "a cherry-pick or revert is already in progress"

4239 msgstr ""

4240

3503 -#: sequencer.c:2324

4241 +#: sequencer.c:2344

4242 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

4243 msgstr ""

4244

3507 -#: sequencer.c:2327

4245 +#: sequencer.c:2347

4246 #, c-format

4247 msgid "could not create sequencer directory '%s'"

4248 msgstr ""

4249

3512 -#: sequencer.c:2341

4250 +#: sequencer.c:2361

4251 msgid "could not lock HEAD"

4252 msgstr ""

4253

3516 -#: sequencer.c:2396 sequencer.c:3403

4254 +#: sequencer.c:2416 sequencer.c:3543

4255 msgid "no cherry-pick or revert in progress"

4256 msgstr ""

4257

3520 -#: sequencer.c:2398

4258 +#: sequencer.c:2418

4259 msgid "cannot resolve HEAD"

4260 msgstr ""

4261

3524 -#: sequencer.c:2400 sequencer.c:2435

4262 +#: sequencer.c:2420 sequencer.c:2455

4263 msgid "cannot abort from a branch yet to be born"

4264 msgstr ""

4265

3528 -#: sequencer.c:2421 builtin/grep.c:720

4266 +#: sequencer.c:2441 builtin/grep.c:721

4267 #, c-format

4268 msgid "cannot open '%s'"

4269 msgstr ""

4270

3533 -#: sequencer.c:2423

4271 +#: sequencer.c:2443

4272 #, c-format

4273 msgid "cannot read '%s': %s"

4274 msgstr ""

4275

3538 -#: sequencer.c:2424

4276 +#: sequencer.c:2444

4277 msgid "unexpected end of file"

4278 msgstr ""

4279

3542 -#: sequencer.c:2430

4280 +#: sequencer.c:2450

4281 #, c-format

4282 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

4283 msgstr ""

4284

3547 -#: sequencer.c:2441

4285 +#: sequencer.c:2461

4286 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

4287 msgstr ""

4288

3551 -#: sequencer.c:2545 sequencer.c:3321

4289 +#: sequencer.c:2565 sequencer.c:3461

4290 #, c-format

4291 msgid "could not update %s"

4292 msgstr ""

4293

3556 -#: sequencer.c:2583 sequencer.c:3301

4294 +#: sequencer.c:2603 sequencer.c:3441

4295 msgid "cannot read HEAD"

4296 msgstr ""

4297

3560 -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

4298 +#: sequencer.c:2618

4299 +#, c-format

4300 +msgid "unable to copy '%s' to '%s'"

4301 +msgstr ""

4302 +

4303 +#: sequencer.c:2626

4304 +#, c-format

4305 +msgid ""

4306 +"You can amend the commit now, with\n"

4307 +"\n"

4308 +" git commit --amend %s\n"

4309 +"\n"

4310 +"Once you are satisfied with your changes, run\n"

4311 +"\n"

4312 +" git rebase --continue\n"

4313 +msgstr ""

4314 +

4315 +#: sequencer.c:2636

4316 +#, c-format

4317 +msgid "Could not apply %s... %.*s"

4318 +msgstr ""

4319 +

4320 +#: sequencer.c:2643

4321 +#, c-format

4322 +msgid "Could not merge %.*s"

4323 +msgstr ""

4324 +

4325 +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4326 #, c-format

4327 msgid "could not copy '%s' to '%s'"

4328 msgstr ""

4329

3565 -#: sequencer.c:2641

4330 +#: sequencer.c:2680 sequencer.c:3095

4331 msgid "could not read index"

4332 msgstr ""

4333

3569 -#: sequencer.c:2646

4334 +#: sequencer.c:2685

4335 #, c-format

4336 msgid ""

4337 "execution failed: %s\n"

@@ -3576,11 +4341,11 @@ msgid ""

4341 "\n"

4342 msgstr ""

4343

3579 -#: sequencer.c:2652

4344 +#: sequencer.c:2691

4345 msgid "and made changes to the index and/or the working tree\n"

4346 msgstr ""

4347

3583 -#: sequencer.c:2658

4348 +#: sequencer.c:2697

4349 #, c-format

4350 msgid ""

4351 "execution succeeded: %s\n"

@@ -3591,62 +4356,81 @@ msgid ""

4356 "\n"

4357 msgstr ""

4358

3594 -#: sequencer.c:2771

4359 +#: sequencer.c:2758

4360 +#, c-format

4361 +msgid "illegal label name: '%.*s'"

4362 +msgstr ""

4363 +

4364 +#: sequencer.c:2810

4365 msgid "writing fake root commit"

4366 msgstr ""

4367

3598 -#: sequencer.c:2776

4368 +#: sequencer.c:2815

4369 msgid "writing squash-onto"

4370 msgstr ""

4371

3602 -#: sequencer.c:2811

4372 +#: sequencer.c:2850

4373 #, c-format

4374 msgid "failed to find tree of %s"

4375 msgstr ""

4376

3607 -#: sequencer.c:2829

4377 +#: sequencer.c:2868

4378 msgid "could not write index"

4379 msgstr ""

4380

3611 -#: sequencer.c:2861

4381 +#: sequencer.c:2895

4382 +#, c-format

4383 +msgid "could not resolve '%s'"

4384 +msgstr ""

4385 +

4386 +#: sequencer.c:2921

4387 msgid "cannot merge without a current revision"

4388 msgstr ""

4389

3615 -#: sequencer.c:2884

4390 +#: sequencer.c:2943

4391 #, c-format

3617 -msgid "could not resolve '%s'"

4392 +msgid "unable to parse '%.*s'"

4393 msgstr ""

4394

3620 -#: sequencer.c:2906

4395 +#: sequencer.c:2952

4396 +#, c-format

4397 +msgid "nothing to merge: '%.*s'"

4398 +msgstr ""

4399 +

4400 +#: sequencer.c:2964

4401 +msgid "octopus merge cannot be executed on top of a [new root]"

4402 +msgstr ""

4403 +

4404 +#: sequencer.c:2979

4405 #, c-format

4406 msgid "could not get commit message of '%s'"

4407 msgstr ""

4408

3625 -#: sequencer.c:2916 sequencer.c:2941

4409 +#: sequencer.c:2989 sequencer.c:3015

4410 #, c-format

4411 msgid "could not write '%s'"

4412 msgstr ""

4413

3630 -#: sequencer.c:3005

4414 +#: sequencer.c:3127

4415 #, c-format

4416 msgid "could not even attempt to merge '%.*s'"

4417 msgstr ""

4418

3635 -#: sequencer.c:3021

4419 +#: sequencer.c:3143

4420 msgid "merge: Unable to write new index file"

4421 msgstr ""

4422

3639 -#: sequencer.c:3088

4423 +#: sequencer.c:3211

4424 #, c-format

4425 msgid "Applied autostash.\n"

4426 msgstr ""

4427

3644 -#: sequencer.c:3100

4428 +#: sequencer.c:3223

4429 #, c-format

4430 msgid "cannot store %s"

4431 msgstr ""

4432

3649 -#: sequencer.c:3103 git-rebase.sh:188

4433 +#: sequencer.c:3226 git-rebase.sh:188

4434 #, c-format

4435 msgid ""

4436 "Applying autostash resulted in conflicts.\n"

@@ -3654,7 +4438,7 @@ msgid ""

4438 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

4439 msgstr ""

4440

3657 -#: sequencer.c:3134

4441 +#: sequencer.c:3257

4442 #, c-format

4443 msgid ""

4444 "Could not execute the todo command\n"

@@ -3667,108 +4451,108 @@ msgid ""

4451 " git rebase --continue\n"

4452 msgstr ""

4453

3670 -#: sequencer.c:3202

4454 +#: sequencer.c:3325

4455 #, c-format

4456 msgid "Stopped at %s... %.*s\n"

4457 msgstr ""

4458

3675 -#: sequencer.c:3264

4459 +#: sequencer.c:3404

4460 #, c-format

4461 msgid "unknown command %d"

4462 msgstr ""

4463

3680 -#: sequencer.c:3309

4464 +#: sequencer.c:3449

4465 msgid "could not read orig-head"

4466 msgstr ""

4467

3684 -#: sequencer.c:3314 sequencer.c:4352

4468 +#: sequencer.c:3454 sequencer.c:4517

4469 msgid "could not read 'onto'"

4470 msgstr ""

4471

3688 -#: sequencer.c:3328

4472 +#: sequencer.c:3468

4473 #, c-format

4474 msgid "could not update HEAD to %s"

4475 msgstr ""

4476

3693 -#: sequencer.c:3414

4477 +#: sequencer.c:3554

4478 msgid "cannot rebase: You have unstaged changes."

4479 msgstr ""

4480

3697 -#: sequencer.c:3423

4481 +#: sequencer.c:3563

4482 msgid "cannot amend non-existing commit"

4483 msgstr ""

4484

3701 -#: sequencer.c:3425

4485 +#: sequencer.c:3565

4486 #, c-format

4487 msgid "invalid file: '%s'"

4488 msgstr ""

4489

3706 -#: sequencer.c:3427

4490 +#: sequencer.c:3567

4491 #, c-format

4492 msgid "invalid contents: '%s'"

4493 msgstr ""

4494

3711 -#: sequencer.c:3430

4495 +#: sequencer.c:3570

4496 msgid ""

4497 "\n"

4498 "You have uncommitted changes in your working tree. Please, commit them\n"

4499 "first and then run 'git rebase --continue' again."

4500 msgstr ""

4501

3718 -#: sequencer.c:3455 sequencer.c:3493

4502 +#: sequencer.c:3595 sequencer.c:3633

4503 #, c-format

4504 msgid "could not write file: '%s'"

4505 msgstr ""

4506

3723 -#: sequencer.c:3508

4507 +#: sequencer.c:3648

4508 msgid "could not remove CHERRY_PICK_HEAD"

4509 msgstr ""

4510

3727 -#: sequencer.c:3515

4511 +#: sequencer.c:3655

4512 msgid "could not commit staged changes."

4513 msgstr ""

4514

3731 -#: sequencer.c:3612

4515 +#: sequencer.c:3752

4516 #, c-format

4517 msgid "%s: can't cherry-pick a %s"

4518 msgstr ""

4519

3736 -#: sequencer.c:3616

4520 +#: sequencer.c:3756

4521 #, c-format

4522 msgid "%s: bad revision"

4523 msgstr ""

4524

3741 -#: sequencer.c:3649

4525 +#: sequencer.c:3791

4526 msgid "can't revert as initial commit"

4527 msgstr ""

4528

3745 -#: sequencer.c:4098

4529 +#: sequencer.c:4238

4530 msgid "make_script: unhandled options"

4531 msgstr ""

4532

3749 -#: sequencer.c:4101

4533 +#: sequencer.c:4241

4534 msgid "make_script: error preparing revisions"

4535 msgstr ""

4536

3753 -#: sequencer.c:4142 sequencer.c:4177

4537 +#: sequencer.c:4281 sequencer.c:4337

4538 #, c-format

4539 msgid "unusable todo list: '%s'"

4540 msgstr ""

4541

3758 -#: sequencer.c:4236

4542 +#: sequencer.c:4396

4543 #, c-format

4544 msgid ""

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

4546 msgstr ""

4547

3764 -#: sequencer.c:4302

4548 +#: sequencer.c:4466

4549 #, c-format

4550 msgid ""

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

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

4553 msgstr ""

4554

3771 -#: sequencer.c:4309

4555 +#: sequencer.c:4473

4556 #, c-format

4557 msgid ""

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

@@ -3779,7 +4563,7 @@ msgid ""

4563 "\n"

4564 msgstr ""

4565

3782 -#: sequencer.c:4321

4566 +#: sequencer.c:4486

4567 #, c-format

4568 msgid ""

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

@@ -3787,12 +4571,7 @@ msgid ""

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

4572 msgstr ""

4573

3790 -#: sequencer.c:4375

3791 -#, c-format

3792 -msgid "could not parse commit '%s'"

3793 -msgstr ""

3794 -

3795 -#: sequencer.c:4490

4574 +#: sequencer.c:4660

4575 msgid "the script was already rearranged."

4576 msgstr ""

4577

@@ -3909,72 +4688,296 @@ msgstr ""

4688 msgid "Unable to read current working directory"

4689 msgstr ""

4690

3912 -#: setup.c:1066 setup.c:1072

4691 +#: setup.c:1066 setup.c:1072

4692 +#, c-format

4693 +msgid "cannot change to '%s'"

4694 +msgstr ""

4695 +

4696 +#: setup.c:1085

4697 +#, c-format

4698 +msgid ""

4699 +"not a git repository (or any parent up to mount point %s)\n"

4700 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

4701 +msgstr ""

4702 +

4703 +#: setup.c:1168

4704 +#, c-format

4705 +msgid ""

4706 +"problem with core.sharedRepository filemode value (0%.3o).\n"

4707 +"The owner of files must always have read and write permissions."

4708 +msgstr ""

4709 +

4710 +#: setup.c:1211

4711 +msgid "open /dev/null or dup failed"

4712 +msgstr ""

4713 +

4714 +#: setup.c:1226

4715 +msgid "fork failed"

4716 +msgstr ""

4717 +

4718 +#: setup.c:1231

4719 +msgid "setsid failed"

4720 +msgstr ""

4721 +

4722 +#: sha1-file.c:381

4723 +#, c-format

4724 +msgid "object directory %s does not exist; check .git/objects/info/alternates"

4725 +msgstr ""

4726 +

4727 +#: sha1-file.c:432

4728 +#, c-format

4729 +msgid "unable to normalize alternate object path: %s"

4730 +msgstr ""

4731 +

4732 +#: sha1-file.c:503

4733 +#, c-format

4734 +msgid "%s: ignoring alternate object stores, nesting too deep"

4735 +msgstr ""

4736 +

4737 +#: sha1-file.c:510

4738 +#, c-format

4739 +msgid "unable to normalize object directory: %s"

4740 +msgstr ""

4741 +

4742 +#: sha1-file.c:565

4743 +msgid "unable to fdopen alternates lockfile"

4744 +msgstr ""

4745 +

4746 +#: sha1-file.c:583

4747 +msgid "unable to read alternates file"

4748 +msgstr ""

4749 +

4750 +#: sha1-file.c:590

4751 +msgid "unable to move new alternates file into place"

4752 +msgstr ""

4753 +

4754 +#: sha1-file.c:625

4755 +#, c-format

4756 +msgid "path '%s' does not exist"

4757 +msgstr ""

4758 +

4759 +#: sha1-file.c:651

4760 +#, c-format

4761 +msgid "reference repository '%s' as a linked checkout is not supported yet."

4762 +msgstr ""

4763 +

4764 +#: sha1-file.c:657

4765 +#, c-format

4766 +msgid "reference repository '%s' is not a local repository."

4767 +msgstr ""

4768 +

4769 +#: sha1-file.c:663

4770 +#, c-format

4771 +msgid "reference repository '%s' is shallow"

4772 +msgstr ""

4773 +

4774 +#: sha1-file.c:671

4775 +#, c-format

4776 +msgid "reference repository '%s' is grafted"

4777 +msgstr ""

4778 +

4779 +#: sha1-file.c:781

4780 +#, c-format

4781 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

4782 +msgstr ""

4783 +

4784 +#: sha1-file.c:806

4785 +msgid "mmap failed"

4786 +msgstr ""

4787 +

4788 +#: sha1-file.c:973

4789 +#, c-format

4790 +msgid "object file %s is empty"

4791 +msgstr ""

4792 +

4793 +#: sha1-file.c:1093 sha1-file.c:2206

4794 +#, c-format

4795 +msgid "corrupt loose object '%s'"

4796 +msgstr ""

4797 +

4798 +#: sha1-file.c:1095 sha1-file.c:2210

4799 +#, c-format

l10n: git.pot: v2.19.0 round 1 (382 new, 30 removed)