25eab542b1 · 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-07-24 21:54+0800\n"

11 +"POT-Creation-Date: 2017-10-08 09:48+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"

@@ -58,7 +58,7 @@ msgstr ""

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

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

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

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

63 msgstr ""

64

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

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

97 msgstr ""

98

99 -#: apply.c:126

99 +#: apply.c:125

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

101 msgstr ""

102

103 -#: apply.c:128

103 +#: apply.c:127

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

105 msgstr ""

106

107 -#: apply.c:131

107 +#: apply.c:130

108 msgid "--3way outside a repository"

109 msgstr ""

110

111 -#: apply.c:142

111 +#: apply.c:141

112 msgid "--index outside a repository"

113 msgstr ""

114

115 -#: apply.c:145

115 +#: apply.c:144

116 msgid "--cached outside a repository"

117 msgstr ""

118

119 -#: apply.c:836

119 +#: apply.c:845

120 #, c-format

121 msgid "Cannot prepare timestamp regexp %s"

122 msgstr ""

123

124 -#: apply.c:845

124 +#: apply.c:854

125 #, c-format

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

127 msgstr ""

128

129 -#: apply.c:929

129 +#: apply.c:928

130 #, c-format

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

132 msgstr ""

133

134 -#: apply.c:967

134 +#: apply.c:966

135 #, c-format

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

137 msgstr ""

138

139 -#: apply.c:973

139 +#: apply.c:972

140 #, c-format

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

142 msgstr ""

143

144 -#: apply.c:974

144 +#: apply.c:973

145 #, c-format

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

147 msgstr ""

148

149 -#: apply.c:979

149 +#: apply.c:978

150 #, c-format

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

152 msgstr ""

153

154 -#: apply.c:1008

154 +#: apply.c:1007

155 #, c-format

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

157 msgstr ""

158

159 -#: apply.c:1326

159 +#: apply.c:1325

160 #, c-format

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

162 msgstr ""

163

164 -#: apply.c:1498

164 +#: apply.c:1497

165 #, c-format

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

167 msgstr ""

168

169 -#: apply.c:1567

169 +#: apply.c:1566

170 #, c-format

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

172 msgstr ""

173

174 -#: apply.c:1587

174 +#: apply.c:1586

175 #, c-format

176 msgid ""

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

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

182 msgstr[0] ""

183 msgstr[1] ""

184

185 -#: apply.c:1600

185 +#: apply.c:1599

186 #, c-format

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

188 msgstr ""

189

190 -#: apply.c:1770

190 +#: apply.c:1787

191 msgid "new file depends on old contents"

192 msgstr ""

193

194 -#: apply.c:1772

194 +#: apply.c:1789

195 msgid "deleted file still has contents"

196 msgstr ""

197

198 -#: apply.c:1806

198 +#: apply.c:1823

199 #, c-format

200 msgid "corrupt patch at line %d"

201 msgstr ""

202

203 -#: apply.c:1843

203 +#: apply.c:1860

204 #, c-format

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

206 msgstr ""

207

208 -#: apply.c:1845

208 +#: apply.c:1862

209 #, c-format

210 msgid "deleted file %s still has contents"

211 msgstr ""

212

213 -#: apply.c:1848

213 +#: apply.c:1865

214 #, c-format

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

216 msgstr ""

217

218 -#: apply.c:1995

218 +#: apply.c:2012

219 #, c-format

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

221 msgstr ""

222

223 -#: apply.c:2032

223 +#: apply.c:2049

224 #, c-format

225 msgid "unrecognized binary patch at line %d"

226 msgstr ""

227

228 -#: apply.c:2193

228 +#: apply.c:2209

229 #, c-format

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

231 msgstr ""

232

233 -#: apply.c:2276

233 +#: apply.c:2295

234 #, c-format

235 msgid "unable to read symlink %s"

236 msgstr ""

237

238 -#: apply.c:2280

238 +#: apply.c:2299

239 #, c-format

240 msgid "unable to open or read %s"

241 msgstr ""

242

243 -#: apply.c:2933

243 +#: apply.c:2958

244 #, c-format

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

246 msgstr ""

247

248 -#: apply.c:3052

248 +#: apply.c:3077

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

255 +#: apply.c:3089

256 #, c-format

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

258 msgstr ""

259

260 -#: apply.c:3070

260 +#: apply.c:3095

261 #, c-format

262 msgid ""

263 "while searching for:\n"

264 "%.*s"

265 msgstr ""

266

267 -#: apply.c:3092

267 +#: apply.c:3117

268 #, c-format

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

270 msgstr ""

271

272 -#: apply.c:3100

272 +#: apply.c:3125

273 #, c-format

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

275 msgstr ""

276

277 -#: apply.c:3146

277 +#: apply.c:3171

278 #, c-format

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

280 msgstr ""

281

282 -#: apply.c:3156

282 +#: apply.c:3181

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

288 +#: apply.c:3189

289 #, c-format

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

291 msgstr ""

292

293 -#: apply.c:3182

293 +#: apply.c:3207

294 #, c-format

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

296 msgstr ""

297

298 -#: apply.c:3195

298 +#: apply.c:3220

299 #, c-format

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

301 msgstr ""

302

303 -#: apply.c:3201

303 +#: apply.c:3226

304 #, c-format

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

306 msgstr ""

307

308 -#: apply.c:3222

308 +#: apply.c:3247

309 #, c-format

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

311 msgstr ""

312

313 -#: apply.c:3344

313 +#: apply.c:3369

314 #, c-format

315 msgid "cannot checkout %s"

316 msgstr ""

317

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

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

319 #, c-format

320 msgid "failed to read %s"

321 msgstr ""

322

323 -#: apply.c:3400

323 +#: apply.c:3426

324 #, c-format

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

326 msgstr ""

327

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

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

329 #, c-format

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

331 msgstr ""

332

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

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

334 #, c-format

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

336 msgstr ""

337

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

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

339 #, c-format

340 msgid "%s: does not match index"

341 msgstr ""

342

343 -#: apply.c:3556

343 +#: apply.c:3582

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

345 msgstr ""

346

347 -#: apply.c:3559

347 +#: apply.c:3585

348 #, c-format

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

350 msgstr ""

351

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

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

353 #, c-format

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

355 msgstr ""

356

357 -#: apply.c:3591

357 +#: apply.c:3617

358 #, c-format

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

360 msgstr ""

361

362 -#: apply.c:3605

362 +#: apply.c:3631

363 #, c-format

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

365 msgstr ""

366

367 -#: apply.c:3610

367 +#: apply.c:3636

368 #, c-format

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

370 msgstr ""

371

372 -#: apply.c:3636

372 +#: apply.c:3662

373 msgid "removal patch leaves file contents"

374 msgstr ""

375

376 -#: apply.c:3708

376 +#: apply.c:3734

377 #, c-format

378 msgid "%s: wrong type"

379 msgstr ""

380

381 -#: apply.c:3710

381 +#: apply.c:3736

382 #, c-format

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

384 msgstr ""

385

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

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

387 #, c-format

388 msgid "invalid path '%s'"

389 msgstr ""

390

391 -#: apply.c:3918

391 +#: apply.c:3944

392 #, c-format

393 msgid "%s: already exists in index"

394 msgstr ""

395

396 -#: apply.c:3921

396 +#: apply.c:3947

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3941

401 +#: apply.c:3967

402 #, c-format

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

404 msgstr ""

405

406 -#: apply.c:3946

406 +#: apply.c:3972

407 #, c-format

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

409 msgstr ""

410

411 -#: apply.c:3966

411 +#: apply.c:3992

412 #, c-format

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

414 msgstr ""

415

416 -#: apply.c:3970

416 +#: apply.c:3996

417 #, c-format

418 msgid "%s: patch does not apply"

419 msgstr ""

420

421 -#: apply.c:3985

421 +#: apply.c:4011

422 #, c-format

423 msgid "Checking patch %s..."

424 msgstr ""

425

426 -#: apply.c:4076

426 +#: apply.c:4102

427 #, c-format

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

429 msgstr ""

430

431 -#: apply.c:4083

431 +#: apply.c:4109

432 #, c-format

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

434 msgstr ""

435

436 -#: apply.c:4086

436 +#: apply.c:4112

437 #, c-format

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

439 msgstr ""

440

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

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

442 #, c-format

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

444 msgstr ""

445

446 -#: apply.c:4095

446 +#: apply.c:4121

447 #, c-format

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

449 msgstr ""

450

451 -#: apply.c:4105

451 +#: apply.c:4131

452 #, c-format

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

454 msgstr ""

455

456 -#: apply.c:4243

456 +#: apply.c:4269

457 #, c-format

458 msgid "unable to remove %s from index"

459 msgstr ""

460

461 -#: apply.c:4278

461 +#: apply.c:4304

462 #, c-format

463 msgid "corrupt patch for submodule %s"

464 msgstr ""

465

466 -#: apply.c:4284

466 +#: apply.c:4310

467 #, c-format

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

469 msgstr ""

470

471 -#: apply.c:4292

471 +#: apply.c:4318

472 #, c-format

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

474 msgstr ""

475

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

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

477 #, c-format

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

479 msgstr ""

480

481 -#: apply.c:4339

481 +#: apply.c:4365

482 #, c-format

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

484 msgstr ""

485

486 -#: apply.c:4343

486 +#: apply.c:4369

487 #, c-format

488 msgid "closing file '%s'"

489 msgstr ""

490

491 -#: apply.c:4413

491 +#: apply.c:4439

492 #, c-format

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

494 msgstr ""

495

496 -#: apply.c:4511

496 +#: apply.c:4537

497 #, c-format

498 msgid "Applied patch %s cleanly."

499 msgstr ""

500

501 -#: apply.c:4519

501 +#: apply.c:4545

502 msgid "internal error"

503 msgstr ""

504

505 -#: apply.c:4522

505 +#: apply.c:4548

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

512 +#: apply.c:4559

513 #, c-format

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

515 msgstr ""

516

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

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

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

521

522 -#: apply.c:4555

522 +#: apply.c:4581

523 #, c-format

524 msgid "Hunk #%d applied cleanly."

525 msgstr ""

526

527 -#: apply.c:4559

527 +#: apply.c:4585

528 #, c-format

529 msgid "Rejected hunk #%d."

530 msgstr ""

531

532 -#: apply.c:4669

532 +#: apply.c:4695

533 #, c-format

534 msgid "Skipped patch '%s'."

535 msgstr ""

536

537 -#: apply.c:4677

537 +#: apply.c:4703

538 msgid "unrecognized input"

539 msgstr ""

540

541 -#: apply.c:4696

541 +#: apply.c:4722

542 msgid "unable to read index file"

543 msgstr ""

544

545 -#: apply.c:4833

545 +#: apply.c:4859

546 #, c-format

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

548 msgstr ""

549

550 -#: apply.c:4860

550 +#: apply.c:4886

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:4866 apply.c:4881

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

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

564 +#: apply.c:4900

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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

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

572 msgid "Unable to write new index file"

573 msgstr ""

574

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

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

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

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

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

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

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

581 msgid "path"

582 msgstr ""

583

584 -#: apply.c:4922

584 +#: apply.c:4948

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

586 msgstr ""

587

588 -#: apply.c:4925

588 +#: apply.c:4951

589 msgid "apply changes matching the given path"

590 msgstr ""

591

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

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

593 msgid "num"

594 msgstr ""

595

596 -#: apply.c:4928

596 +#: apply.c:4954

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

598 msgstr ""

599

600 -#: apply.c:4931

600 +#: apply.c:4957

601 msgid "ignore additions made by the patch"

602 msgstr ""

603

604 -#: apply.c:4933

604 +#: apply.c:4959

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

606 msgstr ""

607

608 -#: apply.c:4937

608 +#: apply.c:4963

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

610 msgstr ""

611

612 -#: apply.c:4939

612 +#: apply.c:4965

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

614 msgstr ""

615

616 -#: apply.c:4941

616 +#: apply.c:4967

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

618 msgstr ""

619

620 -#: apply.c:4943

620 +#: apply.c:4969

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

622 msgstr ""

623

624 -#: apply.c:4945

624 +#: apply.c:4971

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

626 msgstr ""

627

628 -#: apply.c:4947

628 +#: apply.c:4973

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

630 msgstr ""

631

632 -#: apply.c:4949

632 +#: apply.c:4975

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

634 msgstr ""

635

636 -#: apply.c:4951

636 +#: apply.c:4977

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

638 msgstr ""

639

640 -#: apply.c:4953

640 +#: apply.c:4979

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

642 msgstr ""

643

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

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

645 msgid "paths are separated with NUL character"

646 msgstr ""

647

648 -#: apply.c:4958

648 +#: apply.c:4984

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

650 msgstr ""

651

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

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

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

654 msgid "action"

655 msgstr ""

656

656 -#: apply.c:4960

657 +#: apply.c:4986

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

659 msgstr ""

660

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

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

662 msgid "ignore changes in whitespace when finding context"

663 msgstr ""

664

664 -#: apply.c:4969

665 +#: apply.c:4995

666 msgid "apply the patch in reverse"

667 msgstr ""

668

668 -#: apply.c:4971

669 +#: apply.c:4997

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

671 msgstr ""

672

672 -#: apply.c:4973

673 +#: apply.c:4999

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

675 msgstr ""

676

676 -#: apply.c:4975

677 +#: apply.c:5001

678 msgid "allow overlapping hunks"

679 msgstr ""

680

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

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

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

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

684 msgid "be verbose"

685 msgstr ""

686

686 -#: apply.c:4978

687 +#: apply.c:5004

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

689 msgstr ""

690

690 -#: apply.c:4981

691 +#: apply.c:5007

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

693 msgstr ""

694

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

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

696 msgid "root"

697 msgstr ""

698

698 -#: apply.c:4984

699 +#: apply.c:5010

700 msgid "prepend <root> to all filenames"

701 msgstr ""

702

@@ -716,108 +717,108 @@ msgstr ""

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

718 msgstr ""

719

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

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

721 #, c-format

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

723 msgstr ""

724

724 -#: archive.c:418

725 +#: archive.c:436

726 msgid "fmt"

727 msgstr ""

728

728 -#: archive.c:418

729 +#: archive.c:436

730 msgid "archive format"

731 msgstr ""

732

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

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

734 msgid "prefix"

735 msgstr ""

736

736 -#: archive.c:420

737 +#: archive.c:438

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

739 msgstr ""

740

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

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

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

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

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

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

745 #: parse-options.h:153

746 msgid "file"

747 msgstr ""

748

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

749 +#: archive.c:440 builtin/archive.c:89

750 msgid "write the archive to this file"

751 msgstr ""

752

752 -#: archive.c:424

753 +#: archive.c:442

754 msgid "read .gitattributes in working directory"

755 msgstr ""

756

756 -#: archive.c:425

757 +#: archive.c:443

758 msgid "report archived files on stderr"

759 msgstr ""

760

760 -#: archive.c:426

761 +#: archive.c:444

762 msgid "store only"

763 msgstr ""

764

764 -#: archive.c:427

765 +#: archive.c:445

766 msgid "compress faster"

767 msgstr ""

768

768 -#: archive.c:435

769 +#: archive.c:453

770 msgid "compress better"

771 msgstr ""

772

772 -#: archive.c:438

773 +#: archive.c:456

774 msgid "list supported archive formats"

775 msgstr ""

776

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

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

777 +#: 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 msgid "repo"

780 msgstr ""

781

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

782 +#: archive.c:459 builtin/archive.c:91

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

784 msgstr ""

785

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

786 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

787 msgid "command"

788 msgstr ""

789

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

790 +#: archive.c:461 builtin/archive.c:93

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

792 msgstr ""

793

793 -#: archive.c:450

794 +#: archive.c:468

795 msgid "Unexpected option --remote"

796 msgstr ""

797

797 -#: archive.c:452

798 +#: archive.c:470

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

800 msgstr ""

801

801 -#: archive.c:454

802 +#: archive.c:472

803 msgid "Unexpected option --output"

804 msgstr ""

805

805 -#: archive.c:476

806 +#: archive.c:494

807 #, c-format

808 msgid "Unknown archive format '%s'"

809 msgstr ""

810

810 -#: archive.c:483

811 +#: archive.c:501

812 #, c-format

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

814 msgstr ""

815

815 -#: attr.c:214

816 +#: attr.c:218

817 #, c-format

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

819 msgstr ""

820

820 -#: attr.c:410

821 +#: attr.c:415

822 msgid ""

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

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

@@ -880,38 +881,38 @@ msgstr ""

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

882 msgstr ""

883

883 -#: bisect.c:849

884 +#: bisect.c:850

885 #, c-format

886 msgid "a %s revision is needed"

887 msgstr ""

888

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

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

890 #, c-format

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

892 msgstr ""

893

893 -#: bisect.c:917

894 +#: bisect.c:918

895 #, c-format

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

897 msgstr ""

898

898 -#: bisect.c:947

899 +#: bisect.c:948

900 msgid "reading bisect refs failed"

901 msgstr ""

902

902 -#: bisect.c:967

903 +#: bisect.c:968

904 #, c-format

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

906 msgstr ""

907

907 -#: bisect.c:975

908 +#: bisect.c:976

909 #, c-format

910 msgid ""

911 "No testable commit found.\n"

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

913 msgstr ""

914

914 -#: bisect.c:994

915 +#: bisect.c:995

916 #, c-format

917 msgid "(roughly %d step)"

918 msgid_plural "(roughly %d steps)"

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

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

923 #. steps)" translation.

924 #.

924 -#: bisect.c:1000

925 +#: bisect.c:1001

926 #, c-format

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

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

@@ -940,10 +941,10 @@ msgstr ""

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

942 msgstr ""

943

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

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

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

946 -#: builtin/shortlog.c:177

944 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 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

947 +#: builtin/shortlog.c:191

948 msgid "revision walk setup failed"

949 msgstr ""

950

@@ -978,42 +979,42 @@ msgstr ""

979

980 #: branch.c:93

981 #, c-format

981 -msgid "Branch %s set up to track remote branch %s from %s by rebasing."

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

983 msgstr ""

984

985 #: branch.c:94

986 #, c-format

986 -msgid "Branch %s set up to track remote branch %s from %s."

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

988 msgstr ""

989

990 #: branch.c:98

991 #, c-format

991 -msgid "Branch %s set up to track local branch %s by rebasing."

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

993 msgstr ""

994

995 #: branch.c:99

996 #, c-format

996 -msgid "Branch %s set up to track local branch %s."

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

998 msgstr ""

999

1000 #: branch.c:104

1001 #, c-format

1001 -msgid "Branch %s set up to track remote ref %s by rebasing."

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

1003 msgstr ""

1004

1005 #: branch.c:105

1006 #, c-format

1006 -msgid "Branch %s set up to track remote ref %s."

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

1008 msgstr ""

1009

1010 #: branch.c:109

1011 #, c-format

1011 -msgid "Branch %s set up to track local ref %s by rebasing."

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

1013 msgstr ""

1014

1015 #: branch.c:110

1016 #, c-format

1016 -msgid "Branch %s set up to track local ref %s."

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

1018 msgstr ""

1019

1020 #: branch.c:119

@@ -1035,21 +1036,21 @@ msgstr ""

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

1037 msgstr ""

1038

1038 -#: branch.c:198

1039 +#: branch.c:197

1040 msgid "Cannot force update the current branch."

1041 msgstr ""

1042

1042 -#: branch.c:218

1043 +#: branch.c:217

1044 #, c-format

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

1046 msgstr ""

1047

1047 -#: branch.c:220

1048 +#: branch.c:219

1049 #, c-format

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

1051 msgstr ""

1052

1052 -#: branch.c:222

1053 +#: branch.c:221

1054 msgid ""

1055 "\n"

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

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

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

1063 msgstr ""

1064

1064 -#: branch.c:265

1065 +#: branch.c:264

1066 #, c-format

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

1068 msgstr ""

1069

1069 -#: branch.c:285

1070 +#: branch.c:284

1071 #, c-format

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

1073 msgstr ""

1074

1074 -#: branch.c:290

1075 +#: branch.c:289

1076 #, c-format

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

1078 msgstr ""

1079

1079 -#: branch.c:344

1080 +#: branch.c:343

1081 #, c-format

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

1083 msgstr ""

@@ -1096,7 +1097,9 @@ msgstr ""

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

1098 msgstr ""

1099

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

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

1103 #, c-format

1104 msgid "could not open '%s'"

1105 msgstr ""

@@ -1105,56 +1108,56 @@ msgstr ""

1108 msgid "Repository lacks these prerequisite commits:"

1109 msgstr ""

1110

1108 -#: bundle.c:186

1111 +#: bundle.c:193

1112 #, c-format

1113 msgid "The bundle contains this ref:"

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

1115 msgstr[0] ""

1116 msgstr[1] ""

1117

1115 -#: bundle.c:193

1118 +#: bundle.c:200

1119 msgid "The bundle records a complete history."

1120 msgstr ""

1121

1119 -#: bundle.c:195

1122 +#: bundle.c:202

1123 #, c-format

1124 msgid "The bundle requires this ref:"

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

1126 msgstr[0] ""

1127 msgstr[1] ""

1128

1126 -#: bundle.c:254

1129 +#: bundle.c:261

1130 msgid "Could not spawn pack-objects"

1131 msgstr ""

1132

1130 -#: bundle.c:265

1133 +#: bundle.c:272

1134 msgid "pack-objects died"

1135 msgstr ""

1136

1134 -#: bundle.c:307

1137 +#: bundle.c:314

1138 msgid "rev-list died"

1139 msgstr ""

1140

1138 -#: bundle.c:356

1141 +#: bundle.c:363

1142 #, c-format

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

1144 msgstr ""

1145

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

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

1147 #, c-format

1148 msgid "unrecognized argument: %s"

1149 msgstr ""

1150

1148 -#: bundle.c:454

1151 +#: bundle.c:461

1152 msgid "Refusing to create empty bundle."

1153 msgstr ""

1154

1152 -#: bundle.c:466

1155 +#: bundle.c:473

1156 #, c-format

1157 msgid "cannot create '%s'"

1158 msgstr ""

1159

1157 -#: bundle.c:494

1160 +#: bundle.c:501

1161 msgid "index-pack died"

1162 msgstr ""

1163

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

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

1167 msgstr ""

1168

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

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

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

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

1171 #, c-format

1172 msgid "could not parse %s"

1173 msgstr ""

@@ -1174,7 +1177,7 @@ msgstr ""

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

1178 msgstr ""

1179

1177 -#: commit.c:1511

1180 +#: commit.c:1517

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"

@@ -1185,152 +1188,152 @@ msgstr ""

1188 msgid "memory exhausted"

1189 msgstr ""

1190

1188 -#: config.c:186

1191 +#: config.c:187

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

1193 msgstr ""

1194

1192 -#: config.c:720

1195 +#: config.c:721

1196 #, c-format

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

1198 msgstr ""

1199

1197 -#: config.c:724

1200 +#: config.c:725

1201 #, c-format

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

1203 msgstr ""

1204

1202 -#: config.c:728

1205 +#: config.c:729

1206 #, c-format

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

1208 msgstr ""

1209

1207 -#: config.c:732

1210 +#: config.c:733

1211 #, c-format

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

1213 msgstr ""

1214

1212 -#: config.c:736

1215 +#: config.c:737

1216 #, c-format

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

1218 msgstr ""

1219

1217 -#: config.c:740

1220 +#: config.c:741

1221 #, c-format

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

1223 msgstr ""

1224

1222 -#: config.c:868

1225 +#: config.c:869

1226 msgid "out of range"

1227 msgstr ""

1228

1226 -#: config.c:868

1229 +#: config.c:869

1230 msgid "invalid unit"

1231 msgstr ""

1232

1230 -#: config.c:874

1233 +#: config.c:875

1234 #, c-format

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

1236 msgstr ""

1237

1235 -#: config.c:879

1238 +#: config.c:880

1239 #, c-format

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

1241 msgstr ""

1242

1240 -#: config.c:882

1243 +#: config.c:883

1244 #, c-format

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

1246 msgstr ""

1247

1245 -#: config.c:885

1248 +#: config.c:886

1249 #, c-format

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

1251 msgstr ""

1252

1250 -#: config.c:888

1253 +#: config.c:889

1254 #, c-format

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

1256 msgstr ""

1257

1255 -#: config.c:891

1258 +#: config.c:892

1259 #, c-format

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

1261 msgstr ""

1262

1260 -#: config.c:894

1263 +#: config.c:895

1264 #, c-format

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

1266 msgstr ""

1267

1265 -#: config.c:989

1268 +#: config.c:990

1269 #, c-format

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

1271 msgstr ""

1272

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

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

1274 #, c-format

1275 msgid "bad zlib compression level %d"

1276 msgstr ""

1277

1275 -#: config.c:1212

1278 +#: config.c:1213

1279 #, c-format

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

1281 msgstr ""

1282

1280 -#: config.c:1368

1283 +#: config.c:1372

1284 #, c-format

1285 msgid "bad pack compression level %d"

1286 msgstr ""

1287

1285 -#: config.c:1564

1288 +#: config.c:1568

1289 msgid "unable to parse command-line config"

1290 msgstr ""

1291

1289 -#: config.c:1894

1292 +#: config.c:1900

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

1294 msgstr ""

1295

1293 -#: config.c:2064

1296 +#: config.c:2087

1297 #, c-format

1298 msgid "Invalid %s: '%s'"

1299 msgstr ""

1300

1298 -#: config.c:2085

1301 +#: config.c:2130

1302 #, c-format

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

1304 msgstr ""

1305

1303 -#: config.c:2111

1306 +#: config.c:2156

1307 #, c-format

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

1309 msgstr ""

1310

1308 -#: config.c:2122

1311 +#: config.c:2167

1312 #, c-format

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

1314 msgstr ""

1315

1313 -#: config.c:2124

1316 +#: config.c:2169

1317 #, c-format

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

1319 msgstr ""

1320

1318 -#: config.c:2183

1321 +#: config.c:2228

1322 #, c-format

1323 msgid "%s has multiple values"

1324 msgstr ""

1325

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

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

1327 #, c-format

1328 msgid "fstat on %s failed"

1329 msgstr ""

1330

1328 -#: config.c:2635

1331 +#: config.c:2678

1332 #, c-format

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

1334 msgstr ""

1335

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

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

1337 #, c-format

1338 msgid "could not unset '%s'"

1339 msgstr ""

@@ -1347,19 +1350,19 @@ msgid ""

1350 "and the repository exists."

1351 msgstr ""

1352

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

1353 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1354 msgid "Checking connectivity"

1355 msgstr ""

1356

1354 -#: connected.c:75

1357 +#: connected.c:76

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

1359 msgstr ""

1360

1358 -#: connected.c:95

1361 +#: connected.c:96

1362 msgid "failed write to rev-list"

1363 msgstr ""

1364

1362 -#: connected.c:102

1365 +#: connected.c:103

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

1367 msgstr ""

1368

@@ -1464,273 +1467,283 @@ msgstr ""

1467 msgid "Performing inexact rename detection"

1468 msgstr ""

1469

1467 -#: diff.c:63

1470 +#: diff.c:74

1471 #, c-format

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

1473 msgstr ""

1474

1472 -#: diff.c:125

1475 +#: diff.c:152

1476 #, c-format

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

1478 msgstr ""

1479

1477 -#: diff.c:130

1480 +#: diff.c:157

1481 #, c-format

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

1483 msgstr ""

1484

1482 -#: diff.c:282

1485 +#: diff.c:281

1486 +msgid ""

1487 +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1488 +"'plain'"

1489 +msgstr ""

1490 +

1491 +#: diff.c:341

1492 #, c-format

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

1494 msgstr ""

1495

1487 -#: diff.c:342

1496 +#: diff.c:398

1497 #, c-format

1498 msgid ""

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

1500 "%s"

1501 msgstr ""

1502

1494 -#: diff.c:3101

1503 +#: diff.c:3861

1504 #, c-format

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

1506 msgstr ""

1507

1499 -#: diff.c:3427

1508 +#: diff.c:4189

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

1510 msgstr ""

1511

1503 -#: diff.c:3517

1512 +#: diff.c:4279

1513 msgid "--follow requires exactly one pathspec"

1514 msgstr ""

1515

1507 -#: diff.c:3680

1516 +#: diff.c:4445

1517 #, c-format

1518 msgid ""

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

1520 "%s"

1521 msgstr ""

1522

1514 -#: diff.c:3694

1523 +#: diff.c:4459

1524 #, c-format

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

1526 msgstr ""

1527

1519 -#: diff.c:4716

1528 +#: diff.c:5505

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

1530 msgstr ""

1531

1523 -#: diff.c:4719

1532 +#: diff.c:5508

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

1534 msgstr ""

1535

1527 -#: diff.c:4722

1536 +#: diff.c:5511

1537 #, c-format

1538 msgid ""

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

1540 msgstr ""

1541

1533 -#: dir.c:1948

1542 +#: dir.c:1983

1543 msgid "failed to get kernel name and information"

1544 msgstr ""

1545

1537 -#: dir.c:2067

1546 +#: dir.c:2102

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

1548 msgstr ""

1549

1541 -#: dir.c:2846 dir.c:2851

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

1551 #, c-format

1552 msgid "could not create directories for %s"

1553 msgstr ""

1554

1546 -#: dir.c:2876

1555 +#: dir.c:2915

1556 #, c-format

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

1558 msgstr ""

1559

1551 -#: entry.c:281

1560 +#: entry.c:176

1561 +msgid "Filtering content"

1562 +msgstr ""

1563 +

1564 +#: entry.c:417

1565 #, c-format

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

1567 msgstr ""

1568

1556 -#: fetch-pack.c:251

1569 +#: fetch-pack.c:252

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

1571 msgstr ""

1572

1560 -#: fetch-pack.c:263

1573 +#: fetch-pack.c:264

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

1575 msgstr ""

1576

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

1577 +#: fetch-pack.c:283 builtin/archive.c:63

1578 #, c-format

1579 msgid "remote error: %s"

1580 msgstr ""

1581

1569 -#: fetch-pack.c:283

1582 +#: fetch-pack.c:284

1583 #, c-format

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

1585 msgstr ""

1586

1574 -#: fetch-pack.c:335

1587 +#: fetch-pack.c:336

1588 msgid "--stateless-rpc requires multi_ack_detailed"

1589 msgstr ""

1590

1578 -#: fetch-pack.c:421

1591 +#: fetch-pack.c:422

1592 #, c-format

1593 msgid "invalid shallow line: %s"

1594 msgstr ""

1595

1583 -#: fetch-pack.c:427

1596 +#: fetch-pack.c:428

1597 #, c-format

1598 msgid "invalid unshallow line: %s"

1599 msgstr ""

1600

1588 -#: fetch-pack.c:429

1601 +#: fetch-pack.c:430

1602 #, c-format

1603 msgid "object not found: %s"

1604 msgstr ""

1605

1593 -#: fetch-pack.c:432

1606 +#: fetch-pack.c:433

1607 #, c-format

1608 msgid "error in object: %s"

1609 msgstr ""

1610

1598 -#: fetch-pack.c:434

1611 +#: fetch-pack.c:435

1612 #, c-format

1613 msgid "no shallow found: %s"

1614 msgstr ""

1615

1603 -#: fetch-pack.c:437

1616 +#: fetch-pack.c:438

1617 #, c-format

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

1619 msgstr ""

1620

1608 -#: fetch-pack.c:476

1621 +#: fetch-pack.c:477

1622 #, c-format

1623 msgid "got %s %d %s"

1624 msgstr ""

1625

1613 -#: fetch-pack.c:490

1626 +#: fetch-pack.c:491

1627 #, c-format

1628 msgid "invalid commit %s"

1629 msgstr ""

1630

1618 -#: fetch-pack.c:523

1631 +#: fetch-pack.c:524

1632 msgid "giving up"

1633 msgstr ""

1634

1622 -#: fetch-pack.c:533 progress.c:237

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

1636 msgid "done"

1637 msgstr ""

1638

1626 -#: fetch-pack.c:545

1639 +#: fetch-pack.c:546

1640 #, c-format

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

1642 msgstr ""

1643

1631 -#: fetch-pack.c:591

1644 +#: fetch-pack.c:592

1645 #, c-format

1646 msgid "Marking %s as complete"

1647 msgstr ""

1648

1636 -#: fetch-pack.c:775

1649 +#: fetch-pack.c:776

1650 #, c-format

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

1652 msgstr ""

1653

1641 -#: fetch-pack.c:813

1654 +#: fetch-pack.c:814

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

1656 msgstr ""

1657

1645 -#: fetch-pack.c:821

1658 +#: fetch-pack.c:822

1659 msgid "protocol error: bad pack header"

1660 msgstr ""

1661

1649 -#: fetch-pack.c:877

1662 +#: fetch-pack.c:878

1663 #, c-format

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

1665 msgstr ""

1666

1654 -#: fetch-pack.c:893

1667 +#: fetch-pack.c:894

1668 #, c-format

1669 msgid "%s failed"

1670 msgstr ""

1671

1659 -#: fetch-pack.c:895

1672 +#: fetch-pack.c:896

1673 msgid "error in sideband demultiplexer"

1674 msgstr ""

1675

1663 -#: fetch-pack.c:922

1676 +#: fetch-pack.c:923

1677 msgid "Server does not support shallow clients"

1678 msgstr ""

1679

1667 -#: fetch-pack.c:926

1680 +#: fetch-pack.c:927

1681 msgid "Server supports multi_ack_detailed"

1682 msgstr ""

1683

1671 -#: fetch-pack.c:929

1684 +#: fetch-pack.c:930

1685 msgid "Server supports no-done"

1686 msgstr ""

1687

1675 -#: fetch-pack.c:935

1688 +#: fetch-pack.c:936

1689 msgid "Server supports multi_ack"

1690 msgstr ""

1691

1679 -#: fetch-pack.c:939

1692 +#: fetch-pack.c:940

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

1694 msgstr ""

1695

1683 -#: fetch-pack.c:943

1696 +#: fetch-pack.c:944

1697 msgid "Server supports side-band"

1698 msgstr ""

1699

1687 -#: fetch-pack.c:947

1700 +#: fetch-pack.c:948

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

1702 msgstr ""

1703

1691 -#: fetch-pack.c:951

1704 +#: fetch-pack.c:952

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

1706 msgstr ""

1707

1695 -#: fetch-pack.c:961

1708 +#: fetch-pack.c:962

1709 msgid "Server supports ofs-delta"

1710 msgstr ""

1711

1699 -#: fetch-pack.c:968

1712 +#: fetch-pack.c:969

1713 #, c-format

1714 msgid "Server version is %.*s"

1715 msgstr ""

1716

1704 -#: fetch-pack.c:974

1717 +#: fetch-pack.c:975

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

1719 msgstr ""

1720

1708 -#: fetch-pack.c:978

1721 +#: fetch-pack.c:979

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

1723 msgstr ""

1724

1712 -#: fetch-pack.c:980

1725 +#: fetch-pack.c:981

1726 msgid "Server does not support --deepen"

1727 msgstr ""

1728

1716 -#: fetch-pack.c:991

1729 +#: fetch-pack.c:992

1730 msgid "no common commits"

1731 msgstr ""

1732

1720 -#: fetch-pack.c:1003

1733 +#: fetch-pack.c:1004

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

1735 msgstr ""

1736

1724 -#: fetch-pack.c:1165

1737 +#: fetch-pack.c:1166

1738 msgid "no matching remote head"

1739 msgstr ""

1740

1728 -#: fetch-pack.c:1187

1741 +#: fetch-pack.c:1188

1742 #, c-format

1743 msgid "no such remote ref %s"

1744 msgstr ""

1745

1733 -#: fetch-pack.c:1190

1746 +#: fetch-pack.c:1191

1747 #, c-format

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

1749 msgstr ""

@@ -1743,7 +1756,7 @@ msgstr ""

1756 msgid "could not create temporary file"

1757 msgstr ""

1758

1746 -#: gpg-interface.c:213

1759 +#: gpg-interface.c:214

1760 #, c-format

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

1762 msgstr ""

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

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

1767 msgstr ""

1768

1756 -#: grep.c:1981

1769 +#: grep.c:1970

1770 #, c-format

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

1772 msgstr ""

1773

1761 -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

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

1775 #, c-format

1776 msgid "failed to stat '%s'"

1777 msgstr ""

1778

1766 -#: grep.c:2009

1779 +#: grep.c:1998

1780 #, c-format

1781 msgid "'%s': short read"

1782 msgstr ""

@@ -1884,12 +1897,12 @@ msgstr ""

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

1898 msgstr ""

1899

1887 -#: ident.c:416 builtin/commit.c:612

1900 +#: ident.c:416 builtin/commit.c:616

1901 #, c-format

1902 msgid "invalid date format: %s"

1903 msgstr ""

1904

1892 -#: lockfile.c:152

1905 +#: lockfile.c:151

1906 #, c-format

1907 msgid ""

1908 "Unable to create '%s.lock': %s.\n"

@@ -1901,7 +1914,7 @@ msgid ""

1914 "remove the file manually to continue."

1915 msgstr ""

1916

1904 -#: lockfile.c:160

1917 +#: lockfile.c:159

1918 #, c-format

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

1920 msgstr ""

@@ -1910,256 +1923,256 @@ msgstr ""

1923 msgid "failed to read the cache"

1924 msgstr ""

1925

1913 -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

1914 -#: builtin/checkout.c:591 builtin/clone.c:753

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

1928 msgid "unable to write new index file"

1929 msgstr ""

1930

1918 -#: merge-recursive.c:210

1931 +#: merge-recursive.c:235

1932 msgid "(bad commit)\n"

1933 msgstr ""

1934

1922 -#: merge-recursive.c:232 merge-recursive.c:240

1935 +#: merge-recursive.c:257 merge-recursive.c:265

1936 #, c-format

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

1938 msgstr ""

1939

1927 -#: merge-recursive.c:304

1940 +#: merge-recursive.c:329

1941 msgid "error building trees"

1942 msgstr ""

1943

1931 -#: merge-recursive.c:728

1944 +#: merge-recursive.c:752

1945 #, c-format

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

1947 msgstr ""

1948

1936 -#: merge-recursive.c:739

1949 +#: merge-recursive.c:763

1950 #, c-format

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

1952 msgstr ""

1953

1941 -#: merge-recursive.c:753 merge-recursive.c:772

1954 +#: merge-recursive.c:777 merge-recursive.c:796

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

1956 msgstr ""

1957

1945 -#: merge-recursive.c:762

1958 +#: merge-recursive.c:786

1959 #, c-format

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

1961 msgstr ""

1962

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

1963 +#: merge-recursive.c:828 builtin/cat-file.c:37

1964 #, c-format

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

1966 msgstr ""

1967

1955 -#: merge-recursive.c:806

1968 +#: merge-recursive.c:830

1969 #, c-format

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

1971 msgstr ""

1972

1960 -#: merge-recursive.c:830

1973 +#: merge-recursive.c:854

1974 #, c-format

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

1976 msgstr ""

1977

1965 -#: merge-recursive.c:841

1978 +#: merge-recursive.c:865

1979 #, c-format

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

1981 msgstr ""

1982

1970 -#: merge-recursive.c:846

1983 +#: merge-recursive.c:870

1984 #, c-format

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

1986 msgstr ""

1987

1975 -#: merge-recursive.c:986

1988 +#: merge-recursive.c:1010

1989 msgid "Failed to execute internal merge"

1990 msgstr ""

1991

1979 -#: merge-recursive.c:990

1992 +#: merge-recursive.c:1014

1993 #, c-format

1994 msgid "Unable to add %s to database"

1995 msgstr ""

1996

1984 -#: merge-recursive.c:1093

1997 +#: merge-recursive.c:1117

1998 #, c-format

1999 msgid ""

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

2001 "in tree."

2002 msgstr ""

2003

1991 -#: merge-recursive.c:1098

2004 +#: merge-recursive.c:1122

2005 #, c-format

2006 msgid ""

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

2008 "left in tree."

2009 msgstr ""

2010

1998 -#: merge-recursive.c:1105

2011 +#: merge-recursive.c:1129

2012 #, c-format

2013 msgid ""

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

2015 "in tree at %s."

2016 msgstr ""

2017

2005 -#: merge-recursive.c:1110

2018 +#: merge-recursive.c:1134

2019 #, c-format

2020 msgid ""

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

2022 "left in tree at %s."

2023 msgstr ""

2024

2012 -#: merge-recursive.c:1144

2025 +#: merge-recursive.c:1168

2026 msgid "rename"

2027 msgstr ""

2028

2016 -#: merge-recursive.c:1144

2029 +#: merge-recursive.c:1168

2030 msgid "renamed"

2031 msgstr ""

2032

2020 -#: merge-recursive.c:1201

2033 +#: merge-recursive.c:1225

2034 #, c-format

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

2036 msgstr ""

2037

2025 -#: merge-recursive.c:1226

2038 +#: merge-recursive.c:1250

2039 #, c-format

2040 msgid ""

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

2042 "\"->\"%s\" in \"%s\"%s"

2043 msgstr ""

2044

2032 -#: merge-recursive.c:1231

2045 +#: merge-recursive.c:1255

2046 msgid " (left unresolved)"

2047 msgstr ""

2048

2036 -#: merge-recursive.c:1293

2049 +#: merge-recursive.c:1317

2050 #, c-format

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

2052 msgstr ""

2053

2041 -#: merge-recursive.c:1326

2054 +#: merge-recursive.c:1350

2055 #, c-format

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

2057 msgstr ""

2058

2046 -#: merge-recursive.c:1529

2059 +#: merge-recursive.c:1553

2060 #, c-format

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

2062 msgstr ""

2063

2051 -#: merge-recursive.c:1544

2064 +#: merge-recursive.c:1568

2065 #, c-format

2066 msgid "Adding merged %s"

2067 msgstr ""

2068

2056 -#: merge-recursive.c:1551 merge-recursive.c:1781

2069 +#: merge-recursive.c:1575 merge-recursive.c:1805

2070 #, c-format

2071 msgid "Adding as %s instead"

2072 msgstr ""

2073

2061 -#: merge-recursive.c:1608

2074 +#: merge-recursive.c:1632

2075 #, c-format

2076 msgid "cannot read object %s"

2077 msgstr ""

2078

2066 -#: merge-recursive.c:1611

2079 +#: merge-recursive.c:1635

2080 #, c-format

2081 msgid "object %s is not a blob"

2082 msgstr ""

2083

2071 -#: merge-recursive.c:1680

2084 +#: merge-recursive.c:1704

2085 msgid "modify"

2086 msgstr ""

2087

2075 -#: merge-recursive.c:1680

2088 +#: merge-recursive.c:1704

2089 msgid "modified"

2090 msgstr ""

2091

2079 -#: merge-recursive.c:1690

2092 +#: merge-recursive.c:1714

2093 msgid "content"

2094 msgstr ""

2095

2083 -#: merge-recursive.c:1697

2096 +#: merge-recursive.c:1721

2097 msgid "add/add"

2098 msgstr ""

2099

2087 -#: merge-recursive.c:1733

2100 +#: merge-recursive.c:1757

2101 #, c-format

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

2103 msgstr ""

2104

2092 -#: merge-recursive.c:1747

2105 +#: merge-recursive.c:1771

2106 #, c-format

2107 msgid "Auto-merging %s"

2108 msgstr ""

2109

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

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

2111 msgid "submodule"

2112 msgstr ""

2113

2101 -#: merge-recursive.c:1752

2114 +#: merge-recursive.c:1776

2115 #, c-format

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

2117 msgstr ""

2118

2106 -#: merge-recursive.c:1846

2119 +#: merge-recursive.c:1870

2120 #, c-format

2121 msgid "Removing %s"

2122 msgstr ""

2123

2111 -#: merge-recursive.c:1872

2124 +#: merge-recursive.c:1896

2125 msgid "file/directory"

2126 msgstr ""

2127

2115 -#: merge-recursive.c:1878

2128 +#: merge-recursive.c:1902

2129 msgid "directory/file"

2130 msgstr ""

2131

2119 -#: merge-recursive.c:1884

2132 +#: merge-recursive.c:1908

2133 #, c-format

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

2135 msgstr ""

2136

2124 -#: merge-recursive.c:1893

2137 +#: merge-recursive.c:1917

2138 #, c-format

2139 msgid "Adding %s"

2140 msgstr ""

2141

2129 -#: merge-recursive.c:1930

2130 -msgid "Already up-to-date!"

2142 +#: merge-recursive.c:1954

2143 +msgid "Already up to date!"

2144 msgstr ""

2145

2133 -#: merge-recursive.c:1939

2146 +#: merge-recursive.c:1963

2147 #, c-format

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

2149 msgstr ""

2150

2138 -#: merge-recursive.c:2022

2151 +#: merge-recursive.c:2060

2152 msgid "Merging:"

2153 msgstr ""

2154

2142 -#: merge-recursive.c:2035

2155 +#: merge-recursive.c:2073

2156 #, c-format

2157 msgid "found %u common ancestor:"

2158 msgid_plural "found %u common ancestors:"

2159 msgstr[0] ""

2160 msgstr[1] ""

2161

2149 -#: merge-recursive.c:2074

2162 +#: merge-recursive.c:2112

2163 msgid "merge returned no commit"

2164 msgstr ""

2165

2153 -#: merge-recursive.c:2137

2166 +#: merge-recursive.c:2175

2167 #, c-format

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

2169 msgstr ""

2170

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

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

2172 msgid "Unable to write index."

2173 msgstr ""

2174

2162 -#: notes-merge.c:273

2175 +#: notes-merge.c:272

2176 #, c-format

2177 msgid ""

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

@@ -2167,7 +2180,7 @@ msgid ""

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

2181 msgstr ""

2182

2170 -#: notes-merge.c:280

2183 +#: notes-merge.c:279

2184 #, c-format

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

2186 msgstr ""

@@ -2195,16 +2208,30 @@ msgstr ""

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

2209 msgstr ""

2210

2198 -#: object.c:240

2211 +#: object.c:239

2212 #, c-format

2213 msgid "unable to parse object: %s"

2214 msgstr ""

2215

2216 +#: packfile.c:556

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

2218 +msgstr ""

2219 +

2220 +#: packfile.c:1683

2221 +#, c-format

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

2223 +msgstr ""

2224 +

2225 +#: packfile.c:1687

2226 +#, c-format

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

2228 +msgstr ""

2229 +

2230 #: parse-options.c:573

2231 msgid "..."

2232 msgstr ""

2233

2207 -#: parse-options.c:591

2234 +#: parse-options.c:592

2235 #, c-format

2236 msgid "usage: %s"

2237 msgstr ""

@@ -2212,17 +2239,17 @@ msgstr ""

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

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

2241 #.

2215 -#: parse-options.c:597

2242 +#: parse-options.c:598

2243 #, c-format

2244 msgid " or: %s"

2245 msgstr ""

2246

2220 -#: parse-options.c:600

2247 +#: parse-options.c:601

2248 #, c-format

2249 msgid " %s"

2250 msgstr ""

2251

2225 -#: parse-options.c:634

2252 +#: parse-options.c:640

2253 msgid "-NUM"

2254 msgstr ""

2255

@@ -2231,7 +2258,7 @@ msgstr ""

2258 msgid "malformed object name '%s'"

2259 msgstr ""

2260

2234 -#: path.c:890

2261 +#: path.c:891

2262 #, c-format

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

2264 msgstr ""

@@ -2302,18 +2329,18 @@ msgstr ""

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

2330 msgstr ""

2331

2305 -#: pathspec.c:575

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

2311 -#: pathspec.c:599

2338 +#: pathspec.c:595

2339 #, c-format

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

2341 msgstr ""

2342

2316 -#: pretty.c:963

2343 +#: pretty.c:962

2344 msgid "unable to parse --pretty format"

2345 msgstr ""

2346

@@ -2331,48 +2358,49 @@ msgid ""

2358 "Using version %i"

2359 msgstr ""

2360

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

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

2362 #, c-format

2363 msgid "could not close '%s'"

2364 msgstr ""

2365

2339 -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

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

2367 #, c-format

2368 msgid "could not stat '%s'"

2369 msgstr ""

2370

2344 -#: read-cache.c:2396

2371 +#: read-cache.c:2407

2372 #, c-format

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

2374 msgstr ""

2375

2349 -#: read-cache.c:2408

2376 +#: read-cache.c:2419

2377 #, c-format

2378 msgid "unable to unlink: %s"

2379 msgstr ""

2380

2354 -#: refs.c:622

2381 +#: refs.c:638

2382 #, c-format

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

2384 msgstr ""

2385

2359 -#: refs.c:1769

2386 +#: refs.c:1779

2387 msgid "ref updates forbidden inside quarantine environment"

2388 msgstr ""

2389

2363 -#: refs/files-backend.c:1664

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

2391 #, c-format

2365 -msgid "could not delete reference %s: %s"

2392 +msgid "could not remove reference %s"

2393 msgstr ""

2394

2368 -#: refs/files-backend.c:1667

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

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

2397 #, c-format

2370 -msgid "could not delete references: %s"

2398 +msgid "could not delete reference %s: %s"

2399 msgstr ""

2400

2373 -#: refs/files-backend.c:1676

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

2402 #, c-format

2375 -msgid "could not remove reference %s"

2403 +msgid "could not delete references: %s"

2404 msgstr ""

2405

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

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

2422 msgid "ahead %d, behind %d"

2423 msgstr ""

2424

2397 -#: ref-filter.c:105

2425 +#: ref-filter.c:104

2426 #, c-format

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

2428 msgstr ""

2429

2402 -#: ref-filter.c:107

2430 +#: ref-filter.c:106

2431 #, c-format

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

2433 msgstr ""

2434

2407 -#: ref-filter.c:121

2435 +#: ref-filter.c:126

2436 #, c-format

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

2438 msgstr ""

2439

2412 -#: ref-filter.c:125

2440 +#: ref-filter.c:130

2441 #, c-format

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

2443 msgstr ""

2444

2417 -#: ref-filter.c:127

2445 +#: ref-filter.c:132

2446 #, c-format

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

2448 msgstr ""

2449

2422 -#: ref-filter.c:167

2450 +#: ref-filter.c:172

2451 #, c-format

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

2453 msgstr ""

2454

2427 -#: ref-filter.c:174

2455 +#: ref-filter.c:179

2456 #, c-format

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

2458 msgstr ""

2459

2432 -#: ref-filter.c:181

2460 +#: ref-filter.c:186

2461 #, c-format

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

2463 msgstr ""

2464

2437 -#: ref-filter.c:200

2465 +#: ref-filter.c:205

2466 #, c-format

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

2468 msgstr ""

2469

2442 -#: ref-filter.c:202

2470 +#: ref-filter.c:207

2471 #, c-format

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

2473 msgstr ""

2474

2447 -#: ref-filter.c:215

2475 +#: ref-filter.c:220

2476 #, c-format

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

2478 msgstr ""

2479

2452 -#: ref-filter.c:219

2480 +#: ref-filter.c:224

2481 #, c-format

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

2483 msgstr ""

2484

2457 -#: ref-filter.c:246

2485 +#: ref-filter.c:251

2486 #, c-format

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

2488 msgstr ""

2489

2462 -#: ref-filter.c:258

2490 +#: ref-filter.c:263

2491 #, c-format

2492 msgid "unrecognized position:%s"

2493 msgstr ""

2494

2467 -#: ref-filter.c:262

2495 +#: ref-filter.c:267

2496 #, c-format

2497 msgid "unrecognized width:%s"

2498 msgstr ""

2499

2472 -#: ref-filter.c:268

2500 +#: ref-filter.c:273

2501 #, c-format

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

2503 msgstr ""

2504

2477 -#: ref-filter.c:272

2505 +#: ref-filter.c:277

2506 #, c-format

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

2508 msgstr ""

2509

2482 -#: ref-filter.c:287

2510 +#: ref-filter.c:292

2511 #, c-format

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

2513 msgstr ""

2514

2487 -#: ref-filter.c:378

2515 +#: ref-filter.c:382

2516 #, c-format

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

2518 msgstr ""

2519

2492 -#: ref-filter.c:404

2520 +#: ref-filter.c:408

2521 #, c-format

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

2523 msgstr ""

2524

2497 -#: ref-filter.c:508

2525 +#: ref-filter.c:520

2526 #, c-format

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

2528 msgstr ""

2529

2502 -#: ref-filter.c:568

2530 +#: ref-filter.c:580

2531 #, c-format

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

2533 msgstr ""

2534

2507 -#: ref-filter.c:570

2535 +#: ref-filter.c:582

2536 #, c-format

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

2538 msgstr ""

2539

2512 -#: ref-filter.c:572

2540 +#: ref-filter.c:584

2541 #, c-format

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

2543 msgstr ""

2544

2517 -#: ref-filter.c:598

2545 +#: ref-filter.c:610

2546 #, c-format

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

2548 msgstr ""

2549

2522 -#: ref-filter.c:600

2550 +#: ref-filter.c:612

2551 #, c-format

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

2553 msgstr ""

2554

2527 -#: ref-filter.c:602

2555 +#: ref-filter.c:614

2556 #, c-format

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

2558 msgstr ""

2559

2532 -#: ref-filter.c:615

2560 +#: ref-filter.c:627

2561 #, c-format

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

2563 msgstr ""

2564

2537 -#: ref-filter.c:670

2565 +#: ref-filter.c:682

2566 #, c-format

2567 msgid "malformed format string %s"

2568 msgstr ""

2569

2542 -#: ref-filter.c:1254

2570 +#: ref-filter.c:1268

2571 #, c-format

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

2573 msgstr ""

2574

2547 -#: ref-filter.c:1257

2575 +#: ref-filter.c:1271

2576 #, c-format

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

2578 msgstr ""

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

2580 #. TRANSLATORS: make sure this matches "HEAD

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

2582 #.

2555 -#: ref-filter.c:1265

2583 +#: ref-filter.c:1279

2584 #, c-format

2585 msgid "(HEAD detached at %s)"

2586 msgstr ""

@@ -2560,108 +2588,108 @@ msgstr ""

2588 #. TRANSLATORS: make sure this matches "HEAD

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

2590 #.

2563 -#: ref-filter.c:1272

2591 +#: ref-filter.c:1286

2592 #, c-format

2593 msgid "(HEAD detached from %s)"

2594 msgstr ""

2595

2568 -#: ref-filter.c:1276

2596 +#: ref-filter.c:1290

2597 msgid "(no branch)"

2598 msgstr ""

2599

2572 -#: ref-filter.c:1426 ref-filter.c:1457

2600 +#: ref-filter.c:1439 ref-filter.c:1470

2601 #, c-format

2602 msgid "missing object %s for %s"

2603 msgstr ""

2604

2577 -#: ref-filter.c:1429 ref-filter.c:1460

2605 +#: ref-filter.c:1442 ref-filter.c:1473

2606 #, c-format

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

2608 msgstr ""

2609

2582 -#: ref-filter.c:1760

2610 +#: ref-filter.c:1773

2611 #, c-format

2612 msgid "malformed object at '%s'"

2613 msgstr ""

2614

2587 -#: ref-filter.c:1827

2615 +#: ref-filter.c:1840

2616 #, c-format

2617 msgid "ignoring ref with broken name %s"

2618 msgstr ""

2619

2592 -#: ref-filter.c:1832

2620 +#: ref-filter.c:1845

2621 #, c-format

2622 msgid "ignoring broken ref %s"

2623 msgstr ""

2624

2597 -#: ref-filter.c:2095

2625 +#: ref-filter.c:2107

2626 #, c-format

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

2628 msgstr ""

2629

2602 -#: ref-filter.c:2176

2630 +#: ref-filter.c:2201

2631 #, c-format

2632 msgid "malformed object name %s"

2633 msgstr ""

2634

2607 -#: remote.c:747

2635 +#: remote.c:750

2636 #, c-format

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

2638 msgstr ""

2639

2612 -#: remote.c:751

2640 +#: remote.c:754

2641 #, c-format

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

2643 msgstr ""

2644

2617 -#: remote.c:755

2645 +#: remote.c:758

2646 #, c-format

2647 msgid "%s tracks both %s and %s"

2648 msgstr ""

2649

2622 -#: remote.c:763

2650 +#: remote.c:766

2651 msgid "Internal error"

2652 msgstr ""

2653

2626 -#: remote.c:1680 remote.c:1782

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

2655 msgid "HEAD does not point to a branch"

2656 msgstr ""

2657

2630 -#: remote.c:1689

2658 +#: remote.c:1690

2659 #, c-format

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

2661 msgstr ""

2662

2635 -#: remote.c:1692

2663 +#: remote.c:1693

2664 #, c-format

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

2666 msgstr ""

2667

2640 -#: remote.c:1698

2668 +#: remote.c:1699

2669 #, c-format

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

2671 msgstr ""

2672

2645 -#: remote.c:1713

2673 +#: remote.c:1714

2674 #, c-format

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

2676 msgstr ""

2677

2650 -#: remote.c:1725

2678 +#: remote.c:1726

2679 #, c-format

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

2681 msgstr ""

2682

2655 -#: remote.c:1736

2683 +#: remote.c:1737

2684 #, c-format

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

2686 msgstr ""

2687

2660 -#: remote.c:1749

2688 +#: remote.c:1750

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

2690 msgstr ""

2691

2664 -#: remote.c:1771

2692 +#: remote.c:1772

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

2694 msgstr ""

2695

@@ -2676,7 +2704,7 @@ msgstr ""

2704

2705 #: remote.c:2083

2706 #, c-format

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

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

2708 msgstr ""

2709

2710 #: remote.c:2087

@@ -2717,16 +2745,16 @@ msgstr[1] ""

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

2746 msgstr ""

2747

2720 -#: revision.c:2187

2748 +#: revision.c:2256

2749 msgid "your current branch appears to be broken"

2750 msgstr ""

2751

2724 -#: revision.c:2190

2752 +#: revision.c:2259

2753 #, c-format

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

2755 msgstr ""

2756

2729 -#: revision.c:2384

2757 +#: revision.c:2453

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

2759 msgstr ""

2760

@@ -2766,72 +2794,73 @@ msgstr ""

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

2795 msgstr ""

2796

2769 -#: sequencer.c:216

2797 +#: sequencer.c:218

2798 msgid "revert"

2799 msgstr ""

2800

2773 -#: sequencer.c:218

2801 +#: sequencer.c:220

2802 msgid "cherry-pick"

2803 msgstr ""

2804

2777 -#: sequencer.c:220

2805 +#: sequencer.c:222

2806 msgid "rebase -i"

2807 msgstr ""

2808

2781 -#: sequencer.c:222

2809 +#: sequencer.c:224

2810 #, c-format

2811 msgid "Unknown action: %d"

2812 msgstr ""

2813

2786 -#: sequencer.c:279

2814 +#: sequencer.c:281

2815 msgid ""

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

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

2818 msgstr ""

2819

2792 -#: sequencer.c:282

2820 +#: sequencer.c:284

2821 msgid ""

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

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

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

2825 msgstr ""

2826

2799 -#: sequencer.c:295 sequencer.c:1685

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

2828 #, c-format

2829 msgid "could not lock '%s'"

2830 msgstr ""

2831

2804 -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

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

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

2834 #, c-format

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

2836 msgstr ""

2837

2809 -#: sequencer.c:302

2838 +#: sequencer.c:304

2839 #, c-format

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

2841 msgstr ""

2842

2814 -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

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

2844 #, c-format

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

2846 msgstr ""

2847

2819 -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

2820 -#: builtin/commit.c:750 builtin/merge.c:1017

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

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

2850 #, c-format

2851 msgid "could not read '%s'"

2852 msgstr ""

2853

2825 -#: sequencer.c:356

2854 +#: sequencer.c:358

2855 #, c-format

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

2857 msgstr ""

2858

2830 -#: sequencer.c:360

2859 +#: sequencer.c:362

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

2861 msgstr ""

2862

2834 -#: sequencer.c:389

2863 +#: sequencer.c:391

2864 #, c-format

2865 msgid "%s: fast-forward"

2866 msgstr ""

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

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

2869 #. "rebase -i".

2870 #.

2842 -#: sequencer.c:472

2871 +#: sequencer.c:474

2872 #, c-format

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

2874 msgstr ""

2875

2847 -#: sequencer.c:491

2876 +#: sequencer.c:493

2877 msgid "could not resolve HEAD commit\n"

2878 msgstr ""

2879

2851 -#: sequencer.c:511

2880 +#: sequencer.c:513

2881 msgid "unable to update cache tree\n"

2882 msgstr ""

2883

2855 -#: sequencer.c:595

2884 +#: sequencer.c:597

2885 #, c-format

2886 msgid ""

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

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

2898 " git rebase --continue\n"

2899 msgstr ""

2900

2872 -#: sequencer.c:697

2901 +#: sequencer.c:699

2902 #, c-format

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

2904 msgstr ""

2905

2877 -#: sequencer.c:702

2906 +#: sequencer.c:704

2907 #, c-format

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

2909 msgstr ""

2910

2882 -#: sequencer.c:824

2911 +#: sequencer.c:826

2912 #, c-format

2913 msgid ""

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

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

2916 "\t%.*s"

2917 msgstr ""

2918

2890 -#: sequencer.c:830

2919 +#: sequencer.c:832

2920 #, c-format

2921 msgid ""

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

@@ -2895,229 +2924,230 @@ msgid ""

2924 "\t%.*s"

2925 msgstr ""

2926

2898 -#: sequencer.c:836 sequencer.c:861

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

2928 #, c-format

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

2930 msgstr ""

2931

2903 -#: sequencer.c:845

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

2933 msgid "need a HEAD to fixup"

2934 msgstr ""

2935

2907 -#: sequencer.c:847

2936 +#: sequencer.c:849

2937 msgid "could not read HEAD"

2938 msgstr ""

2939

2911 -#: sequencer.c:849

2940 +#: sequencer.c:851

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

2942 msgstr ""

2943

2915 -#: sequencer.c:855

2944 +#: sequencer.c:857

2945 #, c-format

2946 msgid "cannot write '%s'"

2947 msgstr ""

2948

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

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

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

2951 msgstr ""

2952

2924 -#: sequencer.c:872

2953 +#: sequencer.c:874

2954 #, c-format

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

2956 msgstr ""

2957

2929 -#: sequencer.c:879

2958 +#: sequencer.c:881

2959 #, c-format

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

2961 msgstr ""

2962

2934 -#: sequencer.c:884

2963 +#: sequencer.c:886

2964 #, c-format

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

2966 msgstr ""

2967

2939 -#: sequencer.c:889

2968 +#: sequencer.c:891

2969 #, c-format

2970 msgid "unknown command: %d"

2971 msgstr ""

2972

2944 -#: sequencer.c:955

2973 +#: sequencer.c:957

2974 msgid "your index file is unmerged."

2975 msgstr ""

2976

2948 -#: sequencer.c:973

2977 +#: sequencer.c:975

2978 #, c-format

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

2980 msgstr ""

2981

2953 -#: sequencer.c:981

2982 +#: sequencer.c:983

2983 #, c-format

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

2985 msgstr ""

2986

2958 -#: sequencer.c:985

2987 +#: sequencer.c:987

2988 #, c-format

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

2990 msgstr ""

2991

2963 -#: sequencer.c:991

2992 +#: sequencer.c:993

2993 #, c-format

2994 msgid "cannot get commit message for %s"

2995 msgstr ""

2996

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

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

2970 -#: sequencer.c:1012

2999 +#: sequencer.c:1014

3000 #, c-format

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

3002 msgstr ""

3003

2975 -#: sequencer.c:1075 sequencer.c:1830

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

3005 #, c-format

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

3007 msgstr ""

3008

2980 -#: sequencer.c:1126

3009 +#: sequencer.c:1128

3010 #, c-format

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

3012 msgstr ""

3013

2985 -#: sequencer.c:1127

3014 +#: sequencer.c:1129

3015 #, c-format

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

3017 msgstr ""

3018

2990 -#: sequencer.c:1169

3019 +#: sequencer.c:1171

3020 msgid "empty commit set passed"

3021 msgstr ""

3022

2994 -#: sequencer.c:1179

3023 +#: sequencer.c:1181

3024 #, c-format

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

3026 msgstr ""

3027

2999 -#: sequencer.c:1186

3028 +#: sequencer.c:1188

3029 #, c-format

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

3031 msgstr ""

3032

3004 -#: sequencer.c:1306

3033 +#: sequencer.c:1308

3034 #, c-format

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

3036 msgstr ""

3037

3009 -#: sequencer.c:1314

3038 +#: sequencer.c:1316

3039 #, c-format

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

3041 msgstr ""

3042

3014 -#: sequencer.c:1347

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

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

3045 #, c-format

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

3047 msgstr ""

3048

3019 -#: sequencer.c:1359

3049 +#: sequencer.c:1361

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

3051 msgstr ""

3052

3023 -#: sequencer.c:1361

3053 +#: sequencer.c:1363

3054 #, c-format

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

3056 msgstr ""

3057

3028 -#: sequencer.c:1366

3058 +#: sequencer.c:1368

3059 msgid "no commits parsed."

3060 msgstr ""

3061

3032 -#: sequencer.c:1377

3062 +#: sequencer.c:1379

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

3064 msgstr ""

3065

3036 -#: sequencer.c:1379

3066 +#: sequencer.c:1381

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

3068 msgstr ""

3069

3040 -#: sequencer.c:1442

3070 +#: sequencer.c:1448

3071 #, c-format

3072 msgid "invalid key: %s"

3073 msgstr ""

3074

3045 -#: sequencer.c:1445

3075 +#: sequencer.c:1451

3076 #, c-format

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

3078 msgstr ""

3079

3050 -#: sequencer.c:1502

3080 +#: sequencer.c:1517

3081 #, c-format

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

3083 msgstr ""

3084

3055 -#: sequencer.c:1540

3085 +#: sequencer.c:1555

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

3087 msgstr ""

3088

3059 -#: sequencer.c:1541

3089 +#: sequencer.c:1556

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

3091 msgstr ""

3092

3063 -#: sequencer.c:1544

3093 +#: sequencer.c:1559

3094 #, c-format

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

3096 msgstr ""

3097

3068 -#: sequencer.c:1558

3098 +#: sequencer.c:1574

3099 msgid "could not lock HEAD"

3100 msgstr ""

3101

3072 -#: sequencer.c:1614 sequencer.c:2188

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

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

3104 msgstr ""

3105

3076 -#: sequencer.c:1616

3106 +#: sequencer.c:1634

3107 msgid "cannot resolve HEAD"

3108 msgstr ""

3109

3080 -#: sequencer.c:1618 sequencer.c:1652

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

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

3112 msgstr ""

3113

3084 -#: sequencer.c:1638 builtin/grep.c:929

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

3115 #, c-format

3116 msgid "cannot open '%s'"

3117 msgstr ""

3118

3089 -#: sequencer.c:1640

3119 +#: sequencer.c:1659

3120 #, c-format

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

3122 msgstr ""

3123

3094 -#: sequencer.c:1641

3124 +#: sequencer.c:1660

3125 msgid "unexpected end of file"

3126 msgstr ""

3127

3098 -#: sequencer.c:1647

3128 +#: sequencer.c:1666

3129 #, c-format

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

3131 msgstr ""

3132

3103 -#: sequencer.c:1658

3133 +#: sequencer.c:1677

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

3135 msgstr ""

3136

3107 -#: sequencer.c:1795 sequencer.c:2086

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

3138 msgid "cannot read HEAD"

3139 msgstr ""

3140

3111 -#: sequencer.c:1835 builtin/difftool.c:633

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

3142 #, c-format

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

3144 msgstr ""

3145

3116 -#: sequencer.c:1851

3146 +#: sequencer.c:1874

3147 msgid "could not read index"

3148 msgstr ""

3149

3120 -#: sequencer.c:1856

3150 +#: sequencer.c:1879

3151 #, c-format

3152 msgid ""

3153 "execution failed: %s\n"

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

3157 "\n"

3158 msgstr ""

3159

3130 -#: sequencer.c:1862

3160 +#: sequencer.c:1885

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

3162 msgstr ""

3163

3134 -#: sequencer.c:1868

3164 +#: sequencer.c:1891

3165 #, c-format

3166 msgid ""

3167 "execution succeeded: %s\n"

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

3172 "\n"

3173 msgstr ""

3174

3145 -#: sequencer.c:1925

3175 +#: sequencer.c:1948

3176 #, c-format

3177 msgid "Applied autostash.\n"

3178 msgstr ""

3179

3150 -#: sequencer.c:1937

3180 +#: sequencer.c:1960

3181 #, c-format

3182 msgid "cannot store %s"

3183 msgstr ""

3184

3155 -#: sequencer.c:1940 git-rebase.sh:173

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

3186 #, c-format

3187 msgid ""

3188 "Applying autostash resulted in conflicts.\n"

@@ -3160,81 +3190,155 @@ msgid ""

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

3191 msgstr ""

3192

3163 -#: sequencer.c:2022

3193 +#: sequencer.c:2045

3194 #, c-format

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

3196 msgstr ""

3197

3168 -#: sequencer.c:2064

3198 +#: sequencer.c:2087

3199 #, c-format

3200 msgid "unknown command %d"

3201 msgstr ""

3202

3173 -#: sequencer.c:2094

3203 +#: sequencer.c:2117

3204 msgid "could not read orig-head"

3205 msgstr ""

3206

3177 -#: sequencer.c:2099

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

3208 msgid "could not read 'onto'"

3209 msgstr ""

3210

3181 -#: sequencer.c:2106

3211 +#: sequencer.c:2129

3212 #, c-format

3213 msgid "could not update %s"

3214 msgstr ""

3215

3186 -#: sequencer.c:2113

3216 +#: sequencer.c:2136

3217 #, c-format

3218 msgid "could not update HEAD to %s"

3219 msgstr ""

3220

3191 -#: sequencer.c:2197

3221 +#: sequencer.c:2220

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

3223 msgstr ""

3224

3195 -#: sequencer.c:2202

3225 +#: sequencer.c:2225

3226 msgid "could not remove CHERRY_PICK_HEAD"

3227 msgstr ""

3228

3199 -#: sequencer.c:2211

3229 +#: sequencer.c:2234

3230 msgid "cannot amend non-existing commit"

3231 msgstr ""

3232

3203 -#: sequencer.c:2213

3233 +#: sequencer.c:2236

3234 #, c-format

3235 msgid "invalid file: '%s'"

3236 msgstr ""

3237

3208 -#: sequencer.c:2215

3238 +#: sequencer.c:2238

3239 #, c-format

3240 msgid "invalid contents: '%s'"

3241 msgstr ""

3242

3213 -#: sequencer.c:2218

3243 +#: sequencer.c:2241

3244 msgid ""

3245 "\n"

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

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

3248 msgstr ""

3249

3220 -#: sequencer.c:2228

3250 +#: sequencer.c:2251

3251 msgid "could not commit staged changes."

3252 msgstr ""

3253

3224 -#: sequencer.c:2308

3254 +#: sequencer.c:2331

3255 #, c-format

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

3257 msgstr ""

3258

3229 -#: sequencer.c:2312

3259 +#: sequencer.c:2335

3260 #, c-format

3261 msgid "%s: bad revision"

3262 msgstr ""

3263

3234 -#: sequencer.c:2345

3264 +#: sequencer.c:2368

3265 msgid "can't revert as initial commit"

3266 msgstr ""

3267

3268 +#: sequencer.c:2471

3269 +msgid "make_script: unhandled options"

3270 +msgstr ""

3271 +

3272 +#: sequencer.c:2474

3273 +msgid "make_script: error preparing revisions"

3274 +msgstr ""

3275 +

3276 +#: sequencer.c:2510

3277 +#, c-format

3278 +msgid "unusable todo list: '%s'"

3279 +msgstr ""

3280 +

3281 +#: sequencer.c:2516

3282 +#, c-format

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

3284 +msgstr ""

3285 +

3286 +#: sequencer.c:2561

3287 +#, c-format

3288 +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."

3289 +msgstr ""

3290 +

3291 +#: sequencer.c:2641

3292 +#, c-format

3293 +msgid ""

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

3295 +"Dropped commits (newer to older):\n"

3296 +msgstr ""

3297 +

3298 +#: sequencer.c:2648

3299 +#, c-format

3300 +msgid ""

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

3302 +"\n"

3303 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

3304 +"warnings.\n"

3305 +"The possible behaviours are: ignore, warn, error.\n"

3306 +"\n"

3307 +msgstr ""

3308 +

3309 +#: sequencer.c:2660

3310 +#, c-format

3311 +msgid ""

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

3313 +"continue'.\n"

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

3315 +msgstr ""

3316 +

3317 +#: sequencer.c:2708

3318 +#, c-format

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

3320 +msgstr ""

3321 +

3322 +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3323 +#: builtin/am.c:775

3324 +#, c-format

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

3326 +msgstr ""

3327 +

3328 +#: sequencer.c:2756

3329 +#, c-format

3330 +msgid "could not truncate '%s'"

3331 +msgstr ""

3332 +

3333 +#: sequencer.c:2848

3334 +msgid "the script was already rearranged."

3335 +msgstr ""

3336 +

3337 +#: sequencer.c:2953

3338 +#, c-format

3339 +msgid "could not finish '%s'"

3340 +msgstr ""

3341 +

3342 #: setup.c:171

3343 #, c-format

3344 msgid ""

@@ -3258,96 +3362,82 @@ msgid ""

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

3363 msgstr ""

3364

3261 -#: setup.c:504

3365 +#: setup.c:499

3366 #, c-format

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

3368 msgstr ""

3369

3266 -#: setup.c:512

3370 +#: setup.c:507

3371 msgid "unknown repository extensions found:"

3372 msgstr ""

3373

3270 -#: setup.c:810

3374 +#: setup.c:806

3375 #, c-format

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

3377 msgstr ""

3378

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

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

3380 msgid "Cannot come back to cwd"

3381 msgstr ""

3382

3279 -#: setup.c:1050

3383 +#: setup.c:1046

3384 msgid "Unable to read current working directory"

3385 msgstr ""

3386

3283 -#: setup.c:1062 setup.c:1068

3387 +#: setup.c:1058 setup.c:1064

3388 #, c-format

3389 msgid "Cannot change to '%s'"

3390 msgstr ""

3391

3288 -#: setup.c:1081

3392 +#: setup.c:1077

3393 #, c-format

3394 msgid ""

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

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

3397 msgstr ""

3398

3295 -#: setup.c:1173

3399 +#: setup.c:1159

3400 #, c-format

3401 msgid ""

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

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

3404 msgstr ""

3405

3302 -#: sha1_file.c:560

3406 +#: sha1_file.c:528

3407 #, c-format

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

3409 msgstr ""

3410

3307 -#: sha1_file.c:586

3411 +#: sha1_file.c:554

3412 #, c-format

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

3414 msgstr ""

3415

3312 -#: sha1_file.c:592

3416 +#: sha1_file.c:560

3417 #, c-format

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

3419 msgstr ""

3420

3317 -#: sha1_file.c:598

3421 +#: sha1_file.c:566

3422 #, c-format

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

3424 msgstr ""

3425

3322 -#: sha1_file.c:606

3426 +#: sha1_file.c:574

3427 #, c-format

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

3429 msgstr ""

3430

3327 -#: sha1_file.c:1245

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

3329 -msgstr ""

3330 -

3331 -#: sha1_file.c:2729

3332 -#, c-format

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

3334 -msgstr ""

3335 -

3336 -#: sha1_file.c:2733

3337 -#, c-format

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

3339 -msgstr ""

3340 -

3341 -#: sha1_name.c:419

3431 +#: sha1_name.c:420

3432 #, c-format

3433 msgid "short SHA1 %s is ambiguous"

3434 msgstr ""

3435

3346 -#: sha1_name.c:430

3436 +#: sha1_name.c:431

3437 msgid "The candidates are:"

3438 msgstr ""

3439

3350 -#: sha1_name.c:589

3440 +#: sha1_name.c:590

3441 msgid ""

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

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

@@ -3360,81 +3450,86 @@ msgid ""

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

3451 msgstr ""

3452

3363 -#: submodule.c:70 submodule.c:104

3453 +#: submodule.c:93 submodule.c:127

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

3455 msgstr ""

3456

3367 -#: submodule.c:74 submodule.c:108

3457 +#: submodule.c:97 submodule.c:131

3458 #, c-format

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

3460 msgstr ""

3461

3372 -#: submodule.c:82

3462 +#: submodule.c:105

3463 #, c-format

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

3465 msgstr ""

3466

3377 -#: submodule.c:115

3467 +#: submodule.c:138

3468 #, c-format

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

3470 msgstr ""

3471

3382 -#: submodule.c:126

3472 +#: submodule.c:149

3473 msgid "staging updated .gitmodules failed"

3474 msgstr ""

3475

3386 -#: submodule.c:165

3387 -msgid "negative values not allowed for submodule.fetchJobs"

3388 -msgstr ""

3389 -

3390 -#: submodule.c:376

3476 +#: submodule.c:309

3477 #, c-format

3478 msgid "in unpopulated submodule '%s'"

3479 msgstr ""

3480

3395 -#: submodule.c:407

3481 +#: submodule.c:340

3482 #, c-format

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

3484 msgstr ""

3485

3400 -#: submodule.c:1337

3486 +#: submodule.c:799

3487 +#, c-format

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

3489 +msgstr ""

3490 +

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

3492 +msgid "Failed to resolve HEAD as a valid ref."

3493 +msgstr ""

3494 +

3495 +#: submodule.c:1304

3496 #, c-format

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

3498 msgstr ""

3499

3405 -#: submodule.c:1475

3500 +#: submodule.c:1442

3501 #, c-format

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

3503 msgstr ""

3504

3410 -#: submodule.c:1488

3505 +#: submodule.c:1455

3506 #, c-format

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

3508 msgstr ""

3509

3415 -#: submodule.c:1581

3510 +#: submodule.c:1548

3511 #, c-format

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

3513 msgstr ""

3514

3420 -#: submodule.c:1845

3515 +#: submodule.c:1809

3516 #, c-format

3517 msgid ""

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

3519 msgstr ""

3520

3426 -#: submodule.c:1857 submodule.c:1913

3521 +#: submodule.c:1821 submodule.c:1877

3522 #, c-format

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

3524 msgstr ""

3525

3431 -#: submodule.c:1861 builtin/submodule--helper.c:678

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

3526 +#: submodule.c:1825 builtin/submodule--helper.c:671

3527 +#: builtin/submodule--helper.c:681

3528 #, c-format

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

3530 msgstr ""

3531

3437 -#: submodule.c:1864

3532 +#: submodule.c:1828

3533 #, c-format

3534 msgid ""

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

@@ -3442,101 +3537,105 @@ msgid ""

3537 "'%s'\n"

3538 msgstr ""

3539

3445 -#: submodule.c:1948

3540 +#: submodule.c:1912

3541 #, c-format

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

3543 msgstr ""

3544

3450 -#: submodule.c:1992

3545 +#: submodule.c:1956

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

3547 msgstr ""

3548

3454 -#: submodule.c:2012

3549 +#: submodule.c:1976

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

3551 msgstr ""

3552

3458 -#: submodule.c:2031

3553 +#: submodule.c:1995

3554 #, c-format

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

3556 msgstr ""

3557

3463 -#: submodule-config.c:420

3558 +#: submodule-config.c:263

3559 +msgid "negative values not allowed for submodule.fetchjobs"

3560 +msgstr ""

3561 +

3562 +#: submodule-config.c:436

3563 #, c-format

3564 msgid "invalid value for %s"

3565 msgstr ""

3566

3468 -#: trailer.c:241

3567 +#: trailer.c:238

3568 #, c-format

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

3570 msgstr ""

3571

3473 -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3474 -#: trailer.c:544

3572 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553

3573 +#: trailer.c:557

3574 #, c-format

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

3576 msgstr ""

3577

3479 -#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3578 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290

3579 #, c-format

3580 msgid "more than one %s"

3581 msgstr ""

3582

3484 -#: trailer.c:703

3583 +#: trailer.c:730

3584 #, c-format

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

3586 msgstr ""

3587

3489 -#: trailer.c:723

3588 +#: trailer.c:750

3589 #, c-format

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

3591 msgstr ""

3592

3494 -#: trailer.c:726

3593 +#: trailer.c:753

3594 msgid "could not read from stdin"

3595 msgstr ""

3596

3498 -#: trailer.c:950 builtin/am.c:45

3597 +#: trailer.c:1008 builtin/am.c:46

3598 #, c-format

3599 msgid "could not stat %s"

3600 msgstr ""

3601

3503 -#: trailer.c:952

3602 +#: trailer.c:1010

3603 #, c-format

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

3605 msgstr ""

3606

3508 -#: trailer.c:954

3607 +#: trailer.c:1012

3608 #, c-format

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

3610 msgstr ""

3611

3513 -#: trailer.c:966

3612 +#: trailer.c:1024

3613 msgid "could not open temporary file"

3614 msgstr ""

3615

3517 -#: trailer.c:1002

3616 +#: trailer.c:1064

3617 #, c-format

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

3619 msgstr ""

3620

3522 -#: transport.c:63

3621 +#: transport.c:62

3622 #, c-format

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

3624 msgstr ""

3625

3527 -#: transport.c:152

3626 +#: transport.c:151

3627 #, c-format

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

3629 msgstr ""

3630

3532 -#: transport.c:890

3631 +#: transport.c:888

3632 #, c-format

3633 msgid ""

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

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

3636 msgstr ""

3637

3539 -#: transport.c:894

3638 +#: transport.c:892

3639 #, c-format

3640 msgid ""

3641 "\n"

@@ -3552,7 +3651,7 @@ msgid ""

3651 "\n"

3652 msgstr ""

3653

3555 -#: transport.c:902

3654 +#: transport.c:900

3655 msgid "Aborting."

3656 msgstr ""

3657

@@ -3573,102 +3672,102 @@ msgstr ""

3672 msgid "empty filename in tree entry"

3673 msgstr ""

3674

3576 -#: tree-walk.c:113

3675 +#: tree-walk.c:114

3676 msgid "too-short tree file"

3677 msgstr ""

3678

3580 -#: unpack-trees.c:105

3679 +#: unpack-trees.c:106

3680 #, c-format

3681 msgid ""

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

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

3684 msgstr ""

3685

3587 -#: unpack-trees.c:107

3686 +#: unpack-trees.c:108

3687 #, c-format

3688 msgid ""

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

3690 "%%s"

3691 msgstr ""

3692

3594 -#: unpack-trees.c:110

3693 +#: unpack-trees.c:111

3694 #, c-format

3695 msgid ""

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

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

3698 msgstr ""

3699

3601 -#: unpack-trees.c:112

3700 +#: unpack-trees.c:113

3701 #, c-format

3702 msgid ""

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

3704 "%%s"

3705 msgstr ""

3706

3608 -#: unpack-trees.c:115

3707 +#: unpack-trees.c:116

3708 #, c-format

3709 msgid ""

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

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

3712 msgstr ""

3713

3615 -#: unpack-trees.c:117

3714 +#: unpack-trees.c:118

3715 #, c-format

3716 msgid ""

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

3718 "%%s"

3719 msgstr ""

3720

3622 -#: unpack-trees.c:122

3721 +#: unpack-trees.c:123

3722 #, c-format

3723 msgid ""

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

3725 "%s"

3726 msgstr ""

3727

3629 -#: unpack-trees.c:126

3728 +#: unpack-trees.c:127

3729 #, c-format

3730 msgid ""

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

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

3733 msgstr ""

3734

3636 -#: unpack-trees.c:128

3735 +#: unpack-trees.c:129

3736 #, c-format

3737 msgid ""

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

3739 "%%s"

3740 msgstr ""

3741

3643 -#: unpack-trees.c:131

3742 +#: unpack-trees.c:132

3743 #, c-format

3744 msgid ""

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

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

3747 msgstr ""

3748

3650 -#: unpack-trees.c:133

3749 +#: unpack-trees.c:134

3750 #, c-format

3751 msgid ""

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

3753 "%%s"

3754 msgstr ""

3755

3657 -#: unpack-trees.c:136

3756 +#: unpack-trees.c:137

3757 #, c-format

3758 msgid ""

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

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

3761 msgstr ""

3762

3664 -#: unpack-trees.c:138

3763 +#: unpack-trees.c:139

3764 #, c-format

3765 msgid ""

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

3767 "%%s"

3768 msgstr ""

3769

3671 -#: unpack-trees.c:143

3770 +#: unpack-trees.c:144

3771 #, c-format

3772 msgid ""

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

@@ -3676,7 +3775,7 @@ msgid ""

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

3776 msgstr ""

3777

3679 -#: unpack-trees.c:145

3778 +#: unpack-trees.c:146

3779 #, c-format

3780 msgid ""

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

@@ -3684,47 +3783,47 @@ msgid ""

3783 "%%s"

3784 msgstr ""

3785

3687 -#: unpack-trees.c:148

3786 +#: unpack-trees.c:149

3787 #, c-format

3788 msgid ""

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

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

3791 msgstr ""

3792

3694 -#: unpack-trees.c:150

3793 +#: unpack-trees.c:151

3794 #, c-format

3795 msgid ""

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

3797 "%%s"

3798 msgstr ""

3799

3701 -#: unpack-trees.c:153

3800 +#: unpack-trees.c:154

3801 #, c-format

3802 msgid ""

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

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

3805 msgstr ""

3806

3708 -#: unpack-trees.c:155

3807 +#: unpack-trees.c:156

3808 #, c-format

3809 msgid ""

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

3811 "%%s"

3812 msgstr ""

3813

3715 -#: unpack-trees.c:162

3814 +#: unpack-trees.c:163

3815 #, c-format

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

3817 msgstr ""

3818

3720 -#: unpack-trees.c:165

3819 +#: unpack-trees.c:166

3820 #, c-format

3821 msgid ""

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

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

3823 "%s"

3824 msgstr ""

3825

3727 -#: unpack-trees.c:167

3826 +#: unpack-trees.c:168

3827 #, c-format

3828 msgid ""

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

@@ -3732,7 +3831,7 @@ msgid ""

3831 "%s"

3832 msgstr ""

3833

3735 -#: unpack-trees.c:169

3834 +#: unpack-trees.c:170

3835 #, c-format

3836 msgid ""

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

@@ -3740,24 +3839,19 @@ msgid ""

3839 "%s"

3840 msgstr ""

3841

3743 -#: unpack-trees.c:171

3842 +#: unpack-trees.c:172

3843 #, c-format

3844 msgid ""

3845 "Cannot update submodule:\n"

3846 "%s"

3847 msgstr ""

3848

3750 -#: unpack-trees.c:248

3849 +#: unpack-trees.c:249

3850 #, c-format

3851 msgid "Aborting\n"

3852 msgstr ""

3853

3755 -#: unpack-trees.c:277

3756 -#, c-format

3757 -msgid "submodule update strategy not supported for submodule '%s'"

3758 -msgstr ""

3759 -

3760 -#: unpack-trees.c:346

3854 +#: unpack-trees.c:331

3855 msgid "Checking out files"

3856 msgstr ""

3857

@@ -3800,13 +3894,8 @@ msgstr ""

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

3895 msgstr ""

3896

3803 -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

3804 -#, c-format

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

3806 -msgstr ""

3807 -

3808 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

3809 -#: builtin/am.c:849 builtin/merge.c:1014

3897 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

3898 +#: builtin/am.c:858 builtin/merge.c:1041

3899 #, c-format

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

3901 msgstr ""

@@ -3830,191 +3919,191 @@ msgstr ""

3919 msgid "could not close %s"

3920 msgstr ""

3921

3833 -#: wt-status.c:152

3922 +#: wt-status.c:150

3923 msgid "Unmerged paths:"

3924 msgstr ""

3925

3837 -#: wt-status.c:179 wt-status.c:206

3926 +#: wt-status.c:177 wt-status.c:204

3927 #, c-format

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

3929 msgstr ""

3930

3842 -#: wt-status.c:181 wt-status.c:208

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

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

3933 msgstr ""

3934

3846 -#: wt-status.c:185

3935 +#: wt-status.c:183

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

3937 msgstr ""

3938

3850 -#: wt-status.c:187 wt-status.c:191

3939 +#: wt-status.c:185 wt-status.c:189

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

3941 msgstr ""

3942

3854 -#: wt-status.c:189

3943 +#: wt-status.c:187

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

3945 msgstr ""

3946

3858 -#: wt-status.c:200 wt-status.c:981

3947 +#: wt-status.c:198 wt-status.c:979

3948 msgid "Changes to be committed:"

3949 msgstr ""

3950

3862 -#: wt-status.c:218 wt-status.c:990

3951 +#: wt-status.c:216 wt-status.c:988

3952 msgid "Changes not staged for commit:"

3953 msgstr ""

3954

3866 -#: wt-status.c:222

3955 +#: wt-status.c:220

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

3957 msgstr ""

3958

3870 -#: wt-status.c:224

3959 +#: wt-status.c:222

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

3961 msgstr ""

3962

3874 -#: wt-status.c:225

3963 +#: wt-status.c:223

3964 msgid ""

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

3966 msgstr ""

3967

3879 -#: wt-status.c:227

3968 +#: wt-status.c:225

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

3970 msgstr ""

3971

3883 -#: wt-status.c:239

3972 +#: wt-status.c:237

3973 #, c-format

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

3975 msgstr ""

3976

3888 -#: wt-status.c:254

3977 +#: wt-status.c:252

3978 msgid "both deleted:"

3979 msgstr ""

3980

3892 -#: wt-status.c:256

3981 +#: wt-status.c:254

3982 msgid "added by us:"

3983 msgstr ""

3984

3896 -#: wt-status.c:258

3985 +#: wt-status.c:256

3986 msgid "deleted by them:"

3987 msgstr ""

3988

3900 -#: wt-status.c:260

3989 +#: wt-status.c:258

3990 msgid "added by them:"

3991 msgstr ""

3992

3904 -#: wt-status.c:262

3993 +#: wt-status.c:260

3994 msgid "deleted by us:"

3995 msgstr ""

3996

3908 -#: wt-status.c:264

3997 +#: wt-status.c:262

3998 msgid "both added:"

3999 msgstr ""

4000

3912 -#: wt-status.c:266

4001 +#: wt-status.c:264

4002 msgid "both modified:"

4003 msgstr ""

4004

3916 -#: wt-status.c:276

4005 +#: wt-status.c:274

4006 msgid "new file:"

4007 msgstr ""

4008

3920 -#: wt-status.c:278

4009 +#: wt-status.c:276

4010 msgid "copied:"

4011 msgstr ""

4012

3924 -#: wt-status.c:280

4013 +#: wt-status.c:278

4014 msgid "deleted:"

4015 msgstr ""

4016

3928 -#: wt-status.c:282

4017 +#: wt-status.c:280

4018 msgid "modified:"

4019 msgstr ""

4020

3932 -#: wt-status.c:284

4021 +#: wt-status.c:282

4022 msgid "renamed:"

4023 msgstr ""

4024

3936 -#: wt-status.c:286

4025 +#: wt-status.c:284

4026 msgid "typechange:"

4027 msgstr ""

4028

3940 -#: wt-status.c:288

4029 +#: wt-status.c:286

4030 msgid "unknown:"

4031 msgstr ""

4032

3944 -#: wt-status.c:290

4033 +#: wt-status.c:288

4034 msgid "unmerged:"

4035 msgstr ""

4036

3948 -#: wt-status.c:372

4037 +#: wt-status.c:370

4038 msgid "new commits, "

4039 msgstr ""

4040

3952 -#: wt-status.c:374

4041 +#: wt-status.c:372

4042 msgid "modified content, "

4043 msgstr ""

4044

3956 -#: wt-status.c:376

4045 +#: wt-status.c:374

4046 msgid "untracked content, "

4047 msgstr ""

4048

3960 -#: wt-status.c:821

4049 +#: wt-status.c:819

4050 #, c-format

4051 msgid "Your stash currently has %d entry"

4052 msgid_plural "Your stash currently has %d entries"

4053 msgstr[0] ""

4054 msgstr[1] ""

4055

3967 -#: wt-status.c:853

4056 +#: wt-status.c:851

4057 msgid "Submodules changed but not updated:"

4058 msgstr ""

4059

3971 -#: wt-status.c:855

4060 +#: wt-status.c:853

4061 msgid "Submodule changes to be committed:"

4062 msgstr ""

4063

3975 -#: wt-status.c:937

4064 +#: wt-status.c:935

4065 msgid ""

3977 -"Do not touch the line above.\n"

3978 -"Everything below will be removed."

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

4067 +"Everything below it will be ignored."

4068 msgstr ""

4069

3981 -#: wt-status.c:1049

4070 +#: wt-status.c:1048

4071 msgid "You have unmerged paths."

4072 msgstr ""

4073

3985 -#: wt-status.c:1052

4074 +#: wt-status.c:1051

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

4076 msgstr ""

4077

3989 -#: wt-status.c:1054

4078 +#: wt-status.c:1053

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

4080 msgstr ""

4081

3993 -#: wt-status.c:1059

4082 +#: wt-status.c:1058

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

4084 msgstr ""

4085

3997 -#: wt-status.c:1062

4086 +#: wt-status.c:1061

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

4088 msgstr ""

4089

4001 -#: wt-status.c:1072

4090 +#: wt-status.c:1071

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

4092 msgstr ""

4093

4005 -#: wt-status.c:1075

4094 +#: wt-status.c:1074

4095 msgid "The current patch is empty."

4096 msgstr ""

4097

4009 -#: wt-status.c:1079

4098 +#: wt-status.c:1078

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

4100 msgstr ""

4101

4013 -#: wt-status.c:1081

4102 +#: wt-status.c:1080

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

4104 msgstr ""

4105

4017 -#: wt-status.c:1083

4106 +#: wt-status.c:1082

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

4108 msgstr ""

4109

@@ -4291,7 +4380,7 @@ msgstr ""

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

4381 msgstr ""

4382

4294 -#: compat/precompose_utf8.c:58 builtin/clone.c:436

4383 +#: compat/precompose_utf8.c:58 builtin/clone.c:437

4384 #, c-format

4385 msgid "failed to unlink '%s'"

4386 msgstr ""

@@ -4305,7 +4394,7 @@ msgstr ""

4394 msgid "unexpected diff status %c"

4395 msgstr ""

4396

4308 -#: builtin/add.c:87 builtin/commit.c:292

4397 +#: builtin/add.c:87 builtin/commit.c:291

4398 msgid "updating files failed"

4399 msgstr ""

4400

@@ -4314,108 +4403,108 @@ msgstr ""

4403 msgid "remove '%s'\n"

4404 msgstr ""

4405

4317 -#: builtin/add.c:151

4406 +#: builtin/add.c:153

4407 msgid "Unstaged changes after refreshing the index:"

4408 msgstr ""

4409

4321 -#: builtin/add.c:211 builtin/rev-parse.c:873

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

4411 msgid "Could not read the index"

4412 msgstr ""

4413

4325 -#: builtin/add.c:222

4414 +#: builtin/add.c:224

4415 #, c-format

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

4417 msgstr ""

4418

4330 -#: builtin/add.c:226

4419 +#: builtin/add.c:228

4420 msgid "Could not write patch"

4421 msgstr ""

4422

4334 -#: builtin/add.c:229

4423 +#: builtin/add.c:231

4424 msgid "editing patch failed"

4425 msgstr ""

4426

4338 -#: builtin/add.c:232

4427 +#: builtin/add.c:234

4428 #, c-format

4429 msgid "Could not stat '%s'"

4430 msgstr ""

4431

4343 -#: builtin/add.c:234

4432 +#: builtin/add.c:236

4433 msgid "Empty patch. Aborted."

4434 msgstr ""

4435

4347 -#: builtin/add.c:239

4436 +#: builtin/add.c:241

4437 #, c-format

4438 msgid "Could not apply '%s'"

4439 msgstr ""

4440

4352 -#: builtin/add.c:249

4441 +#: builtin/add.c:251

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

4443 msgstr ""

4444

4356 -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124

4445 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

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

4358 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164

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

4448 msgid "dry run"

4449 msgstr ""

4450

4362 -#: builtin/add.c:272

4451 +#: builtin/add.c:274

4452 msgid "interactive picking"

4453 msgstr ""

4454

4366 -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299

4455 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4456 msgid "select hunks interactively"

4457 msgstr ""

4458

4370 -#: builtin/add.c:274

4459 +#: builtin/add.c:276

4460 msgid "edit current diff and apply"

4461 msgstr ""

4462

4374 -#: builtin/add.c:275

4463 +#: builtin/add.c:277

4464 msgid "allow adding otherwise ignored files"

4465 msgstr ""

4466

4378 -#: builtin/add.c:276

4467 +#: builtin/add.c:278

4468 msgid "update tracked files"

4469 msgstr ""

4470

4382 -#: builtin/add.c:277

4471 +#: builtin/add.c:279

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

4473 msgstr ""

4474

4386 -#: builtin/add.c:278

4475 +#: builtin/add.c:280

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

4477 msgstr ""

4478

4390 -#: builtin/add.c:281

4479 +#: builtin/add.c:283

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

4481 msgstr ""

4482

4394 -#: builtin/add.c:283

4483 +#: builtin/add.c:285

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

4485 msgstr ""

4486

4398 -#: builtin/add.c:284

4487 +#: builtin/add.c:286

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

4489 msgstr ""

4490

4402 -#: builtin/add.c:285

4491 +#: builtin/add.c:287

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

4493 msgstr ""

4494

4406 -#: builtin/add.c:286 builtin/update-index.c:952

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

4496 msgid "(+/-)x"

4497 msgstr ""

4498

4410 -#: builtin/add.c:286 builtin/update-index.c:953

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

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

4501 msgstr ""

4502

4414 -#: builtin/add.c:288

4503 +#: builtin/add.c:290

4504 msgid "warn when adding an embedded repository"

4505 msgstr ""

4506

4418 -#: builtin/add.c:303

4507 +#: builtin/add.c:305

4508 #, c-format

4509 msgid ""

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

@@ -4433,185 +4522,185 @@ msgid ""

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

4523 msgstr ""

4524

4436 -#: builtin/add.c:331

4525 +#: builtin/add.c:333

4526 #, c-format

4527 msgid "adding embedded git repository: %s"

4528 msgstr ""

4529

4441 -#: builtin/add.c:349

4530 +#: builtin/add.c:351

4531 #, c-format

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

4533 msgstr ""

4534

4446 -#: builtin/add.c:357

4535 +#: builtin/add.c:359

4536 msgid "adding files failed"

4537 msgstr ""

4538

4450 -#: builtin/add.c:394

4539 +#: builtin/add.c:396

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

4541 msgstr ""

4542

4454 -#: builtin/add.c:401

4543 +#: builtin/add.c:403

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

4545 msgstr ""

4546

4458 -#: builtin/add.c:405

4547 +#: builtin/add.c:407

4548 #, c-format

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

4550 msgstr ""

4551

4463 -#: builtin/add.c:420

4552 +#: builtin/add.c:422

4553 #, c-format

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

4555 msgstr ""

4556

4468 -#: builtin/add.c:421

4557 +#: builtin/add.c:423

4558 #, c-format

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

4560 msgstr ""

4561

4473 -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282

4474 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351

4475 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272

4476 -#: builtin/submodule--helper.c:244

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

4563 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4564 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4565 +#: builtin/submodule--helper.c:243

4566 msgid "index file corrupt"

4567 msgstr ""

4568

4480 -#: builtin/am.c:413

4569 +#: builtin/am.c:414

4570 msgid "could not parse author script"

4571 msgstr ""

4572

4484 -#: builtin/am.c:489

4573 +#: builtin/am.c:498

4574 #, c-format

4575 msgid "'%s' was deleted by the applypatch-msg hook"

4576 msgstr ""

4577

4489 -#: builtin/am.c:530

4578 +#: builtin/am.c:539

4579 #, c-format

4580 msgid "Malformed input line: '%s'."

4581 msgstr ""

4582

4494 -#: builtin/am.c:567

4583 +#: builtin/am.c:576

4584 #, c-format

4585 msgid "Failed to copy notes from '%s' to '%s'"

4586 msgstr ""

4587

4499 -#: builtin/am.c:593

4588 +#: builtin/am.c:602

4589 msgid "fseek failed"

4590 msgstr ""

4591

4503 -#: builtin/am.c:777

4592 +#: builtin/am.c:786

4593 #, c-format

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

4595 msgstr ""

4596

4508 -#: builtin/am.c:842

4597 +#: builtin/am.c:851

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

4599 msgstr ""

4600

4512 -#: builtin/am.c:889

4601 +#: builtin/am.c:899

4602 msgid "invalid timestamp"

4603 msgstr ""

4604

4516 -#: builtin/am.c:892 builtin/am.c:900

4605 +#: builtin/am.c:904 builtin/am.c:916

4606 msgid "invalid Date line"

4607 msgstr ""

4608

4520 -#: builtin/am.c:897

4609 +#: builtin/am.c:911

4610 msgid "invalid timezone offset"

4611 msgstr ""

4612

4524 -#: builtin/am.c:986

4613 +#: builtin/am.c:1004

4614 msgid "Patch format detection failed."

4615 msgstr ""

4616

4528 -#: builtin/am.c:991 builtin/clone.c:401

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

4618 #, c-format

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

4620 msgstr ""

4621

4533 -#: builtin/am.c:995

4622 +#: builtin/am.c:1013

4623 msgid "Failed to split patches."

4624 msgstr ""

4625

4537 -#: builtin/am.c:1120 builtin/commit.c:377

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

4627 msgid "unable to write index file"

4628 msgstr ""

4629

4541 -#: builtin/am.c:1171

4630 +#: builtin/am.c:1193

4631 #, c-format

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

4633 msgstr ""

4634

4546 -#: builtin/am.c:1172

4635 +#: builtin/am.c:1194

4636 #, c-format

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

4638 msgstr ""

4639

4551 -#: builtin/am.c:1173

4640 +#: builtin/am.c:1195

4641 #, c-format

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

4643 msgstr ""

4644

4556 -#: builtin/am.c:1304

4645 +#: builtin/am.c:1302

4646 msgid "Patch is empty."

4647 msgstr ""

4648

4560 -#: builtin/am.c:1370

4649 +#: builtin/am.c:1368

4650 #, c-format

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

4652 msgstr ""

4653

4565 -#: builtin/am.c:1392

4654 +#: builtin/am.c:1390

4655 #, c-format

4656 msgid "unable to parse commit %s"

4657 msgstr ""

4658

4570 -#: builtin/am.c:1586

4659 +#: builtin/am.c:1584

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

4661 msgstr ""

4662

4574 -#: builtin/am.c:1588

4663 +#: builtin/am.c:1586

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

4665 msgstr ""

4666

4578 -#: builtin/am.c:1607

4667 +#: builtin/am.c:1605

4668 msgid ""

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

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

4671 msgstr ""

4672

4584 -#: builtin/am.c:1613

4673 +#: builtin/am.c:1611

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

4675 msgstr ""

4676

4588 -#: builtin/am.c:1638

4677 +#: builtin/am.c:1636

4678 msgid "Failed to merge in the changes."

4679 msgstr ""

4680

4592 -#: builtin/am.c:1662 builtin/merge.c:632

4681 +#: builtin/am.c:1660 builtin/merge.c:641

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

4683 msgstr ""

4684

4596 -#: builtin/am.c:1669

4685 +#: builtin/am.c:1667

4686 msgid "applying to an empty history"

4687 msgstr ""

4688

4600 -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803

4601 -#: builtin/merge.c:828

4689 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

4690 +#: builtin/merge.c:849

4691 msgid "failed to write commit object"

4692 msgstr ""

4693

4605 -#: builtin/am.c:1715 builtin/am.c:1719

4694 +#: builtin/am.c:1713 builtin/am.c:1717

4695 #, c-format

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

4697 msgstr ""

4698

4610 -#: builtin/am.c:1735

4699 +#: builtin/am.c:1733

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

4701 msgstr ""

4702

4614 -#: builtin/am.c:1740

4703 +#: builtin/am.c:1738

4704 msgid "Commit Body is:"

4705 msgstr ""

4706

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

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

4709 #. input at this point.

4710 #.

4622 -#: builtin/am.c:1750

4711 +#: builtin/am.c:1748

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

4713 msgstr ""

4714

4626 -#: builtin/am.c:1800

4715 +#: builtin/am.c:1798

4716 #, c-format

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

4718 msgstr ""

4719

4631 -#: builtin/am.c:1840 builtin/am.c:1912

4720 +#: builtin/am.c:1838 builtin/am.c:1910

4721 #, c-format

4722 msgid "Applying: %.*s"

4723 msgstr ""

4724

4636 -#: builtin/am.c:1856

4725 +#: builtin/am.c:1854

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

4727 msgstr ""

4728

4640 -#: builtin/am.c:1864

4729 +#: builtin/am.c:1862

4730 #, c-format

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

4732 msgstr ""

4733

4645 -#: builtin/am.c:1870

4734 +#: builtin/am.c:1868

4735 #, c-format

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

4737 msgstr ""

4738

4650 -#: builtin/am.c:1915

4739 +#: builtin/am.c:1913

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

4657 -#: builtin/am.c:1922

4746 +#: builtin/am.c:1920

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 "

@@ -4662,172 +4751,171 @@ msgid ""

4751 "You might run `git rm` on a file to accept \"deleted by them\" for it."

4752 msgstr ""

4753

4665 -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323

4666 -#: builtin/reset.c:331

4754 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

4755 +#: builtin/reset.c:340

4756 #, c-format

4757 msgid "Could not parse object '%s'."

4758 msgstr ""

4759

4671 -#: builtin/am.c:2083

4760 +#: builtin/am.c:2081

4761 msgid "failed to clean index"

4762 msgstr ""

4763

4675 -#: builtin/am.c:2117

4764 +#: builtin/am.c:2116

4765 msgid ""

4766 "You seem to have moved HEAD since the last 'am' failure.\n"

4767 "Not rewinding to ORIG_HEAD"

4768 msgstr ""

4769

4681 -#: builtin/am.c:2180

4770 +#: builtin/am.c:2179

4771 #, c-format

4772 msgid "Invalid value for --patch-format: %s"

4773 msgstr ""

4774

4686 -#: builtin/am.c:2213

4775 +#: builtin/am.c:2212

4776 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

4777 msgstr ""

4778

4690 -#: builtin/am.c:2214

4779 +#: builtin/am.c:2213

4780 msgid "git am [<options>] (--continue | --skip | --abort)"

4781 msgstr ""

4782

4694 -#: builtin/am.c:2220

4783 +#: builtin/am.c:2219

4784 msgid "run interactively"

4785 msgstr ""

4786

4698 -#: builtin/am.c:2222

4787 +#: builtin/am.c:2221

4788 msgid "historical option -- no-op"

4789 msgstr ""

4790

4702 -#: builtin/am.c:2224

4791 +#: builtin/am.c:2223

4792 msgid "allow fall back on 3way merging if needed"

4793 msgstr ""

4794

4706 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

4795 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

4796 #: builtin/repack.c:180

4797 msgid "be quiet"

4798 msgstr ""

4799

4711 -#: builtin/am.c:2227

4800 +#: builtin/am.c:2226

4801 msgid "add a Signed-off-by line to the commit message"

4802 msgstr ""

4803

4715 -#: builtin/am.c:2230

4804 +#: builtin/am.c:2229

4805 msgid "recode into utf8 (default)"

4806 msgstr ""

4807

4719 -#: builtin/am.c:2232

4808 +#: builtin/am.c:2231

4809 msgid "pass -k flag to git-mailinfo"

4810 msgstr ""

4811

4723 -#: builtin/am.c:2234

4812 +#: builtin/am.c:2233

4813 msgid "pass -b flag to git-mailinfo"

4814 msgstr ""

4815

4727 -#: builtin/am.c:2236

4816 +#: builtin/am.c:2235

4817 msgid "pass -m flag to git-mailinfo"

4818 msgstr ""

4819

4731 -#: builtin/am.c:2238

4820 +#: builtin/am.c:2237

4821 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

4822 msgstr ""

4823

4735 -#: builtin/am.c:2241

4824 +#: builtin/am.c:2240

4825 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

4826 msgstr ""

4827

4739 -#: builtin/am.c:2244

4828 +#: builtin/am.c:2243

4829 msgid "strip everything before a scissors line"

4830 msgstr ""

4831

4743 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

4744 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

4745 -#: builtin/am.c:2273

4832 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

4833 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

4834 +#: builtin/am.c:2272

4835 msgid "pass it through git-apply"

4836 msgstr ""

4837

4749 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666

4750 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142

4751 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193

4752 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169

4753 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134

4754 -#: parse-options.h:245

4838 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

4839 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

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

4758 -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38

4759 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39

4846 +#: builtin/am.c:2268 builtin/branch.c:622 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

4763 -#: builtin/am.c:2270

4851 +#: builtin/am.c:2269

4852 msgid "format the patch(es) are in"

4853 msgstr ""

4854

4767 -#: builtin/am.c:2276

4855 +#: builtin/am.c:2275

4856 msgid "override error message when patch failure occurs"

4857 msgstr ""

4858

4771 -#: builtin/am.c:2278

4859 +#: builtin/am.c:2277

4860 msgid "continue applying patches after resolving a conflict"

4861 msgstr ""

4862

4775 -#: builtin/am.c:2281

4863 +#: builtin/am.c:2280

4864 msgid "synonyms for --continue"

4865 msgstr ""

4866

4779 -#: builtin/am.c:2284

4867 +#: builtin/am.c:2283

4868 msgid "skip the current patch"

4869 msgstr ""

4870

4783 -#: builtin/am.c:2287

4871 +#: builtin/am.c:2286

4872 msgid "restore the original branch and abort the patching operation."

4873 msgstr ""

4874

4787 -#: builtin/am.c:2291

4875 +#: builtin/am.c:2290

4876 msgid "lie about committer date"

4877 msgstr ""

4878

4791 -#: builtin/am.c:2293

4879 +#: builtin/am.c:2292

4880 msgid "use current timestamp for author date"

4881 msgstr ""

4882

4795 -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233

4796 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414

4883 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

4884 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

4885 msgid "key-id"

4886 msgstr ""

4887

4800 -#: builtin/am.c:2296

4888 +#: builtin/am.c:2295

4889 msgid "GPG-sign commits"

4890 msgstr ""

4891

4804 -#: builtin/am.c:2299

4892 +#: builtin/am.c:2298

4893 msgid "(internal use for git-rebase)"

4894 msgstr ""

4895

4808 -#: builtin/am.c:2317

4896 +#: builtin/am.c:2316

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

4814 -#: builtin/am.c:2324

4902 +#: builtin/am.c:2323

4903 msgid "failed to read the index"

4904 msgstr ""

4905

4818 -#: builtin/am.c:2339

4906 +#: builtin/am.c:2338

4907 #, c-format

4908 msgid "previous rebase directory %s still exists but mbox given."

4909 msgstr ""

4910

4823 -#: builtin/am.c:2363

4911 +#: builtin/am.c:2362

4912 #, c-format

4913 msgid ""

4914 "Stray %s directory found.\n"

4915 "Use \"git am --abort\" to remove it."

4916 msgstr ""

4917

4830 -#: builtin/am.c:2369

4918 +#: builtin/am.c:2368

4919 msgid "Resolve operation not in progress, we are not resuming."

4920 msgstr ""

4921

@@ -5029,124 +5117,149 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

5117 msgstr ""

5118

5119 #: builtin/branch.c:31

5032 -msgid "git branch [<options>] [-r | -a] [--points-at]"

5120 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

5121 msgstr ""

5122

5123 #: builtin/branch.c:32

5124 +msgid "git branch [<options>] [-r | -a] [--points-at]"

5125 +msgstr ""

5126 +

5127 +#: builtin/branch.c:33

5128 msgid "git branch [<options>] [-r | -a] [--format]"

5129 msgstr ""

5130

5039 -#: builtin/branch.c:145

5131 +#: builtin/branch.c:146

5132 #, c-format

5133 msgid ""

5134 "deleting branch '%s' that has been merged to\n"

5135 " '%s', but not yet merged to HEAD."

5136 msgstr ""

5137

5046 -#: builtin/branch.c:149

5138 +#: builtin/branch.c:150

5139 #, c-format

5140 msgid ""

5141 "not deleting branch '%s' that is not yet merged to\n"

5142 " '%s', even though it is merged to HEAD."

5143 msgstr ""

5144

5053 -#: builtin/branch.c:163

5145 +#: builtin/branch.c:164

5146 #, c-format

5147 msgid "Couldn't look up commit object for '%s'"

5148 msgstr ""

5149

5058 -#: builtin/branch.c:167

5150 +#: builtin/branch.c:168

5151 #, c-format

5152 msgid ""

5153 "The branch '%s' is not fully merged.\n"

5154 "If you are sure you want to delete it, run 'git branch -D %s'."

5155 msgstr ""

5156

5065 -#: builtin/branch.c:180

5157 +#: builtin/branch.c:181

5158 msgid "Update of config-file failed"

5159 msgstr ""

5160

5069 -#: builtin/branch.c:211

5161 +#: builtin/branch.c:212

5162 msgid "cannot use -a with -d"

5163 msgstr ""

5164

5073 -#: builtin/branch.c:217

5165 +#: builtin/branch.c:218

5166 msgid "Couldn't look up commit object for HEAD"

5167 msgstr ""

5168

5077 -#: builtin/branch.c:231

5169 +#: builtin/branch.c:232

5170 #, c-format

5171 msgid "Cannot delete branch '%s' checked out at '%s'"

5172 msgstr ""

5173

5082 -#: builtin/branch.c:246

5174 +#: builtin/branch.c:247

5175 #, c-format

5176 msgid "remote-tracking branch '%s' not found."

5177 msgstr ""

5178

5087 -#: builtin/branch.c:247

5179 +#: builtin/branch.c:248

5180 #, c-format

5181 msgid "branch '%s' not found."

5182 msgstr ""

5183

5092 -#: builtin/branch.c:262

5184 +#: builtin/branch.c:263

5185 #, c-format

5186 msgid "Error deleting remote-tracking branch '%s'"

5187 msgstr ""

5188

5097 -#: builtin/branch.c:263

5189 +#: builtin/branch.c:264

5190 #, c-format

5191 msgid "Error deleting branch '%s'"

5192 msgstr ""

5193

5102 -#: builtin/branch.c:270

5194 +#: builtin/branch.c:271

5195 #, c-format

5196 msgid "Deleted remote-tracking branch %s (was %s).\n"

5197 msgstr ""

5198

5107 -#: builtin/branch.c:271

5199 +#: builtin/branch.c:272

5200 #, c-format

5201 msgid "Deleted branch %s (was %s).\n"

5202 msgstr ""

5203

5112 -#: builtin/branch.c:445

5204 +#: builtin/branch.c:417 builtin/tag.c:58

5205 +msgid "unable to parse format string"

5206 +msgstr ""

5207 +

5208 +#: builtin/branch.c:450

5209 #, c-format

5210 msgid "Branch %s is being rebased at %s"

5211 msgstr ""

5212

5117 -#: builtin/branch.c:449

5213 +#: builtin/branch.c:454

5214 #, c-format

5215 msgid "Branch %s is being bisected at %s"

5216 msgstr ""

5217

5122 -#: builtin/branch.c:464

5218 +#: builtin/branch.c:470

5219 +msgid "cannot copy the current branch while not on any."

5220 +msgstr ""

5221 +

5222 +#: builtin/branch.c:472

5223 msgid "cannot rename the current branch while not on any."

5224 msgstr ""

5225

5126 -#: builtin/branch.c:474

5226 +#: builtin/branch.c:483

5227 #, c-format

5228 msgid "Invalid branch name: '%s'"

5229 msgstr ""

5230

5131 -#: builtin/branch.c:491

5231 +#: builtin/branch.c:504

5232 msgid "Branch rename failed"

5233 msgstr ""

5234

5135 -#: builtin/branch.c:494

5235 +#: builtin/branch.c:506

5236 +msgid "Branch copy failed"

5237 +msgstr ""

5238 +

5239 +#: builtin/branch.c:510

5240 +#, c-format

5241 +msgid "Copied a misnamed branch '%s' away"

5242 +msgstr ""

5243 +

5244 +#: builtin/branch.c:513

5245 #, c-format

5246 msgid "Renamed a misnamed branch '%s' away"

5247 msgstr ""

5248

5140 -#: builtin/branch.c:497

5249 +#: builtin/branch.c:519

5250 #, c-format

5251 msgid "Branch renamed to %s, but HEAD is not updated!"

5252 msgstr ""

5253

5145 -#: builtin/branch.c:506

5254 +#: builtin/branch.c:528

5255 msgid "Branch is renamed, but update of config-file failed"

5256 msgstr ""

5257

5149 -#: builtin/branch.c:522

5258 +#: builtin/branch.c:530

5259 +msgid "Branch is copied, but update of config-file failed"

5260 +msgstr ""

5261 +

5262 +#: builtin/branch.c:546

5263 #, c-format

5264 msgid ""

5265 "Please edit the description for the branch\n"

@@ -5154,225 +5267,224 @@ msgid ""

5267 "Lines starting with '%c' will be stripped.\n"

5268 msgstr ""

5269

5157 -#: builtin/branch.c:555

5270 +#: builtin/branch.c:579

5271 msgid "Generic options"

5272 msgstr ""

5273

5161 -#: builtin/branch.c:557

5274 +#: builtin/branch.c:581

5275 msgid "show hash and subject, give twice for upstream branch"

5276 msgstr ""

5277

5165 -#: builtin/branch.c:558

5278 +#: builtin/branch.c:582

5279 msgid "suppress informational messages"

5280 msgstr ""

5281

5169 -#: builtin/branch.c:559

5282 +#: builtin/branch.c:583

5283 msgid "set up tracking mode (see git-pull(1))"

5284 msgstr ""

5285

5173 -#: builtin/branch.c:561

5174 -msgid "change upstream info"

5286 +#: builtin/branch.c:585

5287 +msgid "do not use"

5288 msgstr ""

5289

5177 -#: builtin/branch.c:563

5290 +#: builtin/branch.c:587

5291 msgid "upstream"

5292 msgstr ""

5293

5181 -#: builtin/branch.c:563

5294 +#: builtin/branch.c:587

5295 msgid "change the upstream info"

5296 msgstr ""

5297

5185 -#: builtin/branch.c:564

5298 +#: builtin/branch.c:588

5299 msgid "Unset the upstream info"

5300 msgstr ""

5301

5189 -#: builtin/branch.c:565

5302 +#: builtin/branch.c:589

5303 msgid "use colored output"

5304 msgstr ""

5305

5193 -#: builtin/branch.c:566

5306 +#: builtin/branch.c:590

5307 msgid "act on remote-tracking branches"

5308 msgstr ""

5309

5197 -#: builtin/branch.c:568 builtin/branch.c:570

5310 +#: builtin/branch.c:592 builtin/branch.c:594

5311 msgid "print only branches that contain the commit"

5312 msgstr ""

5313

5201 -#: builtin/branch.c:569 builtin/branch.c:571

5314 +#: builtin/branch.c:593 builtin/branch.c:595

5315 msgid "print only branches that don't contain the commit"

5316 msgstr ""

5317

5205 -#: builtin/branch.c:574

5318 +#: builtin/branch.c:598

5319 msgid "Specific git-branch actions:"

5320 msgstr ""

5321

5209 -#: builtin/branch.c:575

5322 +#: builtin/branch.c:599

5323 msgid "list both remote-tracking and local branches"

5324 msgstr ""

5325

5213 -#: builtin/branch.c:577

5326 +#: builtin/branch.c:601

5327 msgid "delete fully merged branch"

5328 msgstr ""

5329

5217 -#: builtin/branch.c:578

5330 +#: builtin/branch.c:602

5331 msgid "delete branch (even if not merged)"

5332 msgstr ""

5333

5221 -#: builtin/branch.c:579

5334 +#: builtin/branch.c:603

5335 msgid "move/rename a branch and its reflog"

5336 msgstr ""

5337

5225 -#: builtin/branch.c:580

5338 +#: builtin/branch.c:604

5339 msgid "move/rename a branch, even if target exists"

5340 msgstr ""

5341

5229 -#: builtin/branch.c:581

5342 +#: builtin/branch.c:605

5343 +msgid "copy a branch and its reflog"

5344 +msgstr ""

5345 +

5346 +#: builtin/branch.c:606

5347 +msgid "copy a branch, even if target exists"

5348 +msgstr ""

5349 +

5350 +#: builtin/branch.c:607

5351 msgid "list branch names"

5352 msgstr ""

5353

5233 -#: builtin/branch.c:582

5354 +#: builtin/branch.c:608

5355 msgid "create the branch's reflog"

5356 msgstr ""

5357

5237 -#: builtin/branch.c:584

5358 +#: builtin/branch.c:610

5359 msgid "edit the description for the branch"

5360 msgstr ""

5361

l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)