5b34e000f9 · 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: 2017-05-05 09:35+0800\n"

11 +"POT-Creation-Date: 2017-07-15 11:57+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:55

21 +#: advice.c:58

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:83

26 +#: advice.c:86

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

28 msgstr ""

29

30 -#: advice.c:85

30 +#: advice.c:88

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

32 msgstr ""

33

34 -#: advice.c:87

34 +#: advice.c:90

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

36 msgstr ""

37

38 -#: advice.c:89

38 +#: advice.c:92

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

40 msgstr ""

41

42 -#: advice.c:91

42 +#: advice.c:94

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

44 msgstr ""

45

46 -#: advice.c:93

46 +#: advice.c:96

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:101

51 +#: advice.c:104

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

57 +#: advice.c:112

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:114 builtin/merge.c:1185

61 +#: advice.c:117 builtin/merge.c:1184

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

63 msgstr ""

64

65 -#: advice.c:116

65 +#: advice.c:119

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

67 msgstr ""

68

69 -#: advice.c:117

69 +#: advice.c:120

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:123

73 +#: advice.c:126

74 #, c-format

75 msgid ""

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

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

86 "\n"

87 msgstr ""

88

89 -#: apply.c:57

89 +#: apply.c:58

90 #, c-format

91 msgid "unrecognized whitespace option '%s'"

92 msgstr ""

93

94 -#: apply.c:73

94 +#: apply.c:74

95 #, c-format

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

97 msgstr ""

98

99 -#: apply.c:125

99 +#: apply.c:126

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

101 msgstr ""

102

103 -#: apply.c:127

103 +#: apply.c:128

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

105 msgstr ""

106

107 -#: apply.c:130

107 +#: apply.c:131

108 msgid "--3way outside a repository"

109 msgstr ""

110

111 -#: apply.c:141

111 +#: apply.c:142

112 msgid "--index outside a repository"

113 msgstr ""

114

115 -#: apply.c:144

115 +#: apply.c:145

116 msgid "--cached outside a repository"

117 msgstr ""

118

119 -#: apply.c:845

119 +#: apply.c:836

120 #, c-format

121 msgid "Cannot prepare timestamp regexp %s"

122 msgstr ""

123

124 -#: apply.c:854

124 +#: apply.c:845

125 #, c-format

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

127 msgstr ""

128

129 -#: apply.c:938

129 +#: apply.c:929

130 #, c-format

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

132 msgstr ""

133

134 -#: apply.c:977

134 +#: apply.c:967

135 #, c-format

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

137 msgstr ""

138

139 -#: apply.c:983

139 +#: apply.c:973

140 #, c-format

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

142 msgstr ""

143

144 -#: apply.c:984

144 +#: apply.c:974

145 #, c-format

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

147 msgstr ""

148

149 -#: apply.c:990

149 +#: apply.c:979

150 #, c-format

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

152 msgstr ""

153

154 -#: apply.c:1488

154 +#: apply.c:1008

155 +#, c-format

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

157 +msgstr ""

158 +

159 +#: apply.c:1326

160 +#, c-format

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

162 +msgstr ""

163 +

164 +#: apply.c:1498

165 #, c-format

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

167 msgstr ""

168

159 -#: apply.c:1557

169 +#: apply.c:1567

170 #, c-format

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

172 msgstr ""

173

164 -#: apply.c:1577

174 +#: apply.c:1587

175 #, c-format

176 msgid ""

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

@@ -172,689 +182,684 @@ msgid_plural ""

182 msgstr[0] ""

183 msgstr[1] ""

184

175 -#: apply.c:1589

185 +#: apply.c:1600

186 #, c-format

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

188 msgstr ""

189

180 -#: apply.c:1759

190 +#: apply.c:1770

191 msgid "new file depends on old contents"

192 msgstr ""

193

184 -#: apply.c:1761

194 +#: apply.c:1772

195 msgid "deleted file still has contents"

196 msgstr ""

197

188 -#: apply.c:1795

198 +#: apply.c:1806

199 #, c-format

200 msgid "corrupt patch at line %d"

201 msgstr ""

202

193 -#: apply.c:1832

203 +#: apply.c:1843

204 #, c-format

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

206 msgstr ""

207

198 -#: apply.c:1834

208 +#: apply.c:1845

209 #, c-format

210 msgid "deleted file %s still has contents"

211 msgstr ""

212

203 -#: apply.c:1837

213 +#: apply.c:1848

214 #, c-format

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

216 msgstr ""

217

208 -#: apply.c:1984

218 +#: apply.c:1995

219 #, c-format

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

221 msgstr ""

222

213 -#: apply.c:2021

223 +#: apply.c:2032

224 #, c-format

225 msgid "unrecognized binary patch at line %d"

226 msgstr ""

227

218 -#: apply.c:2182

228 +#: apply.c:2193

229 #, c-format

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

231 msgstr ""

232

223 -#: apply.c:2265

233 +#: apply.c:2276

234 #, c-format

235 msgid "unable to read symlink %s"

236 msgstr ""

237

228 -#: apply.c:2269

238 +#: apply.c:2280

239 #, c-format

240 msgid "unable to open or read %s"

241 msgstr ""

242

233 -#: apply.c:2922

243 +#: apply.c:2933

244 #, c-format

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

246 msgstr ""

247

238 -#: apply.c:3041

248 +#: apply.c:3052

249 #, c-format

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

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

252 msgstr[0] ""

253 msgstr[1] ""

254

245 -#: apply.c:3053

255 +#: apply.c:3064

256 #, c-format

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

258 msgstr ""

259

250 -#: apply.c:3059

260 +#: apply.c:3070

261 #, c-format

262 msgid ""

263 "while searching for:\n"

264 "%.*s"

265 msgstr ""

266

257 -#: apply.c:3081

267 +#: apply.c:3092

268 #, c-format

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

270 msgstr ""

271

262 -#: apply.c:3089

272 +#: apply.c:3100

273 #, c-format

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

275 msgstr ""

276

267 -#: apply.c:3135

277 +#: apply.c:3146

278 #, c-format

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

280 msgstr ""

281

272 -#: apply.c:3145

282 +#: apply.c:3156

283 #, c-format

284 msgid ""

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

286 msgstr ""

287

278 -#: apply.c:3153

288 +#: apply.c:3164

289 #, c-format

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

291 msgstr ""

292

283 -#: apply.c:3171

293 +#: apply.c:3182

294 #, c-format

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

296 msgstr ""

297

288 -#: apply.c:3184

298 +#: apply.c:3195

299 #, c-format

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

301 msgstr ""

302

293 -#: apply.c:3190

303 +#: apply.c:3201

304 #, c-format

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

306 msgstr ""

307

298 -#: apply.c:3211

308 +#: apply.c:3222

309 #, c-format

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

311 msgstr ""

312

303 -#: apply.c:3333

313 +#: apply.c:3344

314 #, c-format

315 msgid "cannot checkout %s"

316 msgstr ""

317

308 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

318 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

322

313 -#: apply.c:3389

323 +#: apply.c:3400

324 #, c-format

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

326 msgstr ""

327

318 -#: apply.c:3418 apply.c:3658

328 +#: apply.c:3429 apply.c:3669

329 #, c-format

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

331 msgstr ""

332

323 -#: apply.c:3501 apply.c:3672

333 +#: apply.c:3512 apply.c:3683

334 #, c-format

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

336 msgstr ""

337

328 -#: apply.c:3510 apply.c:3680

338 +#: apply.c:3521 apply.c:3691

339 #, c-format

340 msgid "%s: does not match index"

341 msgstr ""

342

333 -#: apply.c:3545

343 +#: apply.c:3556

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

345 msgstr ""

346

337 -#: apply.c:3548

347 +#: apply.c:3559

348 #, c-format

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

350 msgstr ""

351

342 -#: apply.c:3564 apply.c:3568

352 +#: apply.c:3575 apply.c:3579

353 #, c-format

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

355 msgstr ""

356

347 -#: apply.c:3580

357 +#: apply.c:3591

358 #, c-format

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

360 msgstr ""

361

352 -#: apply.c:3594

362 +#: apply.c:3605

363 #, c-format

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

365 msgstr ""

366

357 -#: apply.c:3599

367 +#: apply.c:3610

368 #, c-format

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

370 msgstr ""

371

362 -#: apply.c:3625

372 +#: apply.c:3636

373 msgid "removal patch leaves file contents"

374 msgstr ""

375

366 -#: apply.c:3697

376 +#: apply.c:3708

377 #, c-format

378 msgid "%s: wrong type"

379 msgstr ""

380

371 -#: apply.c:3699

381 +#: apply.c:3710

382 #, c-format

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

384 msgstr ""

385

376 -#: apply.c:3850 apply.c:3852

386 +#: apply.c:3860 apply.c:3862

387 #, c-format

388 msgid "invalid path '%s'"

389 msgstr ""

390

381 -#: apply.c:3908

391 +#: apply.c:3918

392 #, c-format

393 msgid "%s: already exists in index"

394 msgstr ""

395

386 -#: apply.c:3911

396 +#: apply.c:3921

397 #, c-format

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

399 msgstr ""

400

391 -#: apply.c:3931

401 +#: apply.c:3941

402 #, c-format

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

404 msgstr ""

405

396 -#: apply.c:3936

406 +#: apply.c:3946

407 #, c-format

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

409 msgstr ""

410

401 -#: apply.c:3956

411 +#: apply.c:3966

412 #, c-format

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

414 msgstr ""

415

406 -#: apply.c:3960

416 +#: apply.c:3970

417 #, c-format

418 msgid "%s: patch does not apply"

419 msgstr ""

420

411 -#: apply.c:3975

421 +#: apply.c:3985

422 #, c-format

423 msgid "Checking patch %s..."

424 msgstr ""

425

416 -#: apply.c:4066

426 +#: apply.c:4076

427 #, c-format

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

429 msgstr ""

430

421 -#: apply.c:4073

431 +#: apply.c:4083

432 #, c-format

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

434 msgstr ""

435

426 -#: apply.c:4076

436 +#: apply.c:4086

437 #, c-format

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

439 msgstr ""

440

431 -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

441 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138

442 #, c-format

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

444 msgstr ""

445

436 -#: apply.c:4085

446 +#: apply.c:4095

447 #, c-format

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

449 msgstr ""

450

441 -#: apply.c:4095

451 +#: apply.c:4105

452 #, c-format

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

454 msgstr ""

455

446 -#: apply.c:4233

456 +#: apply.c:4243

457 #, c-format

458 msgid "unable to remove %s from index"

459 msgstr ""

460

451 -#: apply.c:4268

461 +#: apply.c:4278

462 #, c-format

463 msgid "corrupt patch for submodule %s"

464 msgstr ""

465

456 -#: apply.c:4274

466 +#: apply.c:4284

467 #, c-format

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

469 msgstr ""

470

461 -#: apply.c:4282

471 +#: apply.c:4292

472 #, c-format

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

474 msgstr ""

475

466 -#: apply.c:4288 apply.c:4432

476 +#: apply.c:4298 apply.c:4442

477 #, c-format

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

479 msgstr ""

480

471 -#: apply.c:4329

481 +#: apply.c:4339

482 #, c-format

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

484 msgstr ""

485

476 -#: apply.c:4333

486 +#: apply.c:4343

487 #, c-format

488 msgid "closing file '%s'"

489 msgstr ""

490

481 -#: apply.c:4403

491 +#: apply.c:4413

492 #, c-format

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

494 msgstr ""

495

486 -#: apply.c:4501

496 +#: apply.c:4511

497 #, c-format

498 msgid "Applied patch %s cleanly."

499 msgstr ""

500

491 -#: apply.c:4509

501 +#: apply.c:4519

502 msgid "internal error"

503 msgstr ""

504

495 -#: apply.c:4512

505 +#: apply.c:4522

506 #, c-format

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

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

509 msgstr[0] ""

510 msgstr[1] ""

511

502 -#: apply.c:4523

512 +#: apply.c:4533

513 #, c-format

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

515 msgstr ""

516

507 -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

517 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

521

512 -#: apply.c:4545

522 +#: apply.c:4555

523 #, c-format

524 msgid "Hunk #%d applied cleanly."

525 msgstr ""

526

517 -#: apply.c:4549

527 +#: apply.c:4559

528 #, c-format

529 msgid "Rejected hunk #%d."

530 msgstr ""

531

522 -#: apply.c:4659

532 +#: apply.c:4669

533 #, c-format

534 msgid "Skipped patch '%s'."

535 msgstr ""

536

527 -#: apply.c:4667

537 +#: apply.c:4677

538 msgid "unrecognized input"

539 msgstr ""

540

531 -#: apply.c:4686

541 +#: apply.c:4696

542 msgid "unable to read index file"

543 msgstr ""

544

535 -#: apply.c:4823

545 +#: apply.c:4833

546 #, c-format

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

548 msgstr ""

549

540 -#: apply.c:4850

550 +#: apply.c:4860

551 #, c-format

552 msgid "squelched %d whitespace error"

553 msgid_plural "squelched %d whitespace errors"

554 msgstr[0] ""

555 msgstr[1] ""

556

547 -#: apply.c:4856 apply.c:4871

557 +#: apply.c:4866 apply.c:4881

558 #, c-format

559 msgid "%d line adds whitespace errors."

560 msgid_plural "%d lines add whitespace errors."

561 msgstr[0] ""

562 msgstr[1] ""

563

554 -#: apply.c:4864

564 +#: apply.c:4874

565 #, c-format

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

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

568 msgstr[0] ""

569 msgstr[1] ""

570

561 -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

571 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

572 msgid "Unable to write new index file"

573 msgstr ""

574

565 -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279

566 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

575 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

576 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187

577 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

578 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

579 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

570 -#: git-add--interactive.perl:239

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

581 msgid "path"

582 msgstr ""

583

574 -#: apply.c:4912

584 +#: apply.c:4922

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

586 msgstr ""

587

578 -#: apply.c:4915

588 +#: apply.c:4925

589 msgid "apply changes matching the given path"

590 msgstr ""

591

582 -#: apply.c:4917 builtin/am.c:2285

592 +#: apply.c:4927 builtin/am.c:2266

593 msgid "num"

594 msgstr ""

595

586 -#: apply.c:4918

596 +#: apply.c:4928

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

598 msgstr ""

599

590 -#: apply.c:4921

600 +#: apply.c:4931

601 msgid "ignore additions made by the patch"

602 msgstr ""

603

594 -#: apply.c:4923

604 +#: apply.c:4933

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

606 msgstr ""

607

598 -#: apply.c:4927

608 +#: apply.c:4937

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

610 msgstr ""

611

602 -#: apply.c:4929

612 +#: apply.c:4939

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

614 msgstr ""

615

606 -#: apply.c:4931

616 +#: apply.c:4941

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

618 msgstr ""

619

610 -#: apply.c:4933

620 +#: apply.c:4943

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

622 msgstr ""

623

614 -#: apply.c:4935

624 +#: apply.c:4945

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

626 msgstr ""

627

618 -#: apply.c:4937

628 +#: apply.c:4947

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

630 msgstr ""

631

622 -#: apply.c:4939

632 +#: apply.c:4949

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

634 msgstr ""

635

626 -#: apply.c:4941

636 +#: apply.c:4951

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

638 msgstr ""

639

630 -#: apply.c:4943

640 +#: apply.c:4953

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

642 msgstr ""

643

634 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515

644 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515

645 msgid "paths are separated with NUL character"

646 msgstr ""

647

638 -#: apply.c:4948

648 +#: apply.c:4958

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

650 msgstr ""

651

642 -#: apply.c:4949 builtin/am.c:2264

652 +#: apply.c:4959 builtin/am.c:2245

653 msgid "action"

654 msgstr ""

655

646 -#: apply.c:4950

656 +#: apply.c:4960

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

658 msgstr ""

659

650 -#: apply.c:4953 apply.c:4956

660 +#: apply.c:4963 apply.c:4966

661 msgid "ignore changes in whitespace when finding context"

662 msgstr ""

663

654 -#: apply.c:4959

664 +#: apply.c:4969

665 msgid "apply the patch in reverse"

666 msgstr ""

667

658 -#: apply.c:4961

668 +#: apply.c:4971

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

670 msgstr ""

671

662 -#: apply.c:4963

672 +#: apply.c:4973

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

674 msgstr ""

675

666 -#: apply.c:4965

676 +#: apply.c:4975

677 msgid "allow overlapping hunks"

678 msgstr ""

679

670 -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

671 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

672 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

680 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21

681 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651

682 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125

683 msgid "be verbose"

684 msgstr ""

685

676 -#: apply.c:4968

686 +#: apply.c:4978

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

688 msgstr ""

689

680 -#: apply.c:4971

690 +#: apply.c:4981

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

692 msgstr ""

693

684 -#: apply.c:4973 builtin/am.c:2273

694 +#: apply.c:4983 builtin/am.c:2254

695 msgid "root"

696 msgstr ""

697

688 -#: apply.c:4974

698 +#: apply.c:4984

699 msgid "prepend <root> to all filenames"

700 msgstr ""

701

692 -#: archive.c:12

702 +#: archive.c:13

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

704 msgstr ""

705

696 -#: archive.c:13

706 +#: archive.c:14

707 msgid "git archive --list"

708 msgstr ""

709

700 -#: archive.c:14

710 +#: archive.c:15

711 msgid ""

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

713 msgstr ""

714

705 -#: archive.c:15

715 +#: archive.c:16

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

717 msgstr ""

718

709 -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

719 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300

720 #, c-format

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

722 msgstr ""

723

714 -#: archive.c:417

724 +#: archive.c:418

725 msgid "fmt"

726 msgstr ""

727

718 -#: archive.c:417

728 +#: archive.c:418

729 msgid "archive format"

730 msgstr ""

731

722 -#: archive.c:418 builtin/log.c:1436

732 +#: archive.c:419 builtin/log.c:1446

733 msgid "prefix"

734 msgstr ""

735

726 -#: archive.c:419

736 +#: archive.c:420

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

738 msgstr ""

739

730 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60

731 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

732 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552

733 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

740 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

741 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080

742 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552

743 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120

744 #: parse-options.h:153

745 msgid "file"

746 msgstr ""

747

738 -#: archive.c:421 builtin/archive.c:89

748 +#: archive.c:422 builtin/archive.c:89

749 msgid "write the archive to this file"

750 msgstr ""

751

742 -#: archive.c:423

752 +#: archive.c:424

753 msgid "read .gitattributes in working directory"

754 msgstr ""

755

746 -#: archive.c:424

756 +#: archive.c:425

757 msgid "report archived files on stderr"

758 msgstr ""

759

750 -#: archive.c:425

760 +#: archive.c:426

761 msgid "store only"

762 msgstr ""

763

754 -#: archive.c:426

764 +#: archive.c:427

765 msgid "compress faster"

766 msgstr ""

767

758 -#: archive.c:434

768 +#: archive.c:435

769 msgid "compress better"

770 msgstr ""

771

762 -#: archive.c:437

772 +#: archive.c:438

773 msgid "list supported archive formats"

774 msgstr ""

775

766 -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

776 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108

777 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

778 msgid "repo"

779 msgstr ""

780

771 -#: archive.c:440 builtin/archive.c:91

781 +#: archive.c:441 builtin/archive.c:91

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

783 msgstr ""

784

775 -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

785 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488

786 msgid "command"

787 msgstr ""

788

779 -#: archive.c:442 builtin/archive.c:93

789 +#: archive.c:443 builtin/archive.c:93

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

791 msgstr ""

792

783 -#: archive.c:449

793 +#: archive.c:450

794 msgid "Unexpected option --remote"

795 msgstr ""

796

787 -#: archive.c:451

797 +#: archive.c:452

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

799 msgstr ""

800

791 -#: archive.c:453

801 +#: archive.c:454

802 msgid "Unexpected option --output"

803 msgstr ""

804

795 -#: archive.c:475

805 +#: archive.c:476

806 #, c-format

807 msgid "Unknown archive format '%s'"

808 msgstr ""

809

800 -#: archive.c:482

810 +#: archive.c:483

811 #, c-format

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

813 msgstr ""

814

805 -#: attr.c:212

815 +#: attr.c:214

816 #, c-format

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

818 msgstr ""

819

810 -#: attr.c:408

820 +#: attr.c:410

821 msgid ""

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

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

824 msgstr ""

825

816 -#: bisect.c:444

817 -#, c-format

818 -msgid "Could not open file '%s'"

819 -msgstr ""

820 -

821 -#: bisect.c:449

826 +#: bisect.c:447

827 #, c-format

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

829 msgstr ""

830

826 -#: bisect.c:657

831 +#: bisect.c:655

832 #, c-format

833 msgid "We cannot bisect more!\n"

834 msgstr ""

835

831 -#: bisect.c:710

836 +#: bisect.c:708

837 #, c-format

838 msgid "Not a valid commit name %s"

839 msgstr ""

840

836 -#: bisect.c:734

841 +#: bisect.c:732

842 #, c-format

843 msgid ""

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

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

846 msgstr ""

847

843 -#: bisect.c:739

848 +#: bisect.c:737

849 #, c-format

850 msgid ""

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

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

853 msgstr ""

854

850 -#: bisect.c:744

855 +#: bisect.c:742

856 #, c-format

857 msgid ""

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

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

860 msgstr ""

861

857 -#: bisect.c:752

862 +#: bisect.c:750

863 #, c-format

864 msgid ""

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

@@ -862,7 +867,7 @@ msgid ""

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

868 msgstr ""

869

865 -#: bisect.c:765

870 +#: bisect.c:763

871 #, c-format

872 msgid ""

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

@@ -870,51 +875,52 @@ msgid ""

875 "We continue anyway."

876 msgstr ""

877

873 -#: bisect.c:800

878 +#: bisect.c:798

879 #, c-format

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

881 msgstr ""

882

878 -#: bisect.c:851

883 +#: bisect.c:849

884 #, c-format

885 msgid "a %s revision is needed"

886 msgstr ""

887

883 -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255

888 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256

889 #, c-format

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

891 msgstr ""

892

888 -#: bisect.c:919

893 +#: bisect.c:917

894 #, c-format

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

896 msgstr ""

897

893 -#: bisect.c:949

898 +#: bisect.c:947

899 msgid "reading bisect refs failed"

900 msgstr ""

901

897 -#: bisect.c:969

902 +#: bisect.c:967

903 #, c-format

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

905 msgstr ""

906

902 -#: bisect.c:977

907 +#: bisect.c:975

908 #, c-format

909 msgid ""

910 "No testable commit found.\n"

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

912 msgstr ""

913

909 -#: bisect.c:996

914 +#: bisect.c:994

915 #, c-format

916 msgid "(roughly %d step)"

917 msgid_plural "(roughly %d steps)"

918 msgstr[0] ""

919 msgstr[1] ""

920

916 -#. TRANSLATORS: the last %s will be replaced with

917 -#. "(roughly %d steps)" translation

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

922 +#. steps)" translation.

923 +#.

924 #: bisect.c:1000

925 #, c-format

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

@@ -922,6 +928,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

928 msgstr[0] ""

929 msgstr[1] ""

930

931 +#: blame.c:1757

932 +msgid "--contents and --reverse do not blend well."

933 +msgstr ""

934 +

935 +#: blame.c:1768

936 +msgid "cannot use --contents with final commit object name"

937 +msgstr ""

938 +

939 +#: blame.c:1788

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

941 +msgstr ""

942 +

943 +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166

944 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907

945 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360

946 +#: builtin/shortlog.c:177

947 +msgid "revision walk setup failed"

948 +msgstr ""

949 +

950 +#: blame.c:1815

951 +msgid ""

952 +"--reverse --first-parent together require range along first-parent chain"

953 +msgstr ""

954 +

955 +#: blame.c:1826

956 +#, c-format

957 +msgid "no such path %s in %s"

958 +msgstr ""

959 +

960 +#: blame.c:1837

961 +#, c-format

962 +msgid "cannot read blob %s for path %s"

963 +msgstr ""

964 +

965 #: branch.c:53

966 #, c-format

967 msgid ""

@@ -1041,7 +1081,7 @@ msgstr ""

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

1082 msgstr ""

1083

1044 -#: branch.c:364

1084 +#: branch.c:366

1085 #, c-format

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

1087 msgstr ""

@@ -1051,92 +1091,85 @@ msgstr ""

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

1092 msgstr ""

1093

1054 -#: bundle.c:61

1094 +#: bundle.c:62

1095 #, c-format

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

1097 msgstr ""

1098

1059 -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777

1099 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778

1100 #, c-format

1101 msgid "could not open '%s'"

1102 msgstr ""

1103

1064 -#: bundle.c:139

1104 +#: bundle.c:140

1105 msgid "Repository lacks these prerequisite commits:"

1106 msgstr ""

1107

1068 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321

1069 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1070 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1071 -#: builtin/merge.c:359 builtin/shortlog.c:176

1072 -msgid "revision walk setup failed"

1073 -msgstr ""

1074 -

1075 -#: bundle.c:185

1108 +#: bundle.c:186

1109 #, c-format

1110 msgid "The bundle contains this ref:"

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

1112 msgstr[0] ""

1113 msgstr[1] ""

1114

1082 -#: bundle.c:192

1115 +#: bundle.c:193

1116 msgid "The bundle records a complete history."

1117 msgstr ""

1118

1086 -#: bundle.c:194

1119 +#: bundle.c:195

1120 #, c-format

1121 msgid "The bundle requires this ref:"

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

1123 msgstr[0] ""

1124 msgstr[1] ""

1125

1093 -#: bundle.c:253

1126 +#: bundle.c:254

1127 msgid "Could not spawn pack-objects"

1128 msgstr ""

1129

1097 -#: bundle.c:264

1130 +#: bundle.c:265

1131 msgid "pack-objects died"

1132 msgstr ""

1133

1101 -#: bundle.c:304

1134 +#: bundle.c:307

1135 msgid "rev-list died"

1136 msgstr ""

1137

1105 -#: bundle.c:353

1138 +#: bundle.c:356

1139 #, c-format

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

1141 msgstr ""

1142

1110 -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1143 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282

1144 #, c-format

1145 msgid "unrecognized argument: %s"

1146 msgstr ""

1147

1115 -#: bundle.c:451

1148 +#: bundle.c:454

1149 msgid "Refusing to create empty bundle."

1150 msgstr ""

1151

1119 -#: bundle.c:463

1152 +#: bundle.c:466

1153 #, c-format

1154 msgid "cannot create '%s'"

1155 msgstr ""

1156

1124 -#: bundle.c:491

1157 +#: bundle.c:494

1158 msgid "index-pack died"

1159 msgstr ""

1160

1128 -#: color.c:300

1161 +#: color.c:301

1162 #, c-format

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

1164 msgstr ""

1165

1133 -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455

1134 -#: builtin/am.c:1489 builtin/am.c:2126

1166 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456

1167 +#: builtin/am.c:1469 builtin/am.c:2107

1168 #, c-format

1169 msgid "could not parse %s"

1170 msgstr ""

1171

1139 -#: commit.c:42

1172 +#: commit.c:43

1173 #, c-format

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

1175 msgstr ""

@@ -1152,161 +1185,161 @@ msgstr ""

1185 msgid "memory exhausted"

1186 msgstr ""

1187

1155 -#: config.c:191

1188 +#: config.c:186

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

1190 msgstr ""

1191

1159 -#: config.c:711

1192 +#: config.c:720

1193 #, c-format

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

1195 msgstr ""

1196

1164 -#: config.c:715

1197 +#: config.c:724

1198 #, c-format

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

1200 msgstr ""

1201

1169 -#: config.c:719

1202 +#: config.c:728

1203 #, c-format

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

1205 msgstr ""

1206

1174 -#: config.c:723

1207 +#: config.c:732

1208 #, c-format

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

1210 msgstr ""

1211

1179 -#: config.c:727

1212 +#: config.c:736

1213 #, c-format

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

1215 msgstr ""

1216

1184 -#: config.c:731

1217 +#: config.c:740

1218 #, c-format

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

1220 msgstr ""

1221

1189 -#: config.c:859

1222 +#: config.c:868

1223 msgid "out of range"

1224 msgstr ""

1225

1193 -#: config.c:859

1226 +#: config.c:868

1227 msgid "invalid unit"

1228 msgstr ""

1229

1197 -#: config.c:865

1230 +#: config.c:874

1231 #, c-format

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

1233 msgstr ""

1234

1202 -#: config.c:870

1235 +#: config.c:879

1236 #, c-format

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

1238 msgstr ""

1239

1207 -#: config.c:873

1240 +#: config.c:882

1241 #, c-format

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

1243 msgstr ""

1244

1212 -#: config.c:876

1245 +#: config.c:885

1246 #, c-format

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

1248 msgstr ""

1249

1217 -#: config.c:879

1250 +#: config.c:888

1251 #, c-format

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

1253 msgstr ""

1254

1222 -#: config.c:882

1255 +#: config.c:891

1256 #, c-format

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

1258 msgstr ""

1259

1227 -#: config.c:885

1260 +#: config.c:894

1261 #, c-format

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

1263 msgstr ""

1264

1232 -#: config.c:980

1265 +#: config.c:989

1266 #, c-format

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

1268 msgstr ""

1269

1237 -#: config.c:1075 config.c:1086

1270 +#: config.c:1084 config.c:1095

1271 #, c-format

1272 msgid "bad zlib compression level %d"

1273 msgstr ""

1274

1242 -#: config.c:1203

1275 +#: config.c:1212

1276 #, c-format

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

1278 msgstr ""

1279

1247 -#: config.c:1359

1280 +#: config.c:1368

1281 #, c-format

1282 msgid "bad pack compression level %d"

1283 msgstr ""

1284

1252 -#: config.c:1557

1285 +#: config.c:1564

1286 msgid "unable to parse command-line config"

1287 msgstr ""

1288

1256 -#: config.c:1611

1289 +#: config.c:1894

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

1291 msgstr ""

1292

1260 -#: config.c:1970

1293 +#: config.c:2064

1294 #, c-format

1295 msgid "Invalid %s: '%s'"

1296 msgstr ""

1297

1265 -#: config.c:1991

1298 +#: config.c:2085

1299 #, c-format

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

1301 msgstr ""

1302

1270 -#: config.c:2017

1303 +#: config.c:2111

1304 #, c-format

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

1306 msgstr ""

1307

1275 -#: config.c:2028

1308 +#: config.c:2122

1309 #, c-format

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

1311 msgstr ""

1312

1280 -#: config.c:2030

1313 +#: config.c:2124

1314 #, c-format

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

1316 msgstr ""

1317

1285 -#: config.c:2089

1318 +#: config.c:2183

1319 #, c-format

1320 msgid "%s has multiple values"

1321 msgstr ""

1322

1290 -#: config.c:2423 config.c:2648

1323 +#: config.c:2517 config.c:2745

1324 #, c-format

1325 msgid "fstat on %s failed"

1326 msgstr ""

1327

1295 -#: config.c:2541

1328 +#: config.c:2635

1329 #, c-format

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

1331 msgstr ""

1332

1300 -#: config.c:2543 builtin/remote.c:774

1333 +#: config.c:2637 builtin/remote.c:775

1334 #, c-format

1335 msgid "could not unset '%s'"

1336 msgstr ""

1337

1305 -#: connect.c:49

1338 +#: connect.c:50

1339 msgid "The remote end hung up upon initial contact"

1340 msgstr ""

1341

1309 -#: connect.c:51

1342 +#: connect.c:52

1343 msgid ""

1344 "Could not read from remote repository.\n"

1345 "\n"

@@ -1314,7 +1347,7 @@ msgid ""

1347 "and the repository exists."

1348 msgstr ""

1349

1317 -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1350 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141

1351 msgid "Checking connectivity"

1352 msgstr ""

1353

@@ -1330,95 +1363,45 @@ msgstr ""

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

1364 msgstr ""

1365

1333 -#: convert.c:201

1366 +#: convert.c:205

1367 #, c-format

1368 msgid ""

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

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

1371 msgstr ""

1372

1340 -#: convert.c:205

1373 +#: convert.c:209

1374 #, c-format

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

1376 msgstr ""

1377

1345 -#: convert.c:211

1378 +#: convert.c:215

1379 #, c-format

1380 msgid ""

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

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

1383 msgstr ""

1384

1352 -#: convert.c:215

1385 +#: convert.c:219

1386 #, c-format

1387 msgid "LF would be replaced by CRLF in %s"

1388 msgstr ""

1389

1357 -#: date.c:97

1390 +#: date.c:116

1391 msgid "in the future"

1392 msgstr ""

1393

1361 -#: date.c:103

1362 -#, c-format

1363 -msgid "%lu second ago"

1364 -msgid_plural "%lu seconds ago"

1365 -msgstr[0] ""

1366 -msgstr[1] ""

1367 -

1368 -#: date.c:110

1369 -#, c-format

1370 -msgid "%lu minute ago"

1371 -msgid_plural "%lu minutes ago"

1372 -msgstr[0] ""

1373 -msgstr[1] ""

1374 -

1375 -#: date.c:117

1376 -#, c-format

1377 -msgid "%lu hour ago"

1378 -msgid_plural "%lu hours ago"

1379 -msgstr[0] ""

1380 -msgstr[1] ""

1381 -

1382 -#: date.c:124

1383 -#, c-format

1384 -msgid "%lu day ago"

1385 -msgid_plural "%lu days ago"

1386 -msgstr[0] ""

1387 -msgstr[1] ""

1388 -

1389 -#: date.c:130

1390 -#, c-format

1391 -msgid "%lu week ago"

1392 -msgid_plural "%lu weeks ago"

1393 -msgstr[0] ""

1394 -msgstr[1] ""

1395 -

1396 -#: date.c:137

1397 -#, c-format

1398 -msgid "%lu month ago"

1399 -msgid_plural "%lu months ago"

1400 -msgstr[0] ""

1401 -msgstr[1] ""

1402 -

1403 -#: date.c:148

1404 -#, c-format

1405 -msgid "%lu year"

1406 -msgid_plural "%lu years"

1394 +#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167

1395 +#: date.c:175 date.c:180

1396 +msgid "%"

1397 +msgid_plural "%"

1398 msgstr[0] ""

1399 msgstr[1] ""

1400

1401 #. TRANSLATORS: "%s" is "<n> years"

1411 -#: date.c:151

1412 -#, c-format

1413 -msgid "%s, %lu month ago"

1414 -msgid_plural "%s, %lu months ago"

1415 -msgstr[0] ""

1416 -msgstr[1] ""

1417 -

1418 -#: date.c:156 date.c:161

1419 -#, c-format

1420 -msgid "%lu year ago"

1421 -msgid_plural "%lu years ago"

1402 +#: date.c:170

1403 +msgid "%s, %"

1404 +msgid_plural "%s, %"

1405 msgstr[0] ""

1406 msgstr[1] ""

1407

@@ -1431,367 +1414,384 @@ msgstr ""

1414 msgid "Performing inexact rename detection"

1415 msgstr ""

1416

1434 -#: diff.c:62

1417 +#: diff.c:63

1418 #, c-format

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

1420 msgstr ""

1421

1439 -#: diff.c:124

1422 +#: diff.c:125

1423 #, c-format

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

1425 msgstr ""

1426

1444 -#: diff.c:129

1427 +#: diff.c:130

1428 #, c-format

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

1430 msgstr ""

1431

1449 -#: diff.c:281

1432 +#: diff.c:282

1433 #, c-format

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

1435 msgstr ""

1436

1454 -#: diff.c:344

1437 +#: diff.c:342

1438 #, c-format

1439 msgid ""

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

1441 "%s"

1442 msgstr ""

1443

1461 -#: diff.c:3102

1444 +#: diff.c:3101

1445 #, c-format

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

1447 msgstr ""

1448

1466 -#: diff.c:3428

1449 +#: diff.c:3427

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

1451 msgstr ""

1452

1470 -#: diff.c:3518

1453 +#: diff.c:3517

1454 msgid "--follow requires exactly one pathspec"

1455 msgstr ""

1456

1474 -#: diff.c:3681

1457 +#: diff.c:3680

1458 #, c-format

1459 msgid ""

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

1461 "%s"

1462 msgstr ""

1463

1481 -#: diff.c:3695

1464 +#: diff.c:3694

1465 #, c-format

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

1467 msgstr ""

1468

1486 -#: diff.c:4719

1469 +#: diff.c:4716

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

1471 msgstr ""

1472

1490 -#: diff.c:4722

1473 +#: diff.c:4719

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

1475 msgstr ""

1476

1494 -#: diff.c:4725

1477 +#: diff.c:4722

1478 #, c-format

1479 msgid ""

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

1481 msgstr ""

1482

1500 -#: dir.c:1899

1483 +#: dir.c:1948

1484 msgid "failed to get kernel name and information"

1485 msgstr ""

1486

1504 -#: dir.c:2018

1487 +#: dir.c:2067

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

1489 msgstr ""

1490

1508 -#: dir.c:2776 dir.c:2781

1491 +#: dir.c:2846 dir.c:2851

1492 #, c-format

1493 msgid "could not create directories for %s"

1494 msgstr ""

1495

1513 -#: dir.c:2806

1496 +#: dir.c:2876

1497 #, c-format

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

1499 msgstr ""

1500

1518 -#: entry.c:280

1501 +#: entry.c:281

1502 #, c-format

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

1504 msgstr ""

1505

1523 -#: fetch-pack.c:249

1506 +#: fetch-pack.c:251

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

1508 msgstr ""

1509

1527 -#: fetch-pack.c:261

1510 +#: fetch-pack.c:263

1511 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1512 msgstr ""

1513

1531 -#: fetch-pack.c:280 builtin/archive.c:63

1514 +#: fetch-pack.c:282 builtin/archive.c:63

1515 #, c-format

1516 msgid "remote error: %s"

1517 msgstr ""

1518

1536 -#: fetch-pack.c:281

1519 +#: fetch-pack.c:283

1520 #, c-format

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

1522 msgstr ""

1523

1541 -#: fetch-pack.c:333

1524 +#: fetch-pack.c:335

1525 msgid "--stateless-rpc requires multi_ack_detailed"

1526 msgstr ""

1527

1545 -#: fetch-pack.c:419

1528 +#: fetch-pack.c:421

1529 #, c-format

1530 msgid "invalid shallow line: %s"

1531 msgstr ""

1532

1550 -#: fetch-pack.c:425

1533 +#: fetch-pack.c:427

1534 #, c-format

1535 msgid "invalid unshallow line: %s"

1536 msgstr ""

1537

1555 -#: fetch-pack.c:427

1538 +#: fetch-pack.c:429

1539 #, c-format

1540 msgid "object not found: %s"

1541 msgstr ""

1542

1560 -#: fetch-pack.c:430

1543 +#: fetch-pack.c:432

1544 #, c-format

1545 msgid "error in object: %s"

1546 msgstr ""

1547

1565 -#: fetch-pack.c:432

1548 +#: fetch-pack.c:434

1549 #, c-format

1550 msgid "no shallow found: %s"

1551 msgstr ""

1552

1570 -#: fetch-pack.c:435

1553 +#: fetch-pack.c:437

1554 #, c-format

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

1556 msgstr ""

1557

1575 -#: fetch-pack.c:474

1558 +#: fetch-pack.c:476

1559 #, c-format

1560 msgid "got %s %d %s"

1561 msgstr ""

1562

1580 -#: fetch-pack.c:488

1563 +#: fetch-pack.c:490

1564 #, c-format

1565 msgid "invalid commit %s"

1566 msgstr ""

1567

1585 -#: fetch-pack.c:521

1568 +#: fetch-pack.c:523

1569 msgid "giving up"

1570 msgstr ""

1571

1589 -#: fetch-pack.c:531 progress.c:235

1572 +#: fetch-pack.c:533 progress.c:235

1573 msgid "done"

1574 msgstr ""

1575

1593 -#: fetch-pack.c:543

1576 +#: fetch-pack.c:545

1577 #, c-format

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

1579 msgstr ""

1580

1598 -#: fetch-pack.c:589

1581 +#: fetch-pack.c:591

1582 #, c-format

1583 msgid "Marking %s as complete"

1584 msgstr ""

1585

1603 -#: fetch-pack.c:737

1586 +#: fetch-pack.c:775

1587 #, c-format

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

1589 msgstr ""

1590

1608 -#: fetch-pack.c:775

1591 +#: fetch-pack.c:813

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

1593 msgstr ""

1594

1612 -#: fetch-pack.c:783

1595 +#: fetch-pack.c:821

1596 msgid "protocol error: bad pack header"

1597 msgstr ""

1598

1616 -#: fetch-pack.c:839

1599 +#: fetch-pack.c:877

1600 #, c-format

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

1602 msgstr ""

1603

1621 -#: fetch-pack.c:855

1604 +#: fetch-pack.c:893

1605 #, c-format

1606 msgid "%s failed"

1607 msgstr ""

1608

1626 -#: fetch-pack.c:857

1609 +#: fetch-pack.c:895

1610 msgid "error in sideband demultiplexer"

1611 msgstr ""

1612

1630 -#: fetch-pack.c:884

1613 +#: fetch-pack.c:922

1614 msgid "Server does not support shallow clients"

1615 msgstr ""

1616

1634 -#: fetch-pack.c:888

1617 +#: fetch-pack.c:926

1618 msgid "Server supports multi_ack_detailed"

1619 msgstr ""

1620

1638 -#: fetch-pack.c:891

1621 +#: fetch-pack.c:929

1622 msgid "Server supports no-done"

1623 msgstr ""

1624

1642 -#: fetch-pack.c:897

1625 +#: fetch-pack.c:935

1626 msgid "Server supports multi_ack"

1627 msgstr ""

1628

1646 -#: fetch-pack.c:901

1629 +#: fetch-pack.c:939

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

1631 msgstr ""

1632

1650 -#: fetch-pack.c:905

1633 +#: fetch-pack.c:943

1634 msgid "Server supports side-band"

1635 msgstr ""

1636

1654 -#: fetch-pack.c:909

1637 +#: fetch-pack.c:947

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

1639 msgstr ""

1640

1658 -#: fetch-pack.c:913

1641 +#: fetch-pack.c:951

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

1643 msgstr ""

1644

1662 -#: fetch-pack.c:923

1645 +#: fetch-pack.c:961

1646 msgid "Server supports ofs-delta"

1647 msgstr ""

1648

1666 -#: fetch-pack.c:930

1649 +#: fetch-pack.c:968

1650 #, c-format

1651 msgid "Server version is %.*s"

1652 msgstr ""

1653

1671 -#: fetch-pack.c:936

1654 +#: fetch-pack.c:974

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

1656 msgstr ""

1657

1675 -#: fetch-pack.c:940

1658 +#: fetch-pack.c:978

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

1660 msgstr ""

1661

1679 -#: fetch-pack.c:942

1662 +#: fetch-pack.c:980

1663 msgid "Server does not support --deepen"

1664 msgstr ""

1665

1683 -#: fetch-pack.c:953

1666 +#: fetch-pack.c:991

1667 msgid "no common commits"

1668 msgstr ""

1669

1687 -#: fetch-pack.c:965

1670 +#: fetch-pack.c:1003

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

1672 msgstr ""

1673

1691 -#: fetch-pack.c:1127

1674 +#: fetch-pack.c:1165

1675 msgid "no matching remote head"

1676 msgstr ""

1677

1695 -#: fetch-pack.c:1149

1678 +#: fetch-pack.c:1187

1679 #, c-format

1680 msgid "no such remote ref %s"

1681 msgstr ""

1682

1700 -#: fetch-pack.c:1152

1683 +#: fetch-pack.c:1190

1684 #, c-format

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

1686 msgstr ""

1687

1705 -#: gpg-interface.c:185

1688 +#: gpg-interface.c:181

1689 msgid "gpg failed to sign the data"

1690 msgstr ""

1691

1709 -#: gpg-interface.c:215

1692 +#: gpg-interface.c:211

1693 msgid "could not create temporary file"

1694 msgstr ""

1695

1713 -#: gpg-interface.c:217

1696 +#: gpg-interface.c:213

1697 #, c-format

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

1699 msgstr ""

1700

1718 -#: graph.c:96

1701 +#: graph.c:97

1702 #, c-format

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

1704 msgstr ""

1705

1723 -#: grep.c:1796

1706 +#: grep.c:1981

1707 #, c-format

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

1709 msgstr ""

1710

1728 -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1711 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

1712 #, c-format

1713 msgid "failed to stat '%s'"

1714 msgstr ""

1715

1733 -#: grep.c:1824

1716 +#: grep.c:2009

1717 #, c-format

1718 msgid "'%s': short read"

1719 msgstr ""

1720

1738 -#: help.c:218

1721 +#: help.c:179

1722 #, c-format

1723 msgid "available git commands in '%s'"

1724 msgstr ""

1725

1743 -#: help.c:225

1726 +#: help.c:186

1727 msgid "git commands available from elsewhere on your $PATH"

1728 msgstr ""

1729

1747 -#: help.c:256

1730 +#: help.c:217

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

1732 msgstr ""

1733

1751 -#: help.c:321

1734 +#: help.c:281

1735 #, c-format

1736 msgid ""

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

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

1739 msgstr ""

1740

1758 -#: help.c:376

1741 +#: help.c:336

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

1743 msgstr ""

1744

1762 -#: help.c:398

1745 +#: help.c:358

1746 #, c-format

1764 -msgid ""

1765 -"WARNING: You called a Git command named '%s', which does not exist.\n"

1766 -"Continuing under the assumption that you meant '%s'"

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

1748 +msgstr ""

1749 +

1750 +#: help.c:363

1751 +#, c-format

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

1753 msgstr ""

1754

1769 -#: help.c:403

1755 +#: help.c:368

1756 #, c-format

1771 -msgid "in %0.1f seconds automatically..."

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

1758 msgstr ""

1759

1774 -#: help.c:410

1760 +#: help.c:376

1761 #, c-format

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

1763 msgstr ""

1764

1779 -#: help.c:414 help.c:480

1765 +#: help.c:380

1766 msgid ""

1767 "\n"

1782 -"Did you mean this?"

1768 +"The most similar command is"

1769 msgid_plural ""

1770 "\n"

1785 -"Did you mean one of these?"

1771 +"The most similar commands are"

1772 msgstr[0] ""

1773 msgstr[1] ""

1774

1789 -#: help.c:476

1775 +#: help.c:395

1776 +msgid "git version [<options>]"

1777 +msgstr ""

1778 +

1779 +#: help.c:456

1780 #, c-format

1781 msgid "%s: %s - %s"

1782 msgstr ""

1783

1794 -#: ident.c:343

1784 +#: help.c:460

1785 +msgid ""

1786 +"\n"

1787 +"Did you mean this?"

1788 +msgid_plural ""

1789 +"\n"

1790 +"Did you mean one of these?"

1791 +msgstr[0] ""

1792 +msgstr[1] ""

1793 +

1794 +#: ident.c:342

1795 msgid ""

1796 "\n"

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

@@ -1806,35 +1806,35 @@ msgid ""

1806 "\n"

1807 msgstr ""

1808

1809 -#: ident.c:367

1809 +#: ident.c:366

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

1811 msgstr ""

1812

1813 -#: ident.c:372

1813 +#: ident.c:371

1814 #, c-format

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

1816 msgstr ""

1817

1818 -#: ident.c:382

1818 +#: ident.c:381

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

1820 msgstr ""

1821

1822 -#: ident.c:388

1822 +#: ident.c:387

1823 #, c-format

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

1825 msgstr ""

1826

1827 -#: ident.c:396

1827 +#: ident.c:395

1828 #, c-format

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

1830 msgstr ""

1831

1832 -#: ident.c:402

1832 +#: ident.c:401

1833 #, c-format

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

1835 msgstr ""

1836

1837 -#: ident.c:417 builtin/commit.c:611

1837 +#: ident.c:416 builtin/commit.c:612

1838 #, c-format

1839 msgid "invalid date format: %s"

1840 msgstr ""

@@ -1860,252 +1860,252 @@ msgstr ""

1860 msgid "failed to read the cache"

1861 msgstr ""

1862

1863 -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393

1864 -#: builtin/checkout.c:607 builtin/clone.c:749

1863 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

1864 +#: builtin/checkout.c:591 builtin/clone.c:753

1865 msgid "unable to write new index file"

1866 msgstr ""

1867

1868 -#: merge-recursive.c:209

1868 +#: merge-recursive.c:210

1869 msgid "(bad commit)\n"

1870 msgstr ""

1871

1872 -#: merge-recursive.c:231 merge-recursive.c:239

1872 +#: merge-recursive.c:232 merge-recursive.c:240

1873 #, c-format

1874 msgid "addinfo_cache failed for path '%s'"

1875 msgstr ""

1876

1877 -#: merge-recursive.c:303

1877 +#: merge-recursive.c:304

1878 msgid "error building trees"

1879 msgstr ""

1880

1881 -#: merge-recursive.c:727

1881 +#: merge-recursive.c:728

1882 #, c-format

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

1884 msgstr ""

1885

1886 -#: merge-recursive.c:738

1886 +#: merge-recursive.c:739

1887 #, c-format

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

1889 msgstr ""

1890

1891 -#: merge-recursive.c:752 merge-recursive.c:771

1891 +#: merge-recursive.c:753 merge-recursive.c:772

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

1893 msgstr ""

1894

1895 -#: merge-recursive.c:761

1895 +#: merge-recursive.c:762

1896 #, c-format

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

1898 msgstr ""

1899

1900 -#: merge-recursive.c:803 builtin/cat-file.c:34

1900 +#: merge-recursive.c:804 builtin/cat-file.c:36

1901 #, c-format

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

1903 msgstr ""

1904

1905 -#: merge-recursive.c:805

1905 +#: merge-recursive.c:806

1906 #, c-format

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

1908 msgstr ""

1909

1910 -#: merge-recursive.c:829

1910 +#: merge-recursive.c:830

1911 #, c-format

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

1913 msgstr ""

1914

1915 -#: merge-recursive.c:840

1915 +#: merge-recursive.c:841

1916 #, c-format

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

1918 msgstr ""

1919

1920 -#: merge-recursive.c:845

1920 +#: merge-recursive.c:846

1921 #, c-format

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

1923 msgstr ""

1924

1925 -#: merge-recursive.c:985

1925 +#: merge-recursive.c:986

1926 msgid "Failed to execute internal merge"

1927 msgstr ""

1928

1929 -#: merge-recursive.c:989

1929 +#: merge-recursive.c:990

1930 #, c-format

1931 msgid "Unable to add %s to database"

1932 msgstr ""

1933

1934 -#: merge-recursive.c:1092

1934 +#: merge-recursive.c:1093

1935 #, c-format

1936 msgid ""

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

1938 "in tree."

1939 msgstr ""

1940

1941 -#: merge-recursive.c:1097

1941 +#: merge-recursive.c:1098

1942 #, c-format

1943 msgid ""

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

1945 "left in tree."

1946 msgstr ""

1947

1948 -#: merge-recursive.c:1104

1948 +#: merge-recursive.c:1105

1949 #, c-format

1950 msgid ""

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

1952 "in tree at %s."

1953 msgstr ""

1954

1955 -#: merge-recursive.c:1109

1955 +#: merge-recursive.c:1110

1956 #, c-format

1957 msgid ""

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

1959 "left in tree at %s."

1960 msgstr ""

1961

1962 -#: merge-recursive.c:1143

1962 +#: merge-recursive.c:1144

1963 msgid "rename"

1964 msgstr ""

1965

1966 -#: merge-recursive.c:1143

1966 +#: merge-recursive.c:1144

1967 msgid "renamed"

1968 msgstr ""

1969

1970 -#: merge-recursive.c:1200

1970 +#: merge-recursive.c:1201

1971 #, c-format

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

1973 msgstr ""

1974

1975 -#: merge-recursive.c:1225

1975 +#: merge-recursive.c:1226

1976 #, c-format

1977 msgid ""

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

1979 "\"->\"%s\" in \"%s\"%s"

1980 msgstr ""

1981

1982 -#: merge-recursive.c:1230

1982 +#: merge-recursive.c:1231

1983 msgid " (left unresolved)"

1984 msgstr ""

1985

1986 -#: merge-recursive.c:1292

1986 +#: merge-recursive.c:1293

1987 #, c-format

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

1989 msgstr ""

1990

1991 -#: merge-recursive.c:1325

1991 +#: merge-recursive.c:1326

1992 #, c-format

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

1994 msgstr ""

1995

1996 -#: merge-recursive.c:1528

1996 +#: merge-recursive.c:1529

1997 #, c-format

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

1999 msgstr ""

2000

2001 -#: merge-recursive.c:1543

2001 +#: merge-recursive.c:1544

2002 #, c-format

2003 msgid "Adding merged %s"

2004 msgstr ""

2005

2006 -#: merge-recursive.c:1550 merge-recursive.c:1780

2006 +#: merge-recursive.c:1551 merge-recursive.c:1781

2007 #, c-format

2008 msgid "Adding as %s instead"

2009 msgstr ""

2010

2011 -#: merge-recursive.c:1607

2011 +#: merge-recursive.c:1608

2012 #, c-format

2013 msgid "cannot read object %s"

2014 msgstr ""

2015

2016 -#: merge-recursive.c:1610

2016 +#: merge-recursive.c:1611

2017 #, c-format

2018 msgid "object %s is not a blob"

2019 msgstr ""

2020

2021 -#: merge-recursive.c:1679

2021 +#: merge-recursive.c:1680

2022 msgid "modify"

2023 msgstr ""

2024

2025 -#: merge-recursive.c:1679

2025 +#: merge-recursive.c:1680

2026 msgid "modified"

2027 msgstr ""

2028

2029 -#: merge-recursive.c:1689

2029 +#: merge-recursive.c:1690

2030 msgid "content"

2031 msgstr ""

2032

2033 -#: merge-recursive.c:1696

2033 +#: merge-recursive.c:1697

2034 msgid "add/add"

2035 msgstr ""

2036

2037 -#: merge-recursive.c:1732

2037 +#: merge-recursive.c:1733

2038 #, c-format

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

2040 msgstr ""

2041

2042 -#: merge-recursive.c:1746

2042 +#: merge-recursive.c:1747

2043 #, c-format

2044 msgid "Auto-merging %s"

2045 msgstr ""

2046

2047 -#: merge-recursive.c:1750 git-submodule.sh:944

2047 +#: merge-recursive.c:1751 git-submodule.sh:945

2048 msgid "submodule"

2049 msgstr ""

2050

2051 -#: merge-recursive.c:1751

2051 +#: merge-recursive.c:1752

2052 #, c-format

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

2054 msgstr ""

2055

2056 -#: merge-recursive.c:1845

2056 +#: merge-recursive.c:1846

2057 #, c-format

2058 msgid "Removing %s"

2059 msgstr ""

2060

2061 -#: merge-recursive.c:1871

2061 +#: merge-recursive.c:1872

2062 msgid "file/directory"

2063 msgstr ""

2064

2065 -#: merge-recursive.c:1877

2065 +#: merge-recursive.c:1878

2066 msgid "directory/file"

2067 msgstr ""

2068

2069 -#: merge-recursive.c:1883

2069 +#: merge-recursive.c:1884

2070 #, c-format

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

2072 msgstr ""

2073

2074 -#: merge-recursive.c:1892

2074 +#: merge-recursive.c:1893

2075 #, c-format

2076 msgid "Adding %s"

2077 msgstr ""

2078

2079 -#: merge-recursive.c:1929

2079 +#: merge-recursive.c:1930

2080 msgid "Already up-to-date!"

2081 msgstr ""

2082

2083 -#: merge-recursive.c:1938

2083 +#: merge-recursive.c:1939

2084 #, c-format

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

2086 msgstr ""

2087

2088 -#: merge-recursive.c:2021

2088 +#: merge-recursive.c:2022

2089 msgid "Merging:"

2090 msgstr ""

2091

2092 -#: merge-recursive.c:2034

2092 +#: merge-recursive.c:2035

2093 #, c-format

2094 msgid "found %u common ancestor:"

2095 msgid_plural "found %u common ancestors:"

2096 msgstr[0] ""

2097 msgstr[1] ""

2098

2099 -#: merge-recursive.c:2073

2099 +#: merge-recursive.c:2074

2100 msgid "merge returned no commit"

2101 msgstr ""

2102

2103 -#: merge-recursive.c:2136

2103 +#: merge-recursive.c:2137

2104 #, c-format

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

2106 msgstr ""

2107

2108 -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2108 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793

2109 msgid "Unable to write index."

2110 msgstr ""

2111

@@ -2122,23 +2122,25 @@ msgstr ""

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

2123 msgstr ""

2124

2125 -#: notes-utils.c:41

2125 +#: notes-utils.c:42

2126 msgid "Cannot commit uninitialized/unreferenced notes tree"

2127 msgstr ""

2128

2129 -#: notes-utils.c:100

2129 +#: notes-utils.c:101

2130 #, c-format

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

2132 msgstr ""

2133

2134 -#: notes-utils.c:110

2134 +#: notes-utils.c:111

2135 #, c-format

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

2137 msgstr ""

2138

2139 -#. TRANSLATORS: The first %s is the name of the

2140 -#. environment variable, the second %s is its value

2141 -#: notes-utils.c:137

2139 +#. TRANSLATORS: The first %s is the name of

2140 +#. the environment variable, the second %s is

2141 +#. its value.

2142 +#.

2143 +#: notes-utils.c:141

2144 #, c-format

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

2146 msgstr ""

@@ -2148,28 +2150,29 @@ msgstr ""

2150 msgid "unable to parse object: %s"

2151 msgstr ""

2152

2151 -#: parse-options.c:572

2153 +#: parse-options.c:573

2154 msgid "..."

2155 msgstr ""

2156

2155 -#: parse-options.c:590

2157 +#: parse-options.c:591

2158 #, c-format

2159 msgid "usage: %s"

2160 msgstr ""

2161

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

2161 -#. one in "usage: %s" translation

2162 -#: parse-options.c:594

2163 +#. one in "usage: %s" translation.

2164 +#.

2165 +#: parse-options.c:597

2166 #, c-format

2167 msgid " or: %s"

2168 msgstr ""

2169

2167 -#: parse-options.c:597

2170 +#: parse-options.c:600

2171 #, c-format

2172 msgid " %s"

2173 msgstr ""

2174

2172 -#: parse-options.c:631

2175 +#: parse-options.c:634

2176 msgid "-NUM"

2177 msgstr ""

2178

@@ -2178,151 +2181,151 @@ msgstr ""

2181 msgid "malformed object name '%s'"

2182 msgstr ""

2183

2181 -#: path.c:810

2184 +#: path.c:890

2185 #, c-format

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

2187 msgstr ""

2188

2186 -#: pathspec.c:125

2189 +#: pathspec.c:129

2190 msgid "Escape character '\\' not allowed as last character in attr value"

2191 msgstr ""

2192

2190 -#: pathspec.c:143

2193 +#: pathspec.c:147

2194 msgid "Only one 'attr:' specification is allowed."

2195 msgstr ""

2196

2194 -#: pathspec.c:146

2197 +#: pathspec.c:150

2198 msgid "attr spec must not be empty"

2199 msgstr ""

2200

2198 -#: pathspec.c:189

2201 +#: pathspec.c:193

2202 #, c-format

2203 msgid "invalid attribute name %s"

2204 msgstr ""

2205

2203 -#: pathspec.c:254

2206 +#: pathspec.c:258

2207 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2208 msgstr ""

2209

2207 -#: pathspec.c:261

2210 +#: pathspec.c:265

2211 msgid ""

2212 "global 'literal' pathspec setting is incompatible with all other global "

2213 "pathspec settings"

2214 msgstr ""

2215

2213 -#: pathspec.c:301

2216 +#: pathspec.c:305

2217 msgid "invalid parameter for pathspec magic 'prefix'"

2218 msgstr ""

2219

2217 -#: pathspec.c:322

2220 +#: pathspec.c:326

2221 #, c-format

2222 msgid "Invalid pathspec magic '%.*s' in '%s'"

2223 msgstr ""

2224

2222 -#: pathspec.c:327

2225 +#: pathspec.c:331

2226 #, c-format

2227 msgid "Missing ')' at the end of pathspec magic in '%s'"

2228 msgstr ""

2229

2227 -#: pathspec.c:365

2230 +#: pathspec.c:369

2231 #, c-format

2232 msgid "Unimplemented pathspec magic '%c' in '%s'"

2233 msgstr ""

2234

2232 -#: pathspec.c:421 pathspec.c:443

2233 -#, c-format

2234 -msgid "Pathspec '%s' is in submodule '%.*s'"

2235 -msgstr ""

2236 -

2237 -#: pathspec.c:483

2235 +#: pathspec.c:428

2236 #, c-format

2237 msgid "%s: 'literal' and 'glob' are incompatible"

2238 msgstr ""

2239

2242 -#: pathspec.c:496

2240 +#: pathspec.c:441

2241 #, c-format

2242 msgid "%s: '%s' is outside repository"

2243 msgstr ""

2244

2247 -#: pathspec.c:584

2245 +#: pathspec.c:515

2246 #, c-format

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

2248 msgstr ""

2249

2252 -#: pathspec.c:594

2250 +#: pathspec.c:525

2251 #, c-format

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

2253 msgstr ""

2254

2257 -#: pathspec.c:644

2255 +#: pathspec.c:575

2256 msgid ""

2257 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2258 "use . instead if you meant to match all paths"

2259 msgstr ""

2260

2263 -#: pathspec.c:668

2261 +#: pathspec.c:599

2262 #, c-format

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

2264 msgstr ""

2265

2268 -#: pretty.c:982

2266 +#: pretty.c:963

2267 msgid "unable to parse --pretty format"

2268 msgstr ""

2269

2272 -#: read-cache.c:1442

2270 +#: read-cache.c:1443

2271 #, c-format

2272 msgid ""

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

2274 "Using version %i"

2275 msgstr ""

2276

2279 -#: read-cache.c:1452

2277 +#: read-cache.c:1453

2278 #, c-format

2279 msgid ""

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

2281 "Using version %i"

2282 msgstr ""

2283

2286 -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048

2284 +#: read-cache.c:2308 builtin/merge.c:1019

2285 +#, c-format

2286 +msgid "could not close '%s'"

2287 +msgstr ""

2288 +

2289 +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

2290 #, c-format

2291 msgid "could not stat '%s'"

2292 msgstr ""

2293

2291 -#: read-cache.c:2388

2294 +#: read-cache.c:2396

2295 #, c-format

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

2297 msgstr ""

2298

2296 -#: read-cache.c:2400

2299 +#: read-cache.c:2408

2300 #, c-format

2301 msgid "unable to unlink: %s"

2302 msgstr ""

2303

2301 -#: refs.c:620 builtin/merge.c:844

2304 +#: refs.c:622

2305 #, c-format

2306 msgid "Could not open '%s' for writing"

2307 msgstr ""

2308

2306 -#: refs.c:1667

2309 +#: refs.c:1769

2310 msgid "ref updates forbidden inside quarantine environment"

2311 msgstr ""

2312

2310 -#: refs/files-backend.c:1631

2313 +#: refs/files-backend.c:1664

2314 #, c-format

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

2316 msgstr ""

2317

2315 -#: refs/files-backend.c:1634

2318 +#: refs/files-backend.c:1667

2319 #, c-format

2320 msgid "could not delete references: %s"

2321 msgstr ""

2322

2320 -#: refs/files-backend.c:1643

2323 +#: refs/files-backend.c:1676

2324 #, c-format

2325 msgid "could not remove reference %s"

2326 msgstr ""

2327

2325 -#: ref-filter.c:35 wt-status.c:1780

2328 +#: ref-filter.c:35 wt-status.c:1811

2329 msgid "gone"

2330 msgstr ""

2331

@@ -2341,301 +2344,303 @@ msgstr ""

2344 msgid "ahead %d, behind %d"

2345 msgstr ""

2346

2344 -#: ref-filter.c:104

2347 +#: ref-filter.c:105

2348 #, c-format

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

2350 msgstr ""

2351

2349 -#: ref-filter.c:106

2352 +#: ref-filter.c:107

2353 #, c-format

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

2355 msgstr ""

2356

2354 -#: ref-filter.c:120

2357 +#: ref-filter.c:121

2358 #, c-format

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

2360 msgstr ""

2361

2359 -#: ref-filter.c:124

2362 +#: ref-filter.c:125

2363 #, c-format

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

2365 msgstr ""

2366

2364 -#: ref-filter.c:126

2367 +#: ref-filter.c:127

2368 #, c-format

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

2370 msgstr ""

2371

2369 -#: ref-filter.c:166

2372 +#: ref-filter.c:167

2373 #, c-format

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

2375 msgstr ""

2376

2374 -#: ref-filter.c:173

2377 +#: ref-filter.c:174

2378 #, c-format

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

2380 msgstr ""

2381

2379 -#: ref-filter.c:180

2382 +#: ref-filter.c:181

2383 #, c-format

2384 msgid "%%(trailers) does not take arguments"

2385 msgstr ""

2386

2384 -#: ref-filter.c:199

2387 +#: ref-filter.c:200

2388 #, c-format

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

2390 msgstr ""

2391

2389 -#: ref-filter.c:201

2392 +#: ref-filter.c:202

2393 #, c-format

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

2395 msgstr ""

2396

2394 -#: ref-filter.c:214

2397 +#: ref-filter.c:215

2398 #, c-format

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

2400 msgstr ""

2401

2399 -#: ref-filter.c:218

2402 +#: ref-filter.c:219

2403 #, c-format

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

2405 msgstr ""

2406

2404 -#: ref-filter.c:245

2407 +#: ref-filter.c:246

2408 #, c-format

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

2410 msgstr ""

2411

2409 -#: ref-filter.c:257

2412 +#: ref-filter.c:258

2413 #, c-format

2414 msgid "unrecognized position:%s"

2415 msgstr ""

2416

2414 -#: ref-filter.c:261

2417 +#: ref-filter.c:262

2418 #, c-format

2419 msgid "unrecognized width:%s"

2420 msgstr ""

2421

2419 -#: ref-filter.c:267

2422 +#: ref-filter.c:268

2423 #, c-format

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

2425 msgstr ""

2426

2424 -#: ref-filter.c:271

2427 +#: ref-filter.c:272

2428 #, c-format

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

2430 msgstr ""

2431

2429 -#: ref-filter.c:286

2432 +#: ref-filter.c:287

2433 #, c-format

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

2435 msgstr ""

2436

2434 -#: ref-filter.c:371

2437 +#: ref-filter.c:378

2438 #, c-format

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

2440 msgstr ""

2441

2439 -#: ref-filter.c:397

2442 +#: ref-filter.c:404

2443 #, c-format

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

2445 msgstr ""

2446

2444 -#: ref-filter.c:501

2447 +#: ref-filter.c:508

2448 #, c-format

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

2450 msgstr ""

2451

2449 -#: ref-filter.c:561

2452 +#: ref-filter.c:568

2453 #, c-format

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

2455 msgstr ""

2456

2454 -#: ref-filter.c:563

2457 +#: ref-filter.c:570

2458 #, c-format

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

2460 msgstr ""

2461

2459 -#: ref-filter.c:565

2462 +#: ref-filter.c:572

2463 #, c-format

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

2465 msgstr ""

2466

2464 -#: ref-filter.c:591

2467 +#: ref-filter.c:598

2468 #, c-format

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

2470 msgstr ""

2471

2469 -#: ref-filter.c:593

2472 +#: ref-filter.c:600

2473 #, c-format

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

2475 msgstr ""

2476

2474 -#: ref-filter.c:595

2477 +#: ref-filter.c:602

2478 #, c-format

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

2480 msgstr ""

2481

2479 -#: ref-filter.c:608

2482 +#: ref-filter.c:615

2483 #, c-format

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

2485 msgstr ""

2486

2484 -#: ref-filter.c:663

2487 +#: ref-filter.c:670

2488 #, c-format

2489 msgid "malformed format string %s"

2490 msgstr ""

2491

2489 -#: ref-filter.c:1247

2492 +#: ref-filter.c:1254

2493 #, c-format

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

2495 msgstr ""

2496

2494 -#: ref-filter.c:1250

2497 +#: ref-filter.c:1257

2498 #, c-format

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

2500 msgstr ""

2501

2499 -#. TRANSLATORS: make sure this matches

2500 -#. "HEAD detached at " in wt-status.c

2501 -#: ref-filter.c:1256

2502 +#. TRANSLATORS: make sure this matches "HEAD

2503 +#. detached at " in wt-status.c

2504 +#.

2505 +#: ref-filter.c:1265

2506 #, c-format

2507 msgid "(HEAD detached at %s)"

2508 msgstr ""

2509

2506 -#. TRANSLATORS: make sure this matches

2507 -#. "HEAD detached from " in wt-status.c

2508 -#: ref-filter.c:1261

2510 +#. TRANSLATORS: make sure this matches "HEAD

2511 +#. detached from " in wt-status.c

2512 +#.

2513 +#: ref-filter.c:1272

2514 #, c-format

2515 msgid "(HEAD detached from %s)"

2516 msgstr ""

2517

2513 -#: ref-filter.c:1265

2518 +#: ref-filter.c:1276

2519 msgid "(no branch)"

2520 msgstr ""

2521

2517 -#: ref-filter.c:1420 ref-filter.c:1451

2522 +#: ref-filter.c:1426 ref-filter.c:1457

2523 #, c-format

2524 msgid "missing object %s for %s"

2525 msgstr ""

2526

2522 -#: ref-filter.c:1423 ref-filter.c:1454

2527 +#: ref-filter.c:1429 ref-filter.c:1460

2528 #, c-format

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

2530 msgstr ""

2531

2527 -#: ref-filter.c:1692

2532 +#: ref-filter.c:1760

2533 #, c-format

2534 msgid "malformed object at '%s'"

2535 msgstr ""

2536

2532 -#: ref-filter.c:1759

2537 +#: ref-filter.c:1827

2538 #, c-format

2539 msgid "ignoring ref with broken name %s"

2540 msgstr ""

2541

2537 -#: ref-filter.c:1764

2542 +#: ref-filter.c:1832

2543 #, c-format

2544 msgid "ignoring broken ref %s"

2545 msgstr ""

2546

2542 -#: ref-filter.c:2028

2547 +#: ref-filter.c:2095

2548 #, c-format

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

2550 msgstr ""

2551

2547 -#: ref-filter.c:2109

2552 +#: ref-filter.c:2176

2553 #, c-format

2554 msgid "malformed object name %s"

2555 msgstr ""

2556

2552 -#: remote.c:754

2557 +#: remote.c:747

2558 #, c-format

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

2560 msgstr ""

2561

2557 -#: remote.c:758

2562 +#: remote.c:751

2563 #, c-format

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

2565 msgstr ""

2566

2562 -#: remote.c:762

2567 +#: remote.c:755

2568 #, c-format

2569 msgid "%s tracks both %s and %s"

2570 msgstr ""

2571

2567 -#: remote.c:770

2572 +#: remote.c:763

2573 msgid "Internal error"

2574 msgstr ""

2575

2571 -#: remote.c:1685 remote.c:1787

2576 +#: remote.c:1680 remote.c:1782

2577 msgid "HEAD does not point to a branch"

2578 msgstr ""

2579

2575 -#: remote.c:1694

2580 +#: remote.c:1689

2581 #, c-format

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

2583 msgstr ""

2584

2580 -#: remote.c:1697

2585 +#: remote.c:1692

2586 #, c-format

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

2588 msgstr ""

2589

2585 -#: remote.c:1703

2590 +#: remote.c:1698

2591 #, c-format

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

2593 msgstr ""

2594

2590 -#: remote.c:1718

2595 +#: remote.c:1713

2596 #, c-format

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

2598 msgstr ""

2599

2595 -#: remote.c:1730

2600 +#: remote.c:1725

2601 #, c-format

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

2603 msgstr ""

2604

2600 -#: remote.c:1741

2605 +#: remote.c:1736

2606 #, c-format

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

2608 msgstr ""

2609

2605 -#: remote.c:1754

2610 +#: remote.c:1749

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

2612 msgstr ""

2613

2609 -#: remote.c:1776

2614 +#: remote.c:1771

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

2616 msgstr ""

2617

2613 -#: remote.c:2081

2618 +#: remote.c:2076

2619 #, c-format

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

2621 msgstr ""

2622

2618 -#: remote.c:2085

2623 +#: remote.c:2080

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

2625 msgstr ""

2626

2622 -#: remote.c:2088

2627 +#: remote.c:2083

2628 #, c-format

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

2630 msgstr ""

2631

2627 -#: remote.c:2092

2632 +#: remote.c:2087

2633 #, c-format

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

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

2636 msgstr[0] ""

2637 msgstr[1] ""

2638

2634 -#: remote.c:2098

2639 +#: remote.c:2093

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

2641 msgstr ""

2642

2638 -#: remote.c:2101

2643 +#: remote.c:2096

2644 #, c-format

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

2646 msgid_plural ""

@@ -2643,11 +2648,11 @@ msgid_plural ""

2648 msgstr[0] ""

2649 msgstr[1] ""

2650

2646 -#: remote.c:2109

2651 +#: remote.c:2104

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

2653 msgstr ""

2654

2650 -#: remote.c:2112

2655 +#: remote.c:2107

2656 #, c-format

2657 msgid ""

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

@@ -2658,151 +2663,146 @@ msgid_plural ""

2663 msgstr[0] ""

2664 msgstr[1] ""

2665

2661 -#: remote.c:2122

2666 +#: remote.c:2117

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

2668 msgstr ""

2669

2665 -#: revision.c:2158

2670 +#: revision.c:2187

2671 msgid "your current branch appears to be broken"

2672 msgstr ""

2673

2669 -#: revision.c:2161

2674 +#: revision.c:2190

2675 #, c-format

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

2677 msgstr ""

2678

2674 -#: revision.c:2355

2679 +#: revision.c:2384

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

2681 msgstr ""

2682

2678 -#: run-command.c:125

2683 +#: run-command.c:644

2684 msgid "open /dev/null failed"

2685 msgstr ""

2686

2682 -#: run-command.c:127

2683 -#, c-format

2684 -msgid "dup2(%d,%d) failed"

2685 -msgstr ""

2686 -

2687 -#: send-pack.c:150

2687 +#: send-pack.c:151

2688 #, c-format

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

2690 msgstr ""

2691

2692 -#: send-pack.c:152

2692 +#: send-pack.c:153

2693 #, c-format

2694 msgid "remote unpack failed: %s"

2695 msgstr ""

2696

2697 -#: send-pack.c:315

2697 +#: send-pack.c:316

2698 msgid "failed to sign the push certificate"

2699 msgstr ""

2700

2701 -#: send-pack.c:428

2701 +#: send-pack.c:429

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

2703 msgstr ""

2704

2705 -#: send-pack.c:430

2705 +#: send-pack.c:431

2706 msgid ""

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

2708 "signed push"

2709 msgstr ""

2710

2711 -#: send-pack.c:442

2711 +#: send-pack.c:443

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

2713 msgstr ""

2714

2715 -#: send-pack.c:447

2715 +#: send-pack.c:448

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

2717 msgstr ""

2718

2719 -#: sequencer.c:215

2719 +#: sequencer.c:216

2720 msgid "revert"

2721 msgstr ""

2722

2723 -#: sequencer.c:217

2723 +#: sequencer.c:218

2724 msgid "cherry-pick"

2725 msgstr ""

2726

2727 -#: sequencer.c:219

2727 +#: sequencer.c:220

2728 msgid "rebase -i"

2729 msgstr ""

2730

2731 -#: sequencer.c:221

2731 +#: sequencer.c:222

2732 #, c-format

2733 msgid "Unknown action: %d"

2734 msgstr ""

2735

2736 -#: sequencer.c:278

2736 +#: sequencer.c:279

2737 msgid ""

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

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

2740 msgstr ""

2741

2742 -#: sequencer.c:281

2742 +#: sequencer.c:282

2743 msgid ""

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

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

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

2747 msgstr ""

2748

2749 -#: sequencer.c:294 sequencer.c:1682

2749 +#: sequencer.c:295 sequencer.c:1685

2750 #, c-format

2751 msgid "could not lock '%s'"

2752 msgstr ""

2753

2754 -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701

2754 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

2755 #, c-format

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

2757 msgstr ""

2758

2759 -#: sequencer.c:301

2759 +#: sequencer.c:302

2760 #, c-format

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

2762 msgstr ""

2763

2764 -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689

2764 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

2765 #, c-format

2766 msgid "failed to finalize '%s'."

2767 msgstr ""

2768

2769 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257

2770 -#: builtin/commit.c:749 builtin/merge.c:1018

2769 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

2770 +#: builtin/commit.c:750 builtin/merge.c:1017

2771 #, c-format

2772 msgid "could not read '%s'"

2773 msgstr ""

2774

2775 -#: sequencer.c:355

2775 +#: sequencer.c:356

2776 #, c-format

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

2778 msgstr ""

2779

2780 -#: sequencer.c:359

2780 +#: sequencer.c:360

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

2782 msgstr ""

2783

2784 -#: sequencer.c:388

2784 +#: sequencer.c:389

2785 #, c-format

2786 msgid "%s: fast-forward"

2787 msgstr ""

2788

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

2790 -#. * "rebase -i".

2790 +#. "rebase -i".

2791 #.

2792 -#: sequencer.c:470

2792 +#: sequencer.c:472

2793 #, c-format

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

2795 msgstr ""

2796

2797 -#: sequencer.c:489

2797 +#: sequencer.c:491

2798 msgid "could not resolve HEAD commit\n"

2799 msgstr ""

2800

2801 -#: sequencer.c:509

2801 +#: sequencer.c:511

2802 msgid "unable to update cache tree\n"

2803 msgstr ""

2804

2805 -#: sequencer.c:592

2805 +#: sequencer.c:595

2806 #, c-format

2807 msgid ""

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

@@ -2819,17 +2819,17 @@ msgid ""

2819 " git rebase --continue\n"

2820 msgstr ""

2821

2822 -#: sequencer.c:694

2822 +#: sequencer.c:697

2823 #, c-format

2824 msgid "could not parse commit %s\n"

2825 msgstr ""

2826

2827 -#: sequencer.c:699

2827 +#: sequencer.c:702

2828 #, c-format

2829 msgid "could not parse parent commit %s\n"

2830 msgstr ""

2831

2832 -#: sequencer.c:821

2832 +#: sequencer.c:824

2833 #, c-format

2834 msgid ""

2835 "unexpected 1st line of squash message:\n"

@@ -2837,7 +2837,7 @@ msgid ""

2837 "\t%.*s"

2838 msgstr ""

2839

2840 -#: sequencer.c:827

2840 +#: sequencer.c:830

2841 #, c-format

2842 msgid ""

2843 "invalid 1st line of squash message:\n"

@@ -2845,229 +2845,229 @@ msgid ""

2845 "\t%.*s"

2846 msgstr ""

2847

2848 -#: sequencer.c:833 sequencer.c:858

2848 +#: sequencer.c:836 sequencer.c:861

2849 #, c-format

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

2851 msgstr ""

2852

2853 -#: sequencer.c:842

2853 +#: sequencer.c:845

2854 msgid "need a HEAD to fixup"

2855 msgstr ""

2856

2857 -#: sequencer.c:844

2857 +#: sequencer.c:847

2858 msgid "could not read HEAD"

2859 msgstr ""

2860

2861 -#: sequencer.c:846

2861 +#: sequencer.c:849

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

2863 msgstr ""

2864

2865 -#: sequencer.c:852

2865 +#: sequencer.c:855

2866 #, c-format

2867 msgid "cannot write '%s'"

2868 msgstr ""

2869

2870 -#: sequencer.c:861 git-rebase--interactive.sh:445

2870 +#: sequencer.c:864 git-rebase--interactive.sh:445

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

2872 msgstr ""

2873

2874 -#: sequencer.c:869

2874 +#: sequencer.c:872

2875 #, c-format

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

2877 msgstr ""

2878

2879 -#: sequencer.c:876

2879 +#: sequencer.c:879

2880 #, c-format

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

2882 msgstr ""

2883

2884 -#: sequencer.c:881

2884 +#: sequencer.c:884

2885 #, c-format

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

2887 msgstr ""

2888

2889 -#: sequencer.c:886

2889 +#: sequencer.c:889

2890 #, c-format

2891 msgid "unknown command: %d"

2892 msgstr ""

2893

2894 -#: sequencer.c:952

2894 +#: sequencer.c:955

2895 msgid "your index file is unmerged."

2896 msgstr ""

2897

2898 -#: sequencer.c:970

2898 +#: sequencer.c:973

2899 #, c-format

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

2901 msgstr ""

2902

2903 -#: sequencer.c:978

2903 +#: sequencer.c:981

2904 #, c-format

2905 msgid "commit %s does not have parent %d"

2906 msgstr ""

2907

2908 -#: sequencer.c:982

2908 +#: sequencer.c:985

2909 #, c-format

2910 msgid "mainline was specified but commit %s is not a merge."

2911 msgstr ""

2912

2913 -#: sequencer.c:988

2913 +#: sequencer.c:991

2914 #, c-format

2915 msgid "cannot get commit message for %s"

2916 msgstr ""

2917

2918 #. TRANSLATORS: The first %s will be a "todo" command like

2919 #. "revert" or "pick", the second %s a SHA1.

2920 -#: sequencer.c:1009

2920 +#: sequencer.c:1012

2921 #, c-format

2922 msgid "%s: cannot parse parent commit %s"

2923 msgstr ""

2924

2925 -#: sequencer.c:1071 sequencer.c:1827

2925 +#: sequencer.c:1075 sequencer.c:1830

2926 #, c-format

2927 msgid "could not rename '%s' to '%s'"

2928 msgstr ""

2929

2930 -#: sequencer.c:1122

2930 +#: sequencer.c:1126

2931 #, c-format

2932 msgid "could not revert %s... %s"

2933 msgstr ""

2934

2935 -#: sequencer.c:1123

2935 +#: sequencer.c:1127

2936 #, c-format

2937 msgid "could not apply %s... %s"

2938 msgstr ""

2939

2940 -#: sequencer.c:1165

2940 +#: sequencer.c:1169

2941 msgid "empty commit set passed"

2942 msgstr ""

2943

2944 -#: sequencer.c:1175

2944 +#: sequencer.c:1179

2945 #, c-format

2946 msgid "git %s: failed to read the index"

2947 msgstr ""

2948

2949 -#: sequencer.c:1182

2949 +#: sequencer.c:1186

2950 #, c-format

2951 msgid "git %s: failed to refresh the index"

2952 msgstr ""

2953

2954 -#: sequencer.c:1303

2954 +#: sequencer.c:1306

2955 #, c-format

2956 msgid "invalid line %d: %.*s"

2957 msgstr ""

2958

2959 -#: sequencer.c:1311

2959 +#: sequencer.c:1314

2960 #, c-format

2961 msgid "cannot '%s' without a previous commit"

2962 msgstr ""

2963

2964 -#: sequencer.c:1344

2964 +#: sequencer.c:1347

2965 #, c-format

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

2967 msgstr ""

2968

2969 -#: sequencer.c:1356

2969 +#: sequencer.c:1359

2970 msgid "please fix this using 'git rebase --edit-todo'."

2971 msgstr ""

2972

2973 -#: sequencer.c:1358

2973 +#: sequencer.c:1361

2974 #, c-format

2975 msgid "unusable instruction sheet: '%s'"

2976 msgstr ""

2977

2978 -#: sequencer.c:1363

2978 +#: sequencer.c:1366

2979 msgid "no commits parsed."

2980 msgstr ""

2981

2982 -#: sequencer.c:1374

2982 +#: sequencer.c:1377

2983 msgid "cannot cherry-pick during a revert."

2984 msgstr ""

2985

2986 -#: sequencer.c:1376

2986 +#: sequencer.c:1379

2987 msgid "cannot revert during a cherry-pick."

2988 msgstr ""

2989

2990 -#: sequencer.c:1439

2990 +#: sequencer.c:1442

2991 #, c-format

2992 msgid "invalid key: %s"

2993 msgstr ""

2994

2995 -#: sequencer.c:1442

2995 +#: sequencer.c:1445

2996 #, c-format

2997 msgid "invalid value for %s: %s"

2998 msgstr ""

2999

3000 -#: sequencer.c:1499

3000 +#: sequencer.c:1502

3001 #, c-format

3002 msgid "malformed options sheet: '%s'"

3003 msgstr ""

3004

3005 -#: sequencer.c:1537

3005 +#: sequencer.c:1540

3006 msgid "a cherry-pick or revert is already in progress"

3007 msgstr ""

3008

3009 -#: sequencer.c:1538

3009 +#: sequencer.c:1541

3010 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3011 msgstr ""

3012

3013 -#: sequencer.c:1541

3013 +#: sequencer.c:1544

3014 #, c-format

3015 msgid "could not create sequencer directory '%s'"

3016 msgstr ""

3017

3018 -#: sequencer.c:1555

3018 +#: sequencer.c:1558

3019 msgid "could not lock HEAD"

3020 msgstr ""

3021

3022 -#: sequencer.c:1611 sequencer.c:2181

3022 +#: sequencer.c:1614 sequencer.c:2188

3023 msgid "no cherry-pick or revert in progress"

3024 msgstr ""

3025

3026 -#: sequencer.c:1613

3026 +#: sequencer.c:1616

3027 msgid "cannot resolve HEAD"

3028 msgstr ""

3029

3030 -#: sequencer.c:1615 sequencer.c:1649

3030 +#: sequencer.c:1618 sequencer.c:1652

3031 msgid "cannot abort from a branch yet to be born"

3032 msgstr ""

3033

3034 -#: sequencer.c:1635 builtin/grep.c:910

3034 +#: sequencer.c:1638 builtin/grep.c:929

3035 #, c-format

3036 msgid "cannot open '%s'"

3037 msgstr ""

3038

3039 -#: sequencer.c:1637

3039 +#: sequencer.c:1640

3040 #, c-format

3041 msgid "cannot read '%s': %s"

3042 msgstr ""

3043

3044 -#: sequencer.c:1638

3044 +#: sequencer.c:1641

3045 msgid "unexpected end of file"

3046 msgstr ""

3047

3048 -#: sequencer.c:1644

3048 +#: sequencer.c:1647

3049 #, c-format

3050 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3051 msgstr ""

3052

3053 -#: sequencer.c:1655

3053 +#: sequencer.c:1658

3054 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3055 msgstr ""

3056

3057 -#: sequencer.c:1792 sequencer.c:2080

3057 +#: sequencer.c:1795 sequencer.c:2086

3058 msgid "cannot read HEAD"

3059 msgstr ""

3060

3061 -#: sequencer.c:1832 builtin/difftool.c:616

3061 +#: sequencer.c:1835 builtin/difftool.c:633

3062 #, c-format

3063 msgid "could not copy '%s' to '%s'"

3064 msgstr ""

3065

3066 -#: sequencer.c:1848

3066 +#: sequencer.c:1851

3067 msgid "could not read index"

3068 msgstr ""

3069

3070 -#: sequencer.c:1853

3070 +#: sequencer.c:1856

3071 #, c-format

3072 msgid ""

3073 "execution failed: %s\n"

@@ -3077,11 +3077,11 @@ msgid ""

3077 "\n"

3078 msgstr ""

3079

3080 -#: sequencer.c:1859

3080 +#: sequencer.c:1862

3081 msgid "and made changes to the index and/or the working tree\n"

3082 msgstr ""

3083

3084 -#: sequencer.c:1865

3084 +#: sequencer.c:1868

3085 #, c-format

3086 msgid ""

3087 "execution succeeded: %s\n"

@@ -3092,17 +3092,17 @@ msgid ""

3092 "\n"

3093 msgstr ""

3094

3095 -#: sequencer.c:1920 git-rebase.sh:169

3095 +#: sequencer.c:1925

3096 #, c-format

3097 -msgid "Applied autostash."

3097 +msgid "Applied autostash.\n"

3098 msgstr ""

3099

3100 -#: sequencer.c:1932

3100 +#: sequencer.c:1937

3101 #, c-format

3102 msgid "cannot store %s"

3103 msgstr ""

3104

3105 -#: sequencer.c:1934 git-rebase.sh:173

3105 +#: sequencer.c:1940 git-rebase.sh:173

3106 #, c-format

3107 msgid ""

3108 "Applying autostash resulted in conflicts.\n"

@@ -3110,89 +3110,89 @@ msgid ""

3110 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3111 msgstr ""

3112

3113 -#: sequencer.c:2016

3113 +#: sequencer.c:2022

3114 #, c-format

3115 msgid "Stopped at %s... %.*s\n"

3116 msgstr ""

3117

3118 -#: sequencer.c:2058

3118 +#: sequencer.c:2064

3119 #, c-format

3120 msgid "unknown command %d"

3121 msgstr ""

3122

3123 -#: sequencer.c:2088

3123 +#: sequencer.c:2094

3124 msgid "could not read orig-head"

3125 msgstr ""

3126

3127 -#: sequencer.c:2092

3127 +#: sequencer.c:2099

3128 msgid "could not read 'onto'"

3129 msgstr ""

3130

3131 -#: sequencer.c:2099

3131 +#: sequencer.c:2106

3132 #, c-format

3133 msgid "could not update %s"

3134 msgstr ""

3135

3136 -#: sequencer.c:2106

3136 +#: sequencer.c:2113

3137 #, c-format

3138 msgid "could not update HEAD to %s"

3139 msgstr ""

3140

3141 -#: sequencer.c:2190

3141 +#: sequencer.c:2197

3142 msgid "cannot rebase: You have unstaged changes."

3143 msgstr ""

3144

3145 -#: sequencer.c:2195

3145 +#: sequencer.c:2202

3146 msgid "could not remove CHERRY_PICK_HEAD"

3147 msgstr ""

3148

3149 -#: sequencer.c:2204

3149 +#: sequencer.c:2211

3150 msgid "cannot amend non-existing commit"

3151 msgstr ""

3152

3153 -#: sequencer.c:2206

3153 +#: sequencer.c:2213

3154 #, c-format

3155 msgid "invalid file: '%s'"

3156 msgstr ""

3157

3158 -#: sequencer.c:2208

3158 +#: sequencer.c:2215

3159 #, c-format

3160 msgid "invalid contents: '%s'"

3161 msgstr ""

3162

3163 -#: sequencer.c:2211

3163 +#: sequencer.c:2218

3164 msgid ""

3165 "\n"

3166 "You have uncommitted changes in your working tree. Please, commit them\n"

3167 "first and then run 'git rebase --continue' again."

3168 msgstr ""

3169

3170 -#: sequencer.c:2221

3170 +#: sequencer.c:2228

3171 msgid "could not commit staged changes."

3172 msgstr ""

3173

3174 -#: sequencer.c:2301

3174 +#: sequencer.c:2308

3175 #, c-format

3176 msgid "%s: can't cherry-pick a %s"

3177 msgstr ""

3178

3179 -#: sequencer.c:2305

3179 +#: sequencer.c:2312

3180 #, c-format

3181 msgid "%s: bad revision"

3182 msgstr ""

3183

3184 -#: sequencer.c:2338

3184 +#: sequencer.c:2345

3185 msgid "can't revert as initial commit"

3186 msgstr ""

3187

3188 -#: setup.c:165

3188 +#: setup.c:171

3189 #, c-format

3190 msgid ""

3191 "%s: no such path in the working tree.\n"

3192 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."

3193 msgstr ""

3194

3195 -#: setup.c:178

3195 +#: setup.c:184

3196 #, c-format

3197 msgid ""

3198 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3200,7 +3200,7 @@ msgid ""

3200 "'git <command> [<revision>...] -- [<file>...]'"

3201 msgstr ""

3202

3203 -#: setup.c:228

3203 +#: setup.c:252

3204 #, c-format

3205 msgid ""

3206 "ambiguous argument '%s': both revision and filename\n"

@@ -3208,68 +3208,68 @@ msgid ""

3208 "'git <command> [<revision>...] -- [<file>...]'"

3209 msgstr ""

3210

3211 -#: setup.c:475

3211 +#: setup.c:504

3212 #, c-format

3213 msgid "Expected git repo version <= %d, found %d"

3214 msgstr ""

3215

3216 -#: setup.c:483

3216 +#: setup.c:512

3217 msgid "unknown repository extensions found:"

3218 msgstr ""

3219

3220 -#: setup.c:776

3220 +#: setup.c:810

3221 #, c-format

3222 msgid "Not a git repository (or any of the parent directories): %s"

3223 msgstr ""

3224

3225 -#: setup.c:778 builtin/index-pack.c:1646

3225 +#: setup.c:812 builtin/index-pack.c:1652

3226 msgid "Cannot come back to cwd"

3227 msgstr ""

3228

3229 -#: setup.c:1010

3229 +#: setup.c:1050

3230 msgid "Unable to read current working directory"

3231 msgstr ""

3232

3233 -#: setup.c:1022 setup.c:1028

3233 +#: setup.c:1062 setup.c:1068

3234 #, c-format

3235 msgid "Cannot change to '%s'"

3236 msgstr ""

3237

3238 -#: setup.c:1041

3238 +#: setup.c:1081

3239 #, c-format

3240 msgid ""

3241 "Not a git repository (or any parent up to mount point %s)\n"

3242 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3243 msgstr ""

3244

3245 -#: setup.c:1106

3245 +#: setup.c:1173

3246 #, c-format

3247 msgid ""

3248 "Problem with core.sharedRepository filemode value (0%.3o).\n"

3249 "The owner of files must always have read and write permissions."

3250 msgstr ""

3251

3252 -#: sha1_file.c:559

3252 +#: sha1_file.c:560

3253 #, c-format

3254 msgid "path '%s' does not exist"

3255 msgstr ""

3256

3257 -#: sha1_file.c:585

3257 +#: sha1_file.c:586

3258 #, c-format

3259 msgid "reference repository '%s' as a linked checkout is not supported yet."

3260 msgstr ""

3261

3262 -#: sha1_file.c:591

3262 +#: sha1_file.c:592

3263 #, c-format

3264 msgid "reference repository '%s' is not a local repository."

3265 msgstr ""

3266

3267 -#: sha1_file.c:597

3267 +#: sha1_file.c:598

3268 #, c-format

3269 msgid "reference repository '%s' is shallow"

3270 msgstr ""

3271

3272 -#: sha1_file.c:605

3272 +#: sha1_file.c:606

3273 #, c-format

3274 msgid "reference repository '%s' is grafted"

3275 msgstr ""

@@ -3278,26 +3278,26 @@ msgstr ""

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

3279 msgstr ""

3280

3281 -#: sha1_file.c:2721

3281 +#: sha1_file.c:2729

3282 #, c-format

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

3284 msgstr ""

3285

3286 -#: sha1_file.c:2725

3286 +#: sha1_file.c:2733

3287 #, c-format

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

3289 msgstr ""

3290

3291 -#: sha1_name.c:409

3291 +#: sha1_name.c:419

3292 #, c-format

3293 msgid "short SHA1 %s is ambiguous"

3294 msgstr ""

3295

3296 -#: sha1_name.c:420

3296 +#: sha1_name.c:430

3297 msgid "The candidates are:"

3298 msgstr ""

3299

3300 -#: sha1_name.c:580

3300 +#: sha1_name.c:589

3301 msgid ""

3302 "Git normally never creates a ref that ends with 40 hex characters\n"

3303 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3310,71 +3310,81 @@ msgid ""

3310 "running \"git config advice.objectNameWarning false\""

3311 msgstr ""

3312

3313 -#: submodule.c:67 submodule.c:101

3313 +#: submodule.c:70 submodule.c:104

3314 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3315 msgstr ""

3316

3317 -#: submodule.c:71 submodule.c:105

3317 +#: submodule.c:74 submodule.c:108

3318 #, c-format

3319 msgid "Could not find section in .gitmodules where path=%s"

3320 msgstr ""

3321

3322 -#: submodule.c:79

3322 +#: submodule.c:82

3323 #, c-format

3324 msgid "Could not update .gitmodules entry %s"

3325 msgstr ""

3326

3327 -#: submodule.c:112

3327 +#: submodule.c:115

3328 #, c-format

3329 msgid "Could not remove .gitmodules entry for %s"

3330 msgstr ""

3331

3332 -#: submodule.c:123

3332 +#: submodule.c:126

3333 msgid "staging updated .gitmodules failed"

3334 msgstr ""

3335

3336 -#: submodule.c:161

3336 +#: submodule.c:165

3337 msgid "negative values not allowed for submodule.fetchJobs"

3338 msgstr ""

3339

3340 -#: submodule.c:1194

3340 +#: submodule.c:376

3341 +#, c-format

3342 +msgid "in unpopulated submodule '%s'"

3343 +msgstr ""

3344 +

3345 +#: submodule.c:407

3346 +#, c-format

3347 +msgid "Pathspec '%s' is in submodule '%.*s'"

3348 +msgstr ""

3349 +

3350 +#: submodule.c:1337

3351 #, c-format

3352 msgid "'%s' not recognized as a git repository"

3353 msgstr ""

3354

3345 -#: submodule.c:1332

3355 +#: submodule.c:1475

3356 #, c-format

3357 msgid "could not start 'git status' in submodule '%s'"

3358 msgstr ""

3359

3350 -#: submodule.c:1345

3360 +#: submodule.c:1488

3361 #, c-format

3362 msgid "could not run 'git status' in submodule '%s'"

3363 msgstr ""

3364

3355 -#: submodule.c:1421

3365 +#: submodule.c:1581

3366 #, c-format

3367 msgid "submodule '%s' has dirty index"

3368 msgstr ""

3369

3360 -#: submodule.c:1678

3370 +#: submodule.c:1845

3371 #, c-format

3372 msgid ""

3373 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3374 msgstr ""

3375

3366 -#: submodule.c:1690 submodule.c:1746

3376 +#: submodule.c:1857 submodule.c:1913

3377 #, c-format

3378 msgid "could not lookup name for submodule '%s'"

3379 msgstr ""

3380

3371 -#: submodule.c:1694 builtin/submodule--helper.c:678

3381 +#: submodule.c:1861 builtin/submodule--helper.c:678

3382 #: builtin/submodule--helper.c:688

3383 #, c-format

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

3385 msgstr ""

3386

3377 -#: submodule.c:1697

3387 +#: submodule.c:1864

3388 #, c-format

3389 msgid ""

3390 "Migrating git directory of '%s%s' from\n"

@@ -3382,101 +3392,101 @@ msgid ""

3392 "'%s'\n"

3393 msgstr ""

3394

3385 -#: submodule.c:1781

3395 +#: submodule.c:1948

3396 #, c-format

3397 msgid "could not recurse into submodule '%s'"

3398 msgstr ""

3399

3390 -#: submodule.c:1825

3400 +#: submodule.c:1992

3401 msgid "could not start ls-files in .."

3402 msgstr ""

3403

3394 -#: submodule.c:1845

3404 +#: submodule.c:2012

3405 msgid "BUG: returned path string doesn't match cwd?"

3406 msgstr ""

3407

3398 -#: submodule.c:1864

3408 +#: submodule.c:2031

3409 #, c-format

3410 msgid "ls-tree returned unexpected return code %d"

3411 msgstr ""

3412

3403 -#: submodule-config.c:380

3413 +#: submodule-config.c:420

3414 #, c-format

3415 msgid "invalid value for %s"

3416 msgstr ""

3417

3408 -#: trailer.c:240

3418 +#: trailer.c:241

3419 #, c-format

3420 msgid "running trailer command '%s' failed"

3421 msgstr ""

3422

3413 -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3414 -#: trailer.c:543

3423 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3424 +#: trailer.c:544

3425 #, c-format

3426 msgid "unknown value '%s' for key '%s'"

3427 msgstr ""

3428

3419 -#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3429 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3430 #, c-format

3431 msgid "more than one %s"

3432 msgstr ""

3433

3424 -#: trailer.c:702

3434 +#: trailer.c:703

3435 #, c-format

3436 msgid "empty trailer token in trailer '%.*s'"

3437 msgstr ""

3438

3429 -#: trailer.c:722

3439 +#: trailer.c:723

3440 #, c-format

3441 msgid "could not read input file '%s'"

3442 msgstr ""

3443

3434 -#: trailer.c:725

3444 +#: trailer.c:726

3445 msgid "could not read from stdin"

3446 msgstr ""

3447

3438 -#: trailer.c:949 builtin/am.c:44

3448 +#: trailer.c:950 builtin/am.c:45

3449 #, c-format

3450 msgid "could not stat %s"

3451 msgstr ""

3452

3443 -#: trailer.c:951

3453 +#: trailer.c:952

3454 #, c-format

3455 msgid "file %s is not a regular file"

3456 msgstr ""

3457

3448 -#: trailer.c:953

3458 +#: trailer.c:954

3459 #, c-format

3460 msgid "file %s is not writable by user"

3461 msgstr ""

3462

3453 -#: trailer.c:965

3463 +#: trailer.c:966

3464 msgid "could not open temporary file"

3465 msgstr ""

3466

3457 -#: trailer.c:1001

3467 +#: trailer.c:1002

3468 #, c-format

3469 msgid "could not rename temporary file to %s"

3470 msgstr ""

3471

3462 -#: transport.c:62

3472 +#: transport.c:63

3473 #, c-format

3474 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3475 msgstr ""

3476

3467 -#: transport.c:151

3477 +#: transport.c:152

3478 #, c-format

3479 msgid "transport: invalid depth option '%s'"

3480 msgstr ""

3481

3472 -#: transport.c:889

3482 +#: transport.c:890

3483 #, c-format

3484 msgid ""

3485 "The following submodule paths contain changes that can\n"

3486 "not be found on any remote:\n"

3487 msgstr ""

3488

3479 -#: transport.c:893

3489 +#: transport.c:894

3490 #, c-format

3491 msgid ""

3492 "\n"

@@ -3492,11 +3502,11 @@ msgid ""

3502 "\n"

3503 msgstr ""

3504

3495 -#: transport.c:901

3505 +#: transport.c:902

3506 msgid "Aborting."

3507 msgstr ""

3508

3499 -#: transport-helper.c:1080

3509 +#: transport-helper.c:1071

3510 #, c-format

3511 msgid "Could not read ref %s"

3512 msgstr ""

@@ -3517,98 +3527,98 @@ msgstr ""

3527 msgid "too-short tree file"

3528 msgstr ""

3529

3520 -#: unpack-trees.c:104

3530 +#: unpack-trees.c:105

3531 #, c-format

3532 msgid ""

3533 "Your local changes to the following files would be overwritten by checkout:\n"

3534 "%%sPlease commit your changes or stash them before you switch branches."

3535 msgstr ""

3536

3527 -#: unpack-trees.c:106

3537 +#: unpack-trees.c:107

3538 #, c-format

3539 msgid ""

3540 "Your local changes to the following files would be overwritten by checkout:\n"

3541 "%%s"

3542 msgstr ""

3543

3534 -#: unpack-trees.c:109

3544 +#: unpack-trees.c:110

3545 #, c-format

3546 msgid ""

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

3548 "%%sPlease commit your changes or stash them before you merge."

3549 msgstr ""

3550

3541 -#: unpack-trees.c:111

3551 +#: unpack-trees.c:112

3552 #, c-format

3553 msgid ""

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

3555 "%%s"

3556 msgstr ""

3557

3548 -#: unpack-trees.c:114

3558 +#: unpack-trees.c:115

3559 #, c-format

3560 msgid ""

3561 "Your local changes to the following files would be overwritten by %s:\n"

3562 "%%sPlease commit your changes or stash them before you %s."

3563 msgstr ""

3564

3555 -#: unpack-trees.c:116

3565 +#: unpack-trees.c:117

3566 #, c-format

3567 msgid ""

3568 "Your local changes to the following files would be overwritten by %s:\n"

3569 "%%s"

3570 msgstr ""

3571

3562 -#: unpack-trees.c:121

3572 +#: unpack-trees.c:122

3573 #, c-format

3574 msgid ""

3575 "Updating the following directories would lose untracked files in them:\n"

3576 "%s"

3577 msgstr ""

3578

3569 -#: unpack-trees.c:125

3579 +#: unpack-trees.c:126

3580 #, c-format

3581 msgid ""

3582 "The following untracked working tree files would be removed by checkout:\n"

3583 "%%sPlease move or remove them before you switch branches."

3584 msgstr ""

3585

3576 -#: unpack-trees.c:127

3586 +#: unpack-trees.c:128

3587 #, c-format

3588 msgid ""

3589 "The following untracked working tree files would be removed by checkout:\n"

3590 "%%s"

3591 msgstr ""

3592

3583 -#: unpack-trees.c:130

3593 +#: unpack-trees.c:131

3594 #, c-format

3595 msgid ""

3596 "The following untracked working tree files would be removed by merge:\n"

3597 "%%sPlease move or remove them before you merge."

3598 msgstr ""

3599

3590 -#: unpack-trees.c:132

3600 +#: unpack-trees.c:133

3601 #, c-format

3602 msgid ""

3603 "The following untracked working tree files would be removed by merge:\n"

3604 "%%s"

3605 msgstr ""

3606

3597 -#: unpack-trees.c:135

3607 +#: unpack-trees.c:136

3608 #, c-format

3609 msgid ""

3610 "The following untracked working tree files would be removed by %s:\n"

3611 "%%sPlease move or remove them before you %s."

3612 msgstr ""

3613

3604 -#: unpack-trees.c:137

3614 +#: unpack-trees.c:138

3615 #, c-format

3616 msgid ""

3617 "The following untracked working tree files would be removed by %s:\n"

3618 "%%s"

3619 msgstr ""

3620

3611 -#: unpack-trees.c:142

3621 +#: unpack-trees.c:143

3622 #, c-format

3623 msgid ""

3624 "The following untracked working tree files would be overwritten by "

@@ -3616,7 +3626,7 @@ msgid ""

3626 "%%sPlease move or remove them before you switch branches."

3627 msgstr ""

3628

3619 -#: unpack-trees.c:144

3629 +#: unpack-trees.c:145

3630 #, c-format

3631 msgid ""

3632 "The following untracked working tree files would be overwritten by "

@@ -3624,47 +3634,47 @@ msgid ""

3634 "%%s"

3635 msgstr ""

3636

3627 -#: unpack-trees.c:147

3637 +#: unpack-trees.c:148

3638 #, c-format

3639 msgid ""

3640 "The following untracked working tree files would be overwritten by merge:\n"

3641 "%%sPlease move or remove them before you merge."

3642 msgstr ""

3643

3634 -#: unpack-trees.c:149

3644 +#: unpack-trees.c:150

3645 #, c-format

3646 msgid ""

3647 "The following untracked working tree files would be overwritten by merge:\n"

3648 "%%s"

3649 msgstr ""

3650

3641 -#: unpack-trees.c:152

3651 +#: unpack-trees.c:153

3652 #, c-format

3653 msgid ""

3654 "The following untracked working tree files would be overwritten by %s:\n"

3655 "%%sPlease move or remove them before you %s."

3656 msgstr ""

3657

3648 -#: unpack-trees.c:154

3658 +#: unpack-trees.c:155

3659 #, c-format

3660 msgid ""

3661 "The following untracked working tree files would be overwritten by %s:\n"

3662 "%%s"

3663 msgstr ""

3664

3655 -#: unpack-trees.c:161

3665 +#: unpack-trees.c:162

3666 #, c-format

3667 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3668 msgstr ""

3669

3660 -#: unpack-trees.c:164

3670 +#: unpack-trees.c:165

3671 #, c-format

3672 msgid ""

3673 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

3674 "%s"

3675 msgstr ""

3676

3667 -#: unpack-trees.c:166

3677 +#: unpack-trees.c:167

3678 #, c-format

3679 msgid ""

3680 "The following working tree files would be overwritten by sparse checkout "

@@ -3672,7 +3682,7 @@ msgid ""

3682 "%s"

3683 msgstr ""

3684

3675 -#: unpack-trees.c:168

3685 +#: unpack-trees.c:169

3686 #, c-format

3687 msgid ""

3688 "The following working tree files would be removed by sparse checkout "

@@ -3680,24 +3690,24 @@ msgid ""

3690 "%s"

3691 msgstr ""

3692

3683 -#: unpack-trees.c:170

3693 +#: unpack-trees.c:171

3694 #, c-format

3695 msgid ""

3696 "Cannot update submodule:\n"

3697 "%s"

3698 msgstr ""

3699

3690 -#: unpack-trees.c:247

3700 +#: unpack-trees.c:248

3701 #, c-format

3702 msgid "Aborting\n"

3703 msgstr ""

3704

3695 -#: unpack-trees.c:272

3705 +#: unpack-trees.c:277

3706 #, c-format

3707 msgid "submodule update strategy not supported for submodule '%s'"

3708 msgstr ""

3709

3700 -#: unpack-trees.c:340

3710 +#: unpack-trees.c:346

3711 msgid "Checking out files"

3712 msgstr ""

3713

@@ -3730,404 +3740,414 @@ msgstr ""

3740 msgid "invalid '..' path segment"

3741 msgstr ""

3742

3733 -#: worktree.c:285

3743 +#: worktree.c:245

3744 #, c-format

3745 msgid "failed to read '%s'"

3746 msgstr ""

3747

3738 -#: wrapper.c:222 wrapper.c:392

3748 +#: wrapper.c:223 wrapper.c:393

3749 #, c-format

3750 msgid "could not open '%s' for reading and writing"

3751 msgstr ""

3752

3743 -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766

3753 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

3754 #, c-format

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

3756 msgstr ""

3757

3748 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757

3749 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015

3750 -#: builtin/pull.c:341

3758 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

3759 +#: builtin/am.c:849 builtin/merge.c:1014

3760 #, c-format

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

3762 msgstr ""

3763

3755 -#: wrapper.c:581 wrapper.c:602

3764 +#: wrapper.c:424 wrapper.c:624

3765 #, c-format

3766 msgid "unable to access '%s'"

3767 msgstr ""

3768

3760 -#: wrapper.c:610

3769 +#: wrapper.c:632

3770 msgid "unable to get current working directory"

3771 msgstr ""

3772

3764 -#: wrapper.c:634

3773 +#: wrapper.c:656

3774 #, c-format

3775 msgid "could not write to %s"

3776 msgstr ""

3777

3769 -#: wrapper.c:636

3778 +#: wrapper.c:658

3779 #, c-format

3780 msgid "could not close %s"

3781 msgstr ""

3782

3774 -#: wt-status.c:151

3783 +#: wt-status.c:152

3784 msgid "Unmerged paths:"

3785 msgstr ""

3786

3778 -#: wt-status.c:178 wt-status.c:205

3787 +#: wt-status.c:179 wt-status.c:206

3788 #, c-format

3789 msgid " (use \"git reset %s <file>...\" to unstage)"

3790 msgstr ""

3791

3783 -#: wt-status.c:180 wt-status.c:207

3792 +#: wt-status.c:181 wt-status.c:208

3793 msgid " (use \"git rm --cached <file>...\" to unstage)"

3794 msgstr ""

3795

3787 -#: wt-status.c:184

3796 +#: wt-status.c:185

3797 msgid " (use \"git add <file>...\" to mark resolution)"

3798 msgstr ""

3799

3791 -#: wt-status.c:186 wt-status.c:190

3800 +#: wt-status.c:187 wt-status.c:191

3801 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

3802 msgstr ""

3803

3795 -#: wt-status.c:188

3804 +#: wt-status.c:189

3805 msgid " (use \"git rm <file>...\" to mark resolution)"

3806 msgstr ""

3807

3799 -#: wt-status.c:199 wt-status.c:958

3808 +#: wt-status.c:200 wt-status.c:981

3809 msgid "Changes to be committed:"

3810 msgstr ""

3811

3803 -#: wt-status.c:217 wt-status.c:967

3812 +#: wt-status.c:218 wt-status.c:990

3813 msgid "Changes not staged for commit:"

3814 msgstr ""

3815

3807 -#: wt-status.c:221

3816 +#: wt-status.c:222

3817 msgid " (use \"git add <file>...\" to update what will be committed)"

3818 msgstr ""

3819

3811 -#: wt-status.c:223

3820 +#: wt-status.c:224

3821 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

3822 msgstr ""

3823

3815 -#: wt-status.c:224

3824 +#: wt-status.c:225

3825 msgid ""

3826 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

3827 msgstr ""

3828

3820 -#: wt-status.c:226

3829 +#: wt-status.c:227

3830 msgid " (commit or discard the untracked or modified content in submodules)"

3831 msgstr ""

3832

3824 -#: wt-status.c:238

3833 +#: wt-status.c:239

3834 #, c-format

3835 msgid " (use \"git %s <file>...\" to include in what will be committed)"

3836 msgstr ""

3837

3829 -#: wt-status.c:253

3838 +#: wt-status.c:254

3839 msgid "both deleted:"

3840 msgstr ""

3841

3833 -#: wt-status.c:255

3842 +#: wt-status.c:256

3843 msgid "added by us:"

3844 msgstr ""

3845

3837 -#: wt-status.c:257

3846 +#: wt-status.c:258

3847 msgid "deleted by them:"

3848 msgstr ""

3849

3841 -#: wt-status.c:259

3850 +#: wt-status.c:260

3851 msgid "added by them:"

3852 msgstr ""

3853

3845 -#: wt-status.c:261

3854 +#: wt-status.c:262

3855 msgid "deleted by us:"

3856 msgstr ""

3857

3849 -#: wt-status.c:263

3858 +#: wt-status.c:264

3859 msgid "both added:"

3860 msgstr ""

3861

3853 -#: wt-status.c:265

3862 +#: wt-status.c:266

3863 msgid "both modified:"

3864 msgstr ""

3865

3857 -#: wt-status.c:275

3866 +#: wt-status.c:276

3867 msgid "new file:"

3868 msgstr ""

3869

3861 -#: wt-status.c:277

3870 +#: wt-status.c:278

3871 msgid "copied:"

3872 msgstr ""

3873

3865 -#: wt-status.c:279

3874 +#: wt-status.c:280

3875 msgid "deleted:"

3876 msgstr ""

3877

3869 -#: wt-status.c:281

3878 +#: wt-status.c:282

3879 msgid "modified:"

3880 msgstr ""

3881

3873 -#: wt-status.c:283

3882 +#: wt-status.c:284

3883 msgid "renamed:"

3884 msgstr ""

3885

3877 -#: wt-status.c:285

3886 +#: wt-status.c:286

3887 msgid "typechange:"

3888 msgstr ""

3889

3881 -#: wt-status.c:287

3890 +#: wt-status.c:288

3891 msgid "unknown:"

3892 msgstr ""

3893

3885 -#: wt-status.c:289

3894 +#: wt-status.c:290

3895 msgid "unmerged:"

3896 msgstr ""

3897

3889 -#: wt-status.c:371

3898 +#: wt-status.c:372

3899 msgid "new commits, "

3900 msgstr ""

3901

3893 -#: wt-status.c:373

3902 +#: wt-status.c:374

3903 msgid "modified content, "

3904 msgstr ""

3905

3897 -#: wt-status.c:375

3906 +#: wt-status.c:376

3907 msgid "untracked content, "

3908 msgstr ""

3909

3901 -#: wt-status.c:831

3910 +#: wt-status.c:821

3911 +#, c-format

3912 +msgid "Your stash currently has %d entry"

3913 +msgid_plural "Your stash currently has %d entries"

3914 +msgstr[0] ""

3915 +msgstr[1] ""

3916 +

3917 +#: wt-status.c:853

3918 msgid "Submodules changed but not updated:"

3919 msgstr ""

3920

3905 -#: wt-status.c:833

3921 +#: wt-status.c:855

3922 msgid "Submodule changes to be committed:"

3923 msgstr ""

3924

3909 -#: wt-status.c:914

3925 +#: wt-status.c:937

3926 msgid ""

3927 "Do not touch the line above.\n"

3928 "Everything below will be removed."

3929 msgstr ""

3930

3915 -#: wt-status.c:1026

3931 +#: wt-status.c:1049

3932 msgid "You have unmerged paths."

3933 msgstr ""

3934

3919 -#: wt-status.c:1029

3935 +#: wt-status.c:1052

3936 msgid " (fix conflicts and run \"git commit\")"

3937 msgstr ""

3938

3923 -#: wt-status.c:1031

3939 +#: wt-status.c:1054

3940 msgid " (use \"git merge --abort\" to abort the merge)"

3941 msgstr ""

3942

3927 -#: wt-status.c:1036

3943 +#: wt-status.c:1059

3944 msgid "All conflicts fixed but you are still merging."

3945 msgstr ""

3946

3931 -#: wt-status.c:1039

3947 +#: wt-status.c:1062

3948 msgid " (use \"git commit\" to conclude merge)"

3949 msgstr ""

3950

3935 -#: wt-status.c:1049

3951 +#: wt-status.c:1072

3952 msgid "You are in the middle of an am session."

3953 msgstr ""

3954

3939 -#: wt-status.c:1052

3955 +#: wt-status.c:1075

3956 msgid "The current patch is empty."

3957 msgstr ""

3958

3943 -#: wt-status.c:1056

3959 +#: wt-status.c:1079

3960 msgid " (fix conflicts and then run \"git am --continue\")"

3961 msgstr ""

3962

3947 -#: wt-status.c:1058

3963 +#: wt-status.c:1081

3964 msgid " (use \"git am --skip\" to skip this patch)"

3965 msgstr ""

3966

3951 -#: wt-status.c:1060

3967 +#: wt-status.c:1083

3968 msgid " (use \"git am --abort\" to restore the original branch)"

3969 msgstr ""

3970

3955 -#: wt-status.c:1189

3971 +#: wt-status.c:1214

3972 msgid "git-rebase-todo is missing."

3973 msgstr ""

3974

3959 -#: wt-status.c:1191

3975 +#: wt-status.c:1216

3976 msgid "No commands done."

3977 msgstr ""

3978

3963 -#: wt-status.c:1194

3979 +#: wt-status.c:1219

3980 #, c-format

3981 msgid "Last command done (%d command done):"

3982 msgid_plural "Last commands done (%d commands done):"

3983 msgstr[0] ""

3984 msgstr[1] ""

3985

3970 -#: wt-status.c:1205

3986 +#: wt-status.c:1230

3987 #, c-format

3988 msgid " (see more in file %s)"

3989 msgstr ""

3990

3975 -#: wt-status.c:1210

3991 +#: wt-status.c:1235

3992 msgid "No commands remaining."

3993 msgstr ""

3994

3979 -#: wt-status.c:1213

3995 +#: wt-status.c:1238

3996 #, c-format

3997 msgid "Next command to do (%d remaining command):"

3998 msgid_plural "Next commands to do (%d remaining commands):"

3999 msgstr[0] ""

4000 msgstr[1] ""

4001

3986 -#: wt-status.c:1221

4002 +#: wt-status.c:1246

4003 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4004 msgstr ""

4005

3990 -#: wt-status.c:1234

4006 +#: wt-status.c:1259

4007 #, c-format

4008 msgid "You are currently rebasing branch '%s' on '%s'."

4009 msgstr ""

4010

3995 -#: wt-status.c:1239

4011 +#: wt-status.c:1264

4012 msgid "You are currently rebasing."

4013 msgstr ""

4014

3999 -#: wt-status.c:1253

4015 +#: wt-status.c:1278

4016 msgid " (fix conflicts and then run \"git rebase --continue\")"

4017 msgstr ""

4018

4003 -#: wt-status.c:1255

4019 +#: wt-status.c:1280

4020 msgid " (use \"git rebase --skip\" to skip this patch)"

4021 msgstr ""

4022

4007 -#: wt-status.c:1257

4023 +#: wt-status.c:1282

4024 msgid " (use \"git rebase --abort\" to check out the original branch)"

4025 msgstr ""

4026

4011 -#: wt-status.c:1263

4027 +#: wt-status.c:1288

4028 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4029 msgstr ""

4030

4015 -#: wt-status.c:1267

4031 +#: wt-status.c:1292

4032 #, c-format

4033 msgid ""

4034 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4035 msgstr ""

4036

4021 -#: wt-status.c:1272

4037 +#: wt-status.c:1297

4038 msgid "You are currently splitting a commit during a rebase."

4039 msgstr ""

4040

4025 -#: wt-status.c:1275

4041 +#: wt-status.c:1300

4042 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4043 msgstr ""

4044

4029 -#: wt-status.c:1279

4045 +#: wt-status.c:1304

4046 #, c-format

4047 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4048 msgstr ""

4049

4034 -#: wt-status.c:1284

4050 +#: wt-status.c:1309

4051 msgid "You are currently editing a commit during a rebase."

4052 msgstr ""

4053

4038 -#: wt-status.c:1287

4054 +#: wt-status.c:1312

4055 msgid " (use \"git commit --amend\" to amend the current commit)"

4056 msgstr ""

4057

4042 -#: wt-status.c:1289

4058 +#: wt-status.c:1314

4059 msgid ""

4060 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4061 msgstr ""

4062

4047 -#: wt-status.c:1299

4063 +#: wt-status.c:1324

4064 #, c-format

4065 msgid "You are currently cherry-picking commit %s."

4066 msgstr ""

4067

4052 -#: wt-status.c:1304

4068 +#: wt-status.c:1329

4069 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4070 msgstr ""

4071

4056 -#: wt-status.c:1307

4072 +#: wt-status.c:1332

4073 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4074 msgstr ""

4075

4060 -#: wt-status.c:1309

4076 +#: wt-status.c:1334

4077 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4078 msgstr ""

4079

4064 -#: wt-status.c:1318

4080 +#: wt-status.c:1343

4081 #, c-format

4082 msgid "You are currently reverting commit %s."

4083 msgstr ""

4084

4069 -#: wt-status.c:1323

4085 +#: wt-status.c:1348

4086 msgid " (fix conflicts and run \"git revert --continue\")"

4087 msgstr ""

4088

4073 -#: wt-status.c:1326

4089 +#: wt-status.c:1351

4090 msgid " (all conflicts fixed: run \"git revert --continue\")"

4091 msgstr ""

4092

4077 -#: wt-status.c:1328

4093 +#: wt-status.c:1353

4094 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4095 msgstr ""

4096

4081 -#: wt-status.c:1339

4097 +#: wt-status.c:1364

4098 #, c-format

4099 msgid "You are currently bisecting, started from branch '%s'."

4100 msgstr ""

4101

4086 -#: wt-status.c:1343

4102 +#: wt-status.c:1368

4103 msgid "You are currently bisecting."

4104 msgstr ""

4105

4090 -#: wt-status.c:1346

4106 +#: wt-status.c:1371

4107 msgid " (use \"git bisect reset\" to get back to the original branch)"

4108 msgstr ""

4109

4094 -#: wt-status.c:1543

4110 +#: wt-status.c:1568

4111 msgid "On branch "

4112 msgstr ""

4113

4098 -#: wt-status.c:1549

4114 +#: wt-status.c:1574

4115 msgid "interactive rebase in progress; onto "

4116 msgstr ""

4117

4102 -#: wt-status.c:1551

4118 +#: wt-status.c:1576

4119 msgid "rebase in progress; onto "

4120 msgstr ""

4121

4106 -#: wt-status.c:1556

4122 +#: wt-status.c:1581

4123 msgid "HEAD detached at "

4124 msgstr ""

4125

4110 -#: wt-status.c:1558

4126 +#: wt-status.c:1583

4127 msgid "HEAD detached from "

4128 msgstr ""

4129

4114 -#: wt-status.c:1561

4130 +#: wt-status.c:1586

4131 msgid "Not currently on any branch."

4132 msgstr ""

4133

4118 -#: wt-status.c:1579

4134 +#: wt-status.c:1606

4135 msgid "Initial commit"

4136 msgstr ""

4137

4122 -#: wt-status.c:1593

4138 +#: wt-status.c:1607

4139 +msgid "No commits yet"

4140 +msgstr ""

4141 +

4142 +#: wt-status.c:1621

4143 msgid "Untracked files"

4144 msgstr ""

4145

4126 -#: wt-status.c:1595

4146 +#: wt-status.c:1623

4147 msgid "Ignored files"

4148 msgstr ""

4149

4130 -#: wt-status.c:1599

4150 +#: wt-status.c:1627

4151 #, c-format

4152 msgid ""

4153 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4135,252 +4155,279 @@ msgid ""

4155 "new files yourself (see 'git help status')."

4156 msgstr ""

4157

4138 -#: wt-status.c:1605

4158 +#: wt-status.c:1633

4159 #, c-format

4160 msgid "Untracked files not listed%s"

4161 msgstr ""

4162

4143 -#: wt-status.c:1607

4163 +#: wt-status.c:1635

4164 msgid " (use -u option to show untracked files)"

4165 msgstr ""

4166

4147 -#: wt-status.c:1613

4167 +#: wt-status.c:1641

4168 msgid "No changes"

4169 msgstr ""

4170

4151 -#: wt-status.c:1618

4171 +#: wt-status.c:1646

4172 #, c-format

4173 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4174 msgstr ""

4175

4156 -#: wt-status.c:1621

4176 +#: wt-status.c:1649

4177 #, c-format

4178 msgid "no changes added to commit\n"

4179 msgstr ""

4180

4161 -#: wt-status.c:1624

4181 +#: wt-status.c:1652

4182 #, c-format

4183 msgid ""

4184 "nothing added to commit but untracked files present (use \"git add\" to "

4185 "track)\n"

4186 msgstr ""

4187

4168 -#: wt-status.c:1627

4188 +#: wt-status.c:1655

4189 #, c-format

4190 msgid "nothing added to commit but untracked files present\n"

4191 msgstr ""

4192

4173 -#: wt-status.c:1630

4193 +#: wt-status.c:1658

4194 #, c-format

4195 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4196 msgstr ""

4197

4178 -#: wt-status.c:1633 wt-status.c:1638

4198 +#: wt-status.c:1661 wt-status.c:1666

4199 #, c-format

4200 msgid "nothing to commit\n"

4201 msgstr ""

4202

4183 -#: wt-status.c:1636

4203 +#: wt-status.c:1664

4204 #, c-format

4205 msgid "nothing to commit (use -u to show untracked files)\n"

4206 msgstr ""

4207

4188 -#: wt-status.c:1640

4208 +#: wt-status.c:1668

4209 #, c-format

4210 msgid "nothing to commit, working tree clean\n"

4211 msgstr ""

4212

4193 -#: wt-status.c:1749

4194 -msgid "Initial commit on "

4213 +#: wt-status.c:1780

4214 +msgid "No commits yet on "

4215 msgstr ""

4216

4197 -#: wt-status.c:1753

4217 +#: wt-status.c:1784

4218 msgid "HEAD (no branch)"

4219 msgstr ""

4220

4201 -#: wt-status.c:1782 wt-status.c:1790

4221 +#: wt-status.c:1813 wt-status.c:1821

4222 msgid "behind "

4223 msgstr ""

4224

4205 -#: wt-status.c:1785 wt-status.c:1788

4225 +#: wt-status.c:1816 wt-status.c:1819

4226 msgid "ahead "

4227 msgstr ""

4228

4229 #. TRANSLATORS: the action is e.g. "pull with rebase"

4210 -#: wt-status.c:2280

4230 +#: wt-status.c:2311

4231 #, c-format

4232 msgid "cannot %s: You have unstaged changes."

4233 msgstr ""

4234

4215 -#: wt-status.c:2286

4235 +#: wt-status.c:2317

4236 msgid "additionally, your index contains uncommitted changes."

4237 msgstr ""

4238

4219 -#: wt-status.c:2288

4239 +#: wt-status.c:2319

4240 #, c-format

4241 msgid "cannot %s: Your index contains uncommitted changes."

4242 msgstr ""

4243

4224 -#: compat/precompose_utf8.c:57 builtin/clone.c:432

4244 +#: compat/precompose_utf8.c:58 builtin/clone.c:436

4245 #, c-format

4246 msgid "failed to unlink '%s'"

4247 msgstr ""

4248

4229 -#: builtin/add.c:22

4249 +#: builtin/add.c:24

4250 msgid "git add [<options>] [--] <pathspec>..."

4251 msgstr ""

4252

4233 -#: builtin/add.c:80

4253 +#: builtin/add.c:82

4254 #, c-format

4255 msgid "unexpected diff status %c"

4256 msgstr ""

4257

4238 -#: builtin/add.c:85 builtin/commit.c:291

4258 +#: builtin/add.c:87 builtin/commit.c:292

4259 msgid "updating files failed"

4260 msgstr ""

4261

4242 -#: builtin/add.c:95

4262 +#: builtin/add.c:97

4263 #, c-format

4264 msgid "remove '%s'\n"

4265 msgstr ""

4266

4247 -#: builtin/add.c:149

4267 +#: builtin/add.c:151

4268 msgid "Unstaged changes after refreshing the index:"

4269 msgstr ""

4270

4251 -#: builtin/add.c:209 builtin/rev-parse.c:872

4271 +#: builtin/add.c:211 builtin/rev-parse.c:873

4272 msgid "Could not read the index"

4273 msgstr ""

4274

4255 -#: builtin/add.c:220

4275 +#: builtin/add.c:222

4276 #, c-format

4277 msgid "Could not open '%s' for writing."

4278 msgstr ""

4279

4260 -#: builtin/add.c:224

4280 +#: builtin/add.c:226

4281 msgid "Could not write patch"

4282 msgstr ""

4283

4264 -#: builtin/add.c:227

4284 +#: builtin/add.c:229

4285 msgid "editing patch failed"

4286 msgstr ""

4287

4268 -#: builtin/add.c:230

4288 +#: builtin/add.c:232

4289 #, c-format

4290 msgid "Could not stat '%s'"

4291 msgstr ""

4292

4273 -#: builtin/add.c:232

4293 +#: builtin/add.c:234

4294 msgid "Empty patch. Aborted."

4295 msgstr ""

4296

4277 -#: builtin/add.c:237

4297 +#: builtin/add.c:239

4298 #, c-format

4299 msgid "Could not apply '%s'"

4300 msgstr ""

4301

4282 -#: builtin/add.c:247

4302 +#: builtin/add.c:249

4303 msgid "The following paths are ignored by one of your .gitignore files:\n"

4304 msgstr ""

4305

4286 -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123

4287 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4288 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163

4306 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124

4307 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4308 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164

4309 msgid "dry run"

4310 msgstr ""

4311

4292 -#: builtin/add.c:269

4312 +#: builtin/add.c:272

4313 msgid "interactive picking"

4314 msgstr ""

4315

4296 -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286

4316 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299

4317 msgid "select hunks interactively"

4318 msgstr ""

4319

4300 -#: builtin/add.c:271

4320 +#: builtin/add.c:274

4321 msgid "edit current diff and apply"

4322 msgstr ""

4323

4304 -#: builtin/add.c:272

4324 +#: builtin/add.c:275

4325 msgid "allow adding otherwise ignored files"

4326 msgstr ""

4327

4308 -#: builtin/add.c:273

4328 +#: builtin/add.c:276

4329 msgid "update tracked files"

4330 msgstr ""

4331

4312 -#: builtin/add.c:274

4332 +#: builtin/add.c:277

4333 msgid "record only the fact that the path will be added later"

4334 msgstr ""

4335

4316 -#: builtin/add.c:275

4336 +#: builtin/add.c:278

4337 msgid "add changes from all tracked and untracked files"

4338 msgstr ""

4339

4320 -#: builtin/add.c:278

4340 +#: builtin/add.c:281

4341 msgid "ignore paths removed in the working tree (same as --no-all)"

4342 msgstr ""

4343

4324 -#: builtin/add.c:280

4344 +#: builtin/add.c:283

4345 msgid "don't add, only refresh the index"

4346 msgstr ""

4347

4328 -#: builtin/add.c:281

4348 +#: builtin/add.c:284

4349 msgid "just skip files which cannot be added because of errors"

4350 msgstr ""

4351

4332 -#: builtin/add.c:282

4352 +#: builtin/add.c:285

4353 msgid "check if - even missing - files are ignored in dry run"

4354 msgstr ""

4355

4336 -#: builtin/add.c:283 builtin/update-index.c:951

4356 +#: builtin/add.c:286 builtin/update-index.c:952

4357 msgid "(+/-)x"

4358 msgstr ""

4359

l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)