d93ef2a150 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2019-02-15 10:09+0800\n"

11 +"POT-Creation-Date: 2019-05-14 17:09+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:101

21 +#: advice.c:103

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:154

26 +#: advice.c:156

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

28 msgstr ""

29

30 -#: advice.c:156

30 +#: advice.c:158

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

32 msgstr ""

33

34 -#: advice.c:158

34 +#: advice.c:160

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

36 msgstr ""

37

38 -#: advice.c:160

38 +#: advice.c:162

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

40 msgstr ""

41

42 -#: advice.c:162

42 +#: advice.c:164

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

44 msgstr ""

45

46 -#: advice.c:164

46 +#: advice.c:166

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:172

51 +#: advice.c:174

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

57 +#: advice.c:182

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:185 builtin/merge.c:1290

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

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

63 msgstr ""

64

65 -#: advice.c:187

65 +#: advice.c:189

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

67 msgstr ""

68

69 -#: advice.c:188

69 +#: advice.c:190

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:194

73 +#: advice.c:196

74 #, c-format

75 msgid ""

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

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

94 msgid "unclosed quote"

95 msgstr ""

96

97 -#: apply.c:59

97 +#: apply.c:63

98 #, c-format

99 msgid "unrecognized whitespace option '%s'"

100 msgstr ""

101

102 -#: apply.c:75

102 +#: apply.c:79

103 #, c-format

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

105 msgstr ""

106

107 -#: apply.c:125

107 +#: apply.c:129

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

109 msgstr ""

110

111 -#: apply.c:127

111 +#: apply.c:131

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

113 msgstr ""

114

115 -#: apply.c:130

115 +#: apply.c:134

116 msgid "--3way outside a repository"

117 msgstr ""

118

119 -#: apply.c:141

119 +#: apply.c:145

120 msgid "--index outside a repository"

121 msgstr ""

122

123 -#: apply.c:144

123 +#: apply.c:148

124 msgid "--cached outside a repository"

125 msgstr ""

126

127 -#: apply.c:825

127 +#: apply.c:829

128 #, c-format

129 msgid "Cannot prepare timestamp regexp %s"

130 msgstr ""

131

132 -#: apply.c:834

132 +#: apply.c:838

133 #, c-format

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

135 msgstr ""

136

137 -#: apply.c:908

137 +#: apply.c:912

138 #, c-format

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

140 msgstr ""

141

142 -#: apply.c:946

142 +#: apply.c:950

143 #, c-format

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

145 msgstr ""

146

147 -#: apply.c:952

147 +#: apply.c:956

148 #, c-format

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

150 msgstr ""

151

152 -#: apply.c:953

152 +#: apply.c:957

153 #, c-format

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

155 msgstr ""

156

157 -#: apply.c:958

157 +#: apply.c:962

158 #, c-format

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

160 msgstr ""

161

162 -#: apply.c:987

162 +#: apply.c:991

163 #, c-format

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

165 msgstr ""

166

167 -#: apply.c:1306

167 +#: apply.c:1310

168 #, c-format

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

170 msgstr ""

171

172 -#: apply.c:1478

172 +#: apply.c:1482

173 #, c-format

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

175 msgstr ""

176

177 -#: apply.c:1547

177 +#: apply.c:1551

178 #, c-format

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

180 msgstr ""

181

182 -#: apply.c:1567

182 +#: apply.c:1571

183 #, c-format

184 msgid ""

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

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

190 msgstr[0] ""

191 msgstr[1] ""

192

193 -#: apply.c:1580

193 +#: apply.c:1584

194 #, c-format

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

196 msgstr ""

197

198 -#: apply.c:1768

198 +#: apply.c:1772

199 msgid "new file depends on old contents"

200 msgstr ""

201

202 -#: apply.c:1770

202 +#: apply.c:1774

203 msgid "deleted file still has contents"

204 msgstr ""

205

206 -#: apply.c:1804

206 +#: apply.c:1808

207 #, c-format

208 msgid "corrupt patch at line %d"

209 msgstr ""

210

211 -#: apply.c:1841

211 +#: apply.c:1845

212 #, c-format

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

214 msgstr ""

215

216 -#: apply.c:1843

216 +#: apply.c:1847

217 #, c-format

218 msgid "deleted file %s still has contents"

219 msgstr ""

220

221 -#: apply.c:1846

221 +#: apply.c:1850

222 #, c-format

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

224 msgstr ""

225

226 -#: apply.c:1993

226 +#: apply.c:1997

227 #, c-format

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

229 msgstr ""

230

231 -#: apply.c:2030

231 +#: apply.c:2034

232 #, c-format

233 msgid "unrecognized binary patch at line %d"

234 msgstr ""

235

236 -#: apply.c:2192

236 +#: apply.c:2196

237 #, c-format

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

239 msgstr ""

240

241 -#: apply.c:2278

241 +#: apply.c:2282

242 #, c-format

243 msgid "unable to read symlink %s"

244 msgstr ""

245

246 -#: apply.c:2282

246 +#: apply.c:2286

247 #, c-format

248 msgid "unable to open or read %s"

249 msgstr ""

250

251 -#: apply.c:2941

251 +#: apply.c:2945

252 #, c-format

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

254 msgstr ""

255

256 -#: apply.c:3062

256 +#: apply.c:3066

257 #, c-format

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

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

260 msgstr[0] ""

261 msgstr[1] ""

262

263 -#: apply.c:3074

263 +#: apply.c:3078

264 #, c-format

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

266 msgstr ""

267

268 -#: apply.c:3080

268 +#: apply.c:3084

269 #, c-format

270 msgid ""

271 "while searching for:\n"

272 "%.*s"

273 msgstr ""

274

275 -#: apply.c:3102

275 +#: apply.c:3106

276 #, c-format

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

278 msgstr ""

279

280 -#: apply.c:3110

280 +#: apply.c:3114

281 #, c-format

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

283 msgstr ""

284

285 -#: apply.c:3157

285 +#: apply.c:3161

286 #, c-format

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

288 msgstr ""

289

290 -#: apply.c:3167

290 +#: apply.c:3171

291 #, c-format

292 msgid ""

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

294 msgstr ""

295

296 -#: apply.c:3175

296 +#: apply.c:3179

297 #, c-format

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

299 msgstr ""

300

301 -#: apply.c:3193

301 +#: apply.c:3197

302 #, c-format

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

304 msgstr ""

305

306 -#: apply.c:3206

306 +#: apply.c:3210

307 #, c-format

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

309 msgstr ""

310

311 -#: apply.c:3212

311 +#: apply.c:3216

312 #, c-format

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

314 msgstr ""

315

316 -#: apply.c:3233

316 +#: apply.c:3237

317 #, c-format

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

319 msgstr ""

320

321 -#: apply.c:3356

321 +#: apply.c:3360

322 #, c-format

323 msgid "cannot checkout %s"

324 msgstr ""

325

326 -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

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

327 #, c-format

328 msgid "failed to read %s"

329 msgstr ""

330

331 -#: apply.c:3416

331 +#: apply.c:3420

332 #, c-format

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

334 msgstr ""

335

336 -#: apply.c:3445 apply.c:3688

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

337 #, c-format

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

339 msgstr ""

340

341 -#: apply.c:3531 apply.c:3703

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

342 #, c-format

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

344 msgstr ""

345

346 -#: apply.c:3540 apply.c:3711

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

347 #, c-format

348 msgid "%s: does not match index"

349 msgstr ""

350

351 -#: apply.c:3575

351 +#: apply.c:3579

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

353 msgstr ""

354

355 -#: apply.c:3578

355 +#: apply.c:3582

356 #, c-format

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

358 msgstr ""

359

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

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

361 #, c-format

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

363 msgstr ""

364

365 -#: apply.c:3610

365 +#: apply.c:3614

366 #, c-format

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

368 msgstr ""

369

370 -#: apply.c:3624

370 +#: apply.c:3628

371 #, c-format

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

373 msgstr ""

374

375 -#: apply.c:3629

375 +#: apply.c:3633

376 #, c-format

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

378 msgstr ""

379

380 -#: apply.c:3655

380 +#: apply.c:3659

381 msgid "removal patch leaves file contents"

382 msgstr ""

383

384 -#: apply.c:3728

384 +#: apply.c:3732

385 #, c-format

386 msgid "%s: wrong type"

387 msgstr ""

388

389 -#: apply.c:3730

389 +#: apply.c:3734

390 #, c-format

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

392 msgstr ""

393

394 -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

395 -#: read-cache.c:1299

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

395 +#: read-cache.c:1309

396 #, c-format

397 msgid "invalid path '%s'"

398 msgstr ""

399

400 -#: apply.c:3939

400 +#: apply.c:3943

401 #, c-format

402 msgid "%s: already exists in index"

403 msgstr ""

404

405 -#: apply.c:3942

405 +#: apply.c:3946

406 #, c-format

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

408 msgstr ""

409

410 -#: apply.c:3962

410 +#: apply.c:3966

411 #, c-format

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

413 msgstr ""

414

415 -#: apply.c:3967

415 +#: apply.c:3971

416 #, c-format

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

418 msgstr ""

419

420 -#: apply.c:3987

420 +#: apply.c:3991

421 #, c-format

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

423 msgstr ""

424

425 -#: apply.c:3991

425 +#: apply.c:3995

426 #, c-format

427 msgid "%s: patch does not apply"

428 msgstr ""

429

430 -#: apply.c:4006

430 +#: apply.c:4010

431 #, c-format

432 msgid "Checking patch %s..."

433 msgstr ""

434

435 -#: apply.c:4098

435 +#: apply.c:4102

436 #, c-format

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

438 msgstr ""

439

440 -#: apply.c:4105

440 +#: apply.c:4109

441 #, c-format

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

443 msgstr ""

444

445 -#: apply.c:4108

445 +#: apply.c:4112

446 #, c-format

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

448 msgstr ""

449

450 -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

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

451 #, c-format

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

453 msgstr ""

454

455 -#: apply.c:4117

455 +#: apply.c:4121

456 #, c-format

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

458 msgstr ""

459

460 -#: apply.c:4127

460 +#: apply.c:4131

461 #, c-format

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

463 msgstr ""

464

465 -#: apply.c:4265

465 +#: apply.c:4269

466 #, c-format

467 msgid "unable to remove %s from index"

468 msgstr ""

469

470 -#: apply.c:4299

470 +#: apply.c:4303

471 #, c-format

472 msgid "corrupt patch for submodule %s"

473 msgstr ""

474

475 -#: apply.c:4305

475 +#: apply.c:4309

476 #, c-format

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

478 msgstr ""

479

480 -#: apply.c:4313

480 +#: apply.c:4317

481 #, c-format

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

483 msgstr ""

484

485 -#: apply.c:4319 apply.c:4464

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

486 #, c-format

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

488 msgstr ""

489

490 -#: apply.c:4362

490 +#: apply.c:4366

491 #, c-format

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

493 msgstr ""

494

495 -#: apply.c:4366

495 +#: apply.c:4370

496 #, c-format

497 msgid "closing file '%s'"

498 msgstr ""

499

500 -#: apply.c:4436

500 +#: apply.c:4440

501 #, c-format

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

503 msgstr ""

504

505 -#: apply.c:4534

505 +#: apply.c:4538

506 #, c-format

507 msgid "Applied patch %s cleanly."

508 msgstr ""

509

510 -#: apply.c:4542

510 +#: apply.c:4546

511 msgid "internal error"

512 msgstr ""

513

514 -#: apply.c:4545

514 +#: apply.c:4549

515 #, c-format

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

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

518 msgstr[0] ""

519 msgstr[1] ""

520

521 -#: apply.c:4556

521 +#: apply.c:4560

522 #, c-format

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

524 msgstr ""

525

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

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

527 #, c-format

528 msgid "cannot open %s"

529 msgstr ""

530

531 -#: apply.c:4578

531 +#: apply.c:4582

532 #, c-format

533 msgid "Hunk #%d applied cleanly."

534 msgstr ""

535

536 -#: apply.c:4582

536 +#: apply.c:4586

537 #, c-format

538 msgid "Rejected hunk #%d."

539 msgstr ""

540

541 -#: apply.c:4692

541 +#: apply.c:4696

542 #, c-format

543 msgid "Skipped patch '%s'."

544 msgstr ""

545

546 -#: apply.c:4700

546 +#: apply.c:4704

547 msgid "unrecognized input"

548 msgstr ""

549

550 -#: apply.c:4720

550 +#: apply.c:4724

551 msgid "unable to read index file"

552 msgstr ""

553

554 -#: apply.c:4875

554 +#: apply.c:4879

555 #, c-format

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

557 msgstr ""

558

559 -#: apply.c:4902

559 +#: apply.c:4906

560 #, c-format

561 msgid "squelched %d whitespace error"

562 msgid_plural "squelched %d whitespace errors"

563 msgstr[0] ""

564 msgstr[1] ""

565

566 -#: apply.c:4908 apply.c:4923

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

567 #, c-format

568 msgid "%d line adds whitespace errors."

569 msgid_plural "%d lines add whitespace errors."

570 msgstr[0] ""

571 msgstr[1] ""

572

573 -#: apply.c:4916

573 +#: apply.c:4920

574 #, c-format

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

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

577 msgstr[0] ""

578 msgstr[1] ""

579

580 -#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

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

581 msgid "Unable to write new index file"

582 msgstr ""

583

584 -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

585 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

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

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

585 +#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271

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

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

588 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

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

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

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

590 msgid "path"

591 msgstr ""

592

593 -#: apply.c:4960

593 +#: apply.c:4964

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

595 msgstr ""

596

597 -#: apply.c:4963

597 +#: apply.c:4967

598 msgid "apply changes matching the given path"

599 msgstr ""

600

601 -#: apply.c:4965 builtin/am.c:2212

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

602 msgid "num"

603 msgstr ""

604

605 -#: apply.c:4966

605 +#: apply.c:4970

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

607 msgstr ""

608

609 -#: apply.c:4969

609 +#: apply.c:4973

610 msgid "ignore additions made by the patch"

611 msgstr ""

612

613 -#: apply.c:4971

613 +#: apply.c:4975

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

615 msgstr ""

616

617 -#: apply.c:4975

617 +#: apply.c:4979

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

619 msgstr ""

620

621 -#: apply.c:4977

621 +#: apply.c:4981

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

623 msgstr ""

624

625 -#: apply.c:4979

625 +#: apply.c:4983

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

627 msgstr ""

628

629 -#: apply.c:4981

629 +#: apply.c:4985

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

631 msgstr ""

632

633 -#: apply.c:4983

633 +#: apply.c:4987

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

635 msgstr ""

636

637 -#: apply.c:4985

637 +#: apply.c:4989

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

639 msgstr ""

640

641 -#: apply.c:4987

641 +#: apply.c:4991

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

643 msgstr ""

644

645 -#: apply.c:4990

645 +#: apply.c:4994

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

647 msgstr ""

648

649 -#: apply.c:4992

649 +#: apply.c:4996

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

651 msgstr ""

652

653 -#: apply.c:4994

653 +#: apply.c:4998

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

655 msgstr ""

656

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

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

658 msgid "paths are separated with NUL character"

659 msgstr ""

660

661 -#: apply.c:4999

661 +#: apply.c:5003

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

663 msgstr ""

664

665 -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

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

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

667 -#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

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

668 msgid "action"

669 msgstr ""

670

671 -#: apply.c:5001

671 +#: apply.c:5005

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

673 msgstr ""

674

675 -#: apply.c:5004 apply.c:5007

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

676 msgid "ignore changes in whitespace when finding context"

677 msgstr ""

678

679 -#: apply.c:5010

679 +#: apply.c:5014

680 msgid "apply the patch in reverse"

681 msgstr ""

682

683 -#: apply.c:5012

683 +#: apply.c:5016

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

685 msgstr ""

686

687 -#: apply.c:5014

687 +#: apply.c:5018

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

689 msgstr ""

690

691 -#: apply.c:5016

691 +#: apply.c:5020

692 msgid "allow overlapping hunks"

693 msgstr ""

694

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

696 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

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

698 -#: builtin/rebase--interactive.c:159

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

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

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

698 msgid "be verbose"

699 msgstr ""

700

702 -#: apply.c:5019

701 +#: apply.c:5023

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

703 msgstr ""

704

706 -#: apply.c:5022

705 +#: apply.c:5026

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

707 msgstr ""

708

710 -#: apply.c:5024 builtin/am.c:2200

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

710 msgid "root"

711 msgstr ""

712

714 -#: apply.c:5025

713 +#: apply.c:5029

714 msgid "prepend <root> to all filenames"

715 msgstr ""

716

@@ -732,7 +731,7 @@ msgstr ""

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

732 msgstr ""

733

735 -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

734 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

735 #, c-format

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

737 msgstr ""

@@ -764,7 +763,7 @@ msgstr ""

763 msgid "archive format"

764 msgstr ""

765

767 -#: archive.c:456 builtin/log.c:1549

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

767 msgid "prefix"

768 msgstr ""

769

@@ -772,11 +771,11 @@ msgstr ""

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

772 msgstr ""

773

775 -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

776 -#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

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

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

779 -#: parse-options.h:162

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

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

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

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

778 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176

779 msgid "file"

780 msgstr ""

781

@@ -808,8 +807,8 @@ msgstr ""

807 msgid "list supported archive formats"

808 msgstr ""

809

811 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

812 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

810 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

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

812 msgid "repo"

813 msgstr ""

814

@@ -817,7 +816,7 @@ msgstr ""

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

817 msgstr ""

818

820 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

819 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713

820 #: builtin/notes.c:498

821 msgid "command"

822 msgstr ""

@@ -863,16 +862,16 @@ msgstr ""

862 msgid "cannot read %s"

863 msgstr ""

864

866 -#: archive-tar.c:458

865 +#: archive-tar.c:459

866 #, c-format

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

868 msgstr ""

869

871 -#: archive-tar.c:461

870 +#: archive-tar.c:462

871 msgid "unable to redirect descriptor"

872 msgstr ""

873

875 -#: archive-tar.c:468

874 +#: archive-tar.c:469

875 #, c-format

876 msgid "'%s' filter reported error"

877 msgstr ""

@@ -887,7 +886,7 @@ msgstr ""

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

887 msgstr ""

888

890 -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

889 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229

890 #, c-format

891 msgid "deflate error (%d)"

892 msgstr ""

@@ -975,33 +974,33 @@ msgstr ""

974 msgid "a %s revision is needed"

975 msgstr ""

976

978 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

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

978 #, c-format

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

980 msgstr ""

981

983 -#: bisect.c:937 builtin/merge.c:139

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

983 #, c-format

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

985 msgstr ""

986

988 -#: bisect.c:967

987 +#: bisect.c:958

988 msgid "reading bisect refs failed"

989 msgstr ""

990

992 -#: bisect.c:986

991 +#: bisect.c:977

992 #, c-format

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

994 msgstr ""

995

997 -#: bisect.c:994

996 +#: bisect.c:985

997 #, c-format

998 msgid ""

999 "No testable commit found.\n"

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

1001 msgstr ""

1002

1004 -#: bisect.c:1013

1003 +#: bisect.c:1004

1004 #, c-format

1005 msgid "(roughly %d step)"

1006 msgid_plural "(roughly %d steps)"

@@ -1011,49 +1010,49 @@ msgstr[1] ""

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

1011 #. steps)" translation.

1012 #.

1014 -#: bisect.c:1019

1013 +#: bisect.c:1010

1014 #, c-format

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

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

1017 msgstr[0] ""

1018 msgstr[1] ""

1019

1021 -#: blame.c:1792

1020 +#: blame.c:1794

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

1022 msgstr ""

1023

1025 -#: blame.c:1806

1024 +#: blame.c:1808

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

1026 msgstr ""

1027

1029 -#: blame.c:1827

1028 +#: blame.c:1829

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

1030 msgstr ""

1031

1033 -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1034 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1035 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1036 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

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

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

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

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

1036 #: builtin/shortlog.c:192

1037 msgid "revision walk setup failed"

1038 msgstr ""

1039

1041 -#: blame.c:1854

1040 +#: blame.c:1856

1041 msgid ""

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

1043 msgstr ""

1044

1046 -#: blame.c:1865

1045 +#: blame.c:1867

1046 #, c-format

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

1048 msgstr ""

1049

1051 -#: blame.c:1876

1050 +#: blame.c:1878

1051 #, c-format

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

1053 msgstr ""

1054

1056 -#: branch.c:52

1055 +#: branch.c:53

1056 #, c-format

1057 msgid ""

1058 "\n"

@@ -1062,85 +1061,85 @@ msgid ""

1061 "\"git branch --set-upstream-to=%s%s%s\"."

1062 msgstr ""

1063

1065 -#: branch.c:66

1064 +#: branch.c:67

1065 #, c-format

1066 msgid "Not setting branch %s as its own upstream."

1067 msgstr ""

1068

1070 -#: branch.c:92

1069 +#: branch.c:93

1070 #, c-format

1071 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1072 msgstr ""

1073

1075 -#: branch.c:93

1074 +#: branch.c:94

1075 #, c-format

1076 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1077 msgstr ""

1078

1080 -#: branch.c:97

1079 +#: branch.c:98

1080 #, c-format

1081 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1082 msgstr ""

1083

1085 -#: branch.c:98

1084 +#: branch.c:99

1085 #, c-format

1086 msgid "Branch '%s' set up to track local branch '%s'."

1087 msgstr ""

1088

1090 -#: branch.c:103

1089 +#: branch.c:104

1090 #, c-format

1091 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1092 msgstr ""

1093

1095 -#: branch.c:104

1094 +#: branch.c:105

1095 #, c-format

1096 msgid "Branch '%s' set up to track remote ref '%s'."

1097 msgstr ""

1098

1100 -#: branch.c:108

1099 +#: branch.c:109

1100 #, c-format

1101 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1102 msgstr ""

1103

1105 -#: branch.c:109

1104 +#: branch.c:110

1105 #, c-format

1106 msgid "Branch '%s' set up to track local ref '%s'."

1107 msgstr ""

1108

1110 -#: branch.c:118

1109 +#: branch.c:119

1110 msgid "Unable to write upstream branch configuration"

1111 msgstr ""

1112

1114 -#: branch.c:155

1113 +#: branch.c:156

1114 #, c-format

1115 msgid "Not tracking: ambiguous information for ref %s"

1116 msgstr ""

1117

1119 -#: branch.c:188

1118 +#: branch.c:189

1119 #, c-format

1120 msgid "'%s' is not a valid branch name."

1121 msgstr ""

1122

1124 -#: branch.c:207

1123 +#: branch.c:208

1124 #, c-format

1125 msgid "A branch named '%s' already exists."

1126 msgstr ""

1127

1129 -#: branch.c:212

1128 +#: branch.c:213

1129 msgid "Cannot force update the current branch."

1130 msgstr ""

1131

1133 -#: branch.c:232

1132 +#: branch.c:233

1133 #, c-format

1134 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1135 msgstr ""

1136

1138 -#: branch.c:234

1137 +#: branch.c:235

1138 #, c-format

1139 msgid "the requested upstream branch '%s' does not exist"

1140 msgstr ""

1141

1143 -#: branch.c:236

1142 +#: branch.c:237

1143 msgid ""

1144 "\n"

1145 "If you are planning on basing your work on an upstream\n"

@@ -1152,17 +1151,17 @@ msgid ""

1151 "\"git push -u\" to set the upstream config as you push."

1152 msgstr ""

1153

1155 -#: branch.c:280

1154 +#: branch.c:281

1155 #, c-format

1156 msgid "Not a valid object name: '%s'."

1157 msgstr ""

1158

1160 -#: branch.c:300

1159 +#: branch.c:301

1160 #, c-format

1161 msgid "Ambiguous object name: '%s'."

1162 msgstr ""

1163

1165 -#: branch.c:305

1164 +#: branch.c:306

1165 #, c-format

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

1167 msgstr ""

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

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

1187 msgstr ""

1188

1190 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1191 -#: builtin/commit.c:776

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

1190 +#: builtin/commit.c:788

1191 #, c-format

1192 msgid "could not open '%s'"

1193 msgstr ""

@@ -1236,7 +1235,7 @@ msgstr ""

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

1236 msgstr ""

1237

1239 -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

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

1239 #, c-format

1240 msgid "unrecognized argument: %s"

1241 msgstr ""

@@ -1259,9 +1258,8 @@ msgstr ""

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

1259 msgstr ""

1260

1262 -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1263 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1264 -#: builtin/replace.c:448

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

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

1263 #, c-format

1264 msgid "could not parse %s"

1265 msgstr ""

@@ -1283,158 +1281,219 @@ msgid ""

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

1282 msgstr ""

1283

1286 -#: commit.c:1122

1284 +#: commit.c:1128

1285 #, c-format

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

1287 msgstr ""

1288

1291 -#: commit.c:1125

1289 +#: commit.c:1131

1290 #, c-format

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

1292 msgstr ""

1293

1296 -#: commit.c:1128

1294 +#: commit.c:1134

1295 #, c-format

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

1297 msgstr ""

1298

1301 -#: commit.c:1131

1299 +#: commit.c:1137

1300 #, c-format

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

1302 msgstr ""

1303

1306 -#: commit.c:1385

1304 +#: commit.c:1391

1305 msgid ""

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

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

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

1309 msgstr ""

1310

1313 -#: commit-graph.c:101

1314 -#, c-format

1315 -msgid "graph file %s is too small"

1311 +#: commit-graph.c:105

1312 +msgid "commit-graph file is too small"

1313 msgstr ""

1314

1318 -#: commit-graph.c:136

1315 +#: commit-graph.c:170

1316 #, c-format

1320 -msgid "graph signature %X does not match signature %X"

1317 +msgid "commit-graph signature %X does not match signature %X"

1318 msgstr ""

1319

1323 -#: commit-graph.c:143

1320 +#: commit-graph.c:177

1321 #, c-format

1325 -msgid "graph version %X does not match version %X"

1322 +msgid "commit-graph version %X does not match version %X"

1323 msgstr ""

1324

1328 -#: commit-graph.c:150

1325 +#: commit-graph.c:184

1326 #, c-format

1330 -msgid "hash version %X does not match version %X"

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

1328 msgstr ""

1329

1333 -#: commit-graph.c:173

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

1330 +#: commit-graph.c:207

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

1332 msgstr ""

1333

1337 -#: commit-graph.c:184

1334 +#: commit-graph.c:218

1335 #, c-format

1339 -msgid "improper chunk offset %08x%08x"

1336 +msgid "commit-graph improper chunk offset %08x%08x"

1337 msgstr ""

1338

1342 -#: commit-graph.c:221

1339 +#: commit-graph.c:255

1340 #, c-format

1344 -msgid "chunk id %08x appears multiple times"

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

1342 msgstr ""

1343

1347 -#: commit-graph.c:334

1344 +#: commit-graph.c:388

1345 #, c-format

1346 msgid "could not find commit %s"

1347 msgstr ""

1348

1352 -#: commit-graph.c:671 builtin/pack-objects.c:2646

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

1350 #, c-format

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

1352 msgstr ""

1353

1357 -#: commit-graph.c:704

1354 +#: commit-graph.c:763

1355 msgid "Loading known commits in commit graph"

1356 msgstr ""

1357

1361 -#: commit-graph.c:720

1358 +#: commit-graph.c:779

1359 msgid "Expanding reachable commits in commit graph"

1360 msgstr ""

1361

1365 -#: commit-graph.c:732

1362 +#: commit-graph.c:791

1363 msgid "Clearing commit marks in commit graph"

1364 msgstr ""

1365

1369 -#: commit-graph.c:752

1366 +#: commit-graph.c:811

1367 msgid "Computing commit graph generation numbers"

1368 msgstr ""

1369

1373 -#: commit-graph.c:869

1370 +#: commit-graph.c:928

1371 #, c-format

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

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

1374 msgstr[0] ""

1375 msgstr[1] ""

1376

1380 -#: commit-graph.c:882

1377 +#: commit-graph.c:941

1378 #, c-format

1379 msgid "error adding pack %s"

1380 msgstr ""

1381

1385 -#: commit-graph.c:884

1382 +#: commit-graph.c:943

1383 #, c-format

1384 msgid "error opening index for %s"

1385 msgstr ""

1386

1390 -#: commit-graph.c:898

1387 +#: commit-graph.c:957

1388 #, c-format

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

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

1391 msgstr[0] ""

1392 msgstr[1] ""

1393

1397 -#: commit-graph.c:930

1394 +#: commit-graph.c:989

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

1396 msgstr ""

1397

1401 -#: commit-graph.c:943

1398 +#: commit-graph.c:1002

1399 msgid "Counting distinct commits in commit graph"

1400 msgstr ""

1401

1405 -#: commit-graph.c:956

1402 +#: commit-graph.c:1015

1403 #, c-format

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

1405 msgstr ""

1406

1410 -#: commit-graph.c:965

1407 +#: commit-graph.c:1024

1408 msgid "Finding extra edges in commit graph"

1409 msgstr ""

1410

1414 -#: commit-graph.c:989

1411 +#: commit-graph.c:1048

1412 msgid "too many commits to write graph"

1413 msgstr ""

1414

1418 -#: commit-graph.c:996 midx.c:769

1415 +#: commit-graph.c:1055 midx.c:805

1416 #, c-format

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

1418 msgstr ""

1419

1423 -#: commit-graph.c:1036

1420 +#: commit-graph.c:1095

1421 #, c-format

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

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

1424 msgstr[0] ""

1425 msgstr[1] ""

1426

1430 -#: commit-graph.c:1109

1427 +#: commit-graph.c:1160

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

1429 msgstr ""

1430

1434 -#: commit-graph.c:1153

1431 +#: commit-graph.c:1170

1432 +#, c-format

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

1434 +msgstr ""

1435 +

1436 +#: commit-graph.c:1180 commit-graph.c:1195

1437 +#, c-format

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

1439 +msgstr ""

1440 +

1441 +#: commit-graph.c:1187

1442 +#, c-format

1443 +msgid "failed to parse commit %s from commit-graph"

1444 +msgstr ""

1445 +

1446 +#: commit-graph.c:1204

1447 msgid "Verifying commits in commit graph"

1448 msgstr ""

1449

1450 +#: commit-graph.c:1217

1451 +#, c-format

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

1453 +msgstr ""

1454 +

1455 +#: commit-graph.c:1224

1456 +#, c-format

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

1458 +msgstr ""

1459 +

1460 +#: commit-graph.c:1234

1461 +#, c-format

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

1463 +msgstr ""

1464 +

1465 +#: commit-graph.c:1240

1466 +#, c-format

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

1468 +msgstr ""

1469 +

1470 +#: commit-graph.c:1253

1471 +#, c-format

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

1473 +msgstr ""

1474 +

1475 +#: commit-graph.c:1258

1476 +#, c-format

1477 +msgid ""

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

1479 +msgstr ""

1480 +

1481 +#: commit-graph.c:1262

1482 +#, c-format

1483 +msgid ""

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

1485 +msgstr ""

1486 +

1487 +#: commit-graph.c:1277

1488 +#, c-format

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

1490 +msgstr ""

1491 +

1492 +#: commit-graph.c:1283

1493 +#, c-format

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

1495 +msgstr ""

1496 +

1497 #: compat/obstack.c:406 compat/obstack.c:408

1498 msgid "memory exhausted"

1499 msgstr ""

@@ -1472,7 +1531,7 @@ msgstr ""

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

1532 msgstr ""

1533

1475 -#: config.c:378 sequencer.c:2330

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

1535 #, c-format

1536 msgid "invalid key: %s"

1537 msgstr ""

@@ -1608,135 +1667,135 @@ msgstr ""

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

1668 msgstr ""

1669

1611 -#: config.c:1481 builtin/pack-objects.c:3394

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

1671 #, c-format

1672 msgid "bad pack compression level %d"

1673 msgstr ""

1674

1616 -#: config.c:1602

1675 +#: config.c:1604

1676 #, c-format

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

1678 msgstr ""

1679

1621 -#: config.c:1605

1680 +#: config.c:1607

1681 #, c-format

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

1683 msgstr ""

1684

1626 -#: config.c:1622

1685 +#: config.c:1624

1686 #, c-format

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

1688 msgstr ""

1689

1631 -#: config.c:1652

1690 +#: config.c:1654

1691 #, c-format

1692 msgid "failed to parse %s"

1693 msgstr ""

1694

1636 -#: config.c:1705

1695 +#: config.c:1710

1696 msgid "unable to parse command-line config"

1697 msgstr ""

1698

1640 -#: config.c:2037

1699 +#: config.c:2059

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

1701 msgstr ""

1702

1644 -#: config.c:2207

1703 +#: config.c:2229

1704 #, c-format

1705 msgid "Invalid %s: '%s'"

1706 msgstr ""

1707

1649 -#: config.c:2250

1708 +#: config.c:2272

1709 #, c-format

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

1711 msgstr ""

1712

1654 -#: config.c:2276

1713 +#: config.c:2298

1714 #, c-format

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

1716 msgstr ""

1717

1659 -#: config.c:2322

1718 +#: config.c:2344

1719 #, c-format

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

1721 msgstr ""

1722

1664 -#: config.c:2324

1723 +#: config.c:2346

1724 #, c-format

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

1726 msgstr ""

1727

1669 -#: config.c:2405

1728 +#: config.c:2427

1729 #, c-format

1730 msgid "invalid section name '%s'"

1731 msgstr ""

1732

1674 -#: config.c:2437

1733 +#: config.c:2459

1734 #, c-format

1735 msgid "%s has multiple values"

1736 msgstr ""

1737

1679 -#: config.c:2466

1738 +#: config.c:2488

1739 #, c-format

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

1741 msgstr ""

1742

1684 -#: config.c:2716 config.c:3040

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

1744 #, c-format

1745 msgid "could not lock config file %s"

1746 msgstr ""

1747

1689 -#: config.c:2727

1748 +#: config.c:2751

1749 #, c-format

1750 msgid "opening %s"

1751 msgstr ""

1752

1694 -#: config.c:2762 builtin/config.c:328

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

1754 #, c-format

1755 msgid "invalid pattern: %s"

1756 msgstr ""

1757

1699 -#: config.c:2787

1758 +#: config.c:2811

1759 #, c-format

1760 msgid "invalid config file %s"

1761 msgstr ""

1762

1704 -#: config.c:2800 config.c:3053

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

1764 #, c-format

1765 msgid "fstat on %s failed"

1766 msgstr ""

1767

1709 -#: config.c:2811

1768 +#: config.c:2835

1769 #, c-format

1770 msgid "unable to mmap '%s'"

1771 msgstr ""

1772

1714 -#: config.c:2820 config.c:3058

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

1774 #, c-format

1775 msgid "chmod on %s failed"

1776 msgstr ""

1777

1719 -#: config.c:2905 config.c:3155

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

1779 #, c-format

1780 msgid "could not write config file %s"

1781 msgstr ""

1782

1724 -#: config.c:2939

1783 +#: config.c:2963

1784 #, c-format

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

1786 msgstr ""

1787

1729 -#: config.c:2941 builtin/remote.c:782

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

1789 #, c-format

1790 msgid "could not unset '%s'"

1791 msgstr ""

1792

1734 -#: config.c:3031

1793 +#: config.c:3055

1794 #, c-format

1795 msgid "invalid section name: %s"

1796 msgstr ""

1797

1739 -#: config.c:3198

1798 +#: config.c:3222

1799 #, c-format

1800 msgid "missing value for '%s'"

1801 msgstr ""

@@ -1883,28 +1942,28 @@ msgstr ""

1942 msgid "ssh variant 'simple' does not support setting port"

1943 msgstr ""

1944

1886 -#: connect.c:1259

1945 +#: connect.c:1260

1946 #, c-format

1947 msgid "strange pathname '%s' blocked"

1948 msgstr ""

1949

1891 -#: connect.c:1304

1950 +#: connect.c:1307

1951 msgid "unable to fork"

1952 msgstr ""

1953

1895 -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

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

1955 msgid "Checking connectivity"

1956 msgstr ""

1957

1899 -#: connected.c:80

1958 +#: connected.c:97

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

1960 msgstr ""

1961

1903 -#: connected.c:100

1962 +#: connected.c:117

1963 msgid "failed write to rev-list"

1964 msgstr ""

1965

1907 -#: connected.c:107

1966 +#: connected.c:124

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

1968 msgstr ""

1969

@@ -2126,443 +2185,935 @@ msgstr ""

2185 msgid "Performing inexact rename detection"

2186 msgstr ""

2187

2129 -#: diff.c:108

2130 -#, c-format

2131 -msgid "option '%s' requires a value"

2188 +#: diff-no-index.c:238

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

2190 msgstr ""

2191

2134 -#: diff.c:158

2192 +#: diff-no-index.c:263

2193 +msgid ""

2194 +"Not a git repository. Use --no-index to compare two paths outside a working "

2195 +"tree"

2196 +msgstr ""

2197 +

2198 +#: diff.c:155

2199 #, c-format

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

2201 msgstr ""

2202

2139 -#: diff.c:163

2203 +#: diff.c:160

2204 #, c-format

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

2206 msgstr ""

2207

2144 -#: diff.c:291

2208 +#: diff.c:296

2209 msgid ""

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

2211 "'dimmed-zebra', 'plain'"

2212 msgstr ""

2213

2150 -#: diff.c:319

2214 +#: diff.c:324

2215 #, c-format

2216 msgid ""

2217 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

2218 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2219 msgstr ""

2220

2157 -#: diff.c:327

2221 +#: diff.c:332

2222 msgid ""

2223 "color-moved-ws: allow-indentation-change cannot be combined with other "

2224 "whitespace modes"

2225 msgstr ""

2226

2163 -#: diff.c:400

2227 +#: diff.c:405

2228 #, c-format

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

2230 msgstr ""

2231

2168 -#: diff.c:460

2232 +#: diff.c:465

2233 #, c-format

2234 msgid ""

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

2236 "%s"

2237 msgstr ""

2238

2175 -#: diff.c:4211

2239 +#: diff.c:4210

2240 #, c-format

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

2242 msgstr ""

2243

2180 -#: diff.c:4553

2244 +#: diff.c:4555

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

2246 msgstr ""

2247

2184 -#: diff.c:4556

2248 +#: diff.c:4558

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

2250 msgstr ""

2251

2188 -#: diff.c:4634

2252 +#: diff.c:4636

2253 msgid "--follow requires exactly one pathspec"

2254 msgstr ""

2255

2192 -#: diff.c:4800

2256 +#: diff.c:4684

2257 +#, c-format

2258 +msgid "invalid --stat value: %s"

2259 +msgstr ""

2260 +

2261 +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216

2262 +#: parse-options.c:200

2263 +#, c-format

2264 +msgid "%s expects a numerical value"

2265 +msgstr ""

2266 +

2267 +#: diff.c:4721

2268 #, c-format

2269 msgid ""

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

2271 "%s"

2272 msgstr ""

2273

2199 -#: diff.c:4814

2274 +#: diff.c:4806

2275 #, c-format

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

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

2277 msgstr ""

2278

2204 -#: diff.c:5900

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

2279 +#: diff.c:4830

2280 +#, c-format

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

2282 msgstr ""

2283

2208 -#: diff.c:5903

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

2284 +#: diff.c:4844

2285 +#, c-format

2286 +msgid "unable to resolve '%s'"

2287 msgstr ""

2288

2212 -#: diff.c:5906

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

2290 #, c-format

2214 -msgid ""

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

2291 +msgid "%s expects <n>/<m> form"

2292 msgstr ""

2293

2218 -#: dir.c:538

2294 +#: diff.c:4912

2295 #, c-format

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

2296 +msgid "%s expects a character, got '%s'"

2297 msgstr ""

2298

2223 -#: dir.c:927

2299 +#: diff.c:4933

2300 #, c-format

2225 -msgid "cannot use %s as an exclude file"

2301 +msgid "bad --color-moved argument: %s"

2302 msgstr ""

2303

2228 -#: dir.c:1842

2304 +#: diff.c:4952

2305 #, c-format

2230 -msgid "could not open directory '%s'"

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

2307 msgstr ""

2308

2233 -#: dir.c:2084

2234 -msgid "failed to get kernel name and information"

2309 +#: diff.c:4992

2310 +msgid ""

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

2312 +"\"histogram\""

2313 msgstr ""

2314

2237 -#: dir.c:2208

2238 -msgid "untracked cache is disabled on this system or location"

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

2316 +#, c-format

2317 +msgid "invalid argument to %s"

2318 msgstr ""

2319

2241 -#: dir.c:3009

2320 +#: diff.c:5186

2321 #, c-format

2243 -msgid "index file corrupt in repo %s"

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

2323 msgstr ""

2324

2246 -#: dir.c:3054 dir.c:3059

2325 +#: diff.c:5240

2326 #, c-format

2248 -msgid "could not create directories for %s"

2327 +msgid "bad --word-diff argument: %s"

2328 msgstr ""

2329

2251 -#: dir.c:3088

2252 -#, c-format

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

2330 +#: diff.c:5263

2331 +msgid "Diff output format options"

2332 msgstr ""

2333

2256 -#: editor.c:73

2257 -#, c-format

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

2334 +#: diff.c:5265 diff.c:5271

2335 +msgid "generate patch"

2336 msgstr ""

2337

2261 -#: entry.c:178

2262 -msgid "Filtering content"

2338 +#: diff.c:5268 builtin/log.c:167

2339 +msgid "suppress diff output"

2340 msgstr ""

2341

2265 -#: entry.c:465

2266 -#, c-format

2267 -msgid "could not stat file '%s'"

2342 +#: diff.c:5273 diff.c:5387 diff.c:5394

2343 +msgid "<n>"

2344 msgstr ""

2345

2270 -#: environment.c:150

2271 -#, c-format

2272 -msgid "bad git namespace path \"%s\""

2346 +#: diff.c:5274 diff.c:5277

2347 +msgid "generate diffs with <n> lines context"

2348 msgstr ""

2349

2275 -#: environment.c:332

2276 -#, c-format

2277 -msgid "could not set GIT_DIR to '%s'"

2350 +#: diff.c:5279

2351 +msgid "generate the diff in raw format"

2352 msgstr ""

2353

2280 -#: exec-cmd.c:361

2281 -#, c-format

2282 -msgid "too many args to run %s"

2354 +#: diff.c:5282

2355 +msgid "synonym for '-p --raw'"

2356 msgstr ""

2357

2285 -#: fetch-object.c:17

2286 -msgid "Remote with no URL"

2358 +#: diff.c:5286

2359 +msgid "synonym for '-p --stat'"

2360 msgstr ""

2361

2289 -#: fetch-pack.c:151

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

2362 +#: diff.c:5290

2363 +msgid "machine friendly --stat"

2364 msgstr ""

2365

2293 -#: fetch-pack.c:154

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

2366 +#: diff.c:5293

2367 +msgid "output only the last line of --stat"

2368 msgstr ""

2369

2297 -#: fetch-pack.c:165

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

2370 +#: diff.c:5295 diff.c:5303

2371 +msgid "<param1,param2>..."

2372 msgstr ""

2373

2301 -#: fetch-pack.c:185

2302 -#, c-format

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

2374 +#: diff.c:5296

2375 +msgid ""

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

2377 msgstr ""

2378

2306 -#: fetch-pack.c:256

2307 -msgid "--stateless-rpc requires multi_ack_detailed"

2379 +#: diff.c:5300

2380 +msgid "synonym for --dirstat=cumulative"

2381 msgstr ""

2382

2310 -#: fetch-pack.c:358 fetch-pack.c:1264

2311 -#, c-format

2312 -msgid "invalid shallow line: %s"

2383 +#: diff.c:5304

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

2385 msgstr ""

2386

2315 -#: fetch-pack.c:364 fetch-pack.c:1271

2316 -#, c-format

2317 -msgid "invalid unshallow line: %s"

2387 +#: diff.c:5308

2388 +msgid "warn if changes introduce conflict markers or whitespace errors"

2389 msgstr ""

2390

2320 -#: fetch-pack.c:366 fetch-pack.c:1273

2321 -#, c-format

2322 -msgid "object not found: %s"

2391 +#: diff.c:5311

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

2393 msgstr ""

2394

2325 -#: fetch-pack.c:369 fetch-pack.c:1276

2326 -#, c-format

2327 -msgid "error in object: %s"

2395 +#: diff.c:5314

2396 +msgid "show only names of changed files"

2397 msgstr ""

2398

2330 -#: fetch-pack.c:371 fetch-pack.c:1278

2331 -#, c-format

2332 -msgid "no shallow found: %s"

2399 +#: diff.c:5317

2400 +msgid "show only names and status of changed files"

2401 msgstr ""

2402

2335 -#: fetch-pack.c:374 fetch-pack.c:1282

2336 -#, c-format

2337 -msgid "expected shallow/unshallow, got %s"

2403 +#: diff.c:5319

2404 +msgid "<width>[,<name-width>[,<count>]]"

2405 msgstr ""

2406

2340 -#: fetch-pack.c:415

2341 -#, c-format

2342 -msgid "got %s %d %s"

2407 +#: diff.c:5320

2408 +msgid "generate diffstat"

2409 msgstr ""

2410

2345 -#: fetch-pack.c:432

2346 -#, c-format

2347 -msgid "invalid commit %s"

2411 +#: diff.c:5322 diff.c:5325 diff.c:5328

2412 +msgid "<width>"

2413 msgstr ""

2414

2350 -#: fetch-pack.c:463

2351 -msgid "giving up"

2415 +#: diff.c:5323

2416 +msgid "generate diffstat with a given width"

2417 msgstr ""

2418

2354 -#: fetch-pack.c:475 progress.c:229

2355 -msgid "done"

2419 +#: diff.c:5326

2420 +msgid "generate diffstat with a given name width"

2421 msgstr ""

2422

2358 -#: fetch-pack.c:487

2359 -#, c-format

2360 -msgid "got %s (%d) %s"

2423 +#: diff.c:5329

2424 +msgid "generate diffstat with a given graph width"

2425 msgstr ""

2426

2363 -#: fetch-pack.c:533

2364 -#, c-format

2365 -msgid "Marking %s as complete"

2427 +#: diff.c:5331

2428 +msgid "<count>"

2429 msgstr ""

2430

2368 -#: fetch-pack.c:740

2369 -#, c-format

2370 -msgid "already have %s (%s)"

2431 +#: diff.c:5332

2432 +msgid "generate diffstat with limited lines"

2433 msgstr ""

2434

2373 -#: fetch-pack.c:779

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

2435 +#: diff.c:5335

2436 +msgid "generate compact summary in diffstat"

2437 msgstr ""

2438

2377 -#: fetch-pack.c:787

2378 -msgid "protocol error: bad pack header"

2439 +#: diff.c:5338

2440 +msgid "output a binary diff that can be applied"

2441 msgstr ""

2442

2381 -#: fetch-pack.c:855

2382 -#, c-format

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

2443 +#: diff.c:5341

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

2445 msgstr ""

2446

2386 -#: fetch-pack.c:871

2387 -#, c-format

2388 -msgid "%s failed"

2447 +#: diff.c:5343

2448 +msgid "show colored diff"

2449 msgstr ""

2450

2391 -#: fetch-pack.c:873

2392 -msgid "error in sideband demultiplexer"

2451 +#: diff.c:5344

2452 +msgid "<kind>"

2453 msgstr ""

2454

2395 -#: fetch-pack.c:902

2396 -msgid "Server does not support shallow clients"

2455 +#: diff.c:5345

2456 +msgid ""

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

2458 +"diff"

2459 msgstr ""

2460

2399 -#: fetch-pack.c:906

2400 -msgid "Server supports multi_ack_detailed"

2461 +#: diff.c:5348

2462 +msgid ""

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

2464 +"--numstat"

2465 msgstr ""

2466

2403 -#: fetch-pack.c:909

2404 -msgid "Server supports no-done"

2467 +#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463

2468 +msgid "<prefix>"

2469 msgstr ""

2470

2407 -#: fetch-pack.c:915

2408 -msgid "Server supports multi_ack"

2471 +#: diff.c:5352

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

2473 msgstr ""

2474

2411 -#: fetch-pack.c:919

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

2475 +#: diff.c:5355

2476 +msgid "show the given source prefix instead of \"b/\""

2477 msgstr ""

2478

2415 -#: fetch-pack.c:923

2416 -msgid "Server supports side-band"

2479 +#: diff.c:5358

2480 +msgid "prepend an additional prefix to every line of output"

2481 msgstr ""

2482

2419 -#: fetch-pack.c:927

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

2483 +#: diff.c:5361

2484 +msgid "do not show any source or destination prefix"

2485 msgstr ""

2486

2423 -#: fetch-pack.c:931

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

2487 +#: diff.c:5364

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

2489 msgstr ""

2490

2427 -#: fetch-pack.c:941

2428 -msgid "Server supports ofs-delta"

2491 +#: diff.c:5368 diff.c:5373 diff.c:5378

2492 +msgid "<char>"

2493 msgstr ""

2494

2431 -#: fetch-pack.c:947 fetch-pack.c:1140

2432 -msgid "Server supports filter"

2495 +#: diff.c:5369

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

2497 msgstr ""

2498

2435 -#: fetch-pack.c:955

2436 -#, c-format

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

2499 +#: diff.c:5374

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

2501 msgstr ""

2502

2440 -#: fetch-pack.c:961

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

2503 +#: diff.c:5379

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

2505 msgstr ""

2506

2444 -#: fetch-pack.c:965

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

2507 +#: diff.c:5382

2508 +msgid "Diff rename options"

2509 msgstr ""

2510

2448 -#: fetch-pack.c:967

2449 -msgid "Server does not support --deepen"

2511 +#: diff.c:5383

2512 +msgid "<n>[/<m>]"

2513 msgstr ""

2514

2452 -#: fetch-pack.c:984

2453 -msgid "no common commits"

2515 +#: diff.c:5384

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

2517 msgstr ""

2518

2456 -#: fetch-pack.c:996 fetch-pack.c:1419

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

2519 +#: diff.c:5388

2520 +msgid "detect renames"

2521 msgstr ""

2522

2460 -#: fetch-pack.c:1134

2461 -msgid "Server does not support shallow requests"

2523 +#: diff.c:5392

2524 +msgid "omit the preimage for deletes"

2525 msgstr ""

2526

2464 -#: fetch-pack.c:1184

2465 -#, c-format

2466 -msgid "error reading section header '%s'"

2527 +#: diff.c:5395

2528 +msgid "detect copies"

2529 msgstr ""

2530

2469 -#: fetch-pack.c:1190

2470 -#, c-format

2471 -msgid "expected '%s', received '%s'"

2531 +#: diff.c:5399

2532 +msgid "use unmodified files as source to find copies"

2533 msgstr ""

2534

2474 -#: fetch-pack.c:1229

2475 -#, c-format

2476 -msgid "unexpected acknowledgment line: '%s'"

2535 +#: diff.c:5401

2536 +msgid "disable rename detection"

2537 msgstr ""

2538

2479 -#: fetch-pack.c:1234

2480 -#, c-format

2481 -msgid "error processing acks: %d"

2539 +#: diff.c:5404

2540 +msgid "use empty blobs as rename source"

2541 msgstr ""

2542

2484 -#: fetch-pack.c:1244

2485 -msgid "expected packfile to be sent after 'ready'"

2543 +#: diff.c:5406

2544 +msgid "continue listing the history of a file beyond renames"

2545 msgstr ""

2546

2488 -#: fetch-pack.c:1246

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

2547 +#: diff.c:5409

2548 +msgid ""

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

2550 +"given limit"

2551 msgstr ""

2552

2492 -#: fetch-pack.c:1287

2493 -#, c-format

2494 -msgid "error processing shallow info: %d"

2553 +#: diff.c:5411

2554 +msgid "Diff algorithm options"

2555 msgstr ""

2556

2497 -#: fetch-pack.c:1308

2498 -#, c-format

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

2557 +#: diff.c:5413

2558 +msgid "produce the smallest possible diff"

2559 msgstr ""

2560

2502 -#: fetch-pack.c:1318

2503 -#, c-format

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

2561 +#: diff.c:5416

2562 +msgid "ignore whitespace when comparing lines"

2563 msgstr ""

2564

2507 -#: fetch-pack.c:1322

2508 -#, c-format

2509 -msgid "error processing wanted refs: %d"

2565 +#: diff.c:5419

2566 +msgid "ignore changes in amount of whitespace"

2567 msgstr ""

2568

2512 -#: fetch-pack.c:1646

2513 -msgid "no matching remote head"

2569 +#: diff.c:5422

2570 +msgid "ignore changes in whitespace at EOL"

2571 msgstr ""

2572

2516 -#: fetch-pack.c:1664 builtin/clone.c:671

2517 -msgid "remote did not send all necessary objects"

2573 +#: diff.c:5425

2574 +msgid "ignore carrier-return at the end of line"

2575 msgstr ""

2576

2520 -#: fetch-pack.c:1690

2521 -#, c-format

2522 -msgid "no such remote ref %s"

2577 +#: diff.c:5428

2578 +msgid "ignore changes whose lines are all blank"

2579 msgstr ""

2580

2525 -#: fetch-pack.c:1693

2526 -#, c-format

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

2581 +#: diff.c:5431

2582 +msgid "heuristic to shift diff hunk boundaries for easy reading"

2583 msgstr ""

2584

2530 -#: gpg-interface.c:318

2531 -msgid "gpg failed to sign the data"

2585 +#: diff.c:5434

2586 +msgid "generate diff using the \"patience diff\" algorithm"

2587 msgstr ""

2588

2534 -#: gpg-interface.c:344

2535 -msgid "could not create temporary file"

2589 +#: diff.c:5438

2590 +msgid "generate diff using the \"histogram diff\" algorithm"

2591 msgstr ""

2592

2538 -#: gpg-interface.c:347

2539 -#, c-format

2540 -msgid "failed writing detached signature to '%s'"

2593 +#: diff.c:5440

2594 +msgid "<algorithm>"

2595 msgstr ""

2596

2543 -#: graph.c:97

2544 -#, c-format

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

2597 +#: diff.c:5441

2598 +msgid "choose a diff algorithm"

2599 msgstr ""

2600

2548 -#: grep.c:2113

2549 -#, c-format

2550 -msgid "'%s': unable to read %s"

2601 +#: diff.c:5443

2602 +msgid "<text>"

2603 msgstr ""

2604

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

2554 -#: builtin/rm.c:135

2555 -#, c-format

2556 -msgid "failed to stat '%s'"

2605 +#: diff.c:5444

2606 +msgid "generate diff using the \"anchored diff\" algorithm"

2607 msgstr ""

2608

2559 -#: grep.c:2141

2560 -#, c-format

2561 -msgid "'%s': short read"

2609 +#: diff.c:5446 diff.c:5455 diff.c:5458

2610 +msgid "<mode>"

2611 msgstr ""

2612

2564 -#: help.c:23

2565 -msgid "start a working area (see also: git help tutorial)"

2613 +#: diff.c:5447

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

2615 +msgstr ""

2616 +

2617 +#: diff.c:5449 diff.c:5452 diff.c:5497

2618 +msgid "<regex>"

2619 +msgstr ""

2620 +

2621 +#: diff.c:5450

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

2623 +msgstr ""

2624 +

2625 +#: diff.c:5453

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

2627 +msgstr ""

2628 +

2629 +#: diff.c:5456

2630 +msgid "move lines of code are colored differently"

2631 +msgstr ""

2632 +

2633 +#: diff.c:5459

2634 +msgid "how white spaces are ignored in --color-moved"

2635 +msgstr ""

2636 +

2637 +#: diff.c:5462

2638 +msgid "Diff other options"

2639 +msgstr ""

2640 +

2641 +#: diff.c:5464

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

2643 +msgstr ""

2644 +

2645 +#: diff.c:5468

2646 +msgid "treat all files as text"

2647 +msgstr ""

2648 +

2649 +#: diff.c:5470

2650 +msgid "swap two inputs, reverse the diff"

2651 +msgstr ""

2652 +

2653 +#: diff.c:5472

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

2655 +msgstr ""

2656 +

2657 +#: diff.c:5474

2658 +msgid "disable all output of the program"

2659 +msgstr ""

2660 +

2661 +#: diff.c:5476

2662 +msgid "allow an external diff helper to be executed"

2663 +msgstr ""

2664 +

2665 +#: diff.c:5478

2666 +msgid "run external text conversion filters when comparing binary files"

2667 +msgstr ""

2668 +

2669 +#: diff.c:5480

2670 +msgid "<when>"

2671 +msgstr ""

2672 +

2673 +#: diff.c:5481

2674 +msgid "ignore changes to submodules in the diff generation"

2675 +msgstr ""

2676 +

2677 +#: diff.c:5484

2678 +msgid "<format>"

2679 +msgstr ""

2680 +

2681 +#: diff.c:5485

2682 +msgid "specify how differences in submodules are shown"

2683 +msgstr ""

2684 +

2685 +#: diff.c:5489

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

2687 +msgstr ""

2688 +

2689 +#: diff.c:5492

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

2691 +msgstr ""

2692 +

2693 +#: diff.c:5494

2694 +msgid "<string>"

2695 +msgstr ""

2696 +

2697 +#: diff.c:5495

2698 +msgid ""

2699 +"look for differences that change the number of occurrences of the specified "

2700 +"string"

2701 +msgstr ""

2702 +

2703 +#: diff.c:5498

2704 +msgid ""

2705 +"look for differences that change the number of occurrences of the specified "

2706 +"regex"

2707 +msgstr ""

2708 +

2709 +#: diff.c:5501

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

2711 +msgstr ""

2712 +

2713 +#: diff.c:5504

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

2715 +msgstr ""

2716 +

2717 +#: diff.c:5507

2718 +msgid "control the order in which files appear in the output"

2719 +msgstr ""

2720 +

2721 +#: diff.c:5508

2722 +msgid "<object-id>"

2723 +msgstr ""

2724 +

2725 +#: diff.c:5509

2726 +msgid ""

2727 +"look for differences that change the number of occurrences of the specified "

2728 +"object"

2729 +msgstr ""

2730 +

2731 +#: diff.c:5511

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

2733 +msgstr ""

2734 +

2735 +#: diff.c:5512

2736 +msgid "select files by diff type"

2737 +msgstr ""

2738 +

2739 +#: diff.c:5514

2740 +msgid "<file>"

2741 +msgstr ""

2742 +

2743 +#: diff.c:5515

2744 +msgid "Output to a specific file"

2745 +msgstr ""

2746 +

2747 +#: diff.c:6148

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

2749 +msgstr ""

2750 +

2751 +#: diff.c:6151

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

2753 +msgstr ""

2754 +

2755 +#: diff.c:6154

2756 +#, c-format

2757 +msgid ""

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

2759 +msgstr ""

2760 +

2761 +#: dir.c:537

2762 +#, c-format

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

2764 +msgstr ""

2765 +

2766 +#: dir.c:926

2767 +#, c-format

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

2769 +msgstr ""

2770 +

2771 +#: dir.c:1843

2772 +#, c-format

2773 +msgid "could not open directory '%s'"

2774 +msgstr ""

2775 +

2776 +#: dir.c:2085

2777 +msgid "failed to get kernel name and information"

2778 +msgstr ""

2779 +

2780 +#: dir.c:2209

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

2782 +msgstr ""

2783 +

2784 +#: dir.c:3013

2785 +#, c-format

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

2787 +msgstr ""

2788 +

2789 +#: dir.c:3058 dir.c:3063

2790 +#, c-format

2791 +msgid "could not create directories for %s"

2792 +msgstr ""

2793 +

2794 +#: dir.c:3092

2795 +#, c-format

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

2797 +msgstr ""

2798 +

2799 +#: editor.c:73

2800 +#, c-format

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

2802 +msgstr ""

2803 +

2804 +#: entry.c:178

2805 +msgid "Filtering content"

2806 +msgstr ""

2807 +

2808 +#: entry.c:476

2809 +#, c-format

2810 +msgid "could not stat file '%s'"

2811 +msgstr ""

2812 +

2813 +#: environment.c:150

2814 +#, c-format

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

2816 +msgstr ""

2817 +

2818 +#: environment.c:332

2819 +#, c-format

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

2821 +msgstr ""

2822 +

2823 +#: exec-cmd.c:363

2824 +#, c-format

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

2826 +msgstr ""

2827 +

2828 +#: fetch-object.c:17

2829 +msgid "Remote with no URL"

2830 +msgstr ""

2831 +

2832 +#: fetch-pack.c:151

2833 +msgid "git fetch-pack: expected shallow list"

2834 +msgstr ""

2835 +

2836 +#: fetch-pack.c:154

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

2838 +msgstr ""

2839 +

2840 +#: fetch-pack.c:165

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

2842 +msgstr ""

2843 +

2844 +#: fetch-pack.c:185

2845 +#, c-format

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

2847 +msgstr ""

2848 +

2849 +#: fetch-pack.c:196

2850 +msgid "unable to write to remote"

2851 +msgstr ""

2852 +

2853 +#: fetch-pack.c:258

2854 +msgid "--stateless-rpc requires multi_ack_detailed"

2855 +msgstr ""

2856 +

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

2858 +#, c-format

2859 +msgid "invalid shallow line: %s"

2860 +msgstr ""

2861 +

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

2863 +#, c-format

2864 +msgid "invalid unshallow line: %s"

2865 +msgstr ""

2866 +

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

2868 +#, c-format

2869 +msgid "object not found: %s"

2870 +msgstr ""

2871 +

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

2873 +#, c-format

2874 +msgid "error in object: %s"

2875 +msgstr ""

2876 +

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

2878 +#, c-format

2879 +msgid "no shallow found: %s"

2880 +msgstr ""

2881 +

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

2883 +#, c-format

2884 +msgid "expected shallow/unshallow, got %s"

2885 +msgstr ""

2886 +

2887 +#: fetch-pack.c:417

2888 +#, c-format

2889 +msgid "got %s %d %s"

2890 +msgstr ""

2891 +

2892 +#: fetch-pack.c:434

2893 +#, c-format

2894 +msgid "invalid commit %s"

2895 +msgstr ""

2896 +

2897 +#: fetch-pack.c:465

2898 +msgid "giving up"

2899 +msgstr ""

2900 +

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

2902 +msgid "done"

2903 +msgstr ""

2904 +

2905 +#: fetch-pack.c:489

2906 +#, c-format

2907 +msgid "got %s (%d) %s"

2908 +msgstr ""

2909 +

2910 +#: fetch-pack.c:535

2911 +#, c-format

2912 +msgid "Marking %s as complete"

2913 +msgstr ""

2914 +

2915 +#: fetch-pack.c:744

2916 +#, c-format

2917 +msgid "already have %s (%s)"

2918 +msgstr ""

2919 +

2920 +#: fetch-pack.c:783

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

2922 +msgstr ""

2923 +

2924 +#: fetch-pack.c:791

2925 +msgid "protocol error: bad pack header"

2926 +msgstr ""

2927 +

2928 +#: fetch-pack.c:859

2929 +#, c-format

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

2931 +msgstr ""

2932 +

2933 +#: fetch-pack.c:875

2934 +#, c-format

2935 +msgid "%s failed"

2936 +msgstr ""

2937 +

2938 +#: fetch-pack.c:877

2939 +msgid "error in sideband demultiplexer"

2940 +msgstr ""

2941 +

2942 +#: fetch-pack.c:906

2943 +msgid "Server does not support shallow clients"

2944 +msgstr ""

2945 +

2946 +#: fetch-pack.c:910

2947 +msgid "Server supports multi_ack_detailed"

2948 +msgstr ""

2949 +

2950 +#: fetch-pack.c:913

2951 +msgid "Server supports no-done"

2952 +msgstr ""

2953 +

2954 +#: fetch-pack.c:919

2955 +msgid "Server supports multi_ack"

2956 +msgstr ""

2957 +

2958 +#: fetch-pack.c:923

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

2960 +msgstr ""

2961 +

2962 +#: fetch-pack.c:927

2963 +msgid "Server supports side-band"

2964 +msgstr ""

2965 +

2966 +#: fetch-pack.c:931

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

2968 +msgstr ""

2969 +

2970 +#: fetch-pack.c:935

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

2972 +msgstr ""

2973 +

2974 +#: fetch-pack.c:945

2975 +msgid "Server supports ofs-delta"

2976 +msgstr ""

2977 +

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

2979 +msgid "Server supports filter"

2980 +msgstr ""

2981 +

2982 +#: fetch-pack.c:959

2983 +#, c-format

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

2985 +msgstr ""

2986 +

2987 +#: fetch-pack.c:965

2988 +msgid "Server does not support --shallow-since"

2989 +msgstr ""

2990 +

2991 +#: fetch-pack.c:969

2992 +msgid "Server does not support --shallow-exclude"

2993 +msgstr ""

2994 +

2995 +#: fetch-pack.c:971

2996 +msgid "Server does not support --deepen"

2997 +msgstr ""

2998 +

2999 +#: fetch-pack.c:988

3000 +msgid "no common commits"

3001 +msgstr ""

3002 +

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

3004 +msgid "git fetch-pack: fetch failed."

3005 +msgstr ""

3006 +

3007 +#: fetch-pack.c:1138

3008 +msgid "Server does not support shallow requests"

3009 +msgstr ""

3010 +

3011 +#: fetch-pack.c:1171

3012 +msgid "unable to write request to remote"

3013 +msgstr ""

3014 +

3015 +#: fetch-pack.c:1189

3016 +#, c-format

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

3018 +msgstr ""

3019 +

3020 +#: fetch-pack.c:1195

3021 +#, c-format

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

3023 +msgstr ""

3024 +

3025 +#: fetch-pack.c:1234

3026 +#, c-format

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

3028 +msgstr ""

3029 +

3030 +#: fetch-pack.c:1239

3031 +#, c-format

3032 +msgid "error processing acks: %d"

3033 +msgstr ""

3034 +

3035 +#: fetch-pack.c:1249

3036 +msgid "expected packfile to be sent after 'ready'"

3037 +msgstr ""

3038 +

3039 +#: fetch-pack.c:1251

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

3041 +msgstr ""

3042 +

3043 +#: fetch-pack.c:1293

3044 +#, c-format

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

3046 +msgstr ""

3047 +

3048 +#: fetch-pack.c:1340

3049 +#, c-format

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

3051 +msgstr ""

3052 +

3053 +#: fetch-pack.c:1345

3054 +#, c-format

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

3056 +msgstr ""

3057 +

3058 +#: fetch-pack.c:1350

3059 +#, c-format

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

3061 +msgstr ""

3062 +

3063 +#: fetch-pack.c:1676

3064 +msgid "no matching remote head"

3065 +msgstr ""

3066 +

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

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

3069 +msgstr ""

3070 +

3071 +#: fetch-pack.c:1726

3072 +#, c-format

3073 +msgid "no such remote ref %s"

3074 +msgstr ""

3075 +

3076 +#: fetch-pack.c:1729

3077 +#, c-format

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

3079 +msgstr ""

3080 +

3081 +#: gpg-interface.c:318

3082 +msgid "gpg failed to sign the data"

3083 +msgstr ""

3084 +

3085 +#: gpg-interface.c:344

3086 +msgid "could not create temporary file"

3087 +msgstr ""

3088 +

3089 +#: gpg-interface.c:347

3090 +#, c-format

3091 +msgid "failed writing detached signature to '%s'"

3092 +msgstr ""

3093 +

3094 +#: graph.c:97

3095 +#, c-format

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

3097 +msgstr ""

3098 +

3099 +#: grep.c:2113

3100 +#, c-format

3101 +msgid "'%s': unable to read %s"

3102 +msgstr ""

3103 +

3104 +#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82

3105 +#: builtin/rm.c:135

3106 +#, c-format

3107 +msgid "failed to stat '%s'"

3108 +msgstr ""

3109 +

3110 +#: grep.c:2141

3111 +#, c-format

3112 +msgid "'%s': short read"

3113 +msgstr ""

3114 +

3115 +#: help.c:23

3116 +msgid "start a working area (see also: git help tutorial)"

3117 msgstr ""

3118

3119 #: help.c:24

@@ -2626,59 +3177,59 @@ msgstr ""

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

3178 msgstr ""

3179

2629 -#: help.c:363 git.c:90

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

3181 #, c-format

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

3183 msgstr ""

3184

2634 -#: help.c:410

3185 +#: help.c:403

3186 msgid "The common Git guides are:"

3187 msgstr ""

3188

2638 -#: help.c:519

3189 +#: help.c:512

3190 msgid "See 'git help <command>' to read about a specific subcommand"

3191 msgstr ""

3192

2642 -#: help.c:524

3193 +#: help.c:517

3194 msgid "External commands"

3195 msgstr ""

3196

2646 -#: help.c:539

3197 +#: help.c:532

3198 msgid "Command aliases"

3199 msgstr ""

3200

2650 -#: help.c:603

3201 +#: help.c:596

3202 #, c-format

3203 msgid ""

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

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

3206 msgstr ""

3207

2657 -#: help.c:662

3208 +#: help.c:655

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

3210 msgstr ""

3211

2661 -#: help.c:684

3212 +#: help.c:677

3213 #, c-format

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

3215 msgstr ""

3216

2666 -#: help.c:689

3217 +#: help.c:682

3218 #, c-format

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

3220 msgstr ""

3221

2671 -#: help.c:694

3222 +#: help.c:687

3223 #, c-format

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

3225 msgstr ""

3226

2676 -#: help.c:702

3227 +#: help.c:695

3228 #, c-format

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

3230 msgstr ""

3231

2681 -#: help.c:706

3232 +#: help.c:699

3233 msgid ""

3234 "\n"

3235 "The most similar command is"

@@ -2688,16 +3239,16 @@ msgid_plural ""

3239 msgstr[0] ""

3240 msgstr[1] ""

3241

2691 -#: help.c:721

3242 +#: help.c:714

3243 msgid "git version [<options>]"

3244 msgstr ""

3245

2695 -#: help.c:789

3246 +#: help.c:782

3247 #, c-format

3248 msgid "%s: %s - %s"

3249 msgstr ""

3250

2700 -#: help.c:793

3251 +#: help.c:786

3252 msgid ""

3253 "\n"

3254 "Did you mean this?"

@@ -2707,7 +3258,7 @@ msgid_plural ""

3258 msgstr[0] ""

3259 msgstr[1] ""

3260

2710 -#: ident.c:345

3261 +#: ident.c:349

3262 msgid ""

3263 "\n"

3264 "*** Please tell me who you are.\n"

@@ -2722,37 +3273,52 @@ msgid ""

3273 "\n"

3274 msgstr ""

3275

2725 -#: ident.c:369

3276 +#: ident.c:379

3277 msgid "no email was given and auto-detection is disabled"

3278 msgstr ""

3279

2729 -#: ident.c:374

3280 +#: ident.c:384

3281 #, c-format

3282 msgid "unable to auto-detect email address (got '%s')"

3283 msgstr ""

3284

2734 -#: ident.c:384

3285 +#: ident.c:401

3286 msgid "no name was given and auto-detection is disabled"

3287 msgstr ""

3288

2738 -#: ident.c:390

3289 +#: ident.c:407

3290 +#, c-format

3291 +msgid "unable to auto-detect name (got '%s')"

3292 +msgstr ""

3293 +

3294 +#: ident.c:415

3295 +#, c-format

3296 +msgid "empty ident name (for <%s>) not allowed"

3297 +msgstr ""

3298 +

3299 +#: ident.c:421

3300 +#, c-format

3301 +msgid "name consists only of disallowed characters: %s"

3302 +msgstr ""

3303 +

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

3305 #, c-format

2740 -msgid "unable to auto-detect name (got '%s')"

3306 +msgid "invalid date format: %s"

3307 msgstr ""

3308

2743 -#: ident.c:398

3309 +#: list-objects.c:129

3310 #, c-format

2745 -msgid "empty ident name (for <%s>) not allowed"

3311 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3312 msgstr ""

3313

2748 -#: ident.c:404

3314 +#: list-objects.c:142

3315 #, c-format

2750 -msgid "name consists only of disallowed characters: %s"

3316 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3317 msgstr ""

3318

2753 -#: ident.c:419 builtin/commit.c:608

3319 +#: list-objects.c:378

3320 #, c-format

2755 -msgid "invalid date format: %s"

3321 +msgid "unable to load root tree for commit %s"

3322 msgstr ""

3323

3324 #: list-objects-filter-options.c:36

@@ -2763,7 +3329,7 @@ msgstr ""

3329 msgid "expected 'tree:<depth>'"

3330 msgstr ""

3331

2766 -#: list-objects-filter-options.c:152

3332 +#: list-objects-filter-options.c:156

3333 msgid "cannot change partial clone promisor remote"

3334 msgstr ""

3335

@@ -2788,113 +3354,114 @@ msgstr ""

3354 msgid "failed to read the cache"

3355 msgstr ""

3356

2791 -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

2792 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

3357 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3358 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776

3359 +#: builtin/stash.c:264

3360 msgid "unable to write new index file"

3361 msgstr ""

3362

2796 -#: merge-recursive.c:332

3363 +#: merge-recursive.c:322

3364 msgid "(bad commit)\n"

3365 msgstr ""

3366

2800 -#: merge-recursive.c:355

3367 +#: merge-recursive.c:345

3368 #, c-format

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

3370 msgstr ""

3371

2805 -#: merge-recursive.c:364

3372 +#: merge-recursive.c:354

3373 #, c-format

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

3375 msgstr ""

3376

2810 -#: merge-recursive.c:447

3377 +#: merge-recursive.c:437

3378 msgid "error building trees"

3379 msgstr ""

3380

2814 -#: merge-recursive.c:902

3381 +#: merge-recursive.c:861

3382 #, c-format

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

3384 msgstr ""

3385

2819 -#: merge-recursive.c:913

3386 +#: merge-recursive.c:872

3387 #, c-format

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

3389 msgstr ""

3390

2824 -#: merge-recursive.c:927 merge-recursive.c:946

3391 +#: merge-recursive.c:886 merge-recursive.c:905

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

3393 msgstr ""

3394

2828 -#: merge-recursive.c:936

3395 +#: merge-recursive.c:895

3396 #, c-format

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

3398 msgstr ""

3399

2833 -#: merge-recursive.c:978 builtin/cat-file.c:40

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

3401 #, c-format

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

3403 msgstr ""

3404

2838 -#: merge-recursive.c:980

3405 +#: merge-recursive.c:939

3406 #, c-format

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

3408 msgstr ""

3409

2843 -#: merge-recursive.c:1004

3410 +#: merge-recursive.c:963

3411 #, c-format

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

3413 msgstr ""

3414

2848 -#: merge-recursive.c:1015

3415 +#: merge-recursive.c:974

3416 #, c-format

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

3418 msgstr ""

3419

2853 -#: merge-recursive.c:1020

3420 +#: merge-recursive.c:979

3421 #, c-format

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

3423 msgstr ""

3424

2858 -#: merge-recursive.c:1211

3425 +#: merge-recursive.c:1175

3426 #, c-format

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

3428 msgstr ""

3429

2863 -#: merge-recursive.c:1218

3430 +#: merge-recursive.c:1182

3431 #, c-format

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

3433 msgstr ""

3434

2868 -#: merge-recursive.c:1225

3435 +#: merge-recursive.c:1189

3436 #, c-format

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

3438 msgstr ""

3439

2873 -#: merge-recursive.c:1233 merge-recursive.c:1245

3440 +#: merge-recursive.c:1197 merge-recursive.c:1209

3441 #, c-format

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

3443 msgstr ""

3444

2878 -#: merge-recursive.c:1236 merge-recursive.c:1248

3445 +#: merge-recursive.c:1200 merge-recursive.c:1212

3446 #, c-format

3447 msgid "Fast-forwarding submodule %s"

3448 msgstr ""

3449

2883 -#: merge-recursive.c:1271

3450 +#: merge-recursive.c:1235

3451 #, c-format

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

3453 msgstr ""

3454

2888 -#: merge-recursive.c:1275

3455 +#: merge-recursive.c:1239

3456 #, c-format

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

3458 msgstr ""

3459

2893 -#: merge-recursive.c:1276

3460 +#: merge-recursive.c:1240

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

3462 msgstr ""

3463

2897 -#: merge-recursive.c:1279

3464 +#: merge-recursive.c:1243

3465 #, c-format

3466 msgid ""

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

@@ -2905,108 +3472,108 @@ msgid ""

3472 "which will accept this suggestion.\n"

3473 msgstr ""

3474

2908 -#: merge-recursive.c:1288

3475 +#: merge-recursive.c:1252

3476 #, c-format

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

3478 msgstr ""

3479

2913 -#: merge-recursive.c:1361

3480 +#: merge-recursive.c:1325

3481 msgid "Failed to execute internal merge"

3482 msgstr ""

3483

2917 -#: merge-recursive.c:1366

3484 +#: merge-recursive.c:1330

3485 #, c-format

3486 msgid "Unable to add %s to database"

3487 msgstr ""

3488

2922 -#: merge-recursive.c:1398

3489 +#: merge-recursive.c:1362

3490 #, c-format

3491 msgid "Auto-merging %s"

3492 msgstr ""

3493

2927 -#: merge-recursive.c:1419

3494 +#: merge-recursive.c:1385

3495 #, c-format

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

3497 msgstr ""

3498

2932 -#: merge-recursive.c:1486

3499 +#: merge-recursive.c:1457

3500 #, c-format

3501 msgid ""

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

3503 "in tree."

3504 msgstr ""

3505

2939 -#: merge-recursive.c:1491

3506 +#: merge-recursive.c:1462

3507 #, c-format

3508 msgid ""

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

3510 "left in tree."

3511 msgstr ""

3512

2946 -#: merge-recursive.c:1498

3513 +#: merge-recursive.c:1469

3514 #, c-format

3515 msgid ""

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

3517 "in tree at %s."

3518 msgstr ""

3519

2953 -#: merge-recursive.c:1503

3520 +#: merge-recursive.c:1474

3521 #, c-format

3522 msgid ""

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

3524 "left in tree at %s."

3525 msgstr ""

3526

2960 -#: merge-recursive.c:1537

3527 +#: merge-recursive.c:1509

3528 msgid "rename"

3529 msgstr ""

3530

2964 -#: merge-recursive.c:1537

3531 +#: merge-recursive.c:1509

3532 msgid "renamed"

3533 msgstr ""

3534

2968 -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3535 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3536 #, c-format

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

3538 msgstr ""

3539

2973 -#: merge-recursive.c:1643

3540 +#: merge-recursive.c:1599

3541 #, c-format

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

3543 msgstr ""

3544

2978 -#: merge-recursive.c:1706

3545 +#: merge-recursive.c:1657

3546 #, c-format

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

3548 msgstr ""

3549

2983 -#: merge-recursive.c:1734

3550 +#: merge-recursive.c:1687

3551 #, c-format

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

3553 msgstr ""

3554

2988 -#: merge-recursive.c:1739

3555 +#: merge-recursive.c:1692

3556 #, c-format

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

3558 msgstr ""

3559

2993 -#: merge-recursive.c:1759

3560 +#: merge-recursive.c:1711

3561 #, c-format

3562 msgid ""

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

3564 "\"->\"%s\" in \"%s\"%s"

3565 msgstr ""

3566

3000 -#: merge-recursive.c:1764

3567 +#: merge-recursive.c:1716

3568 msgid " (left unresolved)"

3569 msgstr ""

3570

3004 -#: merge-recursive.c:1868

3571 +#: merge-recursive.c:1825

3572 #, c-format

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

3574 msgstr ""

3575

3009 -#: merge-recursive.c:2064

3576 +#: merge-recursive.c:2030

3577 #, c-format

3578 msgid ""

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

@@ -3014,255 +3581,295 @@ msgid ""

3581 "getting a majority of the files."

3582 msgstr ""

3583

3017 -#: merge-recursive.c:2096

3584 +#: merge-recursive.c:2062

3585 #, c-format

3586 msgid ""

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

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

3589 msgstr ""

3590

3024 -#: merge-recursive.c:2106

3591 +#: merge-recursive.c:2072

3592 #, c-format

3593 msgid ""

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

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

3596 msgstr ""

3597

3031 -#: merge-recursive.c:2198

3598 +#: merge-recursive.c:2164

3599 #, c-format

3600 msgid ""

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

3602 ">%s in %s"

3603 msgstr ""

3604

3038 -#: merge-recursive.c:2443

3605 +#: merge-recursive.c:2408

3606 #, c-format

3607 msgid ""

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

3609 "renamed."

3610 msgstr ""

3611

3045 -#: merge-recursive.c:3022

3612 +#: merge-recursive.c:2929

3613 #, c-format

3614 msgid "cannot read object %s"

3615 msgstr ""

3616

3050 -#: merge-recursive.c:3025

3617 +#: merge-recursive.c:2932

3618 #, c-format

3619 msgid "object %s is not a blob"

3620 msgstr ""

3621

3055 -#: merge-recursive.c:3094

3622 +#: merge-recursive.c:2996

3623 msgid "modify"

3624 msgstr ""

3625

3059 -#: merge-recursive.c:3094

3626 +#: merge-recursive.c:2996

3627 msgid "modified"

3628 msgstr ""

3629

3063 -#: merge-recursive.c:3105

3630 +#: merge-recursive.c:3008

3631 msgid "content"

3632 msgstr ""

3633

3067 -#: merge-recursive.c:3112

3634 +#: merge-recursive.c:3012

3635 msgid "add/add"

3636 msgstr ""

3637

3071 -#: merge-recursive.c:3160

3638 +#: merge-recursive.c:3035

3639 #, c-format

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

3641 msgstr ""

3642

3076 -#: merge-recursive.c:3182 git-submodule.sh:861

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

3644 msgid "submodule"

3645 msgstr ""

3646

3080 -#: merge-recursive.c:3183

3647 +#: merge-recursive.c:3058

3648 #, c-format

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

3650 msgstr ""

3651

3085 -#: merge-recursive.c:3216

3652 +#: merge-recursive.c:3088

3653 #, c-format

3654 msgid "Adding as %s instead"

3655 msgstr ""

3656

3090 -#: merge-recursive.c:3319

3657 +#: merge-recursive.c:3170

3658 +#, c-format

3659 +msgid ""

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

3661 +"moving it to %s."

3662 +msgstr ""

3663 +

3664 +#: merge-recursive.c:3173

3665 +#, c-format

3666 +msgid ""

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

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

3669 +msgstr ""

3670 +

3671 +#: merge-recursive.c:3177

3672 +#, c-format

3673 +msgid ""

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

3675 +"%s; moving it to %s."

3676 +msgstr ""

3677 +

3678 +#: merge-recursive.c:3180

3679 +#, c-format

3680 +msgid ""

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

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

3683 +msgstr ""

3684 +

3685 +#: merge-recursive.c:3294

3686 #, c-format

3687 msgid "Removing %s"

3688 msgstr ""

3689

3095 -#: merge-recursive.c:3345

3690 +#: merge-recursive.c:3317

3691 msgid "file/directory"

3692 msgstr ""

3693

3099 -#: merge-recursive.c:3351

3694 +#: merge-recursive.c:3322

3695 msgid "directory/file"

3696 msgstr ""

3697

3103 -#: merge-recursive.c:3358

3698 +#: merge-recursive.c:3329

3699 #, c-format

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

3701 msgstr ""

3702

3108 -#: merge-recursive.c:3367

3703 +#: merge-recursive.c:3338

3704 #, c-format

3705 msgid "Adding %s"

3706 msgstr ""

3707

3113 -#: merge-recursive.c:3376

3708 +#: merge-recursive.c:3347

3709 #, c-format

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

3711 msgstr ""

3712

3118 -#: merge-recursive.c:3417

3713 +#: merge-recursive.c:3385

3714 #, c-format

3715 msgid ""

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

3717 " %s"

3718 msgstr ""

3719

3125 -#: merge-recursive.c:3428

3720 +#: merge-recursive.c:3396

3721 msgid "Already up to date!"

3722 msgstr ""

3723

3129 -#: merge-recursive.c:3437

3724 +#: merge-recursive.c:3405

3725 #, c-format

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

3727 msgstr ""

3728

3134 -#: merge-recursive.c:3536

3729 +#: merge-recursive.c:3504

3730 msgid "Merging:"

3731 msgstr ""

3732

3138 -#: merge-recursive.c:3549

3733 +#: merge-recursive.c:3517

3734 #, c-format

3735 msgid "found %u common ancestor:"

3736 msgid_plural "found %u common ancestors:"

3737 msgstr[0] ""

3738 msgstr[1] ""

3739

3145 -#: merge-recursive.c:3588

3740 +#: merge-recursive.c:3556

3741 msgid "merge returned no commit"

3742 msgstr ""

3743

3149 -#: merge-recursive.c:3654

3744 +#: merge-recursive.c:3622

3745 #, c-format

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

3747 msgstr ""

3748

3154 -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

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

3750 msgid "Unable to write index."

3751 msgstr ""

3752

3158 -#: midx.c:65

3753 +#: midx.c:66

3754 #, c-format

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

3756 msgstr ""

3757

3163 -#: midx.c:81

3758 +#: midx.c:82

3759 #, c-format

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

3761 msgstr ""

3762

3168 -#: midx.c:86

3763 +#: midx.c:87

3764 #, c-format

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

3766 msgstr ""

3767

3173 -#: midx.c:91

3768 +#: midx.c:92

3769 #, c-format

3770 msgid "hash version %u does not match"

3771 msgstr ""

3772

3178 -#: midx.c:105

3773 +#: midx.c:106

3774 msgid "invalid chunk offset (too large)"

3775 msgstr ""

3776

3182 -#: midx.c:129

3777 +#: midx.c:130

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

3779 msgstr ""

3780

3186 -#: midx.c:142

3781 +#: midx.c:143

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

3783 msgstr ""

3784

3190 -#: midx.c:144

3785 +#: midx.c:145

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

3787 msgstr ""

3788

3194 -#: midx.c:146

3789 +#: midx.c:147

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

3791 msgstr ""

3792

3198 -#: midx.c:148

3793 +#: midx.c:149

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

3795 msgstr ""

3796

3202 -#: midx.c:162

3797 +#: midx.c:163

3798 #, c-format

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

3800 msgstr ""

3801

3207 -#: midx.c:205

3802 +#: midx.c:209

3803 #, c-format

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

3805 msgstr ""

3806

3212 -#: midx.c:246

3807 +#: midx.c:250

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

3809 msgstr ""

3810

3216 -#: midx.c:271

3811 +#: midx.c:275

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

3813 msgstr ""

3814

3220 -#: midx.c:407

3815 +#: midx.c:443

3816 #, c-format

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

3818 msgstr ""

3819

3225 -#: midx.c:413

3820 +#: midx.c:449

3821 #, c-format

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

3823 msgstr ""

3824

3230 -#: midx.c:507

3825 +#: midx.c:543

3826 #, c-format

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

3828 msgstr ""

3829

3235 -#: midx.c:943

3830 +#: midx.c:979

3831 #, c-format

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

3833 msgstr ""

3834

3240 -#: midx.c:981

3835 +#: midx.c:1034

3836 +msgid "Looking for referenced packfiles"

3837 +msgstr ""

3838 +

3839 +#: midx.c:1049

3840 #, c-format

3841 msgid ""

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

3843 msgstr ""

3844

3246 -#: midx.c:992

3845 +#: midx.c:1053

3846 +msgid "Verifying OID order in MIDX"

3847 +msgstr ""

3848 +

3849 +#: midx.c:1062

3850 #, c-format

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

3852 msgstr ""

3853

3251 -#: midx.c:996

3854 +#: midx.c:1081

3855 +msgid "Sorting objects by packfile"

3856 +msgstr ""

3857 +

3858 +#: midx.c:1087

3859 msgid "Verifying object offsets"

3860 msgstr ""

3861

3255 -#: midx.c:1004

3862 +#: midx.c:1103

3863 #, c-format

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

3865 msgstr ""

3866

3260 -#: midx.c:1010

3867 +#: midx.c:1109

3868 #, c-format

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

3870 msgstr ""

3871

3265 -#: midx.c:1019

3872 +#: midx.c:1118

3873 #, c-format

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

3875 msgstr ""

@@ -3343,85 +3950,80 @@ msgstr ""

3950 msgid "hash mismatch %s"

3951 msgstr ""

3952

3346 -#: packfile.c:607

3953 +#: packfile.c:617

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

3955 msgstr ""

3956

3350 -#: packfile.c:1870

3957 +#: packfile.c:1880

3958 #, c-format

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

3960 msgstr ""

3961

3355 -#: packfile.c:1874

3962 +#: packfile.c:1884

3963 #, c-format

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

3965 msgstr ""

3966

3360 -#: parse-options.c:35

3967 +#: parse-options.c:38

3968 #, c-format

3969 msgid "%s requires a value"

3970 msgstr ""

3971

3365 -#: parse-options.c:69

3972 +#: parse-options.c:73

3973 #, c-format

3974 msgid "%s is incompatible with %s"

3975 msgstr ""

3976

3370 -#: parse-options.c:74

3977 +#: parse-options.c:78

3978 #, c-format

3979 msgid "%s : incompatible with something else"

3980 msgstr ""

3981

3375 -#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3982 +#: parse-options.c:92 parse-options.c:96 parse-options.c:287

3983 #, c-format

3984 msgid "%s takes no value"

3985 msgstr ""

3986

3380 -#: parse-options.c:90

3987 +#: parse-options.c:94

3988 #, c-format

3989 msgid "%s isn't available"

3990 msgstr ""

3991

3385 -#: parse-options.c:178

3386 -#, c-format

3387 -msgid "%s expects a numerical value"

3388 -msgstr ""

3389 -

3390 -#: parse-options.c:194

3992 +#: parse-options.c:216

3993 #, c-format

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

3995 msgstr ""

3996

3395 -#: parse-options.c:322

3997 +#: parse-options.c:356

3998 #, c-format

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

4000 msgstr ""

4001

3400 -#: parse-options.c:356 parse-options.c:364

4002 +#: parse-options.c:390 parse-options.c:398

4003 #, c-format

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

4005 msgstr ""

4006

3405 -#: parse-options.c:649

4007 +#: parse-options.c:733

4008 #, c-format

4009 msgid "unknown option `%s'"

4010 msgstr ""

4011

3410 -#: parse-options.c:651

4012 +#: parse-options.c:735

4013 #, c-format

4014 msgid "unknown switch `%c'"

4015 msgstr ""

4016

3415 -#: parse-options.c:653

4017 +#: parse-options.c:737

4018 #, c-format

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

4020 msgstr ""

4021

3420 -#: parse-options.c:675

4022 +#: parse-options.c:759

4023 msgid "..."

4024 msgstr ""

4025

3424 -#: parse-options.c:694

4026 +#: parse-options.c:778

4027 #, c-format

4028 msgid "usage: %s"

4029 msgstr ""

@@ -3429,17 +4031,17 @@ msgstr ""

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

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

4033 #.

3432 -#: parse-options.c:700

4034 +#: parse-options.c:784

4035 #, c-format

4036 msgid " or: %s"

4037 msgstr ""

4038

3437 -#: parse-options.c:703

4039 +#: parse-options.c:787

4040 #, c-format

4041 msgid " %s"

4042 msgstr ""

4043

3442 -#: parse-options.c:742

4044 +#: parse-options.c:826

4045 msgid "-NUM"

4046 msgstr ""

4047

@@ -3458,12 +4060,12 @@ msgstr ""

4060 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

4061 msgstr ""

4062

3461 -#: parse-options-cb.c:110

4063 +#: parse-options-cb.c:127 parse-options-cb.c:144

4064 #, c-format

4065 msgid "malformed object name '%s'"

4066 msgstr ""

4067

3466 -#: path.c:894

4068 +#: path.c:897

4069 #, c-format

4070 msgid "Could not make %s writable by group"

4071 msgstr ""

@@ -3539,45 +4141,53 @@ msgstr ""

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

4142 msgstr ""

4143

3542 -#: pkt-line.c:104

4144 +#: pkt-line.c:92

4145 +msgid "unable to write flush packet"

4146 +msgstr ""

4147 +

4148 +#: pkt-line.c:99

4149 +msgid "unable to write delim packet"

4150 +msgstr ""

4151 +

4152 +#: pkt-line.c:106

4153 msgid "flush packet write failed"

4154 msgstr ""

4155

3546 -#: pkt-line.c:144 pkt-line.c:230

4156 +#: pkt-line.c:146 pkt-line.c:232

4157 msgid "protocol error: impossibly long line"

4158 msgstr ""

4159

3550 -#: pkt-line.c:160 pkt-line.c:162

4160 +#: pkt-line.c:162 pkt-line.c:164

4161 msgid "packet write with format failed"

4162 msgstr ""

4163

3554 -#: pkt-line.c:194

4164 +#: pkt-line.c:196

4165 msgid "packet write failed - data exceeds max packet size"

4166 msgstr ""

4167

3558 -#: pkt-line.c:201 pkt-line.c:208

4168 +#: pkt-line.c:203 pkt-line.c:210

4169 msgid "packet write failed"

4170 msgstr ""

4171

3562 -#: pkt-line.c:293

4172 +#: pkt-line.c:295

4173 msgid "read error"

4174 msgstr ""

4175

3566 -#: pkt-line.c:301

4176 +#: pkt-line.c:303

4177 msgid "the remote end hung up unexpectedly"

4178 msgstr ""

4179

3570 -#: pkt-line.c:329

4180 +#: pkt-line.c:331

4181 #, c-format

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

4183 msgstr ""

4184

3575 -#: pkt-line.c:339 pkt-line.c:344

4185 +#: pkt-line.c:341 pkt-line.c:346

4186 #, c-format

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

4188 msgstr ""

4189

3580 -#: pkt-line.c:353

4190 +#: pkt-line.c:362

4191 #, c-format

4192 msgid "remote error: %s"

4193 msgstr ""

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

4201 msgid "unable to create threaded lstat: %s"

4202 msgstr ""

4203

3594 -#: pretty.c:963

4204 +#: pretty.c:966

4205 msgid "unable to parse --pretty format"

4206 msgstr ""

4207

@@ -3603,7 +4213,7 @@ msgstr ""

4213 msgid "could not read `log` output"

4214 msgstr ""

4215

3606 -#: range-diff.c:74 sequencer.c:4828

4216 +#: range-diff.c:74 sequencer.c:4897

4217 #, c-format

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

4219 msgstr ""

@@ -3617,196 +4227,207 @@ msgstr ""

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

4228 msgstr ""

4229

3620 -#: read-cache.c:673

4230 +#: read-cache.c:680

4231 #, c-format

4232 msgid "will not add file alias '%s' ('%s' already exists in index)"

4233 msgstr ""

4234

3625 -#: read-cache.c:689

4235 +#: read-cache.c:696

4236 msgid "cannot create an empty blob in the object database"

4237 msgstr ""

4238

3629 -#: read-cache.c:710

4239 +#: read-cache.c:718

4240 #, c-format

4241 msgid "%s: can only add regular files, symbolic links or git-directories"

4242 msgstr ""

4243

3634 -#: read-cache.c:765

4244 +#: read-cache.c:723

4245 +#, c-format

4246 +msgid "'%s' does not have a commit checked out"

4247 +msgstr ""

4248 +

4249 +#: read-cache.c:775

4250 #, c-format

4251 msgid "unable to index file '%s'"

4252 msgstr ""

4253

3639 -#: read-cache.c:784

4254 +#: read-cache.c:794

4255 #, c-format

4256 msgid "unable to add '%s' to index"

4257 msgstr ""

4258

3644 -#: read-cache.c:795

4259 +#: read-cache.c:805

4260 #, c-format

4261 msgid "unable to stat '%s'"

4262 msgstr ""

4263

3649 -#: read-cache.c:1304

4264 +#: read-cache.c:1314

4265 #, c-format

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

4267 msgstr ""

4268

3654 -#: read-cache.c:1489

4269 +#: read-cache.c:1499

4270 msgid "Refresh index"

4271 msgstr ""

4272

3658 -#: read-cache.c:1603

4273 +#: read-cache.c:1613

4274 #, c-format

4275 msgid ""

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

4277 "Using version %i"

4278 msgstr ""

4279

3665 -#: read-cache.c:1613

4280 +#: read-cache.c:1623

4281 #, c-format

4282 msgid ""

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

4284 "Using version %i"

4285 msgstr ""

4286

3672 -#: read-cache.c:1684

4287 +#: read-cache.c:1679

4288 #, c-format

4289 msgid "bad signature 0x%08x"

4290 msgstr ""

4291

3677 -#: read-cache.c:1687

4292 +#: read-cache.c:1682

4293 #, c-format

4294 msgid "bad index version %d"

4295 msgstr ""

4296

3682 -#: read-cache.c:1696

4297 +#: read-cache.c:1691

4298 msgid "bad index file sha1 signature"

4299 msgstr ""

4300

3686 -#: read-cache.c:1726

4301 +#: read-cache.c:1721

4302 #, c-format

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

4304 msgstr ""

4305

3691 -#: read-cache.c:1728

4306 +#: read-cache.c:1723

4307 #, c-format

4308 msgid "ignoring %.4s extension"

4309 msgstr ""

4310

3696 -#: read-cache.c:1765

4311 +#: read-cache.c:1760

4312 #, c-format

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

4314 msgstr ""

4315

3701 -#: read-cache.c:1781

4316 +#: read-cache.c:1776

4317 #, c-format

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

4319 msgstr ""

4320

3706 -#: read-cache.c:1836

4321 +#: read-cache.c:1833

4322 msgid "unordered stage entries in index"

4323 msgstr ""

4324

3710 -#: read-cache.c:1839

4325 +#: read-cache.c:1836

4326 #, c-format

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

4328 msgstr ""

4329

3715 -#: read-cache.c:1842

4330 +#: read-cache.c:1839

4331 #, c-format

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

4333 msgstr ""

4334

3720 -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3721 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3722 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3723 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

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

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

4337 +#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

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

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

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

4341 msgid "index file corrupt"

4342 msgstr ""

4343

3729 -#: read-cache.c:2090

4344 +#: read-cache.c:2087

4345 #, c-format

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

4347 msgstr ""

4348

3734 -#: read-cache.c:2103

4349 +#: read-cache.c:2100

4350 #, c-format

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

4352 msgstr ""

4353

3739 -#: read-cache.c:2136

4354 +#: read-cache.c:2133

4355 #, c-format

4356 msgid "%s: index file open failed"

4357 msgstr ""

4358

3744 -#: read-cache.c:2140

4359 +#: read-cache.c:2137

4360 #, c-format

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

4362 msgstr ""

4363

3749 -#: read-cache.c:2144

4364 +#: read-cache.c:2141

4365 #, c-format

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

4367 msgstr ""

4368

3754 -#: read-cache.c:2148

4369 +#: read-cache.c:2145

4370 #, c-format

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

4372 msgstr ""

4373

3759 -#: read-cache.c:2190

4374 +#: read-cache.c:2187

4375 #, c-format

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

4377 msgstr ""

4378

3764 -#: read-cache.c:2217

4379 +#: read-cache.c:2214

4380 #, c-format

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

4382 msgstr ""

4383

3769 -#: read-cache.c:2239

4384 +#: read-cache.c:2246

4385 #, c-format

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

4387 msgstr ""

4388

3774 -#: read-cache.c:2274

4389 +#: read-cache.c:2293

4390 #, c-format

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

4392 msgstr ""

4393

3779 -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4394 +#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117

4395 #, c-format

4396 msgid "could not close '%s'"

4397 msgstr ""

4398

3784 -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4399 +#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807

4400 #, c-format

4401 msgid "could not stat '%s'"

4402 msgstr ""

4403

3789 -#: read-cache.c:3057

4404 +#: read-cache.c:3104

4405 #, c-format

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

4407 msgstr ""

4408

3794 -#: read-cache.c:3069

4409 +#: read-cache.c:3116

4410 #, c-format

4411 msgid "unable to unlink: %s"

4412 msgstr ""

4413

3799 -#: read-cache.c:3088

4414 +#: read-cache.c:3141

4415 #, c-format

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

4417 msgstr ""

4418

3804 -#: read-cache.c:3237

4419 +#: read-cache.c:3290

4420 #, c-format

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

4422 msgstr ""

4423

3809 -#: rebase-interactive.c:10

4424 +#: rebase-interactive.c:26

4425 +#, c-format

4426 +msgid ""

4427 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4428 +msgstr ""

4429 +

4430 +#: rebase-interactive.c:35

4431 msgid ""

4432 "\n"

4433 "Commands:\n"

@@ -3828,19 +4449,26 @@ msgid ""

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

4450 msgstr ""

4451

3831 -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

4452 +#: rebase-interactive.c:56

4453 +#, c-format

4454 +msgid "Rebase %s onto %s (%d command)"

4455 +msgid_plural "Rebase %s onto %s (%d commands)"

4456 +msgstr[0] ""

4457 +msgstr[1] ""

4458 +

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

4460 msgid ""

4461 "\n"

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

4463 msgstr ""

4464

3837 -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

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

4466 msgid ""

4467 "\n"

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

4469 msgstr ""

4470

3843 -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

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

4472 msgid ""

4473 "\n"

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

@@ -3849,21 +4477,44 @@ msgid ""

4477 "\n"

4478 msgstr ""

4479

3852 -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

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

4481 msgid ""

4482 "\n"

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

4484 "\n"

4485 msgstr ""

4486

3859 -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

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

4488 msgid "Note that empty commits are commented out"

4489 msgstr ""

4490

3863 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

3864 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

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

4492 +#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

4493 #, c-format

3866 -msgid "could not read '%s'."

4494 +msgid "could not write '%s'"

4495 +msgstr ""

4496 +

4497 +#: rebase-interactive.c:108

4498 +#, c-format

4499 +msgid "could not copy '%s' to '%s'."

4500 +msgstr ""

4501 +

4502 +#: rebase-interactive.c:173

4503 +#, c-format

4504 +msgid ""

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

4506 +"Dropped commits (newer to older):\n"

4507 +msgstr ""

4508 +

4509 +#: rebase-interactive.c:180

4510 +#, c-format

4511 +msgid ""

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

4513 +"\n"

4514 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

4515 +"warnings.\n"

4516 +"The possible behaviours are: ignore, warn, error.\n"

4517 +"\n"

4518 msgstr ""

4519

4520 #: refs.c:192

@@ -3871,110 +4522,108 @@ msgstr ""

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

4523 msgstr ""

4524

3874 -#: refs.c:583

4525 +#: refs.c:597

4526 #, c-format

4527 msgid "ignoring dangling symref %s"

4528 msgstr ""

4529

3879 -#: refs.c:585 ref-filter.c:1976

4530 +#: refs.c:599 ref-filter.c:1982

4531 #, c-format

4532 msgid "ignoring broken ref %s"

4533 msgstr ""

4534

3884 -#: refs.c:711

4535 +#: refs.c:734

4536 #, c-format

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

4538 msgstr ""

4539

3889 -#: refs.c:721 refs.c:772

4540 +#: refs.c:744 refs.c:795

4541 #, c-format

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

4543 msgstr ""

4544

3894 -#: refs.c:727

4545 +#: refs.c:750

4546 #, c-format

4547 msgid "ref '%s' already exists"

4548 msgstr ""

4549

3899 -#: refs.c:732

4550 +#: refs.c:755

4551 #, c-format

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

4553 msgstr ""

4554

3904 -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

3905 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

3906 -#: wrapper.c:656

4555 +#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

4556 +#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

4557 #, c-format

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

4559 msgstr ""

4560

3911 -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

3912 -#: builtin/am.c:713 builtin/rebase.c:575

4561 +#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

4562 #, c-format

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

4564 msgstr ""

4565

3917 -#: refs.c:774

4566 +#: refs.c:797

4567 #, c-format

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

4569 msgstr ""

4570

3922 -#: refs.c:905

4571 +#: refs.c:928

4572 #, c-format

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

4574 msgstr ""

4575

3927 -#: refs.c:911

4576 +#: refs.c:934

4577 #, c-format

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

4579 msgstr ""

4580

3932 -#: refs.c:969

4581 +#: refs.c:993

4582 #, c-format

4583 msgid "log for %s is empty"

4584 msgstr ""

4585

3937 -#: refs.c:1061

4586 +#: refs.c:1085

4587 #, c-format

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

4589 msgstr ""

4590

3942 -#: refs.c:1137

4591 +#: refs.c:1161

4592 #, c-format

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

4594 msgstr ""

4595

3947 -#: refs.c:1911

4596 +#: refs.c:1942

4597 #, c-format

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

4599 msgstr ""

4600

3952 -#: refs.c:1943

4601 +#: refs.c:1974

4602 msgid "ref updates forbidden inside quarantine environment"

4603 msgstr ""

4604

3956 -#: refs.c:2039 refs.c:2069

4605 +#: refs.c:2070 refs.c:2100

4606 #, c-format

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

4608 msgstr ""

4609

3961 -#: refs.c:2045 refs.c:2080

4610 +#: refs.c:2076 refs.c:2111

4611 #, c-format

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

4613 msgstr ""

4614

3966 -#: refs/files-backend.c:1228

4615 +#: refs/files-backend.c:1234

4616 #, c-format

4617 msgid "could not remove reference %s"

4618 msgstr ""

4619

3971 -#: refs/files-backend.c:1242 refs/packed-backend.c:1532

4620 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532

4621 #: refs/packed-backend.c:1542

4622 #, c-format

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

4624 msgstr ""

4625

3977 -#: refs/files-backend.c:1245 refs/packed-backend.c:1545

4626 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545

4627 #, c-format

4628 msgid "could not delete references: %s"

4629 msgstr ""

@@ -3984,7 +4633,7 @@ msgstr ""

4633 msgid "invalid refspec '%s'"

4634 msgstr ""

4635

3987 -#: ref-filter.c:39 wt-status.c:1861

4636 +#: ref-filter.c:39 wt-status.c:1907

4637 msgid "gone"

4638 msgstr ""

4639

@@ -4108,78 +4757,78 @@ msgstr ""

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

4758 msgstr ""

4759

4111 -#: ref-filter.c:527

4760 +#: ref-filter.c:531

4761 #, c-format

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

4763 msgstr ""

4764

4116 -#: ref-filter.c:554

4765 +#: ref-filter.c:558

4766 #, c-format

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

4768 msgstr ""

4769

4121 -#: ref-filter.c:558

4770 +#: ref-filter.c:562

4771 #, c-format

4772 msgid ""

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

4774 msgstr ""

4775

4127 -#: ref-filter.c:682

4776 +#: ref-filter.c:686

4777 #, c-format

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

4779 msgstr ""

4780

4132 -#: ref-filter.c:745

4781 +#: ref-filter.c:749

4782 #, c-format

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

4784 msgstr ""

4785

4137 -#: ref-filter.c:747

4786 +#: ref-filter.c:751

4787 #, c-format

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

4789 msgstr ""

4790

4142 -#: ref-filter.c:749

4791 +#: ref-filter.c:753

4792 #, c-format

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

4794 msgstr ""

4795

4147 -#: ref-filter.c:777

4796 +#: ref-filter.c:781

4797 #, c-format

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

4799 msgstr ""

4800

4152 -#: ref-filter.c:779

4801 +#: ref-filter.c:783

4802 #, c-format

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

4804 msgstr ""

4805

4157 -#: ref-filter.c:781

4806 +#: ref-filter.c:785

4807 #, c-format

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

4809 msgstr ""

4810

4162 -#: ref-filter.c:796

4811 +#: ref-filter.c:800

4812 #, c-format

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

4814 msgstr ""

4815

4167 -#: ref-filter.c:853

4816 +#: ref-filter.c:857

4817 #, c-format

4818 msgid "malformed format string %s"

4819 msgstr ""

4820

4172 -#: ref-filter.c:1447

4821 +#: ref-filter.c:1453

4822 #, c-format

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

4824 msgstr ""

4825

4177 -#: ref-filter.c:1450

4826 +#: ref-filter.c:1456

4827 #, c-format

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

4829 msgstr ""

4830

4182 -#: ref-filter.c:1453

4831 +#: ref-filter.c:1459

4832 #, c-format

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

4834 msgstr ""

@@ -4187,7 +4836,7 @@ msgstr ""

4836 #. TRANSLATORS: make sure this matches "HEAD

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

4838 #.

4190 -#: ref-filter.c:1461

4839 +#: ref-filter.c:1467

4840 #, c-format

4841 msgid "(HEAD detached at %s)"

4842 msgstr ""

@@ -4195,56 +4844,56 @@ msgstr ""

4844 #. TRANSLATORS: make sure this matches "HEAD

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

4846 #.

4198 -#: ref-filter.c:1468

4847 +#: ref-filter.c:1474

4848 #, c-format

4849 msgid "(HEAD detached from %s)"

4850 msgstr ""

4851

4203 -#: ref-filter.c:1472

4852 +#: ref-filter.c:1478

4853 msgid "(no branch)"

4854 msgstr ""

4855

4207 -#: ref-filter.c:1506 ref-filter.c:1663

4856 +#: ref-filter.c:1512 ref-filter.c:1669

4857 #, c-format

4858 msgid "missing object %s for %s"

4859 msgstr ""

4860

4212 -#: ref-filter.c:1516

4861 +#: ref-filter.c:1522

4862 #, c-format

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

4864 msgstr ""

4865

4217 -#: ref-filter.c:1882

4866 +#: ref-filter.c:1888

4867 #, c-format

4868 msgid "malformed object at '%s'"

4869 msgstr ""

4870

4222 -#: ref-filter.c:1971

4871 +#: ref-filter.c:1977

4872 #, c-format

4873 msgid "ignoring ref with broken name %s"

4874 msgstr ""

4875

4227 -#: ref-filter.c:2257

4876 +#: ref-filter.c:2263

4877 #, c-format

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

4879 msgstr ""

4880

4232 -#: ref-filter.c:2352

4881 +#: ref-filter.c:2363

4882 #, c-format

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

4884 msgstr ""

4885

4237 -#: ref-filter.c:2355

4886 +#: ref-filter.c:2366

4887 #, c-format

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

4889 msgstr ""

4890

4242 -#: ref-filter.c:2365

4891 +#: ref-filter.c:2376

4892 #, c-format

4893 msgid "malformed object name %s"

4894 msgstr ""

4895

4247 -#: ref-filter.c:2370

4896 +#: ref-filter.c:2381

4897 #, c-format

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

4899 msgstr ""

@@ -4419,42 +5068,42 @@ msgstr ""

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

5069 msgstr ""

5070

4422 -#: remote.c:1990

5071 +#: remote.c:2016

5072 #, c-format

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

5074 msgstr ""

5075

4427 -#: remote.c:1994

5076 +#: remote.c:2020

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

5078 msgstr ""

5079

4431 -#: remote.c:1997

5080 +#: remote.c:2023

5081 #, c-format

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

5083 msgstr ""

5084

4436 -#: remote.c:2001

5085 +#: remote.c:2027

5086 #, c-format

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

5088 msgstr ""

5089

4441 -#: remote.c:2004

5090 +#: remote.c:2030

5091 #, c-format

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

5093 msgstr ""

5094

4446 -#: remote.c:2008

5095 +#: remote.c:2034

5096 #, c-format

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

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

5099 msgstr[0] ""

5100 msgstr[1] ""

5101

4453 -#: remote.c:2014

5102 +#: remote.c:2040

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

5104 msgstr ""

5105

4457 -#: remote.c:2017

5106 +#: remote.c:2043

5107 #, c-format

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

5109 msgid_plural ""

@@ -4462,11 +5111,11 @@ msgid_plural ""

5111 msgstr[0] ""

5112 msgstr[1] ""

5113

4465 -#: remote.c:2025

5114 +#: remote.c:2051

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

5116 msgstr ""

5117

4469 -#: remote.c:2028

5118 +#: remote.c:2054

5119 #, c-format

5120 msgid ""

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

@@ -4477,11 +5126,11 @@ msgid_plural ""

5126 msgstr[0] ""

5127 msgstr[1] ""

5128

4480 -#: remote.c:2038

5129 +#: remote.c:2064

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

5131 msgstr ""

5132

4484 -#: remote.c:2221

5133 +#: remote.c:2247

5134 #, c-format

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

5136 msgstr ""

@@ -4509,12 +5158,6 @@ msgstr ""

5158 msgid "unable to write rerere record"

5159 msgstr ""

5160

4512 -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4513 -#: builtin/fsck.c:314

4514 -#, c-format

4515 -msgid "could not write '%s'"

4516 -msgstr ""

4517 -

5161 #: rerere.c:495

5162 #, c-format

5163 msgid "there were errors while writing '%s' (%s)"

@@ -4565,8 +5208,8 @@ msgstr ""

5208 msgid "Recorded preimage for '%s'"

5209 msgstr ""

5210

4568 -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4569 -#: builtin/submodule--helper.c:1427

5211 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5212 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5213 #, c-format

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

5215 msgstr ""

@@ -4600,29 +5243,33 @@ msgstr ""

5243 msgid "unable to open rr-cache directory"

5244 msgstr ""

5245

4603 -#: revision.c:2484

5246 +#: revision.c:2476

5247 msgid "your current branch appears to be broken"

5248 msgstr ""

5249

4607 -#: revision.c:2487

5250 +#: revision.c:2479

5251 #, c-format

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

5253 msgstr ""

5254

4612 -#: revision.c:2684

5255 +#: revision.c:2679

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

5257 msgstr ""

5258

4616 -#: run-command.c:742

5259 +#: revision.c:2683

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

5261 +msgstr ""

5262 +

5263 +#: run-command.c:763

5264 msgid "open /dev/null failed"

5265 msgstr ""

5266

4620 -#: run-command.c:1231

5267 +#: run-command.c:1269

5268 #, c-format

5269 msgid "cannot create async thread: %s"

5270 msgstr ""

5271

4625 -#: run-command.c:1295

5272 +#: run-command.c:1333

5273 #, c-format

5274 msgid ""

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

@@ -4665,150 +5312,155 @@ msgstr ""

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

5313 msgstr ""

5314

4668 -#: sequencer.c:184

5315 +#: sequencer.c:187

5316 #, c-format

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

5318 msgstr ""

5319

4673 -#: sequencer.c:288

5320 +#: sequencer.c:292

5321 #, c-format

5322 msgid "could not delete '%s'"

5323 msgstr ""

5324

4678 -#: sequencer.c:314

5325 +#: sequencer.c:318

5326 msgid "revert"

5327 msgstr ""

5328

4682 -#: sequencer.c:316

5329 +#: sequencer.c:320

5330 msgid "cherry-pick"

5331 msgstr ""

5332

4686 -#: sequencer.c:318

5333 +#: sequencer.c:322

5334 msgid "rebase -i"

5335 msgstr ""

5336

4690 -#: sequencer.c:320

5337 +#: sequencer.c:324

5338 #, c-format

5339 msgid "unknown action: %d"

5340 msgstr ""

5341

4695 -#: sequencer.c:378

5342 +#: sequencer.c:382

5343 msgid ""

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

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

5346 msgstr ""

5347

4701 -#: sequencer.c:381

5348 +#: sequencer.c:385

5349 msgid ""

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

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

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

5353 msgstr ""

5354

4708 -#: sequencer.c:394 sequencer.c:2671

5355 +#: sequencer.c:398 sequencer.c:2801

5356 #, c-format

5357 msgid "could not lock '%s'"

5358 msgstr ""

5359

4713 -#: sequencer.c:401

5360 +#: sequencer.c:405

5361 #, c-format

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

5363 msgstr ""

5364

4718 -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

4719 -#: sequencer.c:2931

5365 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5366 +#: sequencer.c:3084

5367 #, c-format

5368 msgid "failed to finalize '%s'"

5369 msgstr ""

5370

4724 -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

4725 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

4726 -#: builtin/merge.c:1085 builtin/rebase.c:154

5371 +#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5372 +#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5373 +#: builtin/merge.c:1115 builtin/rebase.c:567

5374 #, c-format

5375 msgid "could not read '%s'"

5376 msgstr ""

5377

4731 -#: sequencer.c:455

5378 +#: sequencer.c:459

5379 #, c-format

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

5381 msgstr ""

5382

4736 -#: sequencer.c:459

5383 +#: sequencer.c:463

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

5385 msgstr ""

5386

4740 -#: sequencer.c:491

5387 +#: sequencer.c:495

5388 #, c-format

5389 msgid "%s: fast-forward"

5390 msgstr ""

5391

5392 +#: sequencer.c:534 builtin/tag.c:555

5393 +#, c-format

5394 +msgid "Invalid cleanup mode %s"

5395 +msgstr ""

5396 +

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

5398 #. "rebase -i".

5399 #.

4748 -#: sequencer.c:582

5400 +#: sequencer.c:629

5401 #, c-format

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

5403 msgstr ""

5404

4753 -#: sequencer.c:598

5405 +#: sequencer.c:646

5406 msgid "unable to update cache tree"

5407 msgstr ""

5408

4757 -#: sequencer.c:612

5409 +#: sequencer.c:660

5410 msgid "could not resolve HEAD commit"

5411 msgstr ""

5412

4761 -#: sequencer.c:692

5413 +#: sequencer.c:740

5414 #, c-format

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

5416 msgstr ""

5417

4766 -#: sequencer.c:703

5418 +#: sequencer.c:751

5419 #, c-format

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

5421 msgstr ""

5422

4771 -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

4772 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5423 +#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5424 +#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

5425 #, c-format

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

5427 msgstr ""

5428

4777 -#: sequencer.c:750

5429 +#: sequencer.c:798

5430 msgid "'GIT_AUTHOR_NAME' already given"

5431 msgstr ""

5432

4781 -#: sequencer.c:755

5433 +#: sequencer.c:803

5434 msgid "'GIT_AUTHOR_EMAIL' already given"

5435 msgstr ""

5436

4785 -#: sequencer.c:760

5437 +#: sequencer.c:808

5438 msgid "'GIT_AUTHOR_DATE' already given"

5439 msgstr ""

5440

4789 -#: sequencer.c:764

5441 +#: sequencer.c:812

5442 #, c-format

5443 msgid "unknown variable '%s'"

5444 msgstr ""

5445

4794 -#: sequencer.c:769

5446 +#: sequencer.c:817

5447 msgid "missing 'GIT_AUTHOR_NAME'"

5448 msgstr ""

5449

4798 -#: sequencer.c:771

5450 +#: sequencer.c:819

5451 msgid "missing 'GIT_AUTHOR_EMAIL'"

5452 msgstr ""

5453

4802 -#: sequencer.c:773

5454 +#: sequencer.c:821

5455 msgid "missing 'GIT_AUTHOR_DATE'"

5456 msgstr ""

5457

4806 -#: sequencer.c:833

5458 +#: sequencer.c:881

5459 #, c-format

5460 msgid "invalid date format '%s' in '%s'"

5461 msgstr ""

5462

4811 -#: sequencer.c:850

5463 +#: sequencer.c:898

5464 #, c-format

5465 msgid ""

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

@@ -4825,15 +5477,15 @@ msgid ""

5477 " git rebase --continue\n"

5478 msgstr ""

5479

4828 -#: sequencer.c:945

5480 +#: sequencer.c:992

5481 msgid "writing root commit"

5482 msgstr ""

5483

4832 -#: sequencer.c:1155

5484 +#: sequencer.c:1213

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

5486 msgstr ""

5487

4836 -#: sequencer.c:1162

5488 +#: sequencer.c:1220

5489 msgid ""

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

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

@@ -4848,7 +5500,7 @@ msgid ""

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

5501 msgstr ""

5502

4851 -#: sequencer.c:1175

5503 +#: sequencer.c:1233

5504 msgid ""

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

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

@@ -4862,294 +5514,305 @@ msgid ""

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

5515 msgstr ""

5516

4865 -#: sequencer.c:1217

5517 +#: sequencer.c:1275

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

5519 msgstr ""

5520

4869 -#: sequencer.c:1219

5521 +#: sequencer.c:1277

5522 msgid "could not parse newly created commit"

5523 msgstr ""

5524

4873 -#: sequencer.c:1265

5525 +#: sequencer.c:1323

5526 msgid "unable to resolve HEAD after creating commit"

5527 msgstr ""

5528

4877 -#: sequencer.c:1267

5529 +#: sequencer.c:1325

5530 msgid "detached HEAD"

5531 msgstr ""

5532

4881 -#: sequencer.c:1271

5533 +#: sequencer.c:1329

5534 msgid " (root-commit)"

5535 msgstr ""

5536

4885 -#: sequencer.c:1292

5537 +#: sequencer.c:1350

5538 msgid "could not parse HEAD"

5539 msgstr ""

5540

4889 -#: sequencer.c:1294

5541 +#: sequencer.c:1352

5542 #, c-format

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

5544 msgstr ""

5545

4894 -#: sequencer.c:1298 builtin/commit.c:1546

5546 +#: sequencer.c:1356 builtin/commit.c:1551

5547 msgid "could not parse HEAD commit"

5548 msgstr ""

5549

4898 -#: sequencer.c:1350 sequencer.c:1964

5550 +#: sequencer.c:1408 sequencer.c:2001

5551 msgid "unable to parse commit author"

5552 msgstr ""

5553

4902 -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5554 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

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

5556 msgstr ""

5557

4906 -#: sequencer.c:1377 sequencer.c:1433

5558 +#: sequencer.c:1435 sequencer.c:1496

5559 #, c-format

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

5561 msgstr ""

5562

4911 -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

4912 -#: builtin/merge.c:884

5563 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

5564 +#: builtin/merge.c:906

5565 msgid "failed to write commit object"

5566 msgstr ""

5567

4916 -#: sequencer.c:1460

5568 +#: sequencer.c:1523

5569 #, c-format

5570 msgid "could not parse commit %s"

5571 msgstr ""

5572

4921 -#: sequencer.c:1465

5573 +#: sequencer.c:1528

5574 #, c-format

5575 msgid "could not parse parent commit %s"

5576 msgstr ""

5577

4926 -#: sequencer.c:1565 sequencer.c:1675

5578 +#: sequencer.c:1602 sequencer.c:1712

5579 #, c-format

5580 msgid "unknown command: %d"

5581 msgstr ""

5582

4931 -#: sequencer.c:1622 sequencer.c:1647

5583 +#: sequencer.c:1659 sequencer.c:1684

5584 #, c-format

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

5586 msgstr ""

5587

4936 -#: sequencer.c:1632 sequencer.c:4808

5588 +#: sequencer.c:1669

5589 msgid "need a HEAD to fixup"

5590 msgstr ""

5591

4940 -#: sequencer.c:1634 sequencer.c:2958

5592 +#: sequencer.c:1671 sequencer.c:3111

5593 msgid "could not read HEAD"

5594 msgstr ""

5595

4944 -#: sequencer.c:1636

5596 +#: sequencer.c:1673

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

5598 msgstr ""

5599

4948 -#: sequencer.c:1642

5600 +#: sequencer.c:1679

5601 #, c-format

5602 msgid "cannot write '%s'"

5603 msgstr ""

5604

4953 -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

5605 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

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

5607 msgstr ""

5608

4957 -#: sequencer.c:1657

5609 +#: sequencer.c:1694

5610 #, c-format

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

5612 msgstr ""

5613

4962 -#: sequencer.c:1664

5614 +#: sequencer.c:1701

5615 #, c-format

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

5617 msgstr ""

5618

4967 -#: sequencer.c:1670

5619 +#: sequencer.c:1707

5620 #, c-format

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

5622 msgstr ""

5623

4972 -#: sequencer.c:1758

5624 +#: sequencer.c:1795

5625 msgid "your index file is unmerged."

5626 msgstr ""

5627

4976 -#: sequencer.c:1765

5628 +#: sequencer.c:1802

5629 msgid "cannot fixup root commit"

5630 msgstr ""

5631

4980 -#: sequencer.c:1784

5632 +#: sequencer.c:1821

5633 #, c-format

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

5635 msgstr ""

5636

4985 -#: sequencer.c:1792 sequencer.c:1800

5637 +#: sequencer.c:1829 sequencer.c:1837

5638 #, c-format

5639 msgid "commit %s does not have parent %d"

5640 msgstr ""

5641

4990 -#: sequencer.c:1806

5642 +#: sequencer.c:1843

5643 #, c-format

5644 msgid "cannot get commit message for %s"

5645 msgstr ""

5646

5647 #. TRANSLATORS: The first %s will be a "todo" command like

5648 #. "revert" or "pick", the second %s a SHA1.

4997 -#: sequencer.c:1825

5649 +#: sequencer.c:1862

5650 #, c-format

5651 msgid "%s: cannot parse parent commit %s"

5652 msgstr ""

5653

5002 -#: sequencer.c:1890

5654 +#: sequencer.c:1927

5655 #, c-format

5656 msgid "could not rename '%s' to '%s'"

5657 msgstr ""

5658

5007 -#: sequencer.c:1945

5659 +#: sequencer.c:1982

5660 #, c-format

5661 msgid "could not revert %s... %s"

5662 msgstr ""

5663

5012 -#: sequencer.c:1946

5664 +#: sequencer.c:1983

5665 #, c-format

5666 msgid "could not apply %s... %s"

5667 msgstr ""

l10n: git.pot: v2.22.0 round 1 (270 new, 56 removed)