18a9072257 · 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-10-17 09:44+0800\n"

11 +"POT-Creation-Date: 2017-12-31 10:45+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:58

21 +#: advice.c:62

22 #, c-format

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

24 msgstr ""

25

26 -#: advice.c:86

26 +#: advice.c:90

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

28 msgstr ""

29

30 -#: advice.c:88

30 +#: advice.c:92

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

32 msgstr ""

33

34 -#: advice.c:90

34 +#: advice.c:94

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

36 msgstr ""

37

38 -#: advice.c:92

38 +#: advice.c:96

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

40 msgstr ""

41

42 -#: advice.c:94

42 +#: advice.c:98

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

44 msgstr ""

45

46 -#: advice.c:96

46 +#: advice.c:100

47 #, c-format

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

49 msgstr ""

50

51 -#: advice.c:104

51 +#: advice.c:108

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

57 +#: advice.c:116

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:117 builtin/merge.c:1211

61 +#: advice.c:121 builtin/merge.c:1213

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

63 msgstr ""

64

65 -#: advice.c:119

65 +#: advice.c:123

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

67 msgstr ""

68

69 -#: advice.c:120

69 +#: advice.c:124

70 msgid "Exiting because of unfinished merge."

71 msgstr ""

72

73 -#: advice.c:126

73 +#: advice.c:130

74 #, c-format

75 msgid ""

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

@@ -96,82 +96,82 @@ msgstr ""

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

97 msgstr ""

98

99 -#: apply.c:125

99 +#: apply.c:122

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

101 msgstr ""

102

103 -#: apply.c:127

103 +#: apply.c:124

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

105 msgstr ""

106

107 -#: apply.c:130

107 +#: apply.c:127

108 msgid "--3way outside a repository"

109 msgstr ""

110

111 -#: apply.c:141

111 +#: apply.c:138

112 msgid "--index outside a repository"

113 msgstr ""

114

115 -#: apply.c:144

115 +#: apply.c:141

116 msgid "--cached outside a repository"

117 msgstr ""

118

119 -#: apply.c:845

119 +#: apply.c:821

120 #, c-format

121 msgid "Cannot prepare timestamp regexp %s"

122 msgstr ""

123

124 -#: apply.c:854

124 +#: apply.c:830

125 #, c-format

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

127 msgstr ""

128

129 -#: apply.c:928

129 +#: apply.c:904

130 #, c-format

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

132 msgstr ""

133

134 -#: apply.c:966

134 +#: apply.c:942

135 #, c-format

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

137 msgstr ""

138

139 -#: apply.c:972

139 +#: apply.c:948

140 #, c-format

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

142 msgstr ""

143

144 -#: apply.c:973

144 +#: apply.c:949

145 #, c-format

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

147 msgstr ""

148

149 -#: apply.c:978

149 +#: apply.c:954

150 #, c-format

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

152 msgstr ""

153

154 -#: apply.c:1007

154 +#: apply.c:983

155 #, c-format

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

157 msgstr ""

158

159 -#: apply.c:1325

159 +#: apply.c:1301

160 #, c-format

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

162 msgstr ""

163

164 -#: apply.c:1497

164 +#: apply.c:1473

165 #, c-format

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

167 msgstr ""

168

169 -#: apply.c:1566

169 +#: apply.c:1542

170 #, c-format

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

172 msgstr ""

173

174 -#: apply.c:1586

174 +#: apply.c:1562

175 #, c-format

176 msgid ""

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

@@ -182,521 +182,522 @@ msgid_plural ""

182 msgstr[0] ""

183 msgstr[1] ""

184

185 -#: apply.c:1599

185 +#: apply.c:1575

186 #, c-format

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

188 msgstr ""

189

190 -#: apply.c:1787

190 +#: apply.c:1763

191 msgid "new file depends on old contents"

192 msgstr ""

193

194 -#: apply.c:1789

194 +#: apply.c:1765

195 msgid "deleted file still has contents"

196 msgstr ""

197

198 -#: apply.c:1823

198 +#: apply.c:1799

199 #, c-format

200 msgid "corrupt patch at line %d"

201 msgstr ""

202

203 -#: apply.c:1860

203 +#: apply.c:1836

204 #, c-format

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

206 msgstr ""

207

208 -#: apply.c:1862

208 +#: apply.c:1838

209 #, c-format

210 msgid "deleted file %s still has contents"

211 msgstr ""

212

213 -#: apply.c:1865

213 +#: apply.c:1841

214 #, c-format

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

216 msgstr ""

217

218 -#: apply.c:2012

218 +#: apply.c:1988

219 #, c-format

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

221 msgstr ""

222

223 -#: apply.c:2049

223 +#: apply.c:2025

224 #, c-format

225 msgid "unrecognized binary patch at line %d"

226 msgstr ""

227

228 -#: apply.c:2209

228 +#: apply.c:2185

229 #, c-format

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

231 msgstr ""

232

233 -#: apply.c:2295

233 +#: apply.c:2271

234 #, c-format

235 msgid "unable to read symlink %s"

236 msgstr ""

237

238 -#: apply.c:2299

238 +#: apply.c:2275

239 #, c-format

240 msgid "unable to open or read %s"

241 msgstr ""

242

243 -#: apply.c:2958

243 +#: apply.c:2934

244 #, c-format

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

246 msgstr ""

247

248 -#: apply.c:3077

248 +#: apply.c:3055

249 #, c-format

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

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

252 msgstr[0] ""

253 msgstr[1] ""

254

255 -#: apply.c:3089

255 +#: apply.c:3067

256 #, c-format

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

258 msgstr ""

259

260 -#: apply.c:3095

260 +#: apply.c:3073

261 #, c-format

262 msgid ""

263 "while searching for:\n"

264 "%.*s"

265 msgstr ""

266

267 -#: apply.c:3117

267 +#: apply.c:3095

268 #, c-format

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

270 msgstr ""

271

272 -#: apply.c:3125

272 +#: apply.c:3103

273 #, c-format

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

275 msgstr ""

276

277 -#: apply.c:3171

277 +#: apply.c:3149

278 #, c-format

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

280 msgstr ""

281

282 -#: apply.c:3181

282 +#: apply.c:3159

283 #, c-format

284 msgid ""

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

286 msgstr ""

287

288 -#: apply.c:3189

288 +#: apply.c:3167

289 #, c-format

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

291 msgstr ""

292

293 -#: apply.c:3207

293 +#: apply.c:3185

294 #, c-format

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

296 msgstr ""

297

298 -#: apply.c:3220

298 +#: apply.c:3198

299 #, c-format

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

301 msgstr ""

302

303 -#: apply.c:3226

303 +#: apply.c:3204

304 #, c-format

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

306 msgstr ""

307

308 -#: apply.c:3247

308 +#: apply.c:3225

309 #, c-format

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

311 msgstr ""

312

313 -#: apply.c:3369

313 +#: apply.c:3347

314 #, c-format

315 msgid "cannot checkout %s"

316 msgstr ""

317

318 -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

318 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

322

323 -#: apply.c:3426

323 +#: apply.c:3404

324 #, c-format

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

326 msgstr ""

327

328 -#: apply.c:3455 apply.c:3695

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

329 #, c-format

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

331 msgstr ""

332

333 -#: apply.c:3538 apply.c:3709

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

334 #, c-format

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

336 msgstr ""

337

338 -#: apply.c:3547 apply.c:3717

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

339 #, c-format

340 msgid "%s: does not match index"

341 msgstr ""

342

343 -#: apply.c:3582

343 +#: apply.c:3560

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

345 msgstr ""

346

347 -#: apply.c:3585

347 +#: apply.c:3563

348 #, c-format

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

350 msgstr ""

351

352 -#: apply.c:3601 apply.c:3605

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

353 #, c-format

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

355 msgstr ""

356

357 -#: apply.c:3617

357 +#: apply.c:3595

358 #, c-format

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

360 msgstr ""

361

362 -#: apply.c:3631

362 +#: apply.c:3609

363 #, c-format

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

365 msgstr ""

366

367 -#: apply.c:3636

367 +#: apply.c:3614

368 #, c-format

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

370 msgstr ""

371

372 -#: apply.c:3662

372 +#: apply.c:3640

373 msgid "removal patch leaves file contents"

374 msgstr ""

375

376 -#: apply.c:3734

376 +#: apply.c:3712

377 #, c-format

378 msgid "%s: wrong type"

379 msgstr ""

380

381 -#: apply.c:3736

381 +#: apply.c:3714

382 #, c-format

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

384 msgstr ""

385

386 -#: apply.c:3886 apply.c:3888

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

387 #, c-format

388 msgid "invalid path '%s'"

389 msgstr ""

390

391 -#: apply.c:3944

391 +#: apply.c:3922

392 #, c-format

393 msgid "%s: already exists in index"

394 msgstr ""

395

396 -#: apply.c:3947

396 +#: apply.c:3925

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3967

401 +#: apply.c:3945

402 #, c-format

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

404 msgstr ""

405

406 -#: apply.c:3972

406 +#: apply.c:3950

407 #, c-format

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

409 msgstr ""

410

411 -#: apply.c:3992

411 +#: apply.c:3970

412 #, c-format

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

414 msgstr ""

415

416 -#: apply.c:3996

416 +#: apply.c:3974

417 #, c-format

418 msgid "%s: patch does not apply"

419 msgstr ""

420

421 -#: apply.c:4011

421 +#: apply.c:3989

422 #, c-format

423 msgid "Checking patch %s..."

424 msgstr ""

425

426 -#: apply.c:4102

426 +#: apply.c:4080

427 #, c-format

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

429 msgstr ""

430

431 -#: apply.c:4109

431 +#: apply.c:4087

432 #, c-format

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

434 msgstr ""

435

436 -#: apply.c:4112

436 +#: apply.c:4090

437 #, c-format

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

439 msgstr ""

440

441 -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

441 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

442 #, c-format

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

444 msgstr ""

445

446 -#: apply.c:4121

446 +#: apply.c:4099

447 #, c-format

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

449 msgstr ""

450

451 -#: apply.c:4131

451 +#: apply.c:4109

452 #, c-format

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

454 msgstr ""

455

456 -#: apply.c:4269

456 +#: apply.c:4247

457 #, c-format

458 msgid "unable to remove %s from index"

459 msgstr ""

460

461 -#: apply.c:4304

461 +#: apply.c:4282

462 #, c-format

463 msgid "corrupt patch for submodule %s"

464 msgstr ""

465

466 -#: apply.c:4310

466 +#: apply.c:4288

467 #, c-format

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

469 msgstr ""

470

471 -#: apply.c:4318

471 +#: apply.c:4296

472 #, c-format

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

474 msgstr ""

475

476 -#: apply.c:4324 apply.c:4468

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

477 #, c-format

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

479 msgstr ""

480

481 -#: apply.c:4365

481 +#: apply.c:4343

482 #, c-format

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

484 msgstr ""

485

486 -#: apply.c:4369

486 +#: apply.c:4347

487 #, c-format

488 msgid "closing file '%s'"

489 msgstr ""

490

491 -#: apply.c:4439

491 +#: apply.c:4417

492 #, c-format

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

494 msgstr ""

495

496 -#: apply.c:4537

496 +#: apply.c:4515

497 #, c-format

498 msgid "Applied patch %s cleanly."

499 msgstr ""

500

501 -#: apply.c:4545

501 +#: apply.c:4523

502 msgid "internal error"

503 msgstr ""

504

505 -#: apply.c:4548

505 +#: apply.c:4526

506 #, c-format

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

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

509 msgstr[0] ""

510 msgstr[1] ""

511

512 -#: apply.c:4559

512 +#: apply.c:4537

513 #, c-format

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

515 msgstr ""

516

517 -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

517 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

521

522 -#: apply.c:4581

522 +#: apply.c:4559

523 #, c-format

524 msgid "Hunk #%d applied cleanly."

525 msgstr ""

526

527 -#: apply.c:4585

527 +#: apply.c:4563

528 #, c-format

529 msgid "Rejected hunk #%d."

530 msgstr ""

531

532 -#: apply.c:4695

532 +#: apply.c:4673

533 #, c-format

534 msgid "Skipped patch '%s'."

535 msgstr ""

536

537 -#: apply.c:4703

537 +#: apply.c:4681

538 msgid "unrecognized input"

539 msgstr ""

540

541 -#: apply.c:4722

541 +#: apply.c:4700

542 msgid "unable to read index file"

543 msgstr ""

544

545 -#: apply.c:4859

545 +#: apply.c:4837

546 #, c-format

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

548 msgstr ""

549

550 -#: apply.c:4886

550 +#: apply.c:4864

551 #, c-format

552 msgid "squelched %d whitespace error"

553 msgid_plural "squelched %d whitespace errors"

554 msgstr[0] ""

555 msgstr[1] ""

556

557 -#: apply.c:4892 apply.c:4907

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

558 #, c-format

559 msgid "%d line adds whitespace errors."

560 msgid_plural "%d lines add whitespace errors."

561 msgstr[0] ""

562 msgstr[1] ""

563

564 -#: apply.c:4900

564 +#: apply.c:4878

565 #, c-format

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

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

568 msgstr[0] ""

569 msgstr[1] ""

570

571 -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

571 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

576 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

577 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

578 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

579 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

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

576 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

577 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

578 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

579 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

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

581 msgid "path"

582 msgstr ""

583

584 -#: apply.c:4948

584 +#: apply.c:4922

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

586 msgstr ""

587

588 -#: apply.c:4951

588 +#: apply.c:4925

589 msgid "apply changes matching the given path"

590 msgstr ""

591

592 -#: apply.c:4953 builtin/am.c:2265

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

593 msgid "num"

594 msgstr ""

595

596 -#: apply.c:4954

596 +#: apply.c:4928

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

598 msgstr ""

599

600 -#: apply.c:4957

600 +#: apply.c:4931

601 msgid "ignore additions made by the patch"

602 msgstr ""

603

604 -#: apply.c:4959

604 +#: apply.c:4933

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

606 msgstr ""

607

608 -#: apply.c:4963

608 +#: apply.c:4937

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

610 msgstr ""

611

612 -#: apply.c:4965

612 +#: apply.c:4939

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

614 msgstr ""

615

616 -#: apply.c:4967

616 +#: apply.c:4941

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

618 msgstr ""

619

620 -#: apply.c:4969

620 +#: apply.c:4943

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

622 msgstr ""

623

624 -#: apply.c:4971

624 +#: apply.c:4945

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

626 msgstr ""

627

628 -#: apply.c:4973

628 +#: apply.c:4947

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

630 msgstr ""

631

632 -#: apply.c:4975

632 +#: apply.c:4949

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

634 msgstr ""

635

636 -#: apply.c:4977

636 +#: apply.c:4951

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

638 msgstr ""

639

640 -#: apply.c:4979

640 +#: apply.c:4953

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

642 msgstr ""

643

644 -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

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

645 msgid "paths are separated with NUL character"

646 msgstr ""

647

648 -#: apply.c:4984

648 +#: apply.c:4958

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

650 msgstr ""

651

652 -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

652 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

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

654 +#: builtin/pack-objects.c:3009

655 msgid "action"

656 msgstr ""

657

657 -#: apply.c:4986

658 +#: apply.c:4960

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

660 msgstr ""

661

661 -#: apply.c:4989 apply.c:4992

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

663 msgid "ignore changes in whitespace when finding context"

664 msgstr ""

665

665 -#: apply.c:4995

666 +#: apply.c:4969

667 msgid "apply the patch in reverse"

668 msgstr ""

669

669 -#: apply.c:4997

670 +#: apply.c:4971

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

672 msgstr ""

673

673 -#: apply.c:4999

674 +#: apply.c:4973

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

676 msgstr ""

677

677 -#: apply.c:5001

678 +#: apply.c:4975

679 msgid "allow overlapping hunks"

680 msgstr ""

681

681 -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

682 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

683 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

682 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

683 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

684 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

685 msgid "be verbose"

686 msgstr ""

687

687 -#: apply.c:5004

688 +#: apply.c:4978

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

690 msgstr ""

691

691 -#: apply.c:5007

692 +#: apply.c:4981

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

694 msgstr ""

695

695 -#: apply.c:5009 builtin/am.c:2253

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

697 msgid "root"

698 msgstr ""

699

699 -#: apply.c:5010

700 +#: apply.c:4984

701 msgid "prepend <root> to all filenames"

702 msgstr ""

703

@@ -717,7 +718,7 @@ msgstr ""

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

719 msgstr ""

720

720 -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

721 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

722 #, c-format

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

724 msgstr ""

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

731 msgid "archive format"

732 msgstr ""

733

733 -#: archive.c:437 builtin/log.c:1452

734 +#: archive.c:437 builtin/log.c:1459

735 msgid "prefix"

736 msgstr ""

737

@@ -738,9 +739,9 @@ msgstr ""

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

740 msgstr ""

741

741 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

742 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

743 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

742 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

743 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

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

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

746 #: parse-options.h:153

747 msgid "file"

@@ -775,7 +776,7 @@ msgid "list supported archive formats"

776 msgstr ""

777

778 #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

778 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

779 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

780 msgid "repo"

781 msgstr ""

782

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

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

826 msgstr ""

827

827 -#: bisect.c:447

828 +#: bisect.c:458

829 #, c-format

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

831 msgstr ""

832

832 -#: bisect.c:655

833 +#: bisect.c:666

834 #, c-format

835 msgid "We cannot bisect more!\n"

836 msgstr ""

837

837 -#: bisect.c:708

838 +#: bisect.c:720

839 #, c-format

840 msgid "Not a valid commit name %s"

841 msgstr ""

842

842 -#: bisect.c:732

843 +#: bisect.c:744

844 #, c-format

845 msgid ""

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

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

848 msgstr ""

849

849 -#: bisect.c:737

850 +#: bisect.c:749

851 #, c-format

852 msgid ""

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

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

855 msgstr ""

856

856 -#: bisect.c:742

857 +#: bisect.c:754

858 #, c-format

859 msgid ""

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

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

862 msgstr ""

863

863 -#: bisect.c:750

864 +#: bisect.c:762

865 #, c-format

866 msgid ""

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

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

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

870 msgstr ""

871

871 -#: bisect.c:763

872 +#: bisect.c:775

873 #, c-format

874 msgid ""

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

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

877 "We continue anyway."

878 msgstr ""

879

879 -#: bisect.c:798

880 +#: bisect.c:810

881 #, c-format

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

883 msgstr ""

884

884 -#: bisect.c:850

885 +#: bisect.c:862

886 #, c-format

887 msgid "a %s revision is needed"

888 msgstr ""

889

889 -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

890 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

891 #, c-format

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

893 msgstr ""

894

894 -#: bisect.c:918

895 +#: bisect.c:930

896 #, c-format

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

898 msgstr ""

899

899 -#: bisect.c:948

900 +#: bisect.c:960

901 msgid "reading bisect refs failed"

902 msgstr ""

903

903 -#: bisect.c:968

904 +#: bisect.c:979

905 #, c-format

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

907 msgstr ""

908

908 -#: bisect.c:976

909 +#: bisect.c:987

910 #, c-format

911 msgid ""

912 "No testable commit found.\n"

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

914 msgstr ""

915

915 -#: bisect.c:995

916 +#: bisect.c:1006

917 #, c-format

918 msgid "(roughly %d step)"

919 msgid_plural "(roughly %d steps)"

@@ -922,7 +923,7 @@ msgstr[1] ""

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

924 #. steps)" translation.

925 #.

925 -#: bisect.c:1001

926 +#: bisect.c:1012

927 #, c-format

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

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

@@ -941,9 +942,9 @@ msgstr ""

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

943 msgstr ""

944

944 -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

945 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

946 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

945 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

946 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

947 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

948 #: builtin/shortlog.c:191

949 msgid "revision walk setup failed"

950 msgstr ""

@@ -1026,31 +1027,31 @@ msgstr ""

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

1028 msgstr ""

1029

1029 -#: branch.c:185

1030 +#: branch.c:189

1031 #, c-format

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

1033 msgstr ""

1034

1034 -#: branch.c:190

1035 +#: branch.c:208

1036 #, c-format

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

1038 msgstr ""

1039

1039 -#: branch.c:197

1040 +#: branch.c:213

1041 msgid "Cannot force update the current branch."

1042 msgstr ""

1043

1043 -#: branch.c:217

1044 +#: branch.c:233

1045 #, c-format

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

1047 msgstr ""

1048

1048 -#: branch.c:219

1049 +#: branch.c:235

1050 #, c-format

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

1052 msgstr ""

1053

1053 -#: branch.c:221

1054 +#: branch.c:237

1055 msgid ""

1056 "\n"

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

@@ -1062,27 +1063,27 @@ msgid ""

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

1064 msgstr ""

1065

1065 -#: branch.c:264

1066 +#: branch.c:280

1067 #, c-format

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

1069 msgstr ""

1070

1070 -#: branch.c:284

1071 +#: branch.c:300

1072 #, c-format

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

1074 msgstr ""

1075

1075 -#: branch.c:289

1076 +#: branch.c:305

1077 #, c-format

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

1079 msgstr ""

1080

1080 -#: branch.c:343

1081 +#: branch.c:359

1082 #, c-format

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

1084 msgstr ""

1085

1085 -#: branch.c:366

1086 +#: branch.c:382

1087 #, c-format

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

1089 msgstr ""

@@ -1097,9 +1098,8 @@ msgstr ""

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

1099 msgstr ""

1100

1100 -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1101 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1102 -#: sequencer.c:2949 builtin/commit.c:782

1101 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1102 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1103 #, c-format

1104 msgid "could not open '%s'"

1105 msgstr ""

@@ -1143,7 +1143,7 @@ msgstr ""

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

1144 msgstr ""

1145

1146 -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1146 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1147 #, c-format

1148 msgid "unrecognized argument: %s"

1149 msgstr ""

@@ -1166,8 +1166,8 @@ msgstr ""

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

1167 msgstr ""

1168

1169 -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1170 -#: builtin/am.c:1467 builtin/am.c:2105

1169 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465

1170 +#: builtin/am.c:1471 builtin/am.c:2106

1171 #, c-format

1172 msgid "could not parse %s"

1173 msgstr ""

@@ -1177,172 +1177,177 @@ msgstr ""

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

1178 msgstr ""

1179

1180 -#: commit.c:1517

1180 +#: commit.c:1524

1181 msgid ""

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

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

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

1185 msgstr ""

1186

1187 -#: compat/obstack.c:406 compat/obstack.c:408

1187 +#: compat/obstack.c:405 compat/obstack.c:407

1188 msgid "memory exhausted"

1189 msgstr ""

1190

1191 -#: config.c:187

1191 +#: config.c:186

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

1193 msgstr ""

1194

1195 -#: config.c:721

1195 +#: config.c:720

1196 #, c-format

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

1198 msgstr ""

1199

1200 -#: config.c:725

1200 +#: config.c:724

1201 #, c-format

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

1203 msgstr ""

1204

1205 -#: config.c:729

1205 +#: config.c:728

1206 #, c-format

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

1208 msgstr ""

1209

1210 -#: config.c:733

1210 +#: config.c:732

1211 #, c-format

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

1213 msgstr ""

1214

1215 -#: config.c:737

1215 +#: config.c:736

1216 #, c-format

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

1218 msgstr ""

1219

1220 -#: config.c:741

1220 +#: config.c:740

1221 #, c-format

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

1223 msgstr ""

1224

1225 -#: config.c:869

1225 +#: config.c:868

1226 msgid "out of range"

1227 msgstr ""

1228

1229 -#: config.c:869

1229 +#: config.c:868

1230 msgid "invalid unit"

1231 msgstr ""

1232

1233 -#: config.c:875

1233 +#: config.c:874

1234 #, c-format

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

1236 msgstr ""

1237

1238 -#: config.c:880

1238 +#: config.c:879

1239 #, c-format

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

1241 msgstr ""

1242

1243 -#: config.c:883

1243 +#: config.c:882

1244 #, c-format

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

1246 msgstr ""

1247

1248 -#: config.c:886

1248 +#: config.c:885

1249 #, c-format

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

1251 msgstr ""

1252

1253 -#: config.c:889

1253 +#: config.c:888

1254 #, c-format

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

1256 msgstr ""

1257

1258 -#: config.c:892

1258 +#: config.c:891

1259 #, c-format

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

1261 msgstr ""

1262

1263 -#: config.c:895

1263 +#: config.c:894

1264 #, c-format

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

1266 msgstr ""

1267

1268 -#: config.c:990

1268 +#: config.c:989

1269 #, c-format

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

1271 msgstr ""

1272

1273 -#: config.c:1085 config.c:1096

1273 +#: config.c:998

1274 +#, c-format

1275 +msgid "'%s' for '%s' is not a valid timestamp"

1276 +msgstr ""

1277 +

1278 +#: config.c:1094 config.c:1105

1279 #, c-format

1280 msgid "bad zlib compression level %d"

1281 msgstr ""

1282

1278 -#: config.c:1213

1283 +#: config.c:1222

1284 #, c-format

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

1286 msgstr ""

1287

1283 -#: config.c:1372

1288 +#: config.c:1378

1289 #, c-format

1290 msgid "bad pack compression level %d"

1291 msgstr ""

1292

1288 -#: config.c:1568

1293 +#: config.c:1574

1294 msgid "unable to parse command-line config"

1295 msgstr ""

1296

1292 -#: config.c:1900

1297 +#: config.c:1906

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

1299 msgstr ""

1300

1296 -#: config.c:2087

1301 +#: config.c:2093

1302 #, c-format

1303 msgid "Invalid %s: '%s'"

1304 msgstr ""

1305

1301 -#: config.c:2130

1306 +#: config.c:2136

1307 #, c-format

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

1309 msgstr ""

1310

1306 -#: config.c:2156

1311 +#: config.c:2162

1312 #, c-format

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

1314 msgstr ""

1315

1311 -#: config.c:2167

1316 +#: config.c:2187

1317 #, c-format

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

1319 msgstr ""

1320

1316 -#: config.c:2169

1321 +#: config.c:2189

1322 #, c-format

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

1324 msgstr ""

1325

1321 -#: config.c:2228

1326 +#: config.c:2248

1327 #, c-format

1328 msgid "%s has multiple values"

1329 msgstr ""

1330

1326 -#: config.c:2571 config.c:2789

1331 +#: config.c:2591 config.c:2808

1332 #, c-format

1333 msgid "fstat on %s failed"

1334 msgstr ""

1335

1331 -#: config.c:2678

1336 +#: config.c:2698

1337 #, c-format

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

1339 msgstr ""

1340

1336 -#: config.c:2680 builtin/remote.c:776

1341 +#: config.c:2700 builtin/remote.c:776

1342 #, c-format

1343 msgid "could not unset '%s'"

1344 msgstr ""

1345

1341 -#: connect.c:50

1346 +#: connect.c:52

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

1348 msgstr ""

1349

1345 -#: connect.c:52

1350 +#: connect.c:54

1351 msgid ""

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

1353 "\n"

@@ -1463,7 +1468,7 @@ msgstr[1] ""

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

1469 msgstr ""

1470

1466 -#: diffcore-rename.c:536

1471 +#: diffcore-rename.c:535

1472 msgid "Performing inexact rename detection"

1473 msgstr ""

1474

@@ -1493,75 +1498,80 @@ msgstr ""

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

1499 msgstr ""

1500

1496 -#: diff.c:398

1501 +#: diff.c:401

1502 #, c-format

1503 msgid ""

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

1505 "%s"

1506 msgstr ""

1507

1503 -#: diff.c:3861

1508 +#: diff.c:3799

1509 #, c-format

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

1511 msgstr ""

1512

1508 -#: diff.c:4189

1513 +#: diff.c:4127

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

1515 msgstr ""

1516

1512 -#: diff.c:4279

1517 +#: diff.c:4215

1518 msgid "--follow requires exactly one pathspec"

1519 msgstr ""

1520

1516 -#: diff.c:4445

1521 +#: diff.c:4381

1522 #, c-format

1523 msgid ""

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

1525 "%s"

1526 msgstr ""

1527

1523 -#: diff.c:4459

1528 +#: diff.c:4395

1529 #, c-format

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

1531 msgstr ""

1532

1528 -#: diff.c:5505

1533 +#: diff.c:5446

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

1535 msgstr ""

1536

1532 -#: diff.c:5508

1537 +#: diff.c:5449

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

1539 msgstr ""

1540

1536 -#: diff.c:5511

1541 +#: diff.c:5452

1542 #, c-format

1543 msgid ""

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

1545 msgstr ""

1546

1542 -#: dir.c:1983

1547 +#: dir.c:2100

1548 msgid "failed to get kernel name and information"

1549 msgstr ""

1550

1546 -#: dir.c:2102

1551 +#: dir.c:2219

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

1553 msgstr ""

1554

1550 -#: dir.c:2885 dir.c:2890

1555 +#: dir.c:3002 dir.c:3007

1556 #, c-format

1557 msgid "could not create directories for %s"

1558 msgstr ""

1559

1555 -#: dir.c:2915

1560 +#: dir.c:3032

1561 #, c-format

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

1563 msgstr ""

1564

1560 -#: entry.c:176

1565 +#: editor.c:61

1566 +#, c-format

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

1568 +msgstr ""

1569 +

1570 +#: entry.c:177

1571 msgid "Filtering content"

1572 msgstr ""

1573

1564 -#: entry.c:433

1574 +#: entry.c:435

1575 #, c-format

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

1577 msgstr ""

@@ -1632,7 +1642,7 @@ msgstr ""

1642 msgid "giving up"

1643 msgstr ""

1644

1635 -#: fetch-pack.c:534 progress.c:242

1645 +#: fetch-pack.c:534 progress.c:229

1646 msgid "done"

1647 msgstr ""

1648

@@ -1646,104 +1656,104 @@ msgstr ""

1656 msgid "Marking %s as complete"

1657 msgstr ""

1658

1649 -#: fetch-pack.c:776

1659 +#: fetch-pack.c:777

1660 #, c-format

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

1662 msgstr ""

1663

1654 -#: fetch-pack.c:814

1664 +#: fetch-pack.c:815

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

1666 msgstr ""

1667

1658 -#: fetch-pack.c:822

1668 +#: fetch-pack.c:823

1669 msgid "protocol error: bad pack header"

1670 msgstr ""

1671

1662 -#: fetch-pack.c:878

1672 +#: fetch-pack.c:879

1673 #, c-format

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

1675 msgstr ""

1676

1667 -#: fetch-pack.c:894

1677 +#: fetch-pack.c:895

1678 #, c-format

1679 msgid "%s failed"

1680 msgstr ""

1681

1672 -#: fetch-pack.c:896

1682 +#: fetch-pack.c:897

1683 msgid "error in sideband demultiplexer"

1684 msgstr ""

1685

1676 -#: fetch-pack.c:923

1686 +#: fetch-pack.c:924

1687 msgid "Server does not support shallow clients"

1688 msgstr ""

1689

1680 -#: fetch-pack.c:927

1690 +#: fetch-pack.c:928

1691 msgid "Server supports multi_ack_detailed"

1692 msgstr ""

1693

1684 -#: fetch-pack.c:930

1694 +#: fetch-pack.c:931

1695 msgid "Server supports no-done"

1696 msgstr ""

1697

1688 -#: fetch-pack.c:936

1698 +#: fetch-pack.c:937

1699 msgid "Server supports multi_ack"

1700 msgstr ""

1701

1692 -#: fetch-pack.c:940

1702 +#: fetch-pack.c:941

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

1704 msgstr ""

1705

1696 -#: fetch-pack.c:944

1706 +#: fetch-pack.c:945

1707 msgid "Server supports side-band"

1708 msgstr ""

1709

1700 -#: fetch-pack.c:948

1710 +#: fetch-pack.c:949

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

1712 msgstr ""

1713

1704 -#: fetch-pack.c:952

1714 +#: fetch-pack.c:953

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

1716 msgstr ""

1717

1708 -#: fetch-pack.c:962

1718 +#: fetch-pack.c:963

1719 msgid "Server supports ofs-delta"

1720 msgstr ""

1721

1712 -#: fetch-pack.c:969

1722 +#: fetch-pack.c:970

1723 #, c-format

1724 msgid "Server version is %.*s"

1725 msgstr ""

1726

1717 -#: fetch-pack.c:975

1727 +#: fetch-pack.c:976

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

1729 msgstr ""

1730

1721 -#: fetch-pack.c:979

1731 +#: fetch-pack.c:980

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

1733 msgstr ""

1734

1725 -#: fetch-pack.c:981

1735 +#: fetch-pack.c:982

1736 msgid "Server does not support --deepen"

1737 msgstr ""

1738

1729 -#: fetch-pack.c:992

1739 +#: fetch-pack.c:993

1740 msgid "no common commits"

1741 msgstr ""

1742

1733 -#: fetch-pack.c:1004

1743 +#: fetch-pack.c:1005

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

1745 msgstr ""

1746

1737 -#: fetch-pack.c:1166

1747 +#: fetch-pack.c:1167

1748 msgid "no matching remote head"

1749 msgstr ""

1750

1741 -#: fetch-pack.c:1188

1751 +#: fetch-pack.c:1189

1752 #, c-format

1753 msgid "no such remote ref %s"

1754 msgstr ""

1755

1746 -#: fetch-pack.c:1191

1756 +#: fetch-pack.c:1192

1757 #, c-format

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

1759 msgstr ""

@@ -1766,17 +1776,17 @@ msgstr ""

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

1777 msgstr ""

1778

1769 -#: grep.c:1970

1779 +#: grep.c:2017

1780 #, c-format

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

1782 msgstr ""

1783

1774 -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1784 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1785 #, c-format

1786 msgid "failed to stat '%s'"

1787 msgstr ""

1788

1779 -#: grep.c:1998

1789 +#: grep.c:2045

1790 #, c-format

1791 msgid "'%s': short read"

1792 msgstr ""

@@ -1839,12 +1849,12 @@ msgstr[1] ""

1849 msgid "git version [<options>]"

1850 msgstr ""

1851

1842 -#: help.c:456

1852 +#: help.c:462

1853 #, c-format

1854 msgid "%s: %s - %s"

1855 msgstr ""

1856

1847 -#: help.c:460

1857 +#: help.c:466

1858 msgid ""

1859 "\n"

1860 "Did you mean this?"

@@ -1902,6 +1912,15 @@ msgstr ""

1912 msgid "invalid date format: %s"

1913 msgstr ""

1914

1915 +#: list-objects-filter-options.c:30

1916 +msgid "multiple object filter types cannot be combined"

1917 +msgstr ""

1918 +

1919 +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

1920 +#, c-format

1921 +msgid "invalid filter-spec expression '%s'"

1922 +msgstr ""

1923 +

1924 #: lockfile.c:151

1925 #, c-format

1926 msgid ""

@@ -1923,8 +1942,8 @@ msgstr ""

1942 msgid "failed to read the cache"

1943 msgstr ""

1944

1926 -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

1927 -#: builtin/checkout.c:595 builtin/clone.c:754

1945 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

1946 +#: builtin/checkout.c:600 builtin/clone.c:754

1947 msgid "unable to write new index file"

1948 msgstr ""

1949

@@ -2107,7 +2126,7 @@ msgstr ""

2126 msgid "Auto-merging %s"

2127 msgstr ""

2128

2110 -#: merge-recursive.c:1775 git-submodule.sh:944

2129 +#: merge-recursive.c:1775 git-submodule.sh:932

2130 msgid "submodule"

2131 msgstr ""

2132

@@ -2129,46 +2148,46 @@ msgstr ""

2148 msgid "directory/file"

2149 msgstr ""

2150

2132 -#: merge-recursive.c:1908

2151 +#: merge-recursive.c:1909

2152 #, c-format

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

2154 msgstr ""

2155

2137 -#: merge-recursive.c:1917

2156 +#: merge-recursive.c:1918

2157 #, c-format

2158 msgid "Adding %s"

2159 msgstr ""

2160

2142 -#: merge-recursive.c:1954

2161 +#: merge-recursive.c:1955

2162 msgid "Already up to date!"

2163 msgstr ""

2164

2146 -#: merge-recursive.c:1963

2165 +#: merge-recursive.c:1964

2166 #, c-format

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

2168 msgstr ""

2169

2151 -#: merge-recursive.c:2060

2170 +#: merge-recursive.c:2061

2171 msgid "Merging:"

2172 msgstr ""

2173

2155 -#: merge-recursive.c:2073

2174 +#: merge-recursive.c:2074

2175 #, c-format

2176 msgid "found %u common ancestor:"

2177 msgid_plural "found %u common ancestors:"

2178 msgstr[0] ""

2179 msgstr[1] ""

2180

2162 -#: merge-recursive.c:2112

2181 +#: merge-recursive.c:2113

2182 msgid "merge returned no commit"

2183 msgstr ""

2184

2166 -#: merge-recursive.c:2175

2185 +#: merge-recursive.c:2176

2186 #, c-format

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

2188 msgstr ""

2189

2171 -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2190 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2191 msgid "Unable to write index."

2192 msgstr ""

2193

@@ -2329,13 +2348,7 @@ msgstr ""

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

2349 msgstr ""

2350

2332 -#: pathspec.c:571

2333 -msgid ""

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

2335 -"use . instead if you meant to match all paths"

2336 -msgstr ""

2337 -

2338 -#: pathspec.c:595

2351 +#: pathspec.c:592

2352 #, c-format

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

2354 msgstr ""

@@ -2344,66 +2357,66 @@ msgstr ""

2357 msgid "unable to parse --pretty format"

2358 msgstr ""

2359

2347 -#: read-cache.c:1443

2360 +#: read-cache.c:1472

2361 #, c-format

2362 msgid ""

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

2364 "Using version %i"

2365 msgstr ""

2366

2354 -#: read-cache.c:1453

2367 +#: read-cache.c:1482

2368 #, c-format

2369 msgid ""

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

2371 "Using version %i"

2372 msgstr ""

2373

2361 -#: read-cache.c:2316 builtin/merge.c:1046

2374 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2375 #, c-format

2376 msgid "could not close '%s'"

2377 msgstr ""

2378

2366 -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2379 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2380 #, c-format

2381 msgid "could not stat '%s'"

2382 msgstr ""

2383

2371 -#: read-cache.c:2407

2384 +#: read-cache.c:2455

2385 #, c-format

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

2387 msgstr ""

2388

2376 -#: read-cache.c:2419

2389 +#: read-cache.c:2467

2390 #, c-format

2391 msgid "unable to unlink: %s"

2392 msgstr ""

2393

2381 -#: refs.c:638

2394 +#: refs.c:706

2395 #, c-format

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

2397 msgstr ""

2398

2386 -#: refs.c:1792

2399 +#: refs.c:1850

2400 msgid "ref updates forbidden inside quarantine environment"

2401 msgstr ""

2402

2390 -#: refs/files-backend.c:1136

2403 +#: refs/files-backend.c:1189

2404 #, c-format

2405 msgid "could not remove reference %s"

2406 msgstr ""

2407

2395 -#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2396 -#: refs/packed-backend.c:1440

2408 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2409 +#: refs/packed-backend.c:1534

2410 #, c-format

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

2412 msgstr ""

2413

2401 -#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2414 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2415 #, c-format

2416 msgid "could not delete references: %s"

2417 msgstr ""

2418

2406 -#: ref-filter.c:35 wt-status.c:1811

2419 +#: ref-filter.c:35 wt-status.c:1816

2420 msgid "gone"

2421 msgstr ""

2422

@@ -2422,157 +2435,157 @@ msgstr ""

2435 msgid "ahead %d, behind %d"

2436 msgstr ""

2437

2425 -#: ref-filter.c:105

2438 +#: ref-filter.c:107

2439 #, c-format

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

2441 msgstr ""

2442

2430 -#: ref-filter.c:107

2443 +#: ref-filter.c:109

2444 #, c-format

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

2446 msgstr ""

2447

2435 -#: ref-filter.c:127

2448 +#: ref-filter.c:129

2449 #, c-format

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

2451 msgstr ""

2452

2440 -#: ref-filter.c:131

2453 +#: ref-filter.c:133

2454 #, c-format

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

2456 msgstr ""

2457

2445 -#: ref-filter.c:133

2458 +#: ref-filter.c:135

2459 #, c-format

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

2461 msgstr ""

2462

2450 -#: ref-filter.c:173

2463 +#: ref-filter.c:184

2464 #, c-format

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

2466 msgstr ""

2467

2455 -#: ref-filter.c:180

2468 +#: ref-filter.c:191

2469 #, c-format

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

2471 msgstr ""

2472

2460 -#: ref-filter.c:198

2473 +#: ref-filter.c:209

2474 #, c-format

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

2476 msgstr ""

2477

2465 -#: ref-filter.c:221

2478 +#: ref-filter.c:232

2479 #, c-format

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

2481 msgstr ""

2482

2470 -#: ref-filter.c:223

2483 +#: ref-filter.c:234

2484 #, c-format

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

2486 msgstr ""

2487

2475 -#: ref-filter.c:236

2488 +#: ref-filter.c:247

2489 #, c-format

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

2491 msgstr ""

2492

2480 -#: ref-filter.c:240

2493 +#: ref-filter.c:251

2494 #, c-format

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

2496 msgstr ""

2497

2485 -#: ref-filter.c:267

2498 +#: ref-filter.c:278

2499 #, c-format

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

2501 msgstr ""

2502

2490 -#: ref-filter.c:279

2503 +#: ref-filter.c:290

2504 #, c-format

2505 msgid "unrecognized position:%s"

2506 msgstr ""

2507

2495 -#: ref-filter.c:283

2508 +#: ref-filter.c:294

2509 #, c-format

2510 msgid "unrecognized width:%s"

2511 msgstr ""

2512

2500 -#: ref-filter.c:289

2513 +#: ref-filter.c:300

2514 #, c-format

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

2516 msgstr ""

2517

2505 -#: ref-filter.c:293

2518 +#: ref-filter.c:304

2519 #, c-format

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

2521 msgstr ""

2522

2510 -#: ref-filter.c:308

2523 +#: ref-filter.c:319

2524 #, c-format

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

2526 msgstr ""

2527

2515 -#: ref-filter.c:398

2528 +#: ref-filter.c:409

2529 #, c-format

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

2531 msgstr ""

2532

2520 -#: ref-filter.c:424

2533 +#: ref-filter.c:435

2534 #, c-format

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

2536 msgstr ""

2537

2525 -#: ref-filter.c:536

2538 +#: ref-filter.c:547

2539 #, c-format

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

2541 msgstr ""

2542

2530 -#: ref-filter.c:596

2543 +#: ref-filter.c:607

2544 #, c-format

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

2546 msgstr ""

2547

2535 -#: ref-filter.c:598

2548 +#: ref-filter.c:609

2549 #, c-format

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

2551 msgstr ""

2552

2540 -#: ref-filter.c:600

2553 +#: ref-filter.c:611

2554 #, c-format

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

2556 msgstr ""

2557

2545 -#: ref-filter.c:626

2558 +#: ref-filter.c:637

2559 #, c-format

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

2561 msgstr ""

2562

2550 -#: ref-filter.c:628

2563 +#: ref-filter.c:639

2564 #, c-format

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

2566 msgstr ""

2567

2555 -#: ref-filter.c:630

2568 +#: ref-filter.c:641

2569 #, c-format

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

2571 msgstr ""

2572

2560 -#: ref-filter.c:643

2573 +#: ref-filter.c:654

2574 #, c-format

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

2576 msgstr ""

2577

2565 -#: ref-filter.c:698

2578 +#: ref-filter.c:709

2579 #, c-format

2580 msgid "malformed format string %s"

2581 msgstr ""

2582

2570 -#: ref-filter.c:1283

2583 +#: ref-filter.c:1313

2584 #, c-format

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

2586 msgstr ""

2587

2575 -#: ref-filter.c:1286

2588 +#: ref-filter.c:1316

2589 #, c-format

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

2591 msgstr ""

@@ -2580,7 +2593,7 @@ msgstr ""

2593 #. TRANSLATORS: make sure this matches "HEAD

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

2595 #.

2583 -#: ref-filter.c:1294

2596 +#: ref-filter.c:1324

2597 #, c-format

2598 msgid "(HEAD detached at %s)"

2599 msgstr ""

@@ -2588,137 +2601,137 @@ msgstr ""

2601 #. TRANSLATORS: make sure this matches "HEAD

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

2603 #.

2591 -#: ref-filter.c:1301

2604 +#: ref-filter.c:1331

2605 #, c-format

2606 msgid "(HEAD detached from %s)"

2607 msgstr ""

2608

2596 -#: ref-filter.c:1305

2609 +#: ref-filter.c:1335

2610 msgid "(no branch)"

2611 msgstr ""

2612

2600 -#: ref-filter.c:1454 ref-filter.c:1485

2613 +#: ref-filter.c:1488 ref-filter.c:1519

2614 #, c-format

2615 msgid "missing object %s for %s"

2616 msgstr ""

2617

2605 -#: ref-filter.c:1457 ref-filter.c:1488

2618 +#: ref-filter.c:1491 ref-filter.c:1522

2619 #, c-format

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

2621 msgstr ""

2622

2610 -#: ref-filter.c:1788

2623 +#: ref-filter.c:1822

2624 #, c-format

2625 msgid "malformed object at '%s'"

2626 msgstr ""

2627

2615 -#: ref-filter.c:1855

2628 +#: ref-filter.c:1889

2629 #, c-format

2630 msgid "ignoring ref with broken name %s"

2631 msgstr ""

2632

2620 -#: ref-filter.c:1860

2633 +#: ref-filter.c:1894

2634 #, c-format

2635 msgid "ignoring broken ref %s"

2636 msgstr ""

2637

2625 -#: ref-filter.c:2122

2638 +#: ref-filter.c:2156

2639 #, c-format

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

2641 msgstr ""

2642

2630 -#: ref-filter.c:2216

2643 +#: ref-filter.c:2250

2644 #, c-format

2645 msgid "malformed object name %s"

2646 msgstr ""

2647

2635 -#: remote.c:750

2648 +#: remote.c:780

2649 #, c-format

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

2651 msgstr ""

2652

2640 -#: remote.c:754

2653 +#: remote.c:784

2654 #, c-format

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

2656 msgstr ""

2657

2645 -#: remote.c:758

2658 +#: remote.c:788

2659 #, c-format

2660 msgid "%s tracks both %s and %s"

2661 msgstr ""

2662

2650 -#: remote.c:766

2663 +#: remote.c:796

2664 msgid "Internal error"

2665 msgstr ""

2666

2654 -#: remote.c:1681 remote.c:1783

2667 +#: remote.c:1711 remote.c:1813

2668 msgid "HEAD does not point to a branch"

2669 msgstr ""

2670

2658 -#: remote.c:1690

2671 +#: remote.c:1720

2672 #, c-format

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

2674 msgstr ""

2675

2663 -#: remote.c:1693

2676 +#: remote.c:1723

2677 #, c-format

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

2679 msgstr ""

2680

2668 -#: remote.c:1699

2681 +#: remote.c:1729

2682 #, c-format

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

2684 msgstr ""

2685

2673 -#: remote.c:1714

2686 +#: remote.c:1744

2687 #, c-format

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

2689 msgstr ""

2690

2678 -#: remote.c:1726

2691 +#: remote.c:1756

2692 #, c-format

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

2694 msgstr ""

2695

2683 -#: remote.c:1737

2696 +#: remote.c:1767

2697 #, c-format

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

2699 msgstr ""

2700

2688 -#: remote.c:1750

2701 +#: remote.c:1780

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

2703 msgstr ""

2704

2692 -#: remote.c:1772

2705 +#: remote.c:1802

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

2707 msgstr ""

2708

2696 -#: remote.c:2076

2709 +#: remote.c:2106

2710 #, c-format

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

2712 msgstr ""

2713

2701 -#: remote.c:2080

2714 +#: remote.c:2110

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

2716 msgstr ""

2717

2705 -#: remote.c:2083

2718 +#: remote.c:2113

2719 #, c-format

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

2721 msgstr ""

2722

2710 -#: remote.c:2087

2723 +#: remote.c:2117

2724 #, c-format

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

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

2727 msgstr[0] ""

2728 msgstr[1] ""

2729

2717 -#: remote.c:2093

2730 +#: remote.c:2123

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

2732 msgstr ""

2733

2721 -#: remote.c:2096

2734 +#: remote.c:2126

2735 #, c-format

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

2737 msgid_plural ""

@@ -2726,11 +2739,11 @@ msgid_plural ""

2739 msgstr[0] ""

2740 msgstr[1] ""

2741

2729 -#: remote.c:2104

2742 +#: remote.c:2134

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

2744 msgstr ""

2745

2733 -#: remote.c:2107

2746 +#: remote.c:2137

2747 #, c-format

2748 msgid ""

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

@@ -2741,27 +2754,34 @@ msgid_plural ""

2754 msgstr[0] ""

2755 msgstr[1] ""

2756

2744 -#: remote.c:2117

2757 +#: remote.c:2147

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

2759 msgstr ""

2760

2748 -#: revision.c:2256

2761 +#: revision.c:2268

2762 msgid "your current branch appears to be broken"

2763 msgstr ""

2764

2752 -#: revision.c:2259

2765 +#: revision.c:2271

2766 #, c-format

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

2768 msgstr ""

2769

2757 -#: revision.c:2453

2770 +#: revision.c:2465

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

2772 msgstr ""

2773

2761 -#: run-command.c:644

2774 +#: run-command.c:645

2775 msgid "open /dev/null failed"

2776 msgstr ""

2777

2778 +#: run-command.c:1188

2779 +#, c-format

2780 +msgid ""

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

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

2783 +msgstr ""

2784 +

2785 #: send-pack.c:151

2786 #, c-format

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

@@ -2824,13 +2844,13 @@ msgid ""

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

2845 msgstr ""

2846

2827 -#: sequencer.c:297 sequencer.c:1704

2847 +#: sequencer.c:297 sequencer.c:1715

2848 #, c-format

2849 msgid "could not lock '%s'"

2850 msgstr ""

2851

2832 -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

2833 -#: sequencer.c:2733 sequencer.c:2749

2852 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

2853 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

2854 #, c-format

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

2856 msgstr ""

@@ -2840,13 +2860,13 @@ msgstr ""

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

2861 msgstr ""

2862

2843 -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

2863 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

2864 #, c-format

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

2866 msgstr ""

2867

2848 -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

2849 -#: builtin/commit.c:754 builtin/merge.c:1044

2868 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

2869 +#: builtin/commit.c:754 builtin/merge.c:1046

2870 #, c-format

2871 msgid "could not read '%s'"

2872 msgstr ""

@@ -2868,20 +2888,20 @@ msgstr ""

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

2889 #. "rebase -i".

2890 #.

2871 -#: sequencer.c:474

2891 +#: sequencer.c:477

2892 #, c-format

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

2894 msgstr ""

2895

2876 -#: sequencer.c:493

2896 +#: sequencer.c:496

2897 msgid "could not resolve HEAD commit\n"

2898 msgstr ""

2899

2880 -#: sequencer.c:513

2900 +#: sequencer.c:516

2901 msgid "unable to update cache tree\n"

2902 msgstr ""

2903

2884 -#: sequencer.c:597

2904 +#: sequencer.c:600

2905 #, c-format

2906 msgid ""

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

@@ -2898,17 +2918,17 @@ msgid ""

2918 " git rebase --continue\n"

2919 msgstr ""

2920

2901 -#: sequencer.c:699

2921 +#: sequencer.c:702

2922 #, c-format

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

2924 msgstr ""

2925

2906 -#: sequencer.c:704

2926 +#: sequencer.c:707

2927 #, c-format

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

2929 msgstr ""

2930

2911 -#: sequencer.c:826

2931 +#: sequencer.c:836

2932 #, c-format

2933 msgid ""

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

@@ -2916,7 +2936,7 @@ msgid ""

2936 "\t%.*s"

2937 msgstr ""

2938

2919 -#: sequencer.c:832

2939 +#: sequencer.c:842

2940 #, c-format

2941 msgid ""

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

@@ -2924,230 +2944,230 @@ msgid ""

2944 "\t%.*s"

2945 msgstr ""

2946

2927 -#: sequencer.c:838 sequencer.c:863

2947 +#: sequencer.c:848 sequencer.c:873

2948 #, c-format

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

2950 msgstr ""

2951

2932 -#: sequencer.c:847 sequencer.c:2681

2952 +#: sequencer.c:857 sequencer.c:2742

2953 msgid "need a HEAD to fixup"

2954 msgstr ""

2955

2936 -#: sequencer.c:849

2956 +#: sequencer.c:859

2957 msgid "could not read HEAD"

2958 msgstr ""

2959

2940 -#: sequencer.c:851

2960 +#: sequencer.c:861

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

2962 msgstr ""

2963

2944 -#: sequencer.c:857

2964 +#: sequencer.c:867

2965 #, c-format

2966 msgid "cannot write '%s'"

2967 msgstr ""

2968

2949 -#: sequencer.c:866 git-rebase--interactive.sh:446

2969 +#: sequencer.c:876 git-rebase--interactive.sh:446

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

2971 msgstr ""

2972

2953 -#: sequencer.c:874

2973 +#: sequencer.c:884

2974 #, c-format

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

2976 msgstr ""

2977

2958 -#: sequencer.c:881

2978 +#: sequencer.c:891

2979 #, c-format

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

2981 msgstr ""

2982

2963 -#: sequencer.c:886

2983 +#: sequencer.c:896

2984 #, c-format

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

2986 msgstr ""

2987

2968 -#: sequencer.c:891

2988 +#: sequencer.c:901

2989 #, c-format

2990 msgid "unknown command: %d"

2991 msgstr ""

2992

2973 -#: sequencer.c:957

2993 +#: sequencer.c:967

2994 msgid "your index file is unmerged."

2995 msgstr ""

2996

2977 -#: sequencer.c:975

2997 +#: sequencer.c:986

2998 #, c-format

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

3000 msgstr ""

3001

2982 -#: sequencer.c:983

3002 +#: sequencer.c:994

3003 #, c-format

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

3005 msgstr ""

3006

2987 -#: sequencer.c:987

3007 +#: sequencer.c:998

3008 #, c-format

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

3010 msgstr ""

3011

2992 -#: sequencer.c:993

3012 +#: sequencer.c:1004

3013 #, c-format

3014 msgid "cannot get commit message for %s"

3015 msgstr ""

3016

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

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

2999 -#: sequencer.c:1014

3019 +#: sequencer.c:1025

3020 #, c-format

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

3022 msgstr ""

3023

3004 -#: sequencer.c:1077 sequencer.c:1853

3024 +#: sequencer.c:1088 sequencer.c:1864

3025 #, c-format

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

3027 msgstr ""

3028

3009 -#: sequencer.c:1128

3029 +#: sequencer.c:1139

3030 #, c-format

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

3032 msgstr ""

3033

3014 -#: sequencer.c:1129

3034 +#: sequencer.c:1140

3035 #, c-format

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

3037 msgstr ""

3038

3019 -#: sequencer.c:1171

3039 +#: sequencer.c:1182

3040 msgid "empty commit set passed"

3041 msgstr ""

3042

3023 -#: sequencer.c:1181

3043 +#: sequencer.c:1192

3044 #, c-format

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

3046 msgstr ""

3047

3028 -#: sequencer.c:1188

3048 +#: sequencer.c:1198

3049 #, c-format

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

3051 msgstr ""

3052

3033 -#: sequencer.c:1308

3053 +#: sequencer.c:1319

3054 #, c-format

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

3056 msgstr ""

3057

3038 -#: sequencer.c:1316

3058 +#: sequencer.c:1327

3059 #, c-format

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

3061 msgstr ""

3062

3043 -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3044 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3063 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3064 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3065 #, c-format

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

3067 msgstr ""

3068

3049 -#: sequencer.c:1361

3069 +#: sequencer.c:1372

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

3071 msgstr ""

3072

3053 -#: sequencer.c:1363

3073 +#: sequencer.c:1374

3074 #, c-format

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

3076 msgstr ""

3077

3058 -#: sequencer.c:1368

3078 +#: sequencer.c:1379

3079 msgid "no commits parsed."

3080 msgstr ""

3081

3062 -#: sequencer.c:1379

3082 +#: sequencer.c:1390

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

3084 msgstr ""

3085

3066 -#: sequencer.c:1381

3086 +#: sequencer.c:1392

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

3088 msgstr ""

3089

3070 -#: sequencer.c:1448

3090 +#: sequencer.c:1459

3091 #, c-format

3092 msgid "invalid key: %s"

3093 msgstr ""

3094

3075 -#: sequencer.c:1451

3095 +#: sequencer.c:1462

3096 #, c-format

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

3098 msgstr ""

3099

3080 -#: sequencer.c:1517

3100 +#: sequencer.c:1528

3101 #, c-format

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

3103 msgstr ""

3104

3085 -#: sequencer.c:1555

3105 +#: sequencer.c:1566

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

3107 msgstr ""

3108

3089 -#: sequencer.c:1556

3109 +#: sequencer.c:1567

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

3111 msgstr ""

3112

3093 -#: sequencer.c:1559

3113 +#: sequencer.c:1570

3114 #, c-format

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

3116 msgstr ""

3117

3098 -#: sequencer.c:1574

3118 +#: sequencer.c:1585

3119 msgid "could not lock HEAD"

3120 msgstr ""

3121

3102 -#: sequencer.c:1632 sequencer.c:2211

3122 +#: sequencer.c:1643 sequencer.c:2227

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

3124 msgstr ""

3125

3106 -#: sequencer.c:1634

3126 +#: sequencer.c:1645

3127 msgid "cannot resolve HEAD"

3128 msgstr ""

3129

3110 -#: sequencer.c:1636 sequencer.c:1671

3130 +#: sequencer.c:1647 sequencer.c:1682

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

3132 msgstr ""

3133

3114 -#: sequencer.c:1657 builtin/grep.c:711

3134 +#: sequencer.c:1668 builtin/grep.c:713

3135 #, c-format

3136 msgid "cannot open '%s'"

3137 msgstr ""

3138

3119 -#: sequencer.c:1659

3139 +#: sequencer.c:1670

3140 #, c-format

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

3142 msgstr ""

3143

3124 -#: sequencer.c:1660

3144 +#: sequencer.c:1671

3145 msgid "unexpected end of file"

3146 msgstr ""

3147

3128 -#: sequencer.c:1666

3148 +#: sequencer.c:1677

3149 #, c-format

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

3151 msgstr ""

3152

3133 -#: sequencer.c:1677

3153 +#: sequencer.c:1688

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

3155 msgstr ""

3156

3137 -#: sequencer.c:1818 sequencer.c:2109

3157 +#: sequencer.c:1829 sequencer.c:2125

3158 msgid "cannot read HEAD"

3159 msgstr ""

3160

3141 -#: sequencer.c:1858 builtin/difftool.c:640

3161 +#: sequencer.c:1869 builtin/difftool.c:639

3162 #, c-format

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

3164 msgstr ""

3165

3146 -#: sequencer.c:1874

3166 +#: sequencer.c:1888

3167 msgid "could not read index"

3168 msgstr ""

3169

3150 -#: sequencer.c:1879

3170 +#: sequencer.c:1893

3171 #, c-format

3172 msgid ""

3173 "execution failed: %s\n"

@@ -3157,11 +3177,11 @@ msgid ""

3177 "\n"

3178 msgstr ""

3179

3160 -#: sequencer.c:1885

3180 +#: sequencer.c:1899

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

3182 msgstr ""

3183

3164 -#: sequencer.c:1891

3184 +#: sequencer.c:1905

3185 #, c-format

3186 msgid ""

3187 "execution succeeded: %s\n"

@@ -3172,17 +3192,17 @@ msgid ""

3192 "\n"

3193 msgstr ""

3194

3175 -#: sequencer.c:1948

3195 +#: sequencer.c:1964

3196 #, c-format

3197 msgid "Applied autostash.\n"

3198 msgstr ""

3199

3180 -#: sequencer.c:1960

3200 +#: sequencer.c:1976

3201 #, c-format

3202 msgid "cannot store %s"

3203 msgstr ""

3204

3185 -#: sequencer.c:1963 git-rebase.sh:175

3205 +#: sequencer.c:1979 git-rebase.sh:175

3206 #, c-format

3207 msgid ""

3208 "Applying autostash resulted in conflicts.\n"

@@ -3190,113 +3210,108 @@ msgid ""

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

3211 msgstr ""

3212

3193 -#: sequencer.c:2045

3213 +#: sequencer.c:2061

3214 #, c-format

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

3216 msgstr ""

3217

3198 -#: sequencer.c:2087

3218 +#: sequencer.c:2103

3219 #, c-format

3220 msgid "unknown command %d"

3221 msgstr ""

3222

3203 -#: sequencer.c:2117

3223 +#: sequencer.c:2133

3224 msgid "could not read orig-head"

3225 msgstr ""

3226

3207 -#: sequencer.c:2122 sequencer.c:2678

3227 +#: sequencer.c:2138 sequencer.c:2739

3228 msgid "could not read 'onto'"

3229 msgstr ""

3230

3211 -#: sequencer.c:2129

3231 +#: sequencer.c:2145

3232 #, c-format

3233 msgid "could not update %s"

3234 msgstr ""

3235

3216 -#: sequencer.c:2136

3236 +#: sequencer.c:2152

3237 #, c-format

3238 msgid "could not update HEAD to %s"

3239 msgstr ""

3240

3221 -#: sequencer.c:2220

3241 +#: sequencer.c:2236

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

3243 msgstr ""

3244

3225 -#: sequencer.c:2225

3245 +#: sequencer.c:2241

3246 msgid "could not remove CHERRY_PICK_HEAD"

3247 msgstr ""

3248

3229 -#: sequencer.c:2234

3249 +#: sequencer.c:2250

3250 msgid "cannot amend non-existing commit"

3251 msgstr ""

3252

3233 -#: sequencer.c:2236

3253 +#: sequencer.c:2252

3254 #, c-format

3255 msgid "invalid file: '%s'"

3256 msgstr ""

3257

3238 -#: sequencer.c:2238

3258 +#: sequencer.c:2254

3259 #, c-format

3260 msgid "invalid contents: '%s'"

3261 msgstr ""

3262

3243 -#: sequencer.c:2241

3263 +#: sequencer.c:2257

3264 msgid ""

3265 "\n"

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

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

3268 msgstr ""

3269

3250 -#: sequencer.c:2251

3270 +#: sequencer.c:2267

3271 msgid "could not commit staged changes."

3272 msgstr ""

3273

3254 -#: sequencer.c:2331

3274 +#: sequencer.c:2347

3275 #, c-format

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

3277 msgstr ""

3278

3259 -#: sequencer.c:2335

3279 +#: sequencer.c:2351

3280 #, c-format

3281 msgid "%s: bad revision"

3282 msgstr ""

3283

3264 -#: sequencer.c:2368

3284 +#: sequencer.c:2384

3285 msgid "can't revert as initial commit"

3286 msgstr ""

3287

3268 -#: sequencer.c:2471

3288 +#: sequencer.c:2489

3289 msgid "make_script: unhandled options"

3290 msgstr ""

3291

3272 -#: sequencer.c:2474

3292 +#: sequencer.c:2492

3293 msgid "make_script: error preparing revisions"

3294 msgstr ""

3295

3276 -#: sequencer.c:2510

3296 +#: sequencer.c:2526 sequencer.c:2561

3297 #, c-format

3298 msgid "unusable todo list: '%s'"

3299 msgstr ""

3300

3281 -#: sequencer.c:2516

3282 -#, c-format

3283 -msgid "unable to open '%s' for writing"

3284 -msgstr ""

3285 -

3286 -#: sequencer.c:2561

3301 +#: sequencer.c:2609

3302 #, c-format

3303 msgid ""

3304 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3305 msgstr ""

3306

3292 -#: sequencer.c:2641

3307 +#: sequencer.c:2689

3308 #, c-format

3309 msgid ""

3310 "Warning: some commits may have been dropped accidentally.\n"

3311 "Dropped commits (newer to older):\n"

3312 msgstr ""

3313

3299 -#: sequencer.c:2648

3314 +#: sequencer.c:2696

3315 #, c-format

3316 msgid ""

3317 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3307,7 +3322,7 @@ msgid ""

3322 "\n"

3323 msgstr ""

3324

3310 -#: sequencer.c:2660

3325 +#: sequencer.c:2708

3326 #, c-format

3327 msgid ""

3328 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3315,31 +3330,21 @@ msgid ""

3330 "Or you can abort the rebase with 'git rebase --abort'.\n"

3331 msgstr ""

3332

3318 -#: sequencer.c:2708

3319 -#, c-format

3320 -msgid "could not parse commit '%s'"

3321 -msgstr ""

3322 -

3323 -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3324 -#: builtin/am.c:775

3333 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3334 +#: builtin/am.c:779

3335 #, c-format

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

3337 msgstr ""

3338

3329 -#: sequencer.c:2756

3339 +#: sequencer.c:2769

3340 #, c-format

3331 -msgid "could not truncate '%s'"

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

3342 msgstr ""

3343

3334 -#: sequencer.c:2848

3344 +#: sequencer.c:2891

3345 msgid "the script was already rearranged."

3346 msgstr ""

3347

3338 -#: sequencer.c:2953

3339 -#, c-format

3340 -msgid "could not finish '%s'"

3341 -msgstr ""

3342 -

3348 #: setup.c:171

3349 #, c-format

3350 msgid ""

@@ -3363,82 +3368,82 @@ msgid ""

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

3369 msgstr ""

3370

3366 -#: setup.c:499

3371 +#: setup.c:501

3372 #, c-format

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

3374 msgstr ""

3375

3371 -#: setup.c:507

3376 +#: setup.c:509

3377 msgid "unknown repository extensions found:"

3378 msgstr ""

3379

3375 -#: setup.c:806

3380 +#: setup.c:811

3381 #, c-format

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

3383 msgstr ""

3384

3380 -#: setup.c:808 builtin/index-pack.c:1653

3385 +#: setup.c:813 builtin/index-pack.c:1653

3386 msgid "Cannot come back to cwd"

3387 msgstr ""

3388

3384 -#: setup.c:1046

3389 +#: setup.c:1052

3390 msgid "Unable to read current working directory"

3391 msgstr ""

3392

3388 -#: setup.c:1058 setup.c:1064

3393 +#: setup.c:1064 setup.c:1070

3394 #, c-format

3395 msgid "Cannot change to '%s'"

3396 msgstr ""

3397

3393 -#: setup.c:1077

3398 +#: setup.c:1083

3399 #, c-format

3400 msgid ""

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

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

3403 msgstr ""

3404

3400 -#: setup.c:1159

3405 +#: setup.c:1167

3406 #, c-format

3407 msgid ""

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

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

3410 msgstr ""

3411

3407 -#: sha1_file.c:528

3412 +#: sha1_file.c:598

3413 #, c-format

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

3415 msgstr ""

3416

3412 -#: sha1_file.c:554

3417 +#: sha1_file.c:624

3418 #, c-format

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

3420 msgstr ""

3421

3417 -#: sha1_file.c:560

3422 +#: sha1_file.c:630

3423 #, c-format

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

3425 msgstr ""

3426

3422 -#: sha1_file.c:566

3427 +#: sha1_file.c:636

3428 #, c-format

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

3430 msgstr ""

3431

3427 -#: sha1_file.c:574

3432 +#: sha1_file.c:644

3433 #, c-format

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

3435 msgstr ""

3436

3432 -#: sha1_name.c:420

3437 +#: sha1_name.c:422

3438 #, c-format

3439 msgid "short SHA1 %s is ambiguous"

3440 msgstr ""

3441

3437 -#: sha1_name.c:431

3442 +#: sha1_name.c:433

3443 msgid "The candidates are:"

3444 msgstr ""

3445

3441 -#: sha1_name.c:590

3446 +#: sha1_name.c:693

3447 msgid ""

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

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

@@ -3451,86 +3456,86 @@ msgid ""

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

3457 msgstr ""

3458

3454 -#: submodule.c:93 submodule.c:127

3459 +#: submodule.c:96 submodule.c:130

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

3461 msgstr ""

3462

3458 -#: submodule.c:97 submodule.c:131

3463 +#: submodule.c:100 submodule.c:134

3464 #, c-format

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

3466 msgstr ""

3467

3463 -#: submodule.c:105

3468 +#: submodule.c:108

3469 #, c-format

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

3471 msgstr ""

3472

3468 -#: submodule.c:138

3473 +#: submodule.c:141

3474 #, c-format

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

3476 msgstr ""

3477

3473 -#: submodule.c:149

3478 +#: submodule.c:152

3479 msgid "staging updated .gitmodules failed"

3480 msgstr ""

3481

3477 -#: submodule.c:309

3482 +#: submodule.c:312

3483 #, c-format

3484 msgid "in unpopulated submodule '%s'"

3485 msgstr ""

3486

3482 -#: submodule.c:340

3487 +#: submodule.c:343

3488 #, c-format

3489 msgid "Pathspec '%s' is in submodule '%.*s'"

3490 msgstr ""

3491

3487 -#: submodule.c:799

3492 +#: submodule.c:833

3493 #, c-format

3494 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3495 msgstr ""

3496

3492 -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3497 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3498 msgid "Failed to resolve HEAD as a valid ref."

3499 msgstr ""

3500

3496 -#: submodule.c:1304

3501 +#: submodule.c:1370

3502 #, c-format

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

3504 msgstr ""

3505

3501 -#: submodule.c:1442

3506 +#: submodule.c:1508

3507 #, c-format

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

3509 msgstr ""

3510

3506 -#: submodule.c:1455

3511 +#: submodule.c:1521

3512 #, c-format

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

3514 msgstr ""

3515

3511 -#: submodule.c:1548

3516 +#: submodule.c:1614

3517 #, c-format

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

3519 msgstr ""

3520

3516 -#: submodule.c:1809

3521 +#: submodule.c:1876

3522 #, c-format

3523 msgid ""

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

3525 msgstr ""

3526

3522 -#: submodule.c:1821 submodule.c:1877

3527 +#: submodule.c:1888 submodule.c:1944

3528 #, c-format

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

3530 msgstr ""

3531

3527 -#: submodule.c:1825 builtin/submodule--helper.c:671

3528 -#: builtin/submodule--helper.c:681

3532 +#: submodule.c:1892 builtin/submodule--helper.c:909

3533 +#: builtin/submodule--helper.c:919

3534 #, c-format

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

3536 msgstr ""

3537

3533 -#: submodule.c:1828

3538 +#: submodule.c:1895

3539 #, c-format

3540 msgid ""

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

@@ -3538,20 +3543,20 @@ msgid ""

3543 "'%s'\n"

3544 msgstr ""

3545

3541 -#: submodule.c:1912

3546 +#: submodule.c:1979

3547 #, c-format

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

3549 msgstr ""

3550

3546 -#: submodule.c:1956

3551 +#: submodule.c:2023

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

3553 msgstr ""

3554

3550 -#: submodule.c:1976

3555 +#: submodule.c:2043

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

3557 msgstr ""

3558

3554 -#: submodule.c:1995

3559 +#: submodule.c:2062

3560 #, c-format

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

3562 msgstr ""

@@ -3619,24 +3624,24 @@ msgstr ""

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

3625 msgstr ""

3626

3622 -#: transport.c:62

3627 +#: transport.c:63

3628 #, c-format

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

3630 msgstr ""

3631

3627 -#: transport.c:151

3632 +#: transport.c:152

3633 #, c-format

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

3635 msgstr ""

3636

3632 -#: transport.c:888

3637 +#: transport.c:904

3638 #, c-format

3639 msgid ""

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

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

3642 msgstr ""

3643

3639 -#: transport.c:892

3644 +#: transport.c:908

3645 #, c-format

3646 msgid ""

3647 "\n"

@@ -3652,11 +3657,11 @@ msgid ""

3657 "\n"

3658 msgstr ""

3659

3655 -#: transport.c:900

3660 +#: transport.c:916

3661 msgid "Aborting."

3662 msgstr ""

3663

3659 -#: transport-helper.c:1071

3664 +#: transport-helper.c:1074

3665 #, c-format

3666 msgid "Could not read ref %s"

3667 msgstr ""

@@ -3677,98 +3682,98 @@ msgstr ""

3682 msgid "too-short tree file"

3683 msgstr ""

3684

3680 -#: unpack-trees.c:106

3685 +#: unpack-trees.c:107

3686 #, c-format

3687 msgid ""

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

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

3690 msgstr ""

3691

3687 -#: unpack-trees.c:108

3692 +#: unpack-trees.c:109

3693 #, c-format

3694 msgid ""

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

3696 "%%s"

3697 msgstr ""

3698

3694 -#: unpack-trees.c:111

3699 +#: unpack-trees.c:112

3700 #, c-format

3701 msgid ""

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

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

3704 msgstr ""

3705

3701 -#: unpack-trees.c:113

3706 +#: unpack-trees.c:114

3707 #, c-format

3708 msgid ""

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

3710 "%%s"

3711 msgstr ""

3712

3708 -#: unpack-trees.c:116

3713 +#: unpack-trees.c:117

3714 #, c-format

3715 msgid ""

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

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

3718 msgstr ""

3719

3715 -#: unpack-trees.c:118

3720 +#: unpack-trees.c:119

3721 #, c-format

3722 msgid ""

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

3724 "%%s"

3725 msgstr ""

3726

3722 -#: unpack-trees.c:123

3727 +#: unpack-trees.c:124

3728 #, c-format

3729 msgid ""

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

3731 "%s"

3732 msgstr ""

3733

3729 -#: unpack-trees.c:127

3734 +#: unpack-trees.c:128

3735 #, c-format

3736 msgid ""

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

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

3739 msgstr ""

3740

3736 -#: unpack-trees.c:129

3741 +#: unpack-trees.c:130

3742 #, c-format

3743 msgid ""

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

3745 "%%s"

3746 msgstr ""

3747

3743 -#: unpack-trees.c:132

3748 +#: unpack-trees.c:133

3749 #, c-format

3750 msgid ""

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

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

3753 msgstr ""

3754

3750 -#: unpack-trees.c:134

3755 +#: unpack-trees.c:135

3756 #, c-format

3757 msgid ""

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

3759 "%%s"

3760 msgstr ""

3761

3757 -#: unpack-trees.c:137

3762 +#: unpack-trees.c:138

3763 #, c-format

3764 msgid ""

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

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

3767 msgstr ""

3768

3764 -#: unpack-trees.c:139

3769 +#: unpack-trees.c:140

3770 #, c-format

3771 msgid ""

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

3773 "%%s"

3774 msgstr ""

3775

3771 -#: unpack-trees.c:144

3776 +#: unpack-trees.c:145

3777 #, c-format

3778 msgid ""

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

@@ -3776,7 +3781,7 @@ msgid ""

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

3782 msgstr ""

3783

3779 -#: unpack-trees.c:146

3784 +#: unpack-trees.c:147

3785 #, c-format

3786 msgid ""

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

@@ -3784,47 +3789,47 @@ msgid ""

3789 "%%s"

3790 msgstr ""

3791

3787 -#: unpack-trees.c:149

3792 +#: unpack-trees.c:150

3793 #, c-format

3794 msgid ""

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

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

3797 msgstr ""

3798

3794 -#: unpack-trees.c:151

3799 +#: unpack-trees.c:152

3800 #, c-format

3801 msgid ""

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

3803 "%%s"

3804 msgstr ""

3805

3801 -#: unpack-trees.c:154

3806 +#: unpack-trees.c:155

3807 #, c-format

3808 msgid ""

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

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

3811 msgstr ""

3812

3808 -#: unpack-trees.c:156

3813 +#: unpack-trees.c:157

3814 #, c-format

3815 msgid ""

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

3817 "%%s"

3818 msgstr ""

3819

3815 -#: unpack-trees.c:163

3820 +#: unpack-trees.c:164

3821 #, c-format

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

3823 msgstr ""

3824

3820 -#: unpack-trees.c:166

3825 +#: unpack-trees.c:167

3826 #, c-format

3827 msgid ""

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

3829 "%s"

3830 msgstr ""

3831

3827 -#: unpack-trees.c:168

3832 +#: unpack-trees.c:169

3833 #, c-format

3834 msgid ""

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

@@ -3832,7 +3837,7 @@ msgid ""

3837 "%s"

3838 msgstr ""

3839

3835 -#: unpack-trees.c:170

3840 +#: unpack-trees.c:171

3841 #, c-format

3842 msgid ""

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

@@ -3840,19 +3845,19 @@ msgid ""

3845 "%s"

3846 msgstr ""

3847

3843 -#: unpack-trees.c:172

3848 +#: unpack-trees.c:173

3849 #, c-format

3850 msgid ""

3851 "Cannot update submodule:\n"

3852 "%s"

3853 msgstr ""

3854

3850 -#: unpack-trees.c:249

3855 +#: unpack-trees.c:250

3856 #, c-format

3857 msgid "Aborting\n"

3858 msgstr ""

3859

3855 -#: unpack-trees.c:331

3860 +#: unpack-trees.c:332

3861 msgid "Checking out files"

3862 msgstr ""

3863

@@ -3895,8 +3900,8 @@ msgstr ""

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

3901 msgstr ""

3902

3898 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

3899 -#: builtin/am.c:858 builtin/merge.c:1041

3903 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

3904 +#: builtin/am.c:862 builtin/merge.c:1043

3905 #, c-format

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

3907 msgstr ""

@@ -3910,16 +3915,6 @@ msgstr ""

3915 msgid "unable to get current working directory"

3916 msgstr ""

3917

3913 -#: wrapper.c:656

3914 -#, c-format

3915 -msgid "could not write to %s"

3916 -msgstr ""

3917 -

3918 -#: wrapper.c:658

3919 -#, c-format

3920 -msgid "could not close %s"

3921 -msgstr ""

3922 -

3918 #: wt-status.c:150

3919 msgid "Unmerged paths:"

3920 msgstr ""

@@ -3945,11 +3940,11 @@ msgstr ""

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

3941 msgstr ""

3942

3948 -#: wt-status.c:198 wt-status.c:979

3943 +#: wt-status.c:198 wt-status.c:984

3944 msgid "Changes to be committed:"

3945 msgstr ""

3946

3952 -#: wt-status.c:216 wt-status.c:988

3947 +#: wt-status.c:216 wt-status.c:993

3948 msgid "Changes not staged for commit:"

3949 msgstr ""

3950

@@ -4047,247 +4042,247 @@ msgstr ""

4042 msgid "untracked content, "

4043 msgstr ""

4044

4050 -#: wt-status.c:819

4045 +#: wt-status.c:824

4046 #, c-format

4047 msgid "Your stash currently has %d entry"

4048 msgid_plural "Your stash currently has %d entries"

4049 msgstr[0] ""

4050 msgstr[1] ""

4051

4057 -#: wt-status.c:851

4052 +#: wt-status.c:856

4053 msgid "Submodules changed but not updated:"

4054 msgstr ""

4055

4061 -#: wt-status.c:853

4056 +#: wt-status.c:858

4057 msgid "Submodule changes to be committed:"

4058 msgstr ""

4059

4065 -#: wt-status.c:935

4060 +#: wt-status.c:940

4061 msgid ""

4062 "Do not modify or remove the line above.\n"

4063 "Everything below it will be ignored."

4064 msgstr ""

4065

4071 -#: wt-status.c:1048

4066 +#: wt-status.c:1053

4067 msgid "You have unmerged paths."

4068 msgstr ""

4069

4075 -#: wt-status.c:1051

4070 +#: wt-status.c:1056

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

4072 msgstr ""

4073

4079 -#: wt-status.c:1053

4074 +#: wt-status.c:1058

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

4076 msgstr ""

4077

4083 -#: wt-status.c:1058

4078 +#: wt-status.c:1063

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

4080 msgstr ""

4081

4087 -#: wt-status.c:1061

4082 +#: wt-status.c:1066

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

4084 msgstr ""

4085

4091 -#: wt-status.c:1071

4086 +#: wt-status.c:1076

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

4088 msgstr ""

4089

4095 -#: wt-status.c:1074

4090 +#: wt-status.c:1079

4091 msgid "The current patch is empty."

4092 msgstr ""

4093

4099 -#: wt-status.c:1078

4094 +#: wt-status.c:1083

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

4096 msgstr ""

4097

4103 -#: wt-status.c:1080

4098 +#: wt-status.c:1085

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

4100 msgstr ""

4101

4107 -#: wt-status.c:1082

4102 +#: wt-status.c:1087

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

4104 msgstr ""

4105

4111 -#: wt-status.c:1214

4106 +#: wt-status.c:1219

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

4108 msgstr ""

4109

4115 -#: wt-status.c:1216

4110 +#: wt-status.c:1221

4111 msgid "No commands done."

4112 msgstr ""

4113

4119 -#: wt-status.c:1219

4114 +#: wt-status.c:1224

4115 #, c-format

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

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

4118 msgstr[0] ""

4119 msgstr[1] ""

4120

4126 -#: wt-status.c:1230

4121 +#: wt-status.c:1235

4122 #, c-format

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

4124 msgstr ""

4125

4131 -#: wt-status.c:1235

4126 +#: wt-status.c:1240

4127 msgid "No commands remaining."

4128 msgstr ""

4129

4135 -#: wt-status.c:1238

4130 +#: wt-status.c:1243

4131 #, c-format

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

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

4134 msgstr[0] ""

4135 msgstr[1] ""

4136

4142 -#: wt-status.c:1246

4137 +#: wt-status.c:1251

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

4139 msgstr ""

4140

4146 -#: wt-status.c:1259

4141 +#: wt-status.c:1264

4142 #, c-format

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

4144 msgstr ""

4145

4151 -#: wt-status.c:1264

4146 +#: wt-status.c:1269

4147 msgid "You are currently rebasing."

4148 msgstr ""

4149

4155 -#: wt-status.c:1278

4150 +#: wt-status.c:1283

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

4152 msgstr ""

4153

4159 -#: wt-status.c:1280

4154 +#: wt-status.c:1285

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

4156 msgstr ""

4157

4163 -#: wt-status.c:1282

4158 +#: wt-status.c:1287

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

4160 msgstr ""

4161

4167 -#: wt-status.c:1288

4162 +#: wt-status.c:1293

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

4164 msgstr ""

4165

4171 -#: wt-status.c:1292

4166 +#: wt-status.c:1297

4167 #, c-format

4168 msgid ""

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

4170 msgstr ""

4171

4177 -#: wt-status.c:1297

4172 +#: wt-status.c:1302

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

4174 msgstr ""

4175

4181 -#: wt-status.c:1300

4176 +#: wt-status.c:1305

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

4178 msgstr ""

4179

4185 -#: wt-status.c:1304

4180 +#: wt-status.c:1309

4181 #, c-format

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

4183 msgstr ""

4184

4190 -#: wt-status.c:1309

4185 +#: wt-status.c:1314

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

4187 msgstr ""

4188

4194 -#: wt-status.c:1312

4189 +#: wt-status.c:1317

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

4191 msgstr ""

4192

4198 -#: wt-status.c:1314

4193 +#: wt-status.c:1319

4194 msgid ""

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

4196 msgstr ""

4197

4203 -#: wt-status.c:1324

4198 +#: wt-status.c:1329

4199 #, c-format

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

4201 msgstr ""

4202

4208 -#: wt-status.c:1329

4203 +#: wt-status.c:1334

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

4205 msgstr ""

4206

4212 -#: wt-status.c:1332

4207 +#: wt-status.c:1337

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

4209 msgstr ""

4210

4216 -#: wt-status.c:1334

4211 +#: wt-status.c:1339

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

4213 msgstr ""

4214

4220 -#: wt-status.c:1343

4215 +#: wt-status.c:1348

4216 #, c-format

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

4218 msgstr ""

4219

4225 -#: wt-status.c:1348

4220 +#: wt-status.c:1353

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

4222 msgstr ""

4223

4229 -#: wt-status.c:1351

4224 +#: wt-status.c:1356

4225 msgid " (all conflicts fixed: run \"git revert --continue\")"

4226 msgstr ""

4227

4233 -#: wt-status.c:1353

4228 +#: wt-status.c:1358

4229 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4230 msgstr ""

4231

4237 -#: wt-status.c:1364

4232 +#: wt-status.c:1369

4233 #, c-format

4234 msgid "You are currently bisecting, started from branch '%s'."

4235 msgstr ""

4236

4242 -#: wt-status.c:1368

4237 +#: wt-status.c:1373

4238 msgid "You are currently bisecting."

4239 msgstr ""

4240

4246 -#: wt-status.c:1371

4241 +#: wt-status.c:1376

4242 msgid " (use \"git bisect reset\" to get back to the original branch)"

4243 msgstr ""

4244

4250 -#: wt-status.c:1568

4245 +#: wt-status.c:1573

4246 msgid "On branch "

4247 msgstr ""

4248

4254 -#: wt-status.c:1574

4249 +#: wt-status.c:1579

4250 msgid "interactive rebase in progress; onto "

4251 msgstr ""

4252

4258 -#: wt-status.c:1576

4253 +#: wt-status.c:1581

4254 msgid "rebase in progress; onto "

4255 msgstr ""

4256

4262 -#: wt-status.c:1581

4257 +#: wt-status.c:1586

4258 msgid "HEAD detached at "

4259 msgstr ""

4260

4266 -#: wt-status.c:1583

4261 +#: wt-status.c:1588

4262 msgid "HEAD detached from "

4263 msgstr ""

4264

4270 -#: wt-status.c:1586

4265 +#: wt-status.c:1591

4266 msgid "Not currently on any branch."

4267 msgstr ""

4268

4274 -#: wt-status.c:1606

4269 +#: wt-status.c:1611

4270 msgid "Initial commit"

4271 msgstr ""

4272

4278 -#: wt-status.c:1607

4273 +#: wt-status.c:1612

4274 msgid "No commits yet"

4275 msgstr ""

4276

4282 -#: wt-status.c:1621

4277 +#: wt-status.c:1626

4278 msgid "Untracked files"

4279 msgstr ""

4280

4286 -#: wt-status.c:1623

4281 +#: wt-status.c:1628

4282 msgid "Ignored files"

4283 msgstr ""

4284

4290 -#: wt-status.c:1627

4285 +#: wt-status.c:1632

4286 #, c-format

4287 msgid ""

4288 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4295,88 +4290,88 @@ msgid ""

4290 "new files yourself (see 'git help status')."

4291 msgstr ""

4292

4298 -#: wt-status.c:1633

4293 +#: wt-status.c:1638

4294 #, c-format

4295 msgid "Untracked files not listed%s"

4296 msgstr ""

4297

4303 -#: wt-status.c:1635

4298 +#: wt-status.c:1640

4299 msgid " (use -u option to show untracked files)"

4300 msgstr ""

4301

4307 -#: wt-status.c:1641

4302 +#: wt-status.c:1646

4303 msgid "No changes"

4304 msgstr ""

4305

4311 -#: wt-status.c:1646

4306 +#: wt-status.c:1651

4307 #, c-format

4308 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4309 msgstr ""

4310

4316 -#: wt-status.c:1649

4311 +#: wt-status.c:1654

4312 #, c-format

4313 msgid "no changes added to commit\n"

4314 msgstr ""

4315

4321 -#: wt-status.c:1652

4316 +#: wt-status.c:1657

4317 #, c-format

4318 msgid ""

4319 "nothing added to commit but untracked files present (use \"git add\" to "

4320 "track)\n"

4321 msgstr ""

4322

4328 -#: wt-status.c:1655

4323 +#: wt-status.c:1660

4324 #, c-format

4325 msgid "nothing added to commit but untracked files present\n"

4326 msgstr ""

4327

4333 -#: wt-status.c:1658

4328 +#: wt-status.c:1663

4329 #, c-format

4330 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4331 msgstr ""

4332

4338 -#: wt-status.c:1661 wt-status.c:1666

4333 +#: wt-status.c:1666 wt-status.c:1671

4334 #, c-format

4335 msgid "nothing to commit\n"

4336 msgstr ""

4337

4343 -#: wt-status.c:1664

4338 +#: wt-status.c:1669

4339 #, c-format

4340 msgid "nothing to commit (use -u to show untracked files)\n"

4341 msgstr ""

4342

4348 -#: wt-status.c:1668

4343 +#: wt-status.c:1673

4344 #, c-format

4345 msgid "nothing to commit, working tree clean\n"

4346 msgstr ""

4347

4353 -#: wt-status.c:1780

4348 +#: wt-status.c:1785

4349 msgid "No commits yet on "

4350 msgstr ""

4351

4357 -#: wt-status.c:1784

4352 +#: wt-status.c:1789

4353 msgid "HEAD (no branch)"

4354 msgstr ""

4355

4361 -#: wt-status.c:1813 wt-status.c:1821

4356 +#: wt-status.c:1818 wt-status.c:1826

4357 msgid "behind "

4358 msgstr ""

4359

4365 -#: wt-status.c:1816 wt-status.c:1819

4360 +#: wt-status.c:1821 wt-status.c:1824

4361 msgid "ahead "

4362 msgstr ""

4363

4364 #. TRANSLATORS: the action is e.g. "pull with rebase"

4370 -#: wt-status.c:2311

4365 +#: wt-status.c:2318

4366 #, c-format

4367 msgid "cannot %s: You have unstaged changes."

4368 msgstr ""

4369

4375 -#: wt-status.c:2317

4370 +#: wt-status.c:2324

4371 msgid "additionally, your index contains uncommitted changes."

4372 msgstr ""

4373

4379 -#: wt-status.c:2319

4374 +#: wt-status.c:2326

4375 #, c-format

4376 msgid "cannot %s: Your index contains uncommitted changes."

4377 msgstr ""

@@ -4390,122 +4385,126 @@ msgstr ""

4385 msgid "git add [<options>] [--] <pathspec>..."

4386 msgstr ""

4387

4393 -#: builtin/add.c:82

4388 +#: builtin/add.c:83

4389 #, c-format

4390 msgid "unexpected diff status %c"

4391 msgstr ""

4392

4398 -#: builtin/add.c:87 builtin/commit.c:291

4393 +#: builtin/add.c:88 builtin/commit.c:291

4394 msgid "updating files failed"

4395 msgstr ""

4396

4402 -#: builtin/add.c:97

4397 +#: builtin/add.c:98

4398 #, c-format

4399 msgid "remove '%s'\n"

4400 msgstr ""

4401

4407 -#: builtin/add.c:153

4402 +#: builtin/add.c:173

4403 msgid "Unstaged changes after refreshing the index:"

4404 msgstr ""

4405

4411 -#: builtin/add.c:213 builtin/rev-parse.c:888

4406 +#: builtin/add.c:233 builtin/rev-parse.c:888

4407 msgid "Could not read the index"

4408 msgstr ""

4409

4415 -#: builtin/add.c:224

4410 +#: builtin/add.c:244

4411 #, c-format

4412 msgid "Could not open '%s' for writing."

4413 msgstr ""

4414

4420 -#: builtin/add.c:228

4415 +#: builtin/add.c:248

4416 msgid "Could not write patch"

4417 msgstr ""

4418

4424 -#: builtin/add.c:231

4419 +#: builtin/add.c:251

4420 msgid "editing patch failed"

4421 msgstr ""

4422

4428 -#: builtin/add.c:234

4423 +#: builtin/add.c:254

4424 #, c-format

4425 msgid "Could not stat '%s'"

4426 msgstr ""

4427

4433 -#: builtin/add.c:236

4428 +#: builtin/add.c:256

4429 msgid "Empty patch. Aborted."

4430 msgstr ""

4431

4437 -#: builtin/add.c:241

4432 +#: builtin/add.c:261

4433 #, c-format

4434 msgid "Could not apply '%s'"

4435 msgstr ""

4436

4442 -#: builtin/add.c:251

4437 +#: builtin/add.c:271

4438 msgid "The following paths are ignored by one of your .gitignore files:\n"

4439 msgstr ""

4440

4446 -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4447 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4441 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4442 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4443 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4444 msgid "dry run"

4445 msgstr ""

4446

4452 -#: builtin/add.c:274

4447 +#: builtin/add.c:294

4448 msgid "interactive picking"

4449 msgstr ""

4450

4456 -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4451 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4452 msgid "select hunks interactively"

4453 msgstr ""

4454

4460 -#: builtin/add.c:276

4455 +#: builtin/add.c:296

4456 msgid "edit current diff and apply"

4457 msgstr ""

4458

4464 -#: builtin/add.c:277

4459 +#: builtin/add.c:297

4460 msgid "allow adding otherwise ignored files"

4461 msgstr ""

4462

4468 -#: builtin/add.c:278

4463 +#: builtin/add.c:298

4464 msgid "update tracked files"

4465 msgstr ""

4466

4472 -#: builtin/add.c:279

4467 +#: builtin/add.c:299

4468 +msgid "renormalize EOL of tracked files (implies -u)"

4469 +msgstr ""

4470 +

4471 +#: builtin/add.c:300

4472 msgid "record only the fact that the path will be added later"

4473 msgstr ""

4474

4476 -#: builtin/add.c:280

4475 +#: builtin/add.c:301

4476 msgid "add changes from all tracked and untracked files"

4477 msgstr ""

4478

4480 -#: builtin/add.c:283

4479 +#: builtin/add.c:304

4480 msgid "ignore paths removed in the working tree (same as --no-all)"

4481 msgstr ""

4482

4484 -#: builtin/add.c:285

4483 +#: builtin/add.c:306

4484 msgid "don't add, only refresh the index"

4485 msgstr ""

4486

4488 -#: builtin/add.c:286

4487 +#: builtin/add.c:307

4488 msgid "just skip files which cannot be added because of errors"

4489 msgstr ""

4490

4492 -#: builtin/add.c:287

4491 +#: builtin/add.c:308

4492 msgid "check if - even missing - files are ignored in dry run"

4493 msgstr ""

4494

4496 -#: builtin/add.c:288 builtin/update-index.c:954

4495 +#: builtin/add.c:309 builtin/update-index.c:964

4496 msgid "(+/-)x"

4497 msgstr ""

4498

4500 -#: builtin/add.c:288 builtin/update-index.c:955

4499 +#: builtin/add.c:309 builtin/update-index.c:965

4500 msgid "override the executable bit of the listed files"

4501 msgstr ""

4502

4504 -#: builtin/add.c:290

4503 +#: builtin/add.c:311

4504 msgid "warn when adding an embedded repository"

4505 msgstr ""

4506

4508 -#: builtin/add.c:305

4507 +#: builtin/add.c:326

4508 #, c-format

4509 msgid ""

4510 "You've added another git repository inside your current repository.\n"

@@ -4523,47 +4522,47 @@ msgid ""

4522 "See \"git help submodule\" for more information."

4523 msgstr ""

4524

4526 -#: builtin/add.c:333

4525 +#: builtin/add.c:354

4526 #, c-format

4527 msgid "adding embedded git repository: %s"

4528 msgstr ""

4529

4531 -#: builtin/add.c:351

4530 +#: builtin/add.c:372

4531 #, c-format

4532 msgid "Use -f if you really want to add them.\n"

4533 msgstr ""

4534

4536 -#: builtin/add.c:359

4535 +#: builtin/add.c:380

4536 msgid "adding files failed"

4537 msgstr ""

4538

4540 -#: builtin/add.c:396

4539 +#: builtin/add.c:417

4540 msgid "-A and -u are mutually incompatible"

4541 msgstr ""

4542

4544 -#: builtin/add.c:403

4543 +#: builtin/add.c:424

4544 msgid "Option --ignore-missing can only be used together with --dry-run"

4545 msgstr ""

4546

4548 -#: builtin/add.c:407

4547 +#: builtin/add.c:428

4548 #, c-format

4549 msgid "--chmod param '%s' must be either -x or +x"

4550 msgstr ""

4551

4553 -#: builtin/add.c:422

4552 +#: builtin/add.c:443

4553 #, c-format

4554 msgid "Nothing specified, nothing added.\n"

4555 msgstr ""

4556

4558 -#: builtin/add.c:423

4557 +#: builtin/add.c:444

4558 #, c-format

4559 msgid "Maybe you wanted to say 'git add .'?\n"

4560 msgstr ""

4561

4563 -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4564 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4565 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4566 -#: builtin/submodule--helper.c:243

4562 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4563 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4564 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4565 +#: builtin/rm.c:271 builtin/submodule--helper.c:311

4566 msgid "index file corrupt"

4567 msgstr ""

4568

@@ -4590,118 +4589,118 @@ msgstr ""

4589 msgid "fseek failed"

4590 msgstr ""

4591

4593 -#: builtin/am.c:786

4592 +#: builtin/am.c:790

4593 #, c-format

4594 msgid "could not parse patch '%s'"

4595 msgstr ""

4596

4598 -#: builtin/am.c:851

4597 +#: builtin/am.c:855

4598 msgid "Only one StGIT patch series can be applied at once"

4599 msgstr ""

4600

4602 -#: builtin/am.c:899

4601 +#: builtin/am.c:903

4602 msgid "invalid timestamp"

4603 msgstr ""

4604

4606 -#: builtin/am.c:904 builtin/am.c:916

4605 +#: builtin/am.c:908 builtin/am.c:920

4606 msgid "invalid Date line"

4607 msgstr ""

4608

4610 -#: builtin/am.c:911

4609 +#: builtin/am.c:915

4610 msgid "invalid timezone offset"

4611 msgstr ""

4612

4614 -#: builtin/am.c:1004

4613 +#: builtin/am.c:1008

4614 msgid "Patch format detection failed."

4615 msgstr ""

4616

4618 -#: builtin/am.c:1009 builtin/clone.c:402

4617 +#: builtin/am.c:1013 builtin/clone.c:402

4618 #, c-format

4619 msgid "failed to create directory '%s'"

4620 msgstr ""

4621

4623 -#: builtin/am.c:1013

4622 +#: builtin/am.c:1017

4623 msgid "Failed to split patches."

4624 msgstr ""

4625

4627 -#: builtin/am.c:1142 builtin/commit.c:376

4626 +#: builtin/am.c:1146 builtin/commit.c:376

4627 msgid "unable to write index file"

4628 msgstr ""

4629

4631 -#: builtin/am.c:1193

4630 +#: builtin/am.c:1197

4631 #, c-format

4632 msgid "When you have resolved this problem, run \"%s --continue\"."

4633 msgstr ""

4634

4636 -#: builtin/am.c:1194

4635 +#: builtin/am.c:1198

4636 #, c-format

4637 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

4638 msgstr ""

4639

4641 -#: builtin/am.c:1195

4640 +#: builtin/am.c:1199

4641 #, c-format

4642 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

4643 msgstr ""

4644

4646 -#: builtin/am.c:1302

4645 +#: builtin/am.c:1306

4646 msgid "Patch is empty."

4647 msgstr ""

4648

4650 -#: builtin/am.c:1368

4649 +#: builtin/am.c:1372

4650 #, c-format

4651 msgid "invalid ident line: %.*s"

4652 msgstr ""

4653

4655 -#: builtin/am.c:1390

4654 +#: builtin/am.c:1394

4655 #, c-format

4656 msgid "unable to parse commit %s"

4657 msgstr ""

4658

4660 -#: builtin/am.c:1584

4659 +#: builtin/am.c:1587

4660 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

4661 msgstr ""

4662

4664 -#: builtin/am.c:1586

4663 +#: builtin/am.c:1589

4664 msgid "Using index info to reconstruct a base tree..."

4665 msgstr ""

4666

4668 -#: builtin/am.c:1605

4667 +#: builtin/am.c:1608

4668 msgid ""

4669 "Did you hand edit your patch?\n"

4670 "It does not apply to blobs recorded in its index."

4671 msgstr ""

4672

4674 -#: builtin/am.c:1611

4673 +#: builtin/am.c:1614

4674 msgid "Falling back to patching base and 3-way merge..."

4675 msgstr ""

4676

4678 -#: builtin/am.c:1636

4677 +#: builtin/am.c:1639

4678 msgid "Failed to merge in the changes."

4679 msgstr ""

4680

4682 -#: builtin/am.c:1660 builtin/merge.c:641

4681 +#: builtin/am.c:1663 builtin/merge.c:642

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

4683 msgstr ""

4684

4686 -#: builtin/am.c:1667

4685 +#: builtin/am.c:1670

4686 msgid "applying to an empty history"

4687 msgstr ""

4688

4690 -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

4691 -#: builtin/merge.c:849

4689 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

4690 +#: builtin/merge.c:850

4691 msgid "failed to write commit object"

4692 msgstr ""

4693

4695 -#: builtin/am.c:1713 builtin/am.c:1717

4694 +#: builtin/am.c:1716 builtin/am.c:1720

4695 #, c-format

4696 msgid "cannot resume: %s does not exist."

4697 msgstr ""

4698

4700 -#: builtin/am.c:1733

4699 +#: builtin/am.c:1736

4700 msgid "cannot be interactive without stdin connected to a terminal."

4701 msgstr ""

4702

4704 -#: builtin/am.c:1738

4703 +#: builtin/am.c:1741

4704 msgid "Commit Body is:"

4705 msgstr ""

4706

@@ -4709,42 +4708,42 @@ msgstr ""

4708 #. in your translation. The program will only accept English

4709 #. input at this point.

4710 #.

4712 -#: builtin/am.c:1748

4711 +#: builtin/am.c:1751

4712 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

4713 msgstr ""

4714

4716 -#: builtin/am.c:1798

4715 +#: builtin/am.c:1801

4716 #, c-format

4717 msgid "Dirty index: cannot apply patches (dirty: %s)"

4718 msgstr ""

4719

4721 -#: builtin/am.c:1838 builtin/am.c:1910

4720 +#: builtin/am.c:1841 builtin/am.c:1913

4721 #, c-format

4722 msgid "Applying: %.*s"

4723 msgstr ""

4724

4726 -#: builtin/am.c:1854

4725 +#: builtin/am.c:1857

4726 msgid "No changes -- Patch already applied."

4727 msgstr ""

4728

4730 -#: builtin/am.c:1862

4729 +#: builtin/am.c:1865

4730 #, c-format

4731 msgid "Patch failed at %s %.*s"

4732 msgstr ""

4733

4735 -#: builtin/am.c:1868

4734 +#: builtin/am.c:1871

4735 #, c-format

4736 msgid "The copy of the patch that failed is found in: %s"

4737 msgstr ""

4738

4740 -#: builtin/am.c:1913

4739 +#: builtin/am.c:1916

4740 msgid ""

4741 "No changes - did you forget to use 'git add'?\n"

4742 "If there is nothing left to stage, chances are that something else\n"

4743 "already introduced the same changes; you might want to skip this patch."

4744 msgstr ""

4745

4747 -#: builtin/am.c:1920

4746 +#: builtin/am.c:1923

4747 msgid ""

4748 "You still have unmerged paths in your index.\n"

4749 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -4752,171 +4751,171 @@ msgid ""

4751 "You might run `git rm` on a file to accept \"deleted by them\" for it."

4752 msgstr ""

4753

4755 -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

4754 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

4755 #: builtin/reset.c:340

4756 #, c-format

4757 msgid "Could not parse object '%s'."

4758 msgstr ""

4759

4761 -#: builtin/am.c:2081

4760 +#: builtin/am.c:2082

4761 msgid "failed to clean index"

4762 msgstr ""

4763

4765 -#: builtin/am.c:2116

4764 +#: builtin/am.c:2117

4765 msgid ""

4766 "You seem to have moved HEAD since the last 'am' failure.\n"

4767 "Not rewinding to ORIG_HEAD"

4768 msgstr ""

4769

4771 -#: builtin/am.c:2179

4770 +#: builtin/am.c:2180

4771 #, c-format

4772 msgid "Invalid value for --patch-format: %s"

4773 msgstr ""

4774

4776 -#: builtin/am.c:2212

4775 +#: builtin/am.c:2213

4776 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

4777 msgstr ""

4778

4780 -#: builtin/am.c:2213

4779 +#: builtin/am.c:2214

4780 msgid "git am [<options>] (--continue | --skip | --abort)"

4781 msgstr ""

4782

4784 -#: builtin/am.c:2219

4783 +#: builtin/am.c:2220

4784 msgid "run interactively"

4785 msgstr ""

4786

4788 -#: builtin/am.c:2221

4787 +#: builtin/am.c:2222

4788 msgid "historical option -- no-op"

4789 msgstr ""

4790

4792 -#: builtin/am.c:2223

4791 +#: builtin/am.c:2224

4792 msgid "allow fall back on 3way merging if needed"

4793 msgstr ""

4794

4796 -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

4795 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

4796 #: builtin/repack.c:180

4797 msgid "be quiet"

4798 msgstr ""

4799

4801 -#: builtin/am.c:2226

4800 +#: builtin/am.c:2227

4801 msgid "add a Signed-off-by line to the commit message"

4802 msgstr ""

4803

4805 -#: builtin/am.c:2229

4804 +#: builtin/am.c:2230

4805 msgid "recode into utf8 (default)"

4806 msgstr ""

4807

4809 -#: builtin/am.c:2231

4808 +#: builtin/am.c:2232

4809 msgid "pass -k flag to git-mailinfo"

4810 msgstr ""

4811

4813 -#: builtin/am.c:2233

4812 +#: builtin/am.c:2234

4813 msgid "pass -b flag to git-mailinfo"

4814 msgstr ""

4815

4817 -#: builtin/am.c:2235

4816 +#: builtin/am.c:2236

4817 msgid "pass -m flag to git-mailinfo"

4818 msgstr ""

4819

4821 -#: builtin/am.c:2237

4820 +#: builtin/am.c:2238

4821 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

4822 msgstr ""

4823

4825 -#: builtin/am.c:2240

4824 +#: builtin/am.c:2241

4825 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

4826 msgstr ""

4827

4829 -#: builtin/am.c:2243

4828 +#: builtin/am.c:2244

4829 msgid "strip everything before a scissors line"

4830 msgstr ""

4831

4833 -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

4834 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

4835 -#: builtin/am.c:2272

4832 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

4833 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

4834 +#: builtin/am.c:2273

4835 msgid "pass it through git-apply"

4836 msgstr ""

4837

4839 -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

4840 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

4838 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

4839 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

4840 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

4841 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

4842 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4843 msgid "n"

4844 msgstr ""

4845

4847 -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

4846 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

4847 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

4848 msgid "format"

4849 msgstr ""

4850

4852 -#: builtin/am.c:2269

4851 +#: builtin/am.c:2270

4852 msgid "format the patch(es) are in"

4853 msgstr ""

4854

4856 -#: builtin/am.c:2275

4855 +#: builtin/am.c:2276

4856 msgid "override error message when patch failure occurs"

4857 msgstr ""

4858

4860 -#: builtin/am.c:2277

4859 +#: builtin/am.c:2278

4860 msgid "continue applying patches after resolving a conflict"

4861 msgstr ""

4862

4864 -#: builtin/am.c:2280

4863 +#: builtin/am.c:2281

4864 msgid "synonyms for --continue"

4865 msgstr ""

4866

4868 -#: builtin/am.c:2283

4867 +#: builtin/am.c:2284

4868 msgid "skip the current patch"

4869 msgstr ""

4870

4872 -#: builtin/am.c:2286

4871 +#: builtin/am.c:2287

4872 msgid "restore the original branch and abort the patching operation."

4873 msgstr ""

4874

4876 -#: builtin/am.c:2290

4875 +#: builtin/am.c:2291

4876 msgid "lie about committer date"

4877 msgstr ""

4878

4880 -#: builtin/am.c:2292

4879 +#: builtin/am.c:2293

4880 msgid "use current timestamp for author date"

4881 msgstr ""

4882

4884 -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

4885 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

4883 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

4884 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

4885 msgid "key-id"

4886 msgstr ""

4887

4889 -#: builtin/am.c:2295

4888 +#: builtin/am.c:2296

4889 msgid "GPG-sign commits"

4890 msgstr ""

4891

4893 -#: builtin/am.c:2298

4892 +#: builtin/am.c:2299

4893 msgid "(internal use for git-rebase)"

4894 msgstr ""

4895

4897 -#: builtin/am.c:2316

4896 +#: builtin/am.c:2317

4897 msgid ""

4898 "The -b/--binary option has been a no-op for long time, and\n"

4899 "it will be removed. Please do not use it anymore."

4900 msgstr ""

4901

4903 -#: builtin/am.c:2323

4902 +#: builtin/am.c:2324

4903 msgid "failed to read the index"

4904 msgstr ""

4905

4907 -#: builtin/am.c:2338

4906 +#: builtin/am.c:2339

4907 #, c-format

4908 msgid "previous rebase directory %s still exists but mbox given."

4909 msgstr ""

4910

4912 -#: builtin/am.c:2362

4911 +#: builtin/am.c:2363

4912 #, c-format

4913 msgid ""

4914 "Stray %s directory found.\n"

4915 "Use \"git am --abort\" to remove it."

4916 msgstr ""

4917

4919 -#: builtin/am.c:2368

4918 +#: builtin/am.c:2369

4919 msgid "Resolve operation not in progress, we are not resuming."

4920 msgstr ""

4921

@@ -4954,18 +4953,69 @@ msgstr ""

4953 msgid "git archive: expected a flush"

4954 msgstr ""

4955

4957 -#: builtin/bisect--helper.c:7

4956 +#: builtin/bisect--helper.c:12

4957 msgid "git bisect--helper --next-all [--no-checkout]"

4958 msgstr ""

4959

4961 -#: builtin/bisect--helper.c:17

4960 +#: builtin/bisect--helper.c:13

4961 +msgid "git bisect--helper --write-terms <bad_term> <good_term>"

4962 +msgstr ""

4963 +

4964 +#: builtin/bisect--helper.c:14

4965 +msgid "git bisect--helper --bisect-clean-state"

4966 +msgstr ""

4967 +

4968 +#: builtin/bisect--helper.c:46

4969 +#, c-format

4970 +msgid "'%s' is not a valid term"

4971 +msgstr ""

4972 +

4973 +#: builtin/bisect--helper.c:50

4974 +#, c-format

4975 +msgid "can't use the builtin command '%s' as a term"

4976 +msgstr ""

4977 +

4978 +#: builtin/bisect--helper.c:60

4979 +#, c-format

4980 +msgid "can't change the meaning of the term '%s'"

4981 +msgstr ""

4982 +

4983 +#: builtin/bisect--helper.c:71

4984 +msgid "please use two different terms"

4985 +msgstr ""

4986 +

4987 +#: builtin/bisect--helper.c:78

4988 +msgid "could not open the file BISECT_TERMS"

4989 +msgstr ""

4990 +

4991 +#: builtin/bisect--helper.c:120

4992 msgid "perform 'git bisect next'"

4993 msgstr ""

4994

4965 -#: builtin/bisect--helper.c:19

4995 +#: builtin/bisect--helper.c:122

4996 +msgid "write the terms to .git/BISECT_TERMS"

4997 +msgstr ""

4998 +

4999 +#: builtin/bisect--helper.c:124

5000 +msgid "cleanup the bisection state"

5001 +msgstr ""

5002 +

5003 +#: builtin/bisect--helper.c:126

5004 +msgid "check for expected revs"

5005 +msgstr ""

5006 +

5007 +#: builtin/bisect--helper.c:128

5008 msgid "update BISECT_HEAD instead of checking out the current commit"

5009 msgstr ""

5010

5011 +#: builtin/bisect--helper.c:143

5012 +msgid "--write-terms requires two arguments"

5013 +msgstr ""

5014 +

5015 +#: builtin/bisect--helper.c:147

5016 +msgid "--bisect-clean-state requires no arguments"

5017 +msgstr ""

5018 +

5019 #: builtin/blame.c:27

5020 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5021 msgstr ""

@@ -5216,51 +5266,51 @@ msgstr ""

5266 msgid "Branch %s is being bisected at %s"

5267 msgstr ""

5268

5219 -#: builtin/branch.c:470

5269 +#: builtin/branch.c:471

5270 msgid "cannot copy the current branch while not on any."

5271 msgstr ""

5272

5223 -#: builtin/branch.c:472

5273 +#: builtin/branch.c:473

5274 msgid "cannot rename the current branch while not on any."

5275 msgstr ""

5276

5227 -#: builtin/branch.c:483

5277 +#: builtin/branch.c:484

5278 #, c-format

5279 msgid "Invalid branch name: '%s'"

5280 msgstr ""

5281

5232 -#: builtin/branch.c:504

5282 +#: builtin/branch.c:511

5283 msgid "Branch rename failed"

5284 msgstr ""

5285

5236 -#: builtin/branch.c:506

5286 +#: builtin/branch.c:513

5287 msgid "Branch copy failed"

5288 msgstr ""

5289

5240 -#: builtin/branch.c:510

5290 +#: builtin/branch.c:517

5291 #, c-format

5242 -msgid "Copied a misnamed branch '%s' away"

5292 +msgid "Created a copy of a misnamed branch '%s'"

5293 msgstr ""

5294

5245 -#: builtin/branch.c:513

5295 +#: builtin/branch.c:520

5296 #, c-format

5297 msgid "Renamed a misnamed branch '%s' away"

5298 msgstr ""

5299

5250 -#: builtin/branch.c:519

5300 +#: builtin/branch.c:526

5301 #, c-format

5302 msgid "Branch renamed to %s, but HEAD is not updated!"

5303 msgstr ""

5304

5255 -#: builtin/branch.c:528

5305 +#: builtin/branch.c:535

5306 msgid "Branch is renamed, but update of config-file failed"

5307 msgstr ""

5308

5259 -#: builtin/branch.c:530

5309 +#: builtin/branch.c:537

5310 msgid "Branch is copied, but update of config-file failed"

5311 msgstr ""

5312

5263 -#: builtin/branch.c:546

5313 +#: builtin/branch.c:553

5314 #, c-format

5315 msgid ""

5316 "Please edit the description for the branch\n"

@@ -5268,221 +5318,217 @@ msgid ""

5318 "Lines starting with '%c' will be stripped.\n"

5319 msgstr ""

5320

5271 -#: builtin/branch.c:579

5321 +#: builtin/branch.c:586

5322 msgid "Generic options"

5323 msgstr ""

5324

5275 -#: builtin/branch.c:581

5325 +#: builtin/branch.c:588

5326 msgid "show hash and subject, give twice for upstream branch"

5327 msgstr ""

5328

5279 -#: builtin/branch.c:582

5329 +#: builtin/branch.c:589

5330 msgid "suppress informational messages"

5331 msgstr ""

5332

5283 -#: builtin/branch.c:583

5333 +#: builtin/branch.c:590

5334 msgid "set up tracking mode (see git-pull(1))"

5335 msgstr ""

5336

5287 -#: builtin/branch.c:585

5337 +#: builtin/branch.c:592

5338 msgid "do not use"

5339 msgstr ""

5340

5291 -#: builtin/branch.c:587

5341 +#: builtin/branch.c:594

5342 msgid "upstream"

5343 msgstr ""

5344

5295 -#: builtin/branch.c:587

5345 +#: builtin/branch.c:594

5346 msgid "change the upstream info"

5347 msgstr ""

5348

5299 -#: builtin/branch.c:588

5349 +#: builtin/branch.c:595

5350 msgid "Unset the upstream info"

5351 msgstr ""

5352

5303 -#: builtin/branch.c:589

5353 +#: builtin/branch.c:596

5354 msgid "use colored output"

5355 msgstr ""

5356

5307 -#: builtin/branch.c:590

5357 +#: builtin/branch.c:597

5358 msgid "act on remote-tracking branches"

5359 msgstr ""

5360

5311 -#: builtin/branch.c:592 builtin/branch.c:594

5361 +#: builtin/branch.c:599 builtin/branch.c:601

5362 msgid "print only branches that contain the commit"

5363 msgstr ""

5364

5315 -#: builtin/branch.c:593 builtin/branch.c:595

5365 +#: builtin/branch.c:600 builtin/branch.c:602

5366 msgid "print only branches that don't contain the commit"

5367 msgstr ""

5368

5319 -#: builtin/branch.c:598

5369 +#: builtin/branch.c:605

5370 msgid "Specific git-branch actions:"

5371 msgstr ""

5372

5323 -#: builtin/branch.c:599

5373 +#: builtin/branch.c:606

5374 msgid "list both remote-tracking and local branches"

5375 msgstr ""

5376

5327 -#: builtin/branch.c:601

5377 +#: builtin/branch.c:608

5378 msgid "delete fully merged branch"

5379 msgstr ""

5380

5331 -#: builtin/branch.c:602

5381 +#: builtin/branch.c:609

5382 msgid "delete branch (even if not merged)"

5383 msgstr ""

5384

5335 -#: builtin/branch.c:603

5385 +#: builtin/branch.c:610

5386 msgid "move/rename a branch and its reflog"

5387 msgstr ""

5388

5339 -#: builtin/branch.c:604

5389 +#: builtin/branch.c:611

5390 msgid "move/rename a branch, even if target exists"

5391 msgstr ""

5392

5343 -#: builtin/branch.c:605

5393 +#: builtin/branch.c:612

5394 msgid "copy a branch and its reflog"

5395 msgstr ""

5396

5347 -#: builtin/branch.c:606

5397 +#: builtin/branch.c:613

5398 msgid "copy a branch, even if target exists"

5399 msgstr ""

5400

5351 -#: builtin/branch.c:607

5401 +#: builtin/branch.c:614

5402 msgid "list branch names"

5403 msgstr ""

5404

5355 -#: builtin/branch.c:608

5405 +#: builtin/branch.c:615

5406 msgid "create the branch's reflog"

5407 msgstr ""

5408

5359 -#: builtin/branch.c:610

5409 +#: builtin/branch.c:617

5410 msgid "edit the description for the branch"

5411 msgstr ""

5412

5363 -#: builtin/branch.c:611

5413 +#: builtin/branch.c:618

5414 msgid "force creation, move/rename, deletion"

5415 msgstr ""

5416

5367 -#: builtin/branch.c:612

5417 +#: builtin/branch.c:619

5418 msgid "print only branches that are merged"

5419 msgstr ""

5420

5371 -#: builtin/branch.c:613

5421 +#: builtin/branch.c:620

5422 msgid "print only branches that are not merged"

5423 msgstr ""

5424

5375 -#: builtin/branch.c:614

5425 +#: builtin/branch.c:621

5426 msgid "list branches in columns"

5427 msgstr ""

5428

5379 -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405

5429 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5430 msgid "key"

5431 msgstr ""

5432

5383 -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406

5433 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5434 msgid "field name to sort on"

5435 msgstr ""

5436

5387 -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408

5437 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5438 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5439 #: builtin/tag.c:408

5440 msgid "object"

5441 msgstr ""

5442

5393 -#: builtin/branch.c:619

5443 +#: builtin/branch.c:626

5444 msgid "print only branches of the object"

5445 msgstr ""

5446

5397 -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415

5447 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

5448 msgid "sorting and filtering are case insensitive"

5449 msgstr ""

5450

5401 -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413

5451 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

5452 #: builtin/verify-tag.c:39

5453 msgid "format to use for the output"

5454 msgstr ""

5455

5406 -#: builtin/branch.c:645 builtin/clone.c:729

5456 +#: builtin/branch.c:652 builtin/clone.c:730

5457 msgid "HEAD not found below refs/heads!"

5458 msgstr ""

5459

5410 -#: builtin/branch.c:668

5460 +#: builtin/branch.c:675

5461 msgid "--column and --verbose are incompatible"

5462 msgstr ""

5463

5414 -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741

5464 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

5465 msgid "branch name required"

5466 msgstr ""

5467

5418 -#: builtin/branch.c:708

5468 +#: builtin/branch.c:718

5469 msgid "Cannot give description to detached HEAD"

5470 msgstr ""

5471

5422 -#: builtin/branch.c:713

5472 +#: builtin/branch.c:723

5473 msgid "cannot edit description of more than one branch"

5474 msgstr ""

5475

5426 -#: builtin/branch.c:720

5476 +#: builtin/branch.c:730

5477 #, c-format

5478 msgid "No commit on branch '%s' yet."

5479 msgstr ""

5480

5431 -#: builtin/branch.c:723

5481 +#: builtin/branch.c:733

5482 #, c-format

5483 msgid "No branch named '%s'."

5484 msgstr ""

5485

5436 -#: builtin/branch.c:738

5486 +#: builtin/branch.c:748

5487 msgid "too many branches for a copy operation"

5488 msgstr ""

5489

5440 -#: builtin/branch.c:747

5490 +#: builtin/branch.c:757

5491 msgid "too many arguments for a rename operation"

5492 msgstr ""

5493

5444 -#: builtin/branch.c:752

5494 +#: builtin/branch.c:762

5495 msgid "too many arguments to set new upstream"

5496 msgstr ""

5497

5448 -#: builtin/branch.c:756

5498 +#: builtin/branch.c:766

5499 #, c-format

5500 msgid ""

5501 "could not set upstream of HEAD to %s when it does not point to any branch."

5502 msgstr ""

5503

5454 -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800

5504 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

5505 #, c-format

5506 msgid "no such branch '%s'"

5507 msgstr ""

5508

5459 -#: builtin/branch.c:763

5509 +#: builtin/branch.c:773

5510 #, c-format

5511 msgid "branch '%s' does not exist"

5512 msgstr ""

5513

5464 -#: builtin/branch.c:775

5514 +#: builtin/branch.c:785

5515 msgid "too many arguments to unset upstream"

5516 msgstr ""

5517

5468 -#: builtin/branch.c:779

5518 +#: builtin/branch.c:789

5519 msgid "could not unset upstream of HEAD when it does not point to any branch."

5520 msgstr ""

5521

5472 -#: builtin/branch.c:785

5522 +#: builtin/branch.c:795

5523 #, c-format

5524 msgid "Branch '%s' has no upstream information"

5525 msgstr ""

5526

5477 -#: builtin/branch.c:797

5478 -msgid "it does not make sense to create 'HEAD' manually"

5479 -msgstr ""

5480 -

5481 -#: builtin/branch.c:803

5527 +#: builtin/branch.c:810

5528 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5529 msgstr ""

5530

5485 -#: builtin/branch.c:806

5531 +#: builtin/branch.c:813

5532 msgid ""

5533 "the '--set-upstream' option is no longer supported. Please use '--track' or "

5534 "'--set-upstream-to' instead."

@@ -5541,7 +5587,7 @@ msgstr ""

5587 msgid "for blob objects, run filters on object's content"

5588 msgstr ""

5589

5544 -#: builtin/cat-file.c:569 git-submodule.sh:943

5590 +#: builtin/cat-file.c:569 git-submodule.sh:931

5591 msgid "blob"

5592 msgstr ""

5593

@@ -5597,7 +5643,7 @@ msgstr ""

5643 msgid "terminate input and output records by a NUL character"

5644 msgstr ""

5645

5600 -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358

5646 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

5647 msgid "suppress progress reporting"

5648 msgstr ""

5649

@@ -5654,160 +5700,160 @@ msgstr ""

5700 msgid "git checkout-index [<options>] [--] [<file>...]"

5701 msgstr ""

5702

5657 -#: builtin/checkout-index.c:145

5703 +#: builtin/checkout-index.c:143

5704 msgid "stage should be between 1 and 3 or all"

5705 msgstr ""

5706

5661 -#: builtin/checkout-index.c:161

5707 +#: builtin/checkout-index.c:159

5708 msgid "check out all files in the index"

5709 msgstr ""

5710

5665 -#: builtin/checkout-index.c:162

5711 +#: builtin/checkout-index.c:160

5712 msgid "force overwrite of existing files"

5713 msgstr ""

5714

5669 -#: builtin/checkout-index.c:164

5715 +#: builtin/checkout-index.c:162

5716 msgid "no warning for existing files and files not in index"

5717 msgstr ""

5718

5673 -#: builtin/checkout-index.c:166

5719 +#: builtin/checkout-index.c:164

5720 msgid "don't checkout new files"

5721 msgstr ""

5722

5677 -#: builtin/checkout-index.c:168

5723 +#: builtin/checkout-index.c:166

5724 msgid "update stat information in the index file"

5725 msgstr ""

5726

5681 -#: builtin/checkout-index.c:172

5727 +#: builtin/checkout-index.c:170

5728 msgid "read list of paths from the standard input"

5729 msgstr ""

5730

5685 -#: builtin/checkout-index.c:174

5731 +#: builtin/checkout-index.c:172

5732 msgid "write the content to temporary files"

5733 msgstr ""

5734

5689 -#: builtin/checkout-index.c:175 builtin/column.c:31

5690 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631

5691 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999

5692 -#: builtin/worktree.c:498

5735 +#: builtin/checkout-index.c:173 builtin/column.c:31

5736 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

5737 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

5738 +#: builtin/worktree.c:552

5739 msgid "string"

5740 msgstr ""

5741

5696 -#: builtin/checkout-index.c:176

5742 +#: builtin/checkout-index.c:174

5743 msgid "when creating files, prepend <string>"

5744 msgstr ""

5745

5700 -#: builtin/checkout-index.c:178

5746 +#: builtin/checkout-index.c:176

5747 msgid "copy out the files from named stage"

5748 msgstr ""

5749

5704 -#: builtin/checkout.c:26

5750 +#: builtin/checkout.c:27

5751 msgid "git checkout [<options>] <branch>"

5752 msgstr ""

5753

5708 -#: builtin/checkout.c:27

5754 +#: builtin/checkout.c:28

5755 msgid "git checkout [<options>] [<branch>] -- <file>..."

5756 msgstr ""

5757

5712 -#: builtin/checkout.c:135 builtin/checkout.c:168

5758 +#: builtin/checkout.c:136 builtin/checkout.c:169

5759 #, c-format

5760 msgid "path '%s' does not have our version"

5761 msgstr ""

5762

5717 -#: builtin/checkout.c:137 builtin/checkout.c:170

5763 +#: builtin/checkout.c:138 builtin/checkout.c:171

5764 #, c-format

5765 msgid "path '%s' does not have their version"

5766 msgstr ""

5767

5722 -#: builtin/checkout.c:153

5768 +#: builtin/checkout.c:154

5769 #, c-format

5770 msgid "path '%s' does not have all necessary versions"

5771 msgstr ""

5772

5727 -#: builtin/checkout.c:197

5773 +#: builtin/checkout.c:198

5774 #, c-format

5775 msgid "path '%s' does not have necessary versions"

5776 msgstr ""

5777

5732 -#: builtin/checkout.c:214

5778 +#: builtin/checkout.c:215

5779 #, c-format

5780 msgid "path '%s': cannot merge"

5781 msgstr ""

5782

5737 -#: builtin/checkout.c:231

5783 +#: builtin/checkout.c:232

5784 #, c-format

5785 msgid "Unable to add merge result for '%s'"

5786 msgstr ""

5787

5742 -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

5743 -#: builtin/checkout.c:262

5788 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

5789 +#: builtin/checkout.c:263

5790 #, c-format

5791 msgid "'%s' cannot be used with updating paths"

5792 msgstr ""

5793

5748 -#: builtin/checkout.c:265 builtin/checkout.c:268

5794 +#: builtin/checkout.c:266 builtin/checkout.c:269

5795 #, c-format

5796 msgid "'%s' cannot be used with %s"

5797 msgstr ""

5798

5753 -#: builtin/checkout.c:271

5799 +#: builtin/checkout.c:272

5800 #, c-format

5801 msgid "Cannot update paths and switch to branch '%s' at the same time."

5802 msgstr ""

5803

5758 -#: builtin/checkout.c:342 builtin/checkout.c:349

5804 +#: builtin/checkout.c:341 builtin/checkout.c:348

5805 #, c-format

5806 msgid "path '%s' is unmerged"

5807 msgstr ""

5808

5763 -#: builtin/checkout.c:501

5809 +#: builtin/checkout.c:506

5810 msgid "you need to resolve your current index first"

5811 msgstr ""

5812

5767 -#: builtin/checkout.c:632

5813 +#: builtin/checkout.c:637

5814 #, c-format

5815 msgid "Can not do reflog for '%s': %s\n"

5816 msgstr ""

5817

5772 -#: builtin/checkout.c:673

5818 +#: builtin/checkout.c:678

5819 msgid "HEAD is now at"

5820 msgstr ""

5821

5776 -#: builtin/checkout.c:677 builtin/clone.c:683

5822 +#: builtin/checkout.c:682 builtin/clone.c:684

5823 msgid "unable to update HEAD"

5824 msgstr ""

5825

5780 -#: builtin/checkout.c:681

5826 +#: builtin/checkout.c:686

5827 #, c-format

5828 msgid "Reset branch '%s'\n"

5829 msgstr ""

5830

5785 -#: builtin/checkout.c:684

5831 +#: builtin/checkout.c:689

5832 #, c-format

5833 msgid "Already on '%s'\n"

5834 msgstr ""

5835

5790 -#: builtin/checkout.c:688

5836 +#: builtin/checkout.c:693

5837 #, c-format

5838 msgid "Switched to and reset branch '%s'\n"

5839 msgstr ""

5840

5795 -#: builtin/checkout.c:690 builtin/checkout.c:1086

5841 +#: builtin/checkout.c:695 builtin/checkout.c:1051

5842 #, c-format

5843 msgid "Switched to a new branch '%s'\n"

5844 msgstr ""

5845

5800 -#: builtin/checkout.c:692

5846 +#: builtin/checkout.c:697

5847 #, c-format

5848 msgid "Switched to branch '%s'\n"

5849 msgstr ""

5850

5805 -#: builtin/checkout.c:743

5851 +#: builtin/checkout.c:748

5852 #, c-format

5853 msgid " ... and %d more.\n"

5854 msgstr ""

5855

5810 -#: builtin/checkout.c:749

5856 +#: builtin/checkout.c:754

5857 #, c-format

5858 msgid ""

5859 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5822,7 +5868,7 @@ msgid_plural ""

5868 msgstr[0] ""

5869 msgstr[1] ""

5870

5825 -#: builtin/checkout.c:768

5871 +#: builtin/checkout.c:773

5872 #, c-format

5873 msgid ""

5874 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5839,160 +5885,160 @@ msgid_plural ""

5885 msgstr[0] ""

5886 msgstr[1] ""

5887

5842 -#: builtin/checkout.c:809

5888 +#: builtin/checkout.c:814

5889 msgid "internal error in revision walk"

5890 msgstr ""

5891

5846 -#: builtin/checkout.c:813

5892 +#: builtin/checkout.c:818

5893 msgid "Previous HEAD position was"

5894 msgstr ""

5895

5850 -#: builtin/checkout.c:843 builtin/checkout.c:1081

5896 +#: builtin/checkout.c:848 builtin/checkout.c:1046

5897 msgid "You are on a branch yet to be born"

5898 msgstr ""

5899

5854 -#: builtin/checkout.c:987

5900 +#: builtin/checkout.c:952

5901 #, c-format

5902 msgid "only one reference expected, %d given."

5903 msgstr ""

5904

l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)