5e078fcd83 · 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: 2014-02-01 08:06+0800\n"

11 +"POT-Creation-Date: 2014-04-19 12:50+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -18,16 +18,12 @@ msgstr ""

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

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

20

21 -#: advice.c:57

21 +#: advice.c:55

22 #, c-format

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

24 msgstr ""

25

26 -#.

27 -#. * Message used both when 'git commit' fails and when

28 -#. * other commands doing a merge do.

29 -#.

30 -#: advice.c:87

26 +#: advice.c:85

27 msgid ""

28 "Fix them up in the work tree,\n"

29 "and then use 'git add/rm <file>' as\n"

@@ -52,76 +48,76 @@ msgstr ""

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

49 msgstr ""

50

55 -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

51 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

52 #, c-format

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

54 msgstr ""

55

60 -#: archive.c:327

56 +#: archive.c:328

57 msgid "fmt"

58 msgstr ""

59

64 -#: archive.c:327

60 +#: archive.c:328

61 msgid "archive format"

62 msgstr ""

63

68 -#: archive.c:328 builtin/log.c:1193

64 +#: archive.c:329 builtin/log.c:1193

65 msgid "prefix"

66 msgstr ""

67

72 -#: archive.c:329

68 +#: archive.c:330

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

70 msgstr ""

71

76 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

77 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

78 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

79 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

80 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

72 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

73 +#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

74 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

75 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

76 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

77 msgid "file"

78 msgstr ""

79

84 -#: archive.c:331 builtin/archive.c:89

80 +#: archive.c:332 builtin/archive.c:89

81 msgid "write the archive to this file"

82 msgstr ""

83

88 -#: archive.c:333

84 +#: archive.c:334

85 msgid "read .gitattributes in working directory"

86 msgstr ""

87

92 -#: archive.c:334

88 +#: archive.c:335

89 msgid "report archived files on stderr"

90 msgstr ""

91

96 -#: archive.c:335

92 +#: archive.c:336

93 msgid "store only"

94 msgstr ""

95

100 -#: archive.c:336

96 +#: archive.c:337

97 msgid "compress faster"

98 msgstr ""

99

104 -#: archive.c:344

100 +#: archive.c:345

101 msgid "compress better"

102 msgstr ""

103

108 -#: archive.c:347

104 +#: archive.c:348

105 msgid "list supported archive formats"

106 msgstr ""

107

112 -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

108 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

109 msgid "repo"

110 msgstr ""

111

116 -#: archive.c:350 builtin/archive.c:91

112 +#: archive.c:351 builtin/archive.c:91

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

114 msgstr ""

115

120 -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

116 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

117 msgid "command"

118 msgstr ""

119

124 -#: archive.c:352 builtin/archive.c:93

120 +#: archive.c:353 builtin/archive.c:93

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

122 msgstr ""

123

@@ -136,81 +132,76 @@ msgstr ""

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

133 msgstr ""

134

139 -#: branch.c:82

135 +#: branch.c:83

136 #, c-format

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

138 msgstr ""

139

144 -#: branch.c:83

140 +#: branch.c:84

141 #, c-format

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

143 msgstr ""

144

149 -#: branch.c:87

145 +#: branch.c:88

146 #, c-format

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

148 msgstr ""

149

154 -#: branch.c:88

150 +#: branch.c:89

151 #, c-format

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

153 msgstr ""

154

159 -#: branch.c:92

155 +#: branch.c:94

156 #, c-format

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

158 msgstr ""

159

164 -#: branch.c:93

160 +#: branch.c:95

161 #, c-format

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

163 msgstr ""

164

169 -#: branch.c:97

165 +#: branch.c:99

166 #, c-format

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

168 msgstr ""

169

174 -#: branch.c:98

170 +#: branch.c:100

171 #, c-format

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

173 msgstr ""

174

179 -#: branch.c:118

180 -#, c-format

181 -msgid "Tracking not set up: name too long: %s"

182 -msgstr ""

183 -

184 -#: branch.c:137

175 +#: branch.c:133

176 #, c-format

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

178 msgstr ""

179

189 -#: branch.c:182

180 +#: branch.c:178

181 #, c-format

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

183 msgstr ""

184

194 -#: branch.c:187

185 +#: branch.c:183

186 #, c-format

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

188 msgstr ""

189

199 -#: branch.c:195

190 +#: branch.c:191

191 msgid "Cannot force update the current branch."

192 msgstr ""

193

203 -#: branch.c:215

194 +#: branch.c:211

195 #, c-format

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

197 msgstr ""

198

208 -#: branch.c:217

199 +#: branch.c:213

200 #, c-format

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

202 msgstr ""

203

213 -#: branch.c:219

204 +#: branch.c:215

205 msgid ""

206 "\n"

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

@@ -222,113 +213,113 @@ msgid ""

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

214 msgstr ""

215

225 -#: branch.c:264

216 +#: branch.c:260

217 #, c-format

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

219 msgstr ""

220

230 -#: branch.c:284

221 +#: branch.c:280

222 #, c-format

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

224 msgstr ""

225

235 -#: branch.c:289

226 +#: branch.c:285

227 #, c-format

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

229 msgstr ""

230

240 -#: branch.c:295

231 +#: branch.c:291

232 msgid "Failed to lock ref for update"

233 msgstr ""

234

244 -#: branch.c:313

235 +#: branch.c:309

236 msgid "Failed to write ref"

237 msgstr ""

238

248 -#: bundle.c:37

239 +#: bundle.c:33

240 #, c-format

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

242 msgstr ""

243

253 -#: bundle.c:64

244 +#: bundle.c:60

245 #, c-format

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

247 msgstr ""

248

258 -#: bundle.c:90 builtin/commit.c:706

249 +#: bundle.c:86 builtin/commit.c:706

250 #, c-format

251 msgid "could not open '%s'"

252 msgstr ""

253

263 -#: bundle.c:141

254 +#: bundle.c:138

255 msgid "Repository lacks these prerequisite commits:"

256 msgstr ""

257

267 -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

258 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

259 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

260 #: builtin/shortlog.c:158

261 msgid "revision walk setup failed"

262 msgstr ""

263

273 -#: bundle.c:187

264 +#: bundle.c:184

265 #, c-format

266 msgid "The bundle contains this ref:"

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

268 msgstr[0] ""

269 msgstr[1] ""

270

280 -#: bundle.c:194

271 +#: bundle.c:191

272 msgid "The bundle records a complete history."

273 msgstr ""

274

284 -#: bundle.c:196

275 +#: bundle.c:193

276 #, c-format

277 msgid "The bundle requires this ref:"

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

279 msgstr[0] ""

280 msgstr[1] ""

281

291 -#: bundle.c:296

282 +#: bundle.c:293

283 msgid "rev-list died"

284 msgstr ""

285

295 -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

286 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

287 #, c-format

288 msgid "unrecognized argument: %s"

289 msgstr ""

290

300 -#: bundle.c:337

291 +#: bundle.c:334

292 #, c-format

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

294 msgstr ""

295

305 -#: bundle.c:382

296 +#: bundle.c:379

297 msgid "Refusing to create empty bundle."

298 msgstr ""

299

309 -#: bundle.c:398

300 +#: bundle.c:395

301 msgid "Could not spawn pack-objects"

302 msgstr ""

303

313 -#: bundle.c:416

304 +#: bundle.c:413

305 msgid "pack-objects died"

306 msgstr ""

307

317 -#: bundle.c:419

308 +#: bundle.c:416

309 #, c-format

310 msgid "cannot create '%s'"

311 msgstr ""

312

322 -#: bundle.c:441

313 +#: bundle.c:438

314 msgid "index-pack died"

315 msgstr ""

316

326 -#: commit.c:53

317 +#: commit.c:54

318 #, c-format

319 msgid "could not parse %s"

320 msgstr ""

321

331 -#: commit.c:55

322 +#: commit.c:56

323 #, c-format

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

325 msgstr ""

@@ -404,6 +395,7 @@ msgid_plural "%lu years"

395 msgstr[0] ""

396 msgstr[1] ""

397

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

399 #: date.c:149

400 #, c-format

401 msgid "%s, %lu month ago"

@@ -423,6 +415,10 @@ msgstr[1] ""

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

416 msgstr ""

417

418 +#: diffcore-rename.c:517

419 +msgid "Performing inexact rename detection"

420 +msgstr ""

421 +

422 #: diff.c:113

423 #, c-format

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

@@ -445,14 +441,14 @@ msgid ""

441 "%s"

442 msgstr ""

443

448 -#: diff.c:3509

444 +#: diff.c:3495

445 #, c-format

446 msgid ""

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

448 "%s"

449 msgstr ""

450

455 -#: diff.c:3523

451 +#: diff.c:3509

452 #, c-format

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

454 msgstr ""

@@ -479,63 +475,63 @@ msgstr ""

475 msgid "failed writing detached signature to '%s': %s"

476 msgstr ""

477

482 -#: grep.c:1695

478 +#: grep.c:1698

479 #, c-format

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

481 msgstr ""

482

487 -#: grep.c:1712

483 +#: grep.c:1715

484 #, c-format

485 msgid "'%s': %s"

486 msgstr ""

487

492 -#: grep.c:1723

488 +#: grep.c:1726

489 #, c-format

490 msgid "'%s': short read %s"

491 msgstr ""

492

497 -#: help.c:210

493 +#: help.c:209

494 #, c-format

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

496 msgstr ""

497

502 -#: help.c:217

498 +#: help.c:216

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

500 msgstr ""

501

506 -#: help.c:233

502 +#: help.c:232

503 msgid "The most commonly used git commands are:"

504 msgstr ""

505

510 -#: help.c:290

506 +#: help.c:289

507 #, c-format

508 msgid ""

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

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

511 msgstr ""

512

517 -#: help.c:347

513 +#: help.c:346

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

515 msgstr ""

516

521 -#: help.c:369

517 +#: help.c:368

518 #, c-format

519 msgid ""

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

521 "Continuing under the assumption that you meant '%s'"

522 msgstr ""

523

528 -#: help.c:374

524 +#: help.c:373

525 #, c-format

526 msgid "in %0.1f seconds automatically..."

527 msgstr ""

528

533 -#: help.c:381

529 +#: help.c:380

530 #, c-format

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

532 msgstr ""

533

538 -#: help.c:385 help.c:444

534 +#: help.c:384 help.c:443

535 msgid ""

536 "\n"

537 "Did you mean this?"

@@ -545,7 +541,7 @@ msgid_plural ""

541 msgstr[0] ""

542 msgstr[1] ""

543

548 -#: help.c:440

544 +#: help.c:439

545 #, c-format

546 msgid "%s: %s - %s"

547 msgstr ""

@@ -554,7 +550,7 @@ msgstr ""

550 msgid "failed to read the cache"

551 msgstr ""

552

557 -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

553 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

554 #: builtin/clone.c:661

555 msgid "unable to write new index file"

556 msgstr ""

@@ -564,244 +560,242 @@ msgstr ""

560 msgid "(bad commit)\n"

561 msgstr ""

562

567 -#: merge-recursive.c:206

563 +#: merge-recursive.c:208

564 #, c-format

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

566 msgstr ""

567

572 -#: merge-recursive.c:269

568 +#: merge-recursive.c:271

569 msgid "error building trees"

570 msgstr ""

571

576 -#: merge-recursive.c:673

572 +#: merge-recursive.c:675

573 #, c-format

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

575 msgstr ""

576

581 -#: merge-recursive.c:684

577 +#: merge-recursive.c:686

578 #, c-format

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

580 msgstr ""

581

586 -#. something else exists

587 -#. .. but not some other error (who really cares what?)

588 -#: merge-recursive.c:698 merge-recursive.c:719

582 +#: merge-recursive.c:700 merge-recursive.c:721

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

584 msgstr ""

585

592 -#: merge-recursive.c:709

586 +#: merge-recursive.c:711

587 #, c-format

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

589 msgstr ""

590

597 -#: merge-recursive.c:749

591 +#: merge-recursive.c:751

592 #, c-format

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

594 msgstr ""

595

602 -#: merge-recursive.c:751

596 +#: merge-recursive.c:753

597 #, c-format

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

599 msgstr ""

600

607 -#: merge-recursive.c:774 builtin/clone.c:317

601 +#: merge-recursive.c:776 builtin/clone.c:317

602 #, c-format

603 msgid "failed to open '%s'"

604 msgstr ""

605

612 -#: merge-recursive.c:782

606 +#: merge-recursive.c:784

607 #, c-format

608 msgid "failed to symlink '%s'"

609 msgstr ""

610

617 -#: merge-recursive.c:785

611 +#: merge-recursive.c:787

612 #, c-format

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

614 msgstr ""

615

622 -#: merge-recursive.c:923

616 +#: merge-recursive.c:925

617 msgid "Failed to execute internal merge"

618 msgstr ""

619

626 -#: merge-recursive.c:927

620 +#: merge-recursive.c:929

621 #, c-format

622 msgid "Unable to add %s to database"

623 msgstr ""

624

631 -#: merge-recursive.c:943

625 +#: merge-recursive.c:945

626 msgid "unsupported object type in the tree"

627 msgstr ""

628

635 -#: merge-recursive.c:1022 merge-recursive.c:1036

629 +#: merge-recursive.c:1024 merge-recursive.c:1038

630 #, c-format

631 msgid ""

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

633 "in tree."

634 msgstr ""

635

642 -#: merge-recursive.c:1028 merge-recursive.c:1041

636 +#: merge-recursive.c:1030 merge-recursive.c:1043

637 #, c-format

638 msgid ""

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

640 "in tree at %s."

641 msgstr ""

642

649 -#: merge-recursive.c:1082

643 +#: merge-recursive.c:1084

644 msgid "rename"

645 msgstr ""

646

653 -#: merge-recursive.c:1082 wt-status.c:283

647 +#: merge-recursive.c:1084

648 msgid "renamed"

649 msgstr ""

650

657 -#: merge-recursive.c:1138

651 +#: merge-recursive.c:1140

652 #, c-format

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

654 msgstr ""

655

662 -#: merge-recursive.c:1160

656 +#: merge-recursive.c:1162

657 #, c-format

658 msgid ""

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

660 "\"->\"%s\" in \"%s\"%s"

661 msgstr ""

662

669 -#: merge-recursive.c:1165

663 +#: merge-recursive.c:1167

664 msgid " (left unresolved)"

665 msgstr ""

666

673 -#: merge-recursive.c:1219

667 +#: merge-recursive.c:1221

668 #, c-format

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

670 msgstr ""

671

678 -#: merge-recursive.c:1249

672 +#: merge-recursive.c:1251

673 #, c-format

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

675 msgstr ""

676

683 -#: merge-recursive.c:1448

677 +#: merge-recursive.c:1450

678 #, c-format

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

680 msgstr ""

681

688 -#: merge-recursive.c:1458

682 +#: merge-recursive.c:1460

683 #, c-format

684 msgid "Adding merged %s"

685 msgstr ""

686

693 -#: merge-recursive.c:1463 merge-recursive.c:1661

687 +#: merge-recursive.c:1465 merge-recursive.c:1663

688 #, c-format

689 msgid "Adding as %s instead"

690 msgstr ""

691

698 -#: merge-recursive.c:1514

692 +#: merge-recursive.c:1516

693 #, c-format

694 msgid "cannot read object %s"

695 msgstr ""

696

703 -#: merge-recursive.c:1517

697 +#: merge-recursive.c:1519

698 #, c-format

699 msgid "object %s is not a blob"

700 msgstr ""

701

708 -#: merge-recursive.c:1565

702 +#: merge-recursive.c:1567

703 msgid "modify"

704 msgstr ""

705

712 -#: merge-recursive.c:1565 wt-status.c:281

706 +#: merge-recursive.c:1567

707 msgid "modified"

708 msgstr ""

709

716 -#: merge-recursive.c:1575

710 +#: merge-recursive.c:1577

711 msgid "content"

712 msgstr ""

713

720 -#: merge-recursive.c:1582

714 +#: merge-recursive.c:1584

715 msgid "add/add"

716 msgstr ""

717

724 -#: merge-recursive.c:1616

718 +#: merge-recursive.c:1618

719 #, c-format

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

721 msgstr ""

722

729 -#: merge-recursive.c:1630

723 +#: merge-recursive.c:1632

724 #, c-format

725 msgid "Auto-merging %s"

726 msgstr ""

727

734 -#: merge-recursive.c:1634 git-submodule.sh:1148

728 +#: merge-recursive.c:1636 git-submodule.sh:1149

729 msgid "submodule"

730 msgstr ""

731

738 -#: merge-recursive.c:1635

732 +#: merge-recursive.c:1637

733 #, c-format

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

735 msgstr ""

736

743 -#: merge-recursive.c:1725

737 +#: merge-recursive.c:1727

738 #, c-format

739 msgid "Removing %s"

740 msgstr ""

741

748 -#: merge-recursive.c:1750

742 +#: merge-recursive.c:1752

743 msgid "file/directory"

744 msgstr ""

745

752 -#: merge-recursive.c:1756

746 +#: merge-recursive.c:1758

747 msgid "directory/file"

748 msgstr ""

749

756 -#: merge-recursive.c:1761

750 +#: merge-recursive.c:1763

751 #, c-format

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

753 msgstr ""

754

761 -#: merge-recursive.c:1771

755 +#: merge-recursive.c:1773

756 #, c-format

757 msgid "Adding %s"

758 msgstr ""

759

766 -#: merge-recursive.c:1788

760 +#: merge-recursive.c:1790

761 msgid "Fatal merge failure, shouldn't happen."

762 msgstr ""

763

770 -#: merge-recursive.c:1807

764 +#: merge-recursive.c:1809

765 msgid "Already up-to-date!"

766 msgstr ""

767

774 -#: merge-recursive.c:1816

768 +#: merge-recursive.c:1818

769 #, c-format

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

771 msgstr ""

772

779 -#: merge-recursive.c:1846

773 +#: merge-recursive.c:1848

774 #, c-format

775 msgid "Unprocessed path??? %s"

776 msgstr ""

777

784 -#: merge-recursive.c:1891

778 +#: merge-recursive.c:1893

779 msgid "Merging:"

780 msgstr ""

781

788 -#: merge-recursive.c:1904

782 +#: merge-recursive.c:1906

783 #, c-format

784 msgid "found %u common ancestor:"

785 msgid_plural "found %u common ancestors:"

786 msgstr[0] ""

787 msgstr[1] ""

788

795 -#: merge-recursive.c:1941

789 +#: merge-recursive.c:1943

790 msgid "merge returned no commit"

791 msgstr ""

792

799 -#: merge-recursive.c:1998

793 +#: merge-recursive.c:2000

794 #, c-format

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

796 msgstr ""

797

804 -#: merge-recursive.c:2010 builtin/merge.c:665

798 +#: merge-recursive.c:2012 builtin/merge.c:668

799 msgid "Unable to write index."

800 msgstr ""

801

@@ -826,33 +820,33 @@ msgstr ""

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

821 msgstr ""

822

829 -#: object.c:202

823 +#: object.c:229

824 #, c-format

825 msgid "unable to parse object: %s"

826 msgstr ""

827

834 -#: parse-options.c:537

828 +#: parse-options.c:532

829 msgid "..."

830 msgstr ""

831

838 -#: parse-options.c:555

832 +#: parse-options.c:550

833 #, c-format

834 msgid "usage: %s"

835 msgstr ""

836

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

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

845 -#: parse-options.c:559

839 +#: parse-options.c:554

840 #, c-format

841 msgid " or: %s"

842 msgstr ""

843

850 -#: parse-options.c:562

844 +#: parse-options.c:557

845 #, c-format

846 msgid " %s"

847 msgstr ""

848

855 -#: parse-options.c:596

849 +#: parse-options.c:591

850 msgid "-NUM"

851 msgstr ""

852

@@ -900,11 +894,6 @@ msgstr ""

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

895 msgstr ""

896

903 -#.

904 -#. * We may want to substitute "this command" with a command

905 -#. * name. E.g. when add--interactive dies when running

906 -#. * "checkout -p"

907 -#.

897 #: pathspec.c:353

898 #, c-format

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

@@ -921,56 +910,69 @@ msgid ""

910 "Perhaps you forgot to add either ':/' or '.' ?"

911 msgstr ""

912

924 -#: remote.c:753

913 +#: progress.c:224

914 +msgid "done"

915 +msgstr ""

916 +

917 +#: read-cache.c:1238

918 +#, c-format

919 +msgid ""

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

921 +"Using version %i"

922 +msgstr ""

923 +

924 +#: read-cache.c:1248

925 +#, c-format

926 +msgid ""

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

928 +"Using version %i"

929 +msgstr ""

930 +

931 +#: remote.c:758

932 #, c-format

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

934 msgstr ""

935

929 -#: remote.c:757

936 +#: remote.c:762

937 #, c-format

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

939 msgstr ""

940

934 -#: remote.c:761

941 +#: remote.c:766

942 #, c-format

943 msgid "%s tracks both %s and %s"

944 msgstr ""

945

939 -#.

940 -#. * This last possibility doesn't occur because

941 -#. * FETCH_HEAD_IGNORE entries always appear at

942 -#. * the end of the list.

943 -#.

944 -#: remote.c:769

946 +#: remote.c:774

947 msgid "Internal error"

948 msgstr ""

949

948 -#: remote.c:1871

950 +#: remote.c:1948

951 #, c-format

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

953 msgstr ""

954

953 -#: remote.c:1875

955 +#: remote.c:1952

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

957 msgstr ""

958

957 -#: remote.c:1878

959 +#: remote.c:1955

960 #, c-format

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

962 msgstr ""

963

962 -#: remote.c:1882

964 +#: remote.c:1959

965 #, c-format

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

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

968 msgstr[0] ""

969 msgstr[1] ""

970

969 -#: remote.c:1888

971 +#: remote.c:1965

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

973 msgstr ""

974

973 -#: remote.c:1891

975 +#: remote.c:1968

976 #, c-format

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

978 msgid_plural ""

@@ -978,11 +980,11 @@ msgid_plural ""

980 msgstr[0] ""

981 msgstr[1] ""

982

981 -#: remote.c:1899

983 +#: remote.c:1976

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

985 msgstr ""

986

985 -#: remote.c:1902

987 +#: remote.c:1979

988 #, c-format

989 msgid ""

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

@@ -993,7 +995,7 @@ msgid_plural ""

995 msgstr[0] ""

996 msgstr[1] ""

997

996 -#: remote.c:1912

998 +#: remote.c:1989

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

1000 msgstr ""

1001

@@ -1006,14 +1008,14 @@ msgstr ""

1008 msgid "dup2(%d,%d) failed"

1009 msgstr ""

1010

1009 -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1010 -#: builtin/merge.c:1006 builtin/merge.c:1016

1011 +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1012 +#: builtin/merge.c:1009 builtin/merge.c:1019

1013 #, c-format

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

1015 msgstr ""

1016

1015 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1016 -#: builtin/merge.c:1008 builtin/merge.c:1021

1017 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1018 +#: builtin/merge.c:1011 builtin/merge.c:1024

1019 #, c-format

1020 msgid "Could not write to '%s'"

1021 msgstr ""

@@ -1031,7 +1033,7 @@ msgid ""

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

1034 msgstr ""

1035

1034 -#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1036 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1037 #, c-format

1038 msgid "Could not write to %s"

1039 msgstr ""

@@ -1067,184 +1069,184 @@ msgstr ""

1069 msgid "Unable to update cache tree\n"

1070 msgstr ""

1071

1070 -#: sequencer.c:423

1072 +#: sequencer.c:430

1073 #, c-format

1074 msgid "Could not parse commit %s\n"

1075 msgstr ""

1076

1075 -#: sequencer.c:428

1077 +#: sequencer.c:435

1078 #, c-format

1079 msgid "Could not parse parent commit %s\n"

1080 msgstr ""

1081

1080 -#: sequencer.c:494

1082 +#: sequencer.c:501

1083 msgid "Your index file is unmerged."

1084 msgstr ""

1085

1084 -#: sequencer.c:513

1086 +#: sequencer.c:520

1087 #, c-format

1088 msgid "Commit %s is a merge but no -m option was given."

1089 msgstr ""

1090

1089 -#: sequencer.c:521

1091 +#: sequencer.c:528

1092 #, c-format

1093 msgid "Commit %s does not have parent %d"

1094 msgstr ""

1095

1094 -#: sequencer.c:525

1096 +#: sequencer.c:532

1097 #, c-format

1098 msgid "Mainline was specified but commit %s is not a merge."

1099 msgstr ""

1100

1101 #. TRANSLATORS: The first %s will be "revert" or

1102 #. "cherry-pick", the second %s a SHA1

1101 -#: sequencer.c:538

1103 +#: sequencer.c:545

1104 #, c-format

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

1106 msgstr ""

1107

1106 -#: sequencer.c:542

1108 +#: sequencer.c:549

1109 #, c-format

1110 msgid "Cannot get commit message for %s"

1111 msgstr ""

1112

1111 -#: sequencer.c:628

1113 +#: sequencer.c:635

1114 #, c-format

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

1116 msgstr ""

1117

1116 -#: sequencer.c:629

1118 +#: sequencer.c:636

1119 #, c-format

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

1121 msgstr ""

1122

1121 -#: sequencer.c:665

1123 +#: sequencer.c:672

1124 msgid "empty commit set passed"

1125 msgstr ""

1126

1125 -#: sequencer.c:673

1127 +#: sequencer.c:680

1128 #, c-format

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

1130 msgstr ""

1131

1130 -#: sequencer.c:678

1132 +#: sequencer.c:685

1133 #, c-format

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

1135 msgstr ""

1136

1135 -#: sequencer.c:736

1137 +#: sequencer.c:743

1138 #, c-format

1139 msgid "Cannot %s during a %s"

1140 msgstr ""

1141

1140 -#: sequencer.c:758

1142 +#: sequencer.c:765

1143 #, c-format

1144 msgid "Could not parse line %d."

1145 msgstr ""

1146

1145 -#: sequencer.c:763

1147 +#: sequencer.c:770

1148 msgid "No commits parsed."

1149 msgstr ""

1150

1149 -#: sequencer.c:776

1151 +#: sequencer.c:783

1152 #, c-format

1153 msgid "Could not open %s"

1154 msgstr ""

1155

1154 -#: sequencer.c:780

1156 +#: sequencer.c:787

1157 #, c-format

1158 msgid "Could not read %s."

1159 msgstr ""

1160

1159 -#: sequencer.c:787

1161 +#: sequencer.c:794

1162 #, c-format

1163 msgid "Unusable instruction sheet: %s"

1164 msgstr ""

1165

1164 -#: sequencer.c:815

1166 +#: sequencer.c:824

1167 #, c-format

1168 msgid "Invalid key: %s"

1169 msgstr ""

1170

1169 -#: sequencer.c:818

1171 +#: sequencer.c:827

1172 #, c-format

1173 msgid "Invalid value for %s: %s"

1174 msgstr ""

1175

1174 -#: sequencer.c:830

1176 +#: sequencer.c:839

1177 #, c-format

1178 msgid "Malformed options sheet: %s"

1179 msgstr ""

1180

1179 -#: sequencer.c:851

1181 +#: sequencer.c:860

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

1183 msgstr ""

1184

1183 -#: sequencer.c:852

1185 +#: sequencer.c:861

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

1187 msgstr ""

1188

1187 -#: sequencer.c:856

1189 +#: sequencer.c:865

1190 #, c-format

1191 msgid "Could not create sequencer directory %s"

1192 msgstr ""

1193

1192 -#: sequencer.c:872 sequencer.c:957

1194 +#: sequencer.c:881 sequencer.c:966

1195 #, c-format

1196 msgid "Error wrapping up %s."

1197 msgstr ""

1198

1197 -#: sequencer.c:891 sequencer.c:1025

1199 +#: sequencer.c:900 sequencer.c:1036

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

1201 msgstr ""

1202

1201 -#: sequencer.c:893

1203 +#: sequencer.c:902

1204 msgid "cannot resolve HEAD"

1205 msgstr ""

1206

1205 -#: sequencer.c:895

1207 +#: sequencer.c:904

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

1209 msgstr ""

1210

1209 -#: sequencer.c:917 builtin/apply.c:4061

1211 +#: sequencer.c:926 builtin/apply.c:4061

1212 #, c-format

1213 msgid "cannot open %s: %s"

1214 msgstr ""

1215

1214 -#: sequencer.c:920

1216 +#: sequencer.c:929

1217 #, c-format

1218 msgid "cannot read %s: %s"

1219 msgstr ""

1220

1219 -#: sequencer.c:921

1221 +#: sequencer.c:930

1222 msgid "unexpected end of file"

1223 msgstr ""

1224

1223 -#: sequencer.c:927

1225 +#: sequencer.c:936

1226 #, c-format

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

1228 msgstr ""

1229

1228 -#: sequencer.c:950

1230 +#: sequencer.c:959

1231 #, c-format

1232 msgid "Could not format %s."

1233 msgstr ""

1234

1233 -#: sequencer.c:1093

1235 +#: sequencer.c:1104

1236 #, c-format

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

1238 msgstr ""

1239

1238 -#: sequencer.c:1096

1240 +#: sequencer.c:1107

1241 #, c-format

1242 msgid "%s: bad revision"

1243 msgstr ""

1244

1243 -#: sequencer.c:1130

1245 +#: sequencer.c:1141

1246 msgid "Can't revert as initial commit"

1247 msgstr ""

1248

1247 -#: sequencer.c:1131

1249 +#: sequencer.c:1142

1250 msgid "Can't cherry-pick into empty head"

1251 msgstr ""

1252

@@ -1261,21 +1263,21 @@ msgid ""

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

1264 msgstr ""

1265

1264 -#: sha1_name.c:1070

1266 +#: sha1_name.c:1072

1267 msgid "HEAD does not point to a branch"

1268 msgstr ""

1269

1268 -#: sha1_name.c:1073

1270 +#: sha1_name.c:1075

1271 #, c-format

1272 msgid "No such branch: '%s'"

1273 msgstr ""

1274

1273 -#: sha1_name.c:1075

1275 +#: sha1_name.c:1077

1276 #, c-format

1277 msgid "No upstream configured for branch '%s'"

1278 msgstr ""

1279

1278 -#: sha1_name.c:1079

1280 +#: sha1_name.c:1081

1281 #, c-format

1282 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1283 msgstr ""

@@ -1289,52 +1291,34 @@ msgstr ""

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

1292 msgstr ""

1293

1292 -#. Maybe the user already did that, don't error out here

1294 #: submodule.c:76

1295 #, c-format

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

1297 msgstr ""

1298

1298 -#. Maybe the user already did that, don't error out here

1299 #: submodule.c:109

1300 #, c-format

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

1302 msgstr ""

1303

1304 -#: submodule.c:127

1305 -msgid "could not find .gitmodules in index"

1306 -msgstr ""

1307 -

1308 -#: submodule.c:133

1309 -msgid "reading updated .gitmodules failed"

1310 -msgstr ""

1311 -

1312 -#: submodule.c:135

1313 -msgid "unable to stat updated .gitmodules"

1314 -msgstr ""

1315 -

1316 -#: submodule.c:139

1317 -msgid "unable to remove .gitmodules from index"

1318 -msgstr ""

1319 -

1320 -#: submodule.c:141

1321 -msgid "adding updated .gitmodules failed"

1322 -msgstr ""

1323 -

1324 -#: submodule.c:143

1304 +#: submodule.c:120

1305 msgid "staging updated .gitmodules failed"

1306 msgstr ""

1307

1328 -#: submodule.c:1144 builtin/init-db.c:363

1308 +#: submodule.c:1121 builtin/init-db.c:363

1309 #, c-format

1310 msgid "Could not create git link %s"

1311 msgstr ""

1312

1333 -#: submodule.c:1155

1313 +#: submodule.c:1132

1314 #, c-format

1315 msgid "Could not set core.worktree in %s"

1316 msgstr ""

1317

1318 +#: unpack-trees.c:206

1319 +msgid "Checking out files"

1320 +msgstr ""

1321 +

1322 #: urlmatch.c:120

1323 msgid "invalid URL scheme name or missing '://' suffix"

1324 msgstr ""

@@ -1438,266 +1422,275 @@ msgstr ""

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

1423 msgstr ""

1424

1441 -#: wt-status.c:254

1442 -msgid "bug"

1443 -msgstr ""

1444 -

1445 -#: wt-status.c:259

1425 +#: wt-status.c:252

1426 msgid "both deleted:"

1427 msgstr ""

1428

1449 -#: wt-status.c:260

1429 +#: wt-status.c:254

1430 msgid "added by us:"

1431 msgstr ""

1432

1453 -#: wt-status.c:261

1433 +#: wt-status.c:256

1434 msgid "deleted by them:"

1435 msgstr ""

1436

1457 -#: wt-status.c:262

1437 +#: wt-status.c:258

1438 msgid "added by them:"

1439 msgstr ""

1440

1461 -#: wt-status.c:263

1441 +#: wt-status.c:260

1442 msgid "deleted by us:"

1443 msgstr ""

1444

1465 -#: wt-status.c:264

1445 +#: wt-status.c:262

1446 msgid "both added:"

1447 msgstr ""

1448

1469 -#: wt-status.c:265

1449 +#: wt-status.c:264

1450 msgid "both modified:"

1451 msgstr ""

1452

1473 -#: wt-status.c:275

1474 -msgid "new file"

1453 +#: wt-status.c:266

1454 +#, c-format

1455 +msgid "bug: unhandled unmerged status %x"

1456 +msgstr ""

1457 +

1458 +#: wt-status.c:274

1459 +msgid "new file:"

1460 +msgstr ""

1461 +

1462 +#: wt-status.c:276

1463 +msgid "copied:"

1464 +msgstr ""

1465 +

1466 +#: wt-status.c:278

1467 +msgid "deleted:"

1468 msgstr ""

1469

1477 -#: wt-status.c:277

1478 -msgid "copied"

1470 +#: wt-status.c:280

1471 +msgid "modified:"

1472 msgstr ""

1473

1481 -#: wt-status.c:279

1482 -msgid "deleted"

1474 +#: wt-status.c:282

1475 +msgid "renamed:"

1476 msgstr ""

1477

1485 -#: wt-status.c:285

1486 -msgid "typechange"

1478 +#: wt-status.c:284

1479 +msgid "typechange:"

1480 msgstr ""

1481

1489 -#: wt-status.c:287

1490 -msgid "unknown"

1482 +#: wt-status.c:286

1483 +msgid "unknown:"

1484 msgstr ""

1485

1493 -#: wt-status.c:289

1494 -msgid "unmerged"

1486 +#: wt-status.c:288

1487 +msgid "unmerged:"

1488 msgstr ""

1489

1497 -#: wt-status.c:336

1490 +#: wt-status.c:370

1491 msgid "new commits, "

1492 msgstr ""

1493

1501 -#: wt-status.c:338

1494 +#: wt-status.c:372

1495 msgid "modified content, "

1496 msgstr ""

1497

1505 -#: wt-status.c:340

1498 +#: wt-status.c:374

1499 msgid "untracked content, "

1500 msgstr ""

1501

1509 -#: wt-status.c:357

1502 +#: wt-status.c:391

1503 #, c-format

1504 msgid "bug: unhandled diff status %c"

1505 msgstr ""

1506

1514 -#: wt-status.c:732

1507 +#: wt-status.c:765

1508 msgid "Submodules changed but not updated:"

1509 msgstr ""

1510

1518 -#: wt-status.c:734

1511 +#: wt-status.c:767

1512 msgid "Submodule changes to be committed:"

1513 msgstr ""

1514

1522 -#: wt-status.c:836

1515 +#: wt-status.c:846

1516 msgid ""

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

1518 "Everything below will be removed."

1519 msgstr ""

1520

1528 -#: wt-status.c:899

1521 +#: wt-status.c:937

1522 msgid "You have unmerged paths."

1523 msgstr ""

1524

1532 -#: wt-status.c:902

1525 +#: wt-status.c:940

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

1527 msgstr ""

1528

1536 -#: wt-status.c:905

1529 +#: wt-status.c:943

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

1531 msgstr ""

1532

1540 -#: wt-status.c:908

1533 +#: wt-status.c:946

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

1535 msgstr ""

1536

1544 -#: wt-status.c:918

1537 +#: wt-status.c:956

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

1539 msgstr ""

1540

1548 -#: wt-status.c:921

1541 +#: wt-status.c:959

1542 msgid "The current patch is empty."

1543 msgstr ""

1544

1552 -#: wt-status.c:925

1545 +#: wt-status.c:963

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

1547 msgstr ""

1548

1556 -#: wt-status.c:927

1549 +#: wt-status.c:965

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

1551 msgstr ""

1552

1560 -#: wt-status.c:929

1553 +#: wt-status.c:967

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

1555 msgstr ""

1556

1564 -#: wt-status.c:989 wt-status.c:1006

1557 +#: wt-status.c:1027 wt-status.c:1044

1558 #, c-format

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

1560 msgstr ""

1561

1569 -#: wt-status.c:994 wt-status.c:1011

1562 +#: wt-status.c:1032 wt-status.c:1049

1563 msgid "You are currently rebasing."

1564 msgstr ""

1565

1573 -#: wt-status.c:997

1566 +#: wt-status.c:1035

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

1568 msgstr ""

1569

1577 -#: wt-status.c:999

1570 +#: wt-status.c:1037

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

1572 msgstr ""

1573

1581 -#: wt-status.c:1001

1574 +#: wt-status.c:1039

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

1576 msgstr ""

1577

1585 -#: wt-status.c:1014

1578 +#: wt-status.c:1052

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

1580 msgstr ""

1581

1589 -#: wt-status.c:1018

1582 +#: wt-status.c:1056

1583 #, c-format

1584 msgid ""

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

1586 msgstr ""

1587

1595 -#: wt-status.c:1023

1588 +#: wt-status.c:1061

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

1590 msgstr ""

1591

1599 -#: wt-status.c:1026

1592 +#: wt-status.c:1064

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

1594 msgstr ""

1595

1603 -#: wt-status.c:1030

1596 +#: wt-status.c:1068

1597 #, c-format

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

1599 msgstr ""

1600

1608 -#: wt-status.c:1035

1601 +#: wt-status.c:1073

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

1603 msgstr ""

1604

1612 -#: wt-status.c:1038

1605 +#: wt-status.c:1076

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

1607 msgstr ""

1608

1616 -#: wt-status.c:1040

1609 +#: wt-status.c:1078

1610 msgid ""

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

1612 msgstr ""

1613

1621 -#: wt-status.c:1050

1614 +#: wt-status.c:1088

1615 #, c-format

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

1617 msgstr ""

1618

1626 -#: wt-status.c:1055

1619 +#: wt-status.c:1093

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

1621 msgstr ""

1622

1630 -#: wt-status.c:1058

1623 +#: wt-status.c:1096

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

1625 msgstr ""

1626

1634 -#: wt-status.c:1060

1627 +#: wt-status.c:1098

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

1629 msgstr ""

1630

1638 -#: wt-status.c:1069

1631 +#: wt-status.c:1107

1632 #, c-format

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

1634 msgstr ""

1635

1643 -#: wt-status.c:1074

1636 +#: wt-status.c:1112

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

1638 msgstr ""

1639

1647 -#: wt-status.c:1077

1640 +#: wt-status.c:1115

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

1642 msgstr ""

1643

1651 -#: wt-status.c:1079

1644 +#: wt-status.c:1117

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

1646 msgstr ""

1647

1655 -#: wt-status.c:1090

1648 +#: wt-status.c:1128

1649 #, c-format

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

1651 msgstr ""

1652

1660 -#: wt-status.c:1094

1653 +#: wt-status.c:1132

1654 msgid "You are currently bisecting."

1655 msgstr ""

1656

1664 -#: wt-status.c:1097

1657 +#: wt-status.c:1135

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

1659 msgstr ""

1660

1668 -#: wt-status.c:1272

1661 +#: wt-status.c:1310

1662 msgid "On branch "

1663 msgstr ""

1664

1672 -#: wt-status.c:1279

1665 +#: wt-status.c:1317

1666 msgid "rebase in progress; onto "

1667 msgstr ""

1668

1676 -#: wt-status.c:1286

1669 +#: wt-status.c:1324

1670 msgid "HEAD detached at "

1671 msgstr ""

1672

1680 -#: wt-status.c:1288

1673 +#: wt-status.c:1326

1674 msgid "HEAD detached from "

1675 msgstr ""

1676

1684 -#: wt-status.c:1291

1677 +#: wt-status.c:1329

1678 msgid "Not currently on any branch."

1679 msgstr ""

1680

1688 -#: wt-status.c:1308

1681 +#: wt-status.c:1346

1682 msgid "Initial commit"

1683 msgstr ""

1684

1692 -#: wt-status.c:1322

1685 +#: wt-status.c:1360

1686 msgid "Untracked files"

1687 msgstr ""

1688

1696 -#: wt-status.c:1324

1689 +#: wt-status.c:1362

1690 msgid "Ignored files"

1691 msgstr ""

1692

1700 -#: wt-status.c:1328

1693 +#: wt-status.c:1366

1694 #, c-format

1695 msgid ""

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

@@ -1705,283 +1698,228 @@ msgid ""

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

1699 msgstr ""

1700

1708 -#: wt-status.c:1334

1701 +#: wt-status.c:1372

1702 #, c-format

1703 msgid "Untracked files not listed%s"

1704 msgstr ""

1705

1713 -#: wt-status.c:1336

1706 +#: wt-status.c:1374

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

1708 msgstr ""

1709

1717 -#: wt-status.c:1342

1710 +#: wt-status.c:1380

1711 msgid "No changes"

1712 msgstr ""

1713

1721 -#: wt-status.c:1347

1714 +#: wt-status.c:1385

1715 #, c-format

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

1717 msgstr ""

1718

1726 -#: wt-status.c:1350

1719 +#: wt-status.c:1388

1720 #, c-format

1721 msgid "no changes added to commit\n"

1722 msgstr ""

1723

1731 -#: wt-status.c:1353

1724 +#: wt-status.c:1391

1725 #, c-format

1726 msgid ""

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

1728 "track)\n"

1729 msgstr ""

1730

1738 -#: wt-status.c:1356

1731 +#: wt-status.c:1394

1732 #, c-format

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

1734 msgstr ""

1735

1743 -#: wt-status.c:1359

1736 +#: wt-status.c:1397

1737 #, c-format

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

1739 msgstr ""

1740

1748 -#: wt-status.c:1362 wt-status.c:1367

1741 +#: wt-status.c:1400 wt-status.c:1405

1742 #, c-format

1743 msgid "nothing to commit\n"

1744 msgstr ""

1745

1753 -#: wt-status.c:1365

1746 +#: wt-status.c:1403

1747 #, c-format

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

1749 msgstr ""

1750

1758 -#: wt-status.c:1369

1751 +#: wt-status.c:1407

1752 #, c-format

1753 msgid "nothing to commit, working directory clean\n"

1754 msgstr ""

1755

1763 -#: wt-status.c:1478

1756 +#: wt-status.c:1516

1757 msgid "HEAD (no branch)"

1758 msgstr ""

1759

1767 -#: wt-status.c:1484

1760 +#: wt-status.c:1522

1761 msgid "Initial commit on "

1762 msgstr ""

1763

1771 -#: wt-status.c:1514

1764 +#: wt-status.c:1554

1765 msgid "gone"

1766 msgstr ""

1767

1775 -#: wt-status.c:1516

1768 +#: wt-status.c:1556 wt-status.c:1564

1769 msgid "behind "

1770 msgstr ""

1771

1779 -#: wt-status.c:1519 wt-status.c:1522

1780 -msgid "ahead "

1781 -msgstr ""

1782 -

1783 -#: wt-status.c:1524

1784 -msgid ", behind "

1785 -msgstr ""

1786 -

1772 #: compat/precompose_utf8.c:55 builtin/clone.c:356

1773 #, c-format

1774 msgid "failed to unlink '%s'"

1775 msgstr ""

1776

1792 -#: builtin/add.c:20

1777 +#: builtin/add.c:21

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

1779 msgstr ""

1780

1796 -#.

1797 -#. * To be consistent with "git add -p" and most Git

1798 -#. * commands, we should default to being tree-wide, but

1799 -#. * this is not the original behavior and can't be

1800 -#. * changed until users trained themselves not to type

1801 -#. * "git add -u" or "git add -A". For now, we warn and

1802 -#. * keep the old behavior. Later, the behavior can be changed

1803 -#. * to tree-wide, keeping the warning for a while, and

1804 -#. * eventually we can drop the warning.

1805 -#.

1806 -#: builtin/add.c:58

1807 -#, c-format

1808 -msgid ""

1809 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1810 -"subdirectory of the tree will change in Git 2.0 and should not be used "

1811 -"anymore.\n"

1812 -"To add content for the whole tree, run:\n"

1813 -"\n"

1814 -" git add %s :/\n"

1815 -" (or git add %s :/)\n"

1816 -"\n"

1817 -"To restrict the command to the current directory, run:\n"

1818 -"\n"

1819 -" git add %s .\n"

1820 -" (or git add %s .)\n"

1821 -"\n"

1822 -"With the current Git version, the command is restricted to the current "

1823 -"directory.\n"

1824 -msgstr ""

1825 -

1826 -#: builtin/add.c:100

1827 -#, c-format

1828 -msgid ""

1829 -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

1830 -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

1831 -"Paths like '%s' that are\n"

1832 -"removed from your working tree are ignored with this version of Git.\n"

1833 -"\n"

1834 -"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

1835 -" ignores paths you removed from your working tree.\n"

1836 -"\n"

1837 -"* 'git add --all <pathspec>' will let you also record the removals.\n"

1838 -"\n"

1839 -"Run 'git status' to check the paths you removed from your working tree.\n"

1840 -msgstr ""

1841 -

1842 -#: builtin/add.c:144

1781 +#: builtin/add.c:64

1782 #, c-format

1783 msgid "unexpected diff status %c"

1784 msgstr ""

1785

1847 -#: builtin/add.c:149 builtin/commit.c:260

1786 +#: builtin/add.c:69 builtin/commit.c:261

1787 msgid "updating files failed"

1788 msgstr ""

1789

1851 -#: builtin/add.c:163

1790 +#: builtin/add.c:79

1791 #, c-format

1792 msgid "remove '%s'\n"

1793 msgstr ""

1794

1856 -#: builtin/add.c:237

1795 +#: builtin/add.c:133

1796 msgid "Unstaged changes after refreshing the index:"

1797 msgstr ""

1798

1860 -#: builtin/add.c:299

1799 +#: builtin/add.c:193

1800 msgid "Could not read the index"

1801 msgstr ""

1802

1864 -#: builtin/add.c:310

1803 +#: builtin/add.c:204

1804 #, c-format

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

1806 msgstr ""

1807

1869 -#: builtin/add.c:314

1808 +#: builtin/add.c:208

1809 msgid "Could not write patch"

1810 msgstr ""

1811

1873 -#: builtin/add.c:319

1812 +#: builtin/add.c:213

1813 #, c-format

1814 msgid "Could not stat '%s'"

1815 msgstr ""

1816

1878 -#: builtin/add.c:321

1817 +#: builtin/add.c:215

1818 msgid "Empty patch. Aborted."

1819 msgstr ""

1820

1882 -#: builtin/add.c:327

1821 +#: builtin/add.c:221

1822 #, c-format

1823 msgid "Could not apply '%s'"

1824 msgstr ""

1825

1887 -#: builtin/add.c:337

1826 +#: builtin/add.c:231

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

1828 msgstr ""

1829

1891 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

1892 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

1830 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1831 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1832 #: builtin/rm.c:269

1833 msgid "dry run"

1834 msgstr ""

1835

1897 -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

1898 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1836 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1837 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1838 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1839 msgid "be verbose"

1840 msgstr ""

1841

1903 -#: builtin/add.c:357

1842 +#: builtin/add.c:251

1843 msgid "interactive picking"

1844 msgstr ""

1845

1907 -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

1846 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1847 msgid "select hunks interactively"

1848 msgstr ""

1849

1911 -#: builtin/add.c:359

1850 +#: builtin/add.c:253

1851 msgid "edit current diff and apply"

1852 msgstr ""

1853

1915 -#: builtin/add.c:360

1854 +#: builtin/add.c:254

1855 msgid "allow adding otherwise ignored files"

1856 msgstr ""

1857

1919 -#: builtin/add.c:361

1858 +#: builtin/add.c:255

1859 msgid "update tracked files"

1860 msgstr ""

1861

1923 -#: builtin/add.c:362

1862 +#: builtin/add.c:256

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

1864 msgstr ""

1865

1927 -#: builtin/add.c:363

1866 +#: builtin/add.c:257

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

1868 msgstr ""

1869

1931 -#. takes no arguments

1932 -#: builtin/add.c:366

1870 +#: builtin/add.c:260

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

1872 msgstr ""

1873

1936 -#: builtin/add.c:368

1874 +#: builtin/add.c:262

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

1876 msgstr ""

1877

1940 -#: builtin/add.c:369

1878 +#: builtin/add.c:263

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

1880 msgstr ""

1881

1944 -#: builtin/add.c:370

1882 +#: builtin/add.c:264

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

1884 msgstr ""

1885

1948 -#: builtin/add.c:392

1886 +#: builtin/add.c:286

1887 #, c-format

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

1889 msgstr ""

1890

1953 -#: builtin/add.c:393

1891 +#: builtin/add.c:287

1892 msgid "no files added"

1893 msgstr ""

1894

1957 -#: builtin/add.c:399

1895 +#: builtin/add.c:293

1896 msgid "adding files failed"

1897 msgstr ""

1898

1961 -#: builtin/add.c:438

1899 +#: builtin/add.c:330

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

1901 msgstr ""

1902

1965 -#: builtin/add.c:456

1903 +#: builtin/add.c:337

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

1905 msgstr ""

1906

1969 -#: builtin/add.c:486

1907 +#: builtin/add.c:358

1908 #, c-format

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

1910 msgstr ""

1911

1974 -#: builtin/add.c:487

1912 +#: builtin/add.c:359

1913 #, c-format

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

1915 msgstr ""

1916

1979 -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

1980 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

1917 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

1918 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

1919 msgid "index file corrupt"

1920 msgstr ""

1921

1984 -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

1922 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

1923 msgid "Unable to write new index file"

1924 msgstr ""

1925

@@ -2088,7 +2026,6 @@ msgstr ""

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

2027 msgstr ""

2028

2091 -#. there has to be one hunk (forward hunk)

2029 #: builtin/apply.c:1900

2030 #, c-format

2031 msgid "unrecognized binary patch at line %d"

@@ -2227,7 +2164,7 @@ msgstr ""

2164 msgid "Checking patch %s..."

2165 msgstr ""

2166

2230 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2167 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2168 #, c-format

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

2170 msgstr ""

@@ -2276,7 +2213,6 @@ msgstr ""

2213 msgid "internal error"

2214 msgstr ""

2215

2279 -#. Say this even without --verbose

2216 #: builtin/apply.c:4043

2217 #, c-format

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

@@ -2368,7 +2304,7 @@ msgstr ""

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

2305 msgstr ""

2306

2371 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2307 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2308 msgid "paths are separated with NUL character"

2309 msgstr ""

2310

@@ -2506,95 +2442,95 @@ msgstr ""

2442 msgid "[rev-opts] are documented in git-rev-list(1)"

2443 msgstr ""

2444

2509 -#: builtin/blame.c:2249

2445 +#: builtin/blame.c:2242

2446 msgid "Show blame entries as we find them, incrementally"

2447 msgstr ""

2448

2513 -#: builtin/blame.c:2250

2449 +#: builtin/blame.c:2243

2450 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2451 msgstr ""

2452

2517 -#: builtin/blame.c:2251

2453 +#: builtin/blame.c:2244

2454 msgid "Do not treat root commits as boundaries (Default: off)"

2455 msgstr ""

2456

2521 -#: builtin/blame.c:2252

2457 +#: builtin/blame.c:2245

2458 msgid "Show work cost statistics"

2459 msgstr ""

2460

2525 -#: builtin/blame.c:2253

2461 +#: builtin/blame.c:2246

2462 msgid "Show output score for blame entries"

2463 msgstr ""

2464

2529 -#: builtin/blame.c:2254

2465 +#: builtin/blame.c:2247

2466 msgid "Show original filename (Default: auto)"

2467 msgstr ""

2468

2533 -#: builtin/blame.c:2255

2469 +#: builtin/blame.c:2248

2470 msgid "Show original linenumber (Default: off)"

2471 msgstr ""

2472

2537 -#: builtin/blame.c:2256

2473 +#: builtin/blame.c:2249

2474 msgid "Show in a format designed for machine consumption"

2475 msgstr ""

2476

2541 -#: builtin/blame.c:2257

2477 +#: builtin/blame.c:2250

2478 msgid "Show porcelain format with per-line commit information"

2479 msgstr ""

2480

2545 -#: builtin/blame.c:2258

2481 +#: builtin/blame.c:2251

2482 msgid "Use the same output mode as git-annotate (Default: off)"

2483 msgstr ""

2484

2549 -#: builtin/blame.c:2259

2485 +#: builtin/blame.c:2252

2486 msgid "Show raw timestamp (Default: off)"

2487 msgstr ""

2488

2553 -#: builtin/blame.c:2260

2489 +#: builtin/blame.c:2253

2490 msgid "Show long commit SHA1 (Default: off)"

2491 msgstr ""

2492

2557 -#: builtin/blame.c:2261

2493 +#: builtin/blame.c:2254

2494 msgid "Suppress author name and timestamp (Default: off)"

2495 msgstr ""

2496

2561 -#: builtin/blame.c:2262

2497 +#: builtin/blame.c:2255

2498 msgid "Show author email instead of name (Default: off)"

2499 msgstr ""

2500

2565 -#: builtin/blame.c:2263

2501 +#: builtin/blame.c:2256

2502 msgid "Ignore whitespace differences"

2503 msgstr ""

2504

2569 -#: builtin/blame.c:2264

2505 +#: builtin/blame.c:2257

2506 msgid "Spend extra cycles to find better match"

2507 msgstr ""

2508

2573 -#: builtin/blame.c:2265

2509 +#: builtin/blame.c:2258

2510 msgid "Use revisions from <file> instead of calling git-rev-list"

2511 msgstr ""

2512

2577 -#: builtin/blame.c:2266

2513 +#: builtin/blame.c:2259

2514 msgid "Use <file>'s contents as the final image"

2515 msgstr ""

2516

2581 -#: builtin/blame.c:2267 builtin/blame.c:2268

2517 +#: builtin/blame.c:2260 builtin/blame.c:2261

2518 msgid "score"

2519 msgstr ""

2520

2585 -#: builtin/blame.c:2267

2521 +#: builtin/blame.c:2260

2522 msgid "Find line copies within and across files"

2523 msgstr ""

2524

2589 -#: builtin/blame.c:2268

2525 +#: builtin/blame.c:2261

2526 msgid "Find line movements within and across files"

2527 msgstr ""

2528

2593 -#: builtin/blame.c:2269

2529 +#: builtin/blame.c:2262

2530 msgid "n,m"

2531 msgstr ""

2532

2597 -#: builtin/blame.c:2269

2533 +#: builtin/blame.c:2262

2534 msgid "Process only line range n,m, counting from 1"

2535 msgstr ""

2536

@@ -2830,8 +2766,9 @@ msgid "act on remote-tracking branches"

2766 msgstr ""

2767

2768 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2833 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2834 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2769 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2770 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2771 +#: builtin/tag.c:533

2772 msgid "commit"

2773 msgstr ""

2774

@@ -3008,43 +2945,43 @@ msgstr ""

2945 msgid "Need a repository to unbundle."

2946 msgstr ""

2947

3011 -#: builtin/cat-file.c:328

2948 +#: builtin/cat-file.c:331

2949 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2950 msgstr ""

2951

3015 -#: builtin/cat-file.c:329

2952 +#: builtin/cat-file.c:332

2953 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2954 msgstr ""

2955

3019 -#: builtin/cat-file.c:366

2956 +#: builtin/cat-file.c:369

2957 msgid "<type> can be one of: blob, tree, commit, tag"

2958 msgstr ""

2959

3023 -#: builtin/cat-file.c:367

2960 +#: builtin/cat-file.c:370

2961 msgid "show object type"

2962 msgstr ""

2963

3027 -#: builtin/cat-file.c:368

2964 +#: builtin/cat-file.c:371

2965 msgid "show object size"

2966 msgstr ""

2967

3031 -#: builtin/cat-file.c:370

2968 +#: builtin/cat-file.c:373

2969 msgid "exit with zero when there's no error"

2970 msgstr ""

2971

3035 -#: builtin/cat-file.c:371

2972 +#: builtin/cat-file.c:374

2973 msgid "pretty-print object's content"

2974 msgstr ""

2975

3039 -#: builtin/cat-file.c:373

2976 +#: builtin/cat-file.c:376

2977 msgid "for blob objects, run textconv on object's content"

2978 msgstr ""

2979

3043 -#: builtin/cat-file.c:375

2980 +#: builtin/cat-file.c:378

2981 msgid "show info and content of objects fed from the standard input"

2982 msgstr ""

2983

3047 -#: builtin/cat-file.c:378

2984 +#: builtin/cat-file.c:381

2985 msgid "show info about objects fed from the standard input"

2986 msgstr ""

2987

@@ -3072,7 +3009,7 @@ msgstr ""

3009 msgid "terminate input and output records by a NUL character"

3010 msgstr ""

3011

3075 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3012 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3013 msgid "suppress progress reporting"

3014 msgstr ""

3015

@@ -3223,60 +3160,59 @@ msgstr ""

3160 msgid "Cannot update paths and switch to branch '%s' at the same time."

3161 msgstr ""

3162

3226 -#: builtin/checkout.c:261 builtin/checkout.c:451

3163 +#: builtin/checkout.c:261 builtin/checkout.c:450

3164 msgid "corrupt index file"

3165 msgstr ""

3166

3230 -#: builtin/checkout.c:322 builtin/checkout.c:329

3167 +#: builtin/checkout.c:321 builtin/checkout.c:328

3168 #, c-format

3169 msgid "path '%s' is unmerged"

3170 msgstr ""

3171

3235 -#: builtin/checkout.c:473

3172 +#: builtin/checkout.c:472

3173 msgid "you need to resolve your current index first"

3174 msgstr ""

3175

3239 -#: builtin/checkout.c:594

3176 +#: builtin/checkout.c:593

3177 #, c-format

3178 msgid "Can not do reflog for '%s'\n"

3179 msgstr ""

3180

3244 -#: builtin/checkout.c:632

3181 +#: builtin/checkout.c:631

3182 msgid "HEAD is now at"

3183 msgstr ""

3184

3248 -#: builtin/checkout.c:639

3185 +#: builtin/checkout.c:638

3186 #, c-format

3187 msgid "Reset branch '%s'\n"

3188 msgstr ""

3189

3253 -#: builtin/checkout.c:642

3190 +#: builtin/checkout.c:641

3191 #, c-format

3192 msgid "Already on '%s'\n"

3193 msgstr ""

3194

3258 -#: builtin/checkout.c:646

3195 +#: builtin/checkout.c:645

3196 #, c-format

3197 msgid "Switched to and reset branch '%s'\n"

3198 msgstr ""

3199

3263 -#: builtin/checkout.c:648 builtin/checkout.c:1033

3200 +#: builtin/checkout.c:647 builtin/checkout.c:1032

3201 #, c-format

3202 msgid "Switched to a new branch '%s'\n"

3203 msgstr ""

3204

3268 -#: builtin/checkout.c:650

3205 +#: builtin/checkout.c:649

3206 #, c-format

3207 msgid "Switched to branch '%s'\n"

3208 msgstr ""

3209

3273 -#: builtin/checkout.c:706

3210 +#: builtin/checkout.c:705

3211 #, c-format

3212 msgid " ... and %d more.\n"

3213 msgstr ""

3214

3278 -#. The singular version

3279 -#: builtin/checkout.c:712

3215 +#: builtin/checkout.c:711

3216 #, c-format

3217 msgid ""

3218 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3291,7 +3227,7 @@ msgid_plural ""

3227 msgstr[0] ""

3228 msgstr[1] ""

3229

3294 -#: builtin/checkout.c:730

3230 +#: builtin/checkout.c:729

3231 #, c-format

3232 msgid ""

3233 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3301,152 +3237,151 @@ msgid ""

3237 "\n"

3238 msgstr ""

3239

3304 -#: builtin/checkout.c:760

3240 +#: builtin/checkout.c:759

3241 msgid "internal error in revision walk"

3242 msgstr ""

3243

3308 -#: builtin/checkout.c:764

3244 +#: builtin/checkout.c:763

3245 msgid "Previous HEAD position was"

3246 msgstr ""

3247

3312 -#: builtin/checkout.c:791 builtin/checkout.c:1028

3248 +#: builtin/checkout.c:790 builtin/checkout.c:1027

3249 msgid "You are on a branch yet to be born"

3250 msgstr ""

3251

3316 -#: builtin/checkout.c:935

3252 +#: builtin/checkout.c:934

3253 #, c-format

3254 msgid "only one reference expected, %d given."

3255 msgstr ""

3256

3321 -#: builtin/checkout.c:974

3257 +#: builtin/checkout.c:973

3258 #, c-format

3259 msgid "invalid reference: %s"

3260 msgstr ""

3261

3326 -#. case (1): want a tree

3327 -#: builtin/checkout.c:1003

3262 +#: builtin/checkout.c:1002

3263 #, c-format

3264 msgid "reference is not a tree: %s"

3265 msgstr ""

3266

3332 -#: builtin/checkout.c:1042

3267 +#: builtin/checkout.c:1041

3268 msgid "paths cannot be used with switching branches"

3269 msgstr ""

3270

3336 -#: builtin/checkout.c:1045 builtin/checkout.c:1049

3271 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3272 #, c-format

3273 msgid "'%s' cannot be used with switching branches"

3274 msgstr ""

3275

3341 -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3342 -#: builtin/checkout.c:1064

3276 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3277 +#: builtin/checkout.c:1063

3278 #, c-format

3279 msgid "'%s' cannot be used with '%s'"

3280 msgstr ""

3281

3347 -#: builtin/checkout.c:1069

3282 +#: builtin/checkout.c:1068

3283 #, c-format

3284 msgid "Cannot switch branch to a non-commit '%s'"

3285 msgstr ""

3286

3352 -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3287 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3288 #: builtin/remote.c:159 builtin/remote.c:161

3289 msgid "branch"

3290 msgstr ""

3291

3357 -#: builtin/checkout.c:1092

3292 +#: builtin/checkout.c:1091

3293 msgid "create and checkout a new branch"

3294 msgstr ""

3295

3361 -#: builtin/checkout.c:1094

3296 +#: builtin/checkout.c:1093

3297 msgid "create/reset and checkout a branch"

3298 msgstr ""

3299

3365 -#: builtin/checkout.c:1095

3300 +#: builtin/checkout.c:1094

3301 msgid "create reflog for new branch"

3302 msgstr ""

3303

3369 -#: builtin/checkout.c:1096

3304 +#: builtin/checkout.c:1095

3305 msgid "detach the HEAD at named commit"

3306 msgstr ""

3307

3373 -#: builtin/checkout.c:1097

3308 +#: builtin/checkout.c:1096

3309 msgid "set upstream info for new branch"

3310 msgstr ""

3311

3377 -#: builtin/checkout.c:1099

3378 -msgid "new branch"

3312 +#: builtin/checkout.c:1098

3313 +msgid "new-branch"

3314 msgstr ""

3315

3381 -#: builtin/checkout.c:1099

3316 +#: builtin/checkout.c:1098

3317 msgid "new unparented branch"

3318 msgstr ""

3319

3385 -#: builtin/checkout.c:1100

3320 +#: builtin/checkout.c:1099

3321 msgid "checkout our version for unmerged files"

3322 msgstr ""

3323

3389 -#: builtin/checkout.c:1102

3324 +#: builtin/checkout.c:1101

3325 msgid "checkout their version for unmerged files"

3326 msgstr ""

3327

3393 -#: builtin/checkout.c:1104

3328 +#: builtin/checkout.c:1103

3329 msgid "force checkout (throw away local modifications)"

3330 msgstr ""

3331

3397 -#: builtin/checkout.c:1105

3332 +#: builtin/checkout.c:1104

3333 msgid "perform a 3-way merge with the new branch"

3334 msgstr ""

3335

3401 -#: builtin/checkout.c:1106 builtin/merge.c:225

3336 +#: builtin/checkout.c:1105 builtin/merge.c:225

3337 msgid "update ignored files (default)"

3338 msgstr ""

3339

3405 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3340 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3341 msgid "style"

3342 msgstr ""

3343

3409 -#: builtin/checkout.c:1108

3344 +#: builtin/checkout.c:1107

3345 msgid "conflict style (merge or diff3)"

3346 msgstr ""

3347

3413 -#: builtin/checkout.c:1111

3348 +#: builtin/checkout.c:1110

3349 msgid "do not limit pathspecs to sparse entries only"

3350 msgstr ""

3351

3417 -#: builtin/checkout.c:1113

3352 +#: builtin/checkout.c:1112

3353 msgid "second guess 'git checkout no-such-branch'"

3354 msgstr ""

3355

3421 -#: builtin/checkout.c:1136

3356 +#: builtin/checkout.c:1135

3357 msgid "-b, -B and --orphan are mutually exclusive"

3358 msgstr ""

3359

3425 -#: builtin/checkout.c:1153

3360 +#: builtin/checkout.c:1152

3361 msgid "--track needs a branch name"

3362 msgstr ""

3363

3429 -#: builtin/checkout.c:1160

3364 +#: builtin/checkout.c:1159

3365 msgid "Missing branch name; try -b"

3366 msgstr ""

3367

3433 -#: builtin/checkout.c:1197

3368 +#: builtin/checkout.c:1196

3369 msgid "invalid path specification"

3370 msgstr ""

3371

3437 -#: builtin/checkout.c:1204

3372 +#: builtin/checkout.c:1203

3373 #, c-format

3374 msgid ""

3375 "Cannot update paths and switch to branch '%s' at the same time.\n"

3376 "Did you intend to checkout '%s' which can not be resolved as commit?"

3377 msgstr ""

3378

3444 -#: builtin/checkout.c:1209

3379 +#: builtin/checkout.c:1208

3380 #, c-format

3381 msgid "git checkout: --detach does not take a path argument '%s'"

3382 msgstr ""

3383

3449 -#: builtin/checkout.c:1213

3384 +#: builtin/checkout.c:1212

3385 msgid ""

3386 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3387 "checking out of the index."

@@ -3482,7 +3417,7 @@ msgstr ""

3417 msgid "failed to remove %s"

3418 msgstr ""

3419

3485 -#: builtin/clean.c:294

3420 +#: builtin/clean.c:295

3421 msgid ""

3422 "Prompt help:\n"

3423 "1 - select a numbered item\n"

@@ -3490,7 +3425,7 @@ msgid ""

3425 " - (empty) select nothing"

3426 msgstr ""

3427

3493 -#: builtin/clean.c:298

3428 +#: builtin/clean.c:299

3429 msgid ""

3430 "Prompt help:\n"

3431 "1 - select a single item\n"

@@ -3502,35 +3437,35 @@ msgid ""

3437 " - (empty) finish selecting"

3438 msgstr ""

3439

3505 -#: builtin/clean.c:516

3440 +#: builtin/clean.c:517

3441 #, c-format

3442 msgid "Huh (%s)?"

3443 msgstr ""

3444

3510 -#: builtin/clean.c:659

3445 +#: builtin/clean.c:660

3446 #, c-format

3447 msgid "Input ignore patterns>> "

3448 msgstr ""

3449

3515 -#: builtin/clean.c:696

3450 +#: builtin/clean.c:697

3451 #, c-format

3452 msgid "WARNING: Cannot find items matched by: %s"

3453 msgstr ""

3454

3520 -#: builtin/clean.c:717

3455 +#: builtin/clean.c:718

3456 msgid "Select items to delete"

3457 msgstr ""

3458

3524 -#: builtin/clean.c:757

3459 +#: builtin/clean.c:758

3460 #, c-format

3461 msgid "remove %s? "

3462 msgstr ""

3463

3529 -#: builtin/clean.c:782

3464 +#: builtin/clean.c:783

3465 msgid "Bye."

3466 msgstr ""

3467

3533 -#: builtin/clean.c:790

3468 +#: builtin/clean.c:791

3469 msgid ""

3470 "clean - start cleaning\n"

3471 "filter by pattern - exclude items from deletion\n"

@@ -3541,70 +3476,70 @@ msgid ""

3476 "? - help for prompt selection"

3477 msgstr ""

3478

3544 -#: builtin/clean.c:817

3479 +#: builtin/clean.c:818

3480 msgid "*** Commands ***"

3481 msgstr ""

3482

3548 -#: builtin/clean.c:818

3483 +#: builtin/clean.c:819

3484 msgid "What now"

3485 msgstr ""

3486

3552 -#: builtin/clean.c:826

3487 +#: builtin/clean.c:827

3488 msgid "Would remove the following item:"

3489 msgid_plural "Would remove the following items:"

3490 msgstr[0] ""

3491 msgstr[1] ""

3492

3558 -#: builtin/clean.c:843

3493 +#: builtin/clean.c:844

3494 msgid "No more files to clean, exiting."

3495 msgstr ""

3496

3562 -#: builtin/clean.c:874

3497 +#: builtin/clean.c:875

3498 msgid "do not print names of files removed"

3499 msgstr ""

3500

3566 -#: builtin/clean.c:876

3501 +#: builtin/clean.c:877

3502 msgid "force"

3503 msgstr ""

3504

3570 -#: builtin/clean.c:877

3505 +#: builtin/clean.c:878

3506 msgid "interactive cleaning"

3507 msgstr ""

3508

3574 -#: builtin/clean.c:879

3509 +#: builtin/clean.c:880

3510 msgid "remove whole directories"

3511 msgstr ""

3512

3578 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3579 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3513 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3514 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3515 msgid "pattern"

3516 msgstr ""

3517

3583 -#: builtin/clean.c:881

3518 +#: builtin/clean.c:882

3519 msgid "add <pattern> to ignore rules"

3520 msgstr ""

3521

3587 -#: builtin/clean.c:882

3522 +#: builtin/clean.c:883

3523 msgid "remove ignored files, too"

3524 msgstr ""

3525

3591 -#: builtin/clean.c:884

3526 +#: builtin/clean.c:885

3527 msgid "remove only ignored files"

3528 msgstr ""

3529

3595 -#: builtin/clean.c:902

3530 +#: builtin/clean.c:903

3531 msgid "-x and -X cannot be used together"

3532 msgstr ""

3533

3599 -#: builtin/clean.c:906

3534 +#: builtin/clean.c:907

3535 msgid ""

3601 -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3536 +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3537 "clean"

3538 msgstr ""

3539

3605 -#: builtin/clean.c:909

3540 +#: builtin/clean.c:910

3541 msgid ""

3607 -"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3542 +"clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3543 "refusing to clean"

3544 msgstr ""

3545

@@ -3613,7 +3548,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

3548 msgstr ""

3549

3550 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3616 -#: builtin/push.c:521

3551 +#: builtin/push.c:504

3552 msgid "force progress reporting"

3553 msgstr ""

3554

@@ -3621,7 +3556,7 @@ msgstr ""

3556 msgid "don't create a checkout"

3557 msgstr ""

3558

3624 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3559 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3560 msgid "create a bare repository"

3561 msgstr ""

3562

@@ -3645,11 +3580,11 @@ msgstr ""

3580 msgid "initialize submodules in the clone"

3581 msgstr ""

3582

3648 -#: builtin/clone.c:82 builtin/init-db.c:485

3583 +#: builtin/clone.c:82 builtin/init-db.c:483

3584 msgid "template-directory"

3585 msgstr ""

3586

3652 -#: builtin/clone.c:83 builtin/init-db.c:486

3587 +#: builtin/clone.c:83 builtin/init-db.c:484

3588 msgid "directory from which templates will be used"

3589 msgstr ""

3590

@@ -3673,7 +3608,7 @@ msgstr ""

3608 msgid "path to git-upload-pack on the remote"

3609 msgstr ""

3610

3676 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3611 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3612 msgid "depth"

3613 msgstr ""

3614

@@ -3685,11 +3620,11 @@ msgstr ""

3620 msgid "clone only one branch, HEAD or --branch"

3621 msgstr ""

3622

3688 -#: builtin/clone.c:96 builtin/init-db.c:494

3623 +#: builtin/clone.c:96 builtin/init-db.c:492

3624 msgid "gitdir"

3625 msgstr ""

3626

3692 -#: builtin/clone.c:97 builtin/init-db.c:495

3627 +#: builtin/clone.c:97 builtin/init-db.c:493

3628 msgid "separate git dir from working tree"

3629 msgstr ""

3630

@@ -3947,67 +3882,67 @@ msgid ""

3882 "the remaining commits.\n"

3883 msgstr ""

3884

3950 -#: builtin/commit.c:287

3885 +#: builtin/commit.c:288

3886 msgid "failed to unpack HEAD tree object"

3887 msgstr ""

3888

3954 -#: builtin/commit.c:329

3889 +#: builtin/commit.c:330

3890 msgid "unable to create temporary index"

3891 msgstr ""

3892

3958 -#: builtin/commit.c:335

3893 +#: builtin/commit.c:336

3894 msgid "interactive add failed"

3895 msgstr ""

3896

3962 -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

3897 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

3898 msgid "unable to write new_index file"

3899 msgstr ""

3900

3966 -#: builtin/commit.c:420

3901 +#: builtin/commit.c:421

3902 msgid "cannot do a partial commit during a merge."

3903 msgstr ""

3904

3970 -#: builtin/commit.c:422

3905 +#: builtin/commit.c:423

3906 msgid "cannot do a partial commit during a cherry-pick."

3907 msgstr ""

3908

3974 -#: builtin/commit.c:432

3909 +#: builtin/commit.c:433

3910 msgid "cannot read the index"

3911 msgstr ""

3912

3978 -#: builtin/commit.c:452

3913 +#: builtin/commit.c:453

3914 msgid "unable to write temporary index file"

3915 msgstr ""

3916

3982 -#: builtin/commit.c:543 builtin/commit.c:549

3917 +#: builtin/commit.c:544 builtin/commit.c:550

3918 #, c-format

3919 msgid "invalid commit: %s"

3920 msgstr ""

3921

3987 -#: builtin/commit.c:571

3922 +#: builtin/commit.c:572

3923 msgid "malformed --author parameter"

3924 msgstr ""

3925

3991 -#: builtin/commit.c:591

3926 +#: builtin/commit.c:592

3927 #, c-format

3928 msgid "Malformed ident string: '%s'"

3929 msgstr ""

3930

3996 -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

3931 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

3932 #, c-format

3933 msgid "could not lookup commit %s"

3934 msgstr ""

3935

4001 -#: builtin/commit.c:642 builtin/shortlog.c:273

3936 +#: builtin/commit.c:641 builtin/shortlog.c:273

3937 #, c-format

3938 msgid "(reading log message from standard input)\n"

3939 msgstr ""

3940

4006 -#: builtin/commit.c:644

3941 +#: builtin/commit.c:643

3942 msgid "could not read log from standard input"

3943 msgstr ""

3944

4010 -#: builtin/commit.c:648

3945 +#: builtin/commit.c:647

3946 #, c-format

3947 msgid "could not read log file '%s'"

3948 msgstr ""

@@ -4033,7 +3968,7 @@ msgstr ""

3968 msgid "could not write commit template"

3969 msgstr ""

3970

4036 -#: builtin/commit.c:760

3971 +#: builtin/commit.c:764

3972 #, c-format

3973 msgid ""

3974 "\n"

@@ -4043,7 +3978,7 @@ msgid ""

3978 "and try again.\n"

3979 msgstr ""

3980

4046 -#: builtin/commit.c:765

3981 +#: builtin/commit.c:769

3982 #, c-format

3983 msgid ""

3984 "\n"

@@ -4053,14 +3988,14 @@ msgid ""

3988 "and try again.\n"

3989 msgstr ""

3990

4056 -#: builtin/commit.c:777

3991 +#: builtin/commit.c:782

3992 #, c-format

3993 msgid ""

3994 "Please enter the commit message for your changes. Lines starting\n"

3995 "with '%c' will be ignored, and an empty message aborts the commit.\n"

3996 msgstr ""

3997

4063 -#: builtin/commit.c:782

3998 +#: builtin/commit.c:789

3999 #, c-format

4000 msgid ""

4001 "Please enter the commit message for your changes. Lines starting\n"

@@ -4068,351 +4003,351 @@ msgid ""

4003 "An empty message aborts the commit.\n"

4004 msgstr ""

4005

4071 -#: builtin/commit.c:795

4006 +#: builtin/commit.c:802

4007 #, c-format

4008 msgid "%sAuthor: %s"

4009 msgstr ""

4010

4076 -#: builtin/commit.c:802

4011 +#: builtin/commit.c:809

4012 #, c-format

4013 msgid "%sCommitter: %s"

4014 msgstr ""

4015

4081 -#: builtin/commit.c:822

4016 +#: builtin/commit.c:829

4017 msgid "Cannot read index"

4018 msgstr ""

4019

4085 -#: builtin/commit.c:865

4020 +#: builtin/commit.c:872

4021 msgid "Error building trees"

4022 msgstr ""

4023

4089 -#: builtin/commit.c:880 builtin/tag.c:359

4024 +#: builtin/commit.c:887 builtin/tag.c:391

4025 #, c-format

4026 msgid "Please supply the message using either -m or -F option.\n"

4027 msgstr ""

4028

4094 -#: builtin/commit.c:982

4029 +#: builtin/commit.c:989

4030 #, c-format

4031 msgid "No existing author found with '%s'"

4032 msgstr ""

4033

4099 -#: builtin/commit.c:997 builtin/commit.c:1237

4034 +#: builtin/commit.c:1004 builtin/commit.c:1244

4035 #, c-format

4036 msgid "Invalid untracked files mode '%s'"

4037 msgstr ""

4038

4104 -#: builtin/commit.c:1034

4039 +#: builtin/commit.c:1041

4040 msgid "--long and -z are incompatible"

4041 msgstr ""

4042

4108 -#: builtin/commit.c:1064

4043 +#: builtin/commit.c:1071

4044 msgid "Using both --reset-author and --author does not make sense"

4045 msgstr ""

4046

4112 -#: builtin/commit.c:1075

4047 +#: builtin/commit.c:1080

4048 msgid "You have nothing to amend."

4049 msgstr ""

4050

4116 -#: builtin/commit.c:1078

4051 +#: builtin/commit.c:1083

4052 msgid "You are in the middle of a merge -- cannot amend."

4053 msgstr ""

4054

4120 -#: builtin/commit.c:1080

4055 +#: builtin/commit.c:1085

4056 msgid "You are in the middle of a cherry-pick -- cannot amend."

4057 msgstr ""

4058

4124 -#: builtin/commit.c:1083

4059 +#: builtin/commit.c:1088

4060 msgid "Options --squash and --fixup cannot be used together"

4061 msgstr ""

4062

4128 -#: builtin/commit.c:1093

4063 +#: builtin/commit.c:1098

4064 msgid "Only one of -c/-C/-F/--fixup can be used."

4065 msgstr ""

4066

4132 -#: builtin/commit.c:1095

4067 +#: builtin/commit.c:1100

4068 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4069 msgstr ""

4070

4136 -#: builtin/commit.c:1103

4071 +#: builtin/commit.c:1108

4072 msgid "--reset-author can be used only with -C, -c or --amend."

4073 msgstr ""

4074

4140 -#: builtin/commit.c:1120

4075 +#: builtin/commit.c:1125

4076 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4077 msgstr ""

4078

4144 -#: builtin/commit.c:1122

4079 +#: builtin/commit.c:1127

4080 msgid "No paths with --include/--only does not make sense."

4081 msgstr ""

4082

4148 -#: builtin/commit.c:1124

4083 +#: builtin/commit.c:1129

4084 msgid "Clever... amending the last one with dirty index."

4085 msgstr ""

4086

4152 -#: builtin/commit.c:1126

4153 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4087 +#: builtin/commit.c:1131

4088 +msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4089 msgstr ""

4090

4156 -#: builtin/commit.c:1136 builtin/tag.c:572

4091 +#: builtin/commit.c:1143 builtin/tag.c:639

4092 #, c-format

4093 msgid "Invalid cleanup mode %s"

4094 msgstr ""

4095

4161 -#: builtin/commit.c:1141

4096 +#: builtin/commit.c:1148

4097 msgid "Paths with -a does not make sense."

4098 msgstr ""

4099

4165 -#: builtin/commit.c:1251 builtin/commit.c:1482

4100 +#: builtin/commit.c:1258 builtin/commit.c:1516

4101 msgid "show status concisely"

4102 msgstr ""

4103

4169 -#: builtin/commit.c:1253 builtin/commit.c:1484

4104 +#: builtin/commit.c:1260 builtin/commit.c:1518

4105 msgid "show branch information"

4106 msgstr ""

4107

4173 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4108 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4109 msgid "machine-readable output"

4110 msgstr ""

4111

4177 -#: builtin/commit.c:1258 builtin/commit.c:1488

4112 +#: builtin/commit.c:1265 builtin/commit.c:1522

4113 msgid "show status in long format (default)"

4114 msgstr ""

4115

4181 -#: builtin/commit.c:1261 builtin/commit.c:1491

4116 +#: builtin/commit.c:1268 builtin/commit.c:1525

4117 msgid "terminate entries with NUL"

4118 msgstr ""

4119

4185 -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4186 -#: builtin/fast-export.c:677 builtin/tag.c:459

4120 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4121 +#: builtin/fast-export.c:677 builtin/tag.c:514

4122 msgid "mode"

4123 msgstr ""

4124

4190 -#: builtin/commit.c:1264 builtin/commit.c:1494

4125 +#: builtin/commit.c:1271 builtin/commit.c:1528

4126 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4127 msgstr ""

4128

4194 -#: builtin/commit.c:1267

4129 +#: builtin/commit.c:1274

4130 msgid "show ignored files"

4131 msgstr ""

4132

4198 -#: builtin/commit.c:1268 parse-options.h:156

4133 +#: builtin/commit.c:1275 parse-options.h:153

4134 msgid "when"

4135 msgstr ""

4136

4202 -#: builtin/commit.c:1269

4137 +#: builtin/commit.c:1276

4138 msgid ""

4139 "ignore changes to submodules, optional when: all, dirty, untracked. "

4140 "(Default: all)"

4141 msgstr ""

4142

4208 -#: builtin/commit.c:1271

4143 +#: builtin/commit.c:1278

4144 msgid "list untracked files in columns"

4145 msgstr ""

4146

4212 -#: builtin/commit.c:1340

4147 +#: builtin/commit.c:1347

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

4149 msgstr ""

4150

4216 -#: builtin/commit.c:1342

4151 +#: builtin/commit.c:1349

4152 msgid "could not parse newly created commit"

4153 msgstr ""

4154

4220 -#: builtin/commit.c:1383

4155 +#: builtin/commit.c:1390

4156 msgid "detached HEAD"

4157 msgstr ""

4158

4224 -#: builtin/commit.c:1385

4159 +#: builtin/commit.c:1392

4160 msgid " (root-commit)"

4161 msgstr ""

4162

4228 -#: builtin/commit.c:1452

4163 +#: builtin/commit.c:1486

4164 msgid "suppress summary after successful commit"

4165 msgstr ""

4166

4232 -#: builtin/commit.c:1453

4167 +#: builtin/commit.c:1487

4168 msgid "show diff in commit message template"

4169 msgstr ""

4170

4236 -#: builtin/commit.c:1455

4171 +#: builtin/commit.c:1489

4172 msgid "Commit message options"

4173 msgstr ""

4174

4240 -#: builtin/commit.c:1456 builtin/tag.c:457

4175 +#: builtin/commit.c:1490 builtin/tag.c:512

4176 msgid "read message from file"

4177 msgstr ""

4178

4244 -#: builtin/commit.c:1457

4179 +#: builtin/commit.c:1491

4180 msgid "author"

4181 msgstr ""

4182

4248 -#: builtin/commit.c:1457

4183 +#: builtin/commit.c:1491

4184 msgid "override author for commit"

4185 msgstr ""

4186

4252 -#: builtin/commit.c:1458 builtin/gc.c:261

4187 +#: builtin/commit.c:1492 builtin/gc.c:272

4188 msgid "date"

4189 msgstr ""

4190

4256 -#: builtin/commit.c:1458

4191 +#: builtin/commit.c:1492

4192 msgid "override date for commit"

4193 msgstr ""

4194

4260 -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4261 -#: builtin/notes.c:562 builtin/tag.c:455

4195 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4196 +#: builtin/notes.c:566 builtin/tag.c:510

4197 msgid "message"

4198 msgstr ""

4199

4265 -#: builtin/commit.c:1459

4200 +#: builtin/commit.c:1493

4201 msgid "commit message"

4202 msgstr ""

4203

4269 -#: builtin/commit.c:1460

4204 +#: builtin/commit.c:1494

4205 msgid "reuse and edit message from specified commit"

4206 msgstr ""

4207

4273 -#: builtin/commit.c:1461

4208 +#: builtin/commit.c:1495

4209 msgid "reuse message from specified commit"

4210 msgstr ""

4211

4277 -#: builtin/commit.c:1462

4212 +#: builtin/commit.c:1496

4213 msgid "use autosquash formatted message to fixup specified commit"

4214 msgstr ""

4215

4281 -#: builtin/commit.c:1463

4216 +#: builtin/commit.c:1497

4217 msgid "use autosquash formatted message to squash specified commit"

4218 msgstr ""

4219

4285 -#: builtin/commit.c:1464

4220 +#: builtin/commit.c:1498

4221 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4222 msgstr ""

4223

4289 -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4224 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4225 msgid "add Signed-off-by:"

4226 msgstr ""

4227

4293 -#: builtin/commit.c:1466

4228 +#: builtin/commit.c:1500

4229 msgid "use specified template file"

4230 msgstr ""

4231

4297 -#: builtin/commit.c:1467

4232 +#: builtin/commit.c:1501

4233 msgid "force edit of commit"

4234 msgstr ""

4235

4301 -#: builtin/commit.c:1468

4236 +#: builtin/commit.c:1502

4237 msgid "default"

4238 msgstr ""

4239

4305 -#: builtin/commit.c:1468 builtin/tag.c:460

4240 +#: builtin/commit.c:1502 builtin/tag.c:515

4241 msgid "how to strip spaces and #comments from message"

4242 msgstr ""

4243

4309 -#: builtin/commit.c:1469

4244 +#: builtin/commit.c:1503

4245 msgid "include status in commit message template"

4246 msgstr ""

4247

4313 -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4314 -msgid "key id"

4248 +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4249 +#: builtin/tag.c:516

4250 +msgid "key-id"

4251 msgstr ""

4252

4317 -#: builtin/commit.c:1471 builtin/merge.c:224

4253 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4254 msgid "GPG sign commit"

4255 msgstr ""

4256

4321 -#. end commit message options

4322 -#: builtin/commit.c:1474

4257 +#: builtin/commit.c:1508

4258 msgid "Commit contents options"

4259 msgstr ""

4260

4326 -#: builtin/commit.c:1475

4261 +#: builtin/commit.c:1509

4262 msgid "commit all changed files"

4263 msgstr ""

4264

4330 -#: builtin/commit.c:1476

4265 +#: builtin/commit.c:1510

4266 msgid "add specified files to index for commit"

4267 msgstr ""

4268

4334 -#: builtin/commit.c:1477

4269 +#: builtin/commit.c:1511

4270 msgid "interactively add files"

4271 msgstr ""

4272

4338 -#: builtin/commit.c:1478

4273 +#: builtin/commit.c:1512

4274 msgid "interactively add changes"

4275 msgstr ""

4276

4342 -#: builtin/commit.c:1479

4277 +#: builtin/commit.c:1513

4278 msgid "commit only specified files"

4279 msgstr ""

4280

4346 -#: builtin/commit.c:1480

4281 +#: builtin/commit.c:1514

4282 msgid "bypass pre-commit hook"

4283 msgstr ""

4284

4350 -#: builtin/commit.c:1481

4285 +#: builtin/commit.c:1515

4286 msgid "show what would be committed"

4287 msgstr ""

4288

4354 -#: builtin/commit.c:1492

4289 +#: builtin/commit.c:1526

4290 msgid "amend previous commit"

4291 msgstr ""

4292

4358 -#: builtin/commit.c:1493

4293 +#: builtin/commit.c:1527

4294 msgid "bypass post-rewrite hook"

4295 msgstr ""

4296

4362 -#: builtin/commit.c:1498

4297 +#: builtin/commit.c:1532

4298 msgid "ok to record an empty change"

4299 msgstr ""

4300

4366 -#: builtin/commit.c:1500

4301 +#: builtin/commit.c:1534

4302 msgid "ok to record a change with an empty message"

4303 msgstr ""

4304

4370 -#: builtin/commit.c:1529

4305 +#: builtin/commit.c:1562

4306 msgid "could not parse HEAD commit"

4307 msgstr ""

4308

4374 -#: builtin/commit.c:1567 builtin/merge.c:518

4309 +#: builtin/commit.c:1601 builtin/merge.c:518

4310 #, c-format

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

4312 msgstr ""

4313

4379 -#: builtin/commit.c:1574

4314 +#: builtin/commit.c:1608

4315 #, c-format

4316 msgid "Corrupt MERGE_HEAD file (%s)"

4317 msgstr ""

4318

4384 -#: builtin/commit.c:1581

4319 +#: builtin/commit.c:1615

4320 msgid "could not read MERGE_MODE"

4321 msgstr ""

4322

4388 -#: builtin/commit.c:1600

4323 +#: builtin/commit.c:1634

4324 #, c-format

4325 msgid "could not read commit message: %s"

4326 msgstr ""

4327

4393 -#: builtin/commit.c:1611

4328 +#: builtin/commit.c:1645

4329 #, c-format

4330 msgid "Aborting commit; you did not edit the message.\n"

4331 msgstr ""

4332

4398 -#: builtin/commit.c:1616

4333 +#: builtin/commit.c:1650

4334 #, c-format

4335 msgid "Aborting commit due to empty commit message.\n"

4336 msgstr ""

4337

4403 -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4338 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4339 msgid "failed to write commit object"

4340 msgstr ""

4341

4407 -#: builtin/commit.c:1652

4342 +#: builtin/commit.c:1686

4343 msgid "cannot lock HEAD ref"

4344 msgstr ""

4345

4411 -#: builtin/commit.c:1656

4346 +#: builtin/commit.c:1690

4347 msgid "cannot update HEAD ref"

4348 msgstr ""

4349

4415 -#: builtin/commit.c:1667

4350 +#: builtin/commit.c:1701

4351 msgid ""

4352 "Repository has been updated, but unable to write\n"

4353 "new_index file. Check that disk is not full or quota is\n"

@@ -4423,127 +4358,127 @@ msgstr ""

4358 msgid "git config [options]"

4359 msgstr ""

4360

4426 -#: builtin/config.c:54

4361 +#: builtin/config.c:53

4362 msgid "Config file location"

4363 msgstr ""

4364

4430 -#: builtin/config.c:55

4365 +#: builtin/config.c:54

4366 msgid "use global config file"

4367 msgstr ""

4368

4434 -#: builtin/config.c:56

4369 +#: builtin/config.c:55

4370 msgid "use system config file"

4371 msgstr ""

4372

4438 -#: builtin/config.c:57

4373 +#: builtin/config.c:56

4374 msgid "use repository config file"

4375 msgstr ""

4376

4442 -#: builtin/config.c:58

4377 +#: builtin/config.c:57

4378 msgid "use given config file"

4379 msgstr ""

4380

4446 -#: builtin/config.c:59

4381 +#: builtin/config.c:58

4382 msgid "blob-id"

4383 msgstr ""

4384

4450 -#: builtin/config.c:59

4385 +#: builtin/config.c:58

4386 msgid "read config from given blob object"

4387 msgstr ""

4388

4454 -#: builtin/config.c:60

4389 +#: builtin/config.c:59

4390 msgid "Action"

4391 msgstr ""

4392

4458 -#: builtin/config.c:61

4393 +#: builtin/config.c:60

4394 msgid "get value: name [value-regex]"

4395 msgstr ""

4396

4462 -#: builtin/config.c:62

4397 +#: builtin/config.c:61

4398 msgid "get all values: key [value-regex]"

4399 msgstr ""

4400

4466 -#: builtin/config.c:63

4401 +#: builtin/config.c:62

4402 msgid "get values for regexp: name-regex [value-regex]"

4403 msgstr ""

4404

4470 -#: builtin/config.c:64

4405 +#: builtin/config.c:63

4406 msgid "get value specific for the URL: section[.var] URL"

4407 msgstr ""

4408

4474 -#: builtin/config.c:65

4409 +#: builtin/config.c:64

4410 msgid "replace all matching variables: name value [value_regex]"

4411 msgstr ""

4412

4478 -#: builtin/config.c:66

4413 +#: builtin/config.c:65

4414 msgid "add a new variable: name value"

4415 msgstr ""

4416

4482 -#: builtin/config.c:67

4417 +#: builtin/config.c:66

4418 msgid "remove a variable: name [value-regex]"

4419 msgstr ""

4420

4486 -#: builtin/config.c:68

4421 +#: builtin/config.c:67

4422 msgid "remove all matches: name [value-regex]"

4423 msgstr ""

4424

4490 -#: builtin/config.c:69

4425 +#: builtin/config.c:68

4426 msgid "rename section: old-name new-name"

4427 msgstr ""

4428

4494 -#: builtin/config.c:70

4429 +#: builtin/config.c:69

4430 msgid "remove a section: name"

4431 msgstr ""

4432

4498 -#: builtin/config.c:71

4433 +#: builtin/config.c:70

4434 msgid "list all"

4435 msgstr ""

4436

4502 -#: builtin/config.c:72

4437 +#: builtin/config.c:71

4438 msgid "open an editor"

4439 msgstr ""

4440

4506 -#: builtin/config.c:73 builtin/config.c:74

4441 +#: builtin/config.c:72 builtin/config.c:73

4442 msgid "slot"

4443 msgstr ""

4444

4510 -#: builtin/config.c:73

4445 +#: builtin/config.c:72

4446 msgid "find the color configured: [default]"

4447 msgstr ""

4448

4514 -#: builtin/config.c:74

4449 +#: builtin/config.c:73

4450 msgid "find the color setting: [stdout-is-tty]"

4451 msgstr ""

4452

4518 -#: builtin/config.c:75

4453 +#: builtin/config.c:74

4454 msgid "Type"

4455 msgstr ""

4456

4522 -#: builtin/config.c:76

4457 +#: builtin/config.c:75

4458 msgid "value is \"true\" or \"false\""

4459 msgstr ""

4460

4526 -#: builtin/config.c:77

4461 +#: builtin/config.c:76

4462 msgid "value is decimal number"

4463 msgstr ""

4464

4530 -#: builtin/config.c:78

4465 +#: builtin/config.c:77

4466 msgid "value is --bool or --int"

4467 msgstr ""

4468

4534 -#: builtin/config.c:79

4469 +#: builtin/config.c:78

4470 msgid "value is a path (file or directory name)"

4471 msgstr ""

4472

4538 -#: builtin/config.c:80

4473 +#: builtin/config.c:79

4474 msgid "Other"

4475 msgstr ""

4476

4542 -#: builtin/config.c:81

4477 +#: builtin/config.c:80

4478 msgid "terminate values with NUL byte"

4479 msgstr ""

4480

4546 -#: builtin/config.c:82

4481 +#: builtin/config.c:81

4482 msgid "respect include directives on lookup"

4483 msgstr ""

4484

@@ -4563,129 +4498,129 @@ msgstr ""

4498 msgid "git describe [options] --dirty"

4499 msgstr ""

4500

4566 -#: builtin/describe.c:237

4501 +#: builtin/describe.c:225

4502 #, c-format

4503 msgid "annotated tag %s not available"

4504 msgstr ""

4505

4571 -#: builtin/describe.c:241

4506 +#: builtin/describe.c:229

4507 #, c-format

4508 msgid "annotated tag %s has no embedded name"

4509 msgstr ""

4510

4576 -#: builtin/describe.c:243

4511 +#: builtin/describe.c:231

4512 #, c-format

4513 msgid "tag '%s' is really '%s' here"

4514 msgstr ""

4515

4581 -#: builtin/describe.c:270

4516 +#: builtin/describe.c:258

4517 #, c-format

4518 msgid "Not a valid object name %s"

4519 msgstr ""

4520

4586 -#: builtin/describe.c:273

4521 +#: builtin/describe.c:261

4522 #, c-format

4523 msgid "%s is not a valid '%s' object"

4524 msgstr ""

4525

4591 -#: builtin/describe.c:290

4526 +#: builtin/describe.c:278

4527 #, c-format

4528 msgid "no tag exactly matches '%s'"

4529 msgstr ""

4530

4596 -#: builtin/describe.c:292

4531 +#: builtin/describe.c:280

4532 #, c-format

4533 msgid "searching to describe %s\n"

4534 msgstr ""

4535

4601 -#: builtin/describe.c:332

4536 +#: builtin/describe.c:327

4537 #, c-format

4538 msgid "finished search at %s\n"

4539 msgstr ""

4540

4606 -#: builtin/describe.c:359

4541 +#: builtin/describe.c:354

4542 #, c-format

4543 msgid ""

4544 "No annotated tags can describe '%s'.\n"

4545 "However, there were unannotated tags: try --tags."

4546 msgstr ""

4547

4613 -#: builtin/describe.c:363

4548 +#: builtin/describe.c:358

4549 #, c-format

4550 msgid ""

4551 "No tags can describe '%s'.\n"

4552 "Try --always, or create some tags."

4553 msgstr ""

4554

4620 -#: builtin/describe.c:384

4555 +#: builtin/describe.c:379

4556 #, c-format

4557 msgid "traversed %lu commits\n"

4558 msgstr ""

4559

4625 -#: builtin/describe.c:387

4560 +#: builtin/describe.c:382

4561 #, c-format

4562 msgid ""

4563 "more than %i tags found; listed %i most recent\n"

4564 "gave up search at %s\n"

4565 msgstr ""

4566

4632 -#: builtin/describe.c:409

4567 +#: builtin/describe.c:404

4568 msgid "find the tag that comes after the commit"

4569 msgstr ""

4570

4636 -#: builtin/describe.c:410

4571 +#: builtin/describe.c:405

4572 msgid "debug search strategy on stderr"

4573 msgstr ""

4574

4640 -#: builtin/describe.c:411

4575 +#: builtin/describe.c:406

4576 msgid "use any ref"

4577 msgstr ""

4578

4644 -#: builtin/describe.c:412

4579 +#: builtin/describe.c:407

4580 msgid "use any tag, even unannotated"

4581 msgstr ""

4582

4648 -#: builtin/describe.c:413

4583 +#: builtin/describe.c:408

4584 msgid "always use long format"

4585 msgstr ""

4586

4652 -#: builtin/describe.c:414

4587 +#: builtin/describe.c:409

4588 msgid "only follow first parent"

4589 msgstr ""

4590

4656 -#: builtin/describe.c:417

4591 +#: builtin/describe.c:412

4592 msgid "only output exact matches"

4593 msgstr ""

4594

4660 -#: builtin/describe.c:419

4595 +#: builtin/describe.c:414

4596 msgid "consider <n> most recent tags (default: 10)"

4597 msgstr ""

4598

4664 -#: builtin/describe.c:421

4599 +#: builtin/describe.c:416

4600 msgid "only consider tags matching <pattern>"

4601 msgstr ""

4602

4668 -#: builtin/describe.c:423 builtin/name-rev.c:321

4603 +#: builtin/describe.c:418 builtin/name-rev.c:321

4604 msgid "show abbreviated commit object as fallback"

4605 msgstr ""

4606

4672 -#: builtin/describe.c:424

4607 +#: builtin/describe.c:419

4608 msgid "mark"

4609 msgstr ""

4610

4676 -#: builtin/describe.c:425

4611 +#: builtin/describe.c:420

4612 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4613 msgstr ""

4614

4680 -#: builtin/describe.c:443

4615 +#: builtin/describe.c:438

4616 msgid "--long is incompatible with --abbrev=0"

4617 msgstr ""

4618

4684 -#: builtin/describe.c:469

4619 +#: builtin/describe.c:464

4620 msgid "No names found, cannot describe anything."

4621 msgstr ""

4622

4688 -#: builtin/describe.c:489

4623 +#: builtin/describe.c:484

4624 msgid "--dirty is incompatible with commit-ishes"

4625 msgstr ""

4626

@@ -4975,7 +4910,7 @@ msgstr ""

4910 msgid "Could not fetch %s"

4911 msgstr ""

4912

4978 -#: builtin/fetch.c:1036

4913 +#: builtin/fetch.c:1035

4914 msgid ""

4915 "No remote repository specified. Please, specify either a URL or a\n"

4916 "remote name from which new revisions should be fetched."

@@ -5014,10 +4949,10 @@ msgstr ""

4949 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4950 msgstr ""

4951

5017 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5018 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164

5019 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446

5020 -#: parse-options.h:135 parse-options.h:242

4952 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

4953 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

4954 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

4955 +#: parse-options.h:132 parse-options.h:239

4956 msgid "n"

4957 msgstr ""

4958

@@ -5081,6 +5016,14 @@ msgstr ""

5016 msgid "field name to sort on"

5017 msgstr ""

5018

5019 +#: builtin/fsck.c:147 builtin/prune.c:172

5020 +msgid "Checking connectivity"

5021 +msgstr ""

5022 +

5023 +#: builtin/fsck.c:544

5024 +msgid "Checking object directories"

5025 +msgstr ""

5026 +

5027 #: builtin/fsck.c:607

5028 msgid "git fsck [options] [<object>...]"

5029 msgstr ""

@@ -5125,51 +5068,62 @@ msgstr ""

5068 msgid "show progress"

5069 msgstr ""

5070

5071 +#: builtin/fsck.c:673

5072 +msgid "Checking objects"

5073 +msgstr ""

5074 +

5075 #: builtin/gc.c:24

5076 msgid "git gc [options]"

5077 msgstr ""

5078

5132 -#: builtin/gc.c:80

5079 +#: builtin/gc.c:90

5080 #, c-format

5081 msgid "Invalid %s: '%s'"

5082 msgstr ""

5083

5137 -#: builtin/gc.c:107

5084 +#: builtin/gc.c:117

5085 #, c-format

5086 msgid "insanely long object directory %.*s"

5087 msgstr ""

5088

5142 -#: builtin/gc.c:262

5089 +#: builtin/gc.c:273

5090 msgid "prune unreferenced objects"

5091 msgstr ""

5092

5146 -#: builtin/gc.c:264

5093 +#: builtin/gc.c:275

5094 msgid "be more thorough (increased runtime)"

5095 msgstr ""

5096

5150 -#: builtin/gc.c:265

5097 +#: builtin/gc.c:276

5098 msgid "enable auto-gc mode"

5099 msgstr ""

5100

5154 -#: builtin/gc.c:266

5101 +#: builtin/gc.c:277

5102 msgid "force running gc even if there may be another gc running"

5103 msgstr ""

5104

5158 -#: builtin/gc.c:306

5105 +#: builtin/gc.c:318

5106 #, c-format

5160 -msgid ""

5161 -"Auto packing the repository for optimum performance. You may also\n"

5162 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

5107 +msgid "Auto packing the repository in background for optimum performance.\n"

5108 +msgstr ""

5109 +

5110 +#: builtin/gc.c:320

5111 +#, c-format

5112 +msgid "Auto packing the repository for optimum performance.\n"

5113 +msgstr ""

5114 +

5115 +#: builtin/gc.c:321

5116 +#, c-format

5117 +msgid "See \"git help gc\" for manual housekeeping.\n"

5118 msgstr ""

5119

5165 -#. be quiet on --auto

5166 -#: builtin/gc.c:316

5120 +#: builtin/gc.c:336

5121 #, c-format

5122 msgid ""

5123 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5124 msgstr ""

5125

5172 -#: builtin/gc.c:341

5126 +#: builtin/gc.c:361

5127 msgid ""

5128 "There are too many unreachable loose objects; run 'git prune' to remove them."

5129 msgstr ""

@@ -5198,209 +5152,209 @@ msgstr ""

5152 msgid "unable to grep from object of type %s"

5153 msgstr ""

5154

5201 -#: builtin/grep.c:551

5155 +#: builtin/grep.c:549

5156 #, c-format

5157 msgid "switch `%c' expects a numerical value"

5158 msgstr ""

5159

5206 -#: builtin/grep.c:568

5160 +#: builtin/grep.c:566

5161 #, c-format

5162 msgid "cannot open '%s'"

5163 msgstr ""

5164

5211 -#: builtin/grep.c:642

5165 +#: builtin/grep.c:640

5166 msgid "search in index instead of in the work tree"

5167 msgstr ""

5168

5215 -#: builtin/grep.c:644

5169 +#: builtin/grep.c:642

5170 msgid "find in contents not managed by git"

5171 msgstr ""

5172

5219 -#: builtin/grep.c:646

5173 +#: builtin/grep.c:644

5174 msgid "search in both tracked and untracked files"

5175 msgstr ""

5176

5223 -#: builtin/grep.c:648

5177 +#: builtin/grep.c:646

5178 msgid "search also in ignored files"

5179 msgstr ""

5180

5227 -#: builtin/grep.c:651

5181 +#: builtin/grep.c:649

5182 msgid "show non-matching lines"

5183 msgstr ""

5184

5231 -#: builtin/grep.c:653

5185 +#: builtin/grep.c:651

5186 msgid "case insensitive matching"

5187 msgstr ""

5188

5235 -#: builtin/grep.c:655

5189 +#: builtin/grep.c:653

5190 msgid "match patterns only at word boundaries"

5191 msgstr ""

5192

5239 -#: builtin/grep.c:657

5193 +#: builtin/grep.c:655

5194 msgid "process binary files as text"

5195 msgstr ""

5196

5243 -#: builtin/grep.c:659

5197 +#: builtin/grep.c:657

5198 msgid "don't match patterns in binary files"

5199 msgstr ""

5200

5247 -#: builtin/grep.c:662

5201 +#: builtin/grep.c:660

5202 msgid "process binary files with textconv filters"

5203 msgstr ""

5204

5251 -#: builtin/grep.c:664

5205 +#: builtin/grep.c:662

5206 msgid "descend at most <depth> levels"

5207 msgstr ""

5208

5255 -#: builtin/grep.c:668

5209 +#: builtin/grep.c:666

5210 msgid "use extended POSIX regular expressions"

5211 msgstr ""

5212

5259 -#: builtin/grep.c:671

5213 +#: builtin/grep.c:669

5214 msgid "use basic POSIX regular expressions (default)"

5215 msgstr ""

5216

5263 -#: builtin/grep.c:674

5217 +#: builtin/grep.c:672

5218 msgid "interpret patterns as fixed strings"

5219 msgstr ""

5220

5267 -#: builtin/grep.c:677

5221 +#: builtin/grep.c:675

5222 msgid "use Perl-compatible regular expressions"

5223 msgstr ""

5224

5271 -#: builtin/grep.c:680

5225 +#: builtin/grep.c:678

5226 msgid "show line numbers"

5227 msgstr ""

5228

5275 -#: builtin/grep.c:681

5229 +#: builtin/grep.c:679

5230 msgid "don't show filenames"

5231 msgstr ""

5232

5279 -#: builtin/grep.c:682

5233 +#: builtin/grep.c:680

5234 msgid "show filenames"

5235 msgstr ""

5236

5283 -#: builtin/grep.c:684

5237 +#: builtin/grep.c:682

5238 msgid "show filenames relative to top directory"

5239 msgstr ""

5240

5287 -#: builtin/grep.c:686

5241 +#: builtin/grep.c:684

5242 msgid "show only filenames instead of matching lines"

5243 msgstr ""

5244

5291 -#: builtin/grep.c:688

5245 +#: builtin/grep.c:686

5246 msgid "synonym for --files-with-matches"

5247 msgstr ""

5248

5295 -#: builtin/grep.c:691

5249 +#: builtin/grep.c:689

5250 msgid "show only the names of files without match"

5251 msgstr ""

5252

5299 -#: builtin/grep.c:693

5253 +#: builtin/grep.c:691

5254 msgid "print NUL after filenames"

5255 msgstr ""

5256

5303 -#: builtin/grep.c:695

5257 +#: builtin/grep.c:693

5258 msgid "show the number of matches instead of matching lines"

5259 msgstr ""

5260

5307 -#: builtin/grep.c:696

5261 +#: builtin/grep.c:694

5262 msgid "highlight matches"

5263 msgstr ""

5264

5311 -#: builtin/grep.c:698

5265 +#: builtin/grep.c:696

5266 msgid "print empty line between matches from different files"

5267 msgstr ""

5268

5315 -#: builtin/grep.c:700

5269 +#: builtin/grep.c:698

5270 msgid "show filename only once above matches from same file"

5271 msgstr ""

5272

5319 -#: builtin/grep.c:703

5273 +#: builtin/grep.c:701

5274 msgid "show <n> context lines before and after matches"

5275 msgstr ""

5276

5323 -#: builtin/grep.c:706

5277 +#: builtin/grep.c:704

5278 msgid "show <n> context lines before matches"

5279 msgstr ""

5280

5327 -#: builtin/grep.c:708

5281 +#: builtin/grep.c:706

5282 msgid "show <n> context lines after matches"

5283 msgstr ""

5284

5331 -#: builtin/grep.c:709

5285 +#: builtin/grep.c:707

5286 msgid "shortcut for -C NUM"

5287 msgstr ""

5288

5335 -#: builtin/grep.c:712

5289 +#: builtin/grep.c:710

5290 msgid "show a line with the function name before matches"

5291 msgstr ""

5292

5339 -#: builtin/grep.c:714

5293 +#: builtin/grep.c:712

5294 msgid "show the surrounding function"

5295 msgstr ""

5296

5343 -#: builtin/grep.c:717

5297 +#: builtin/grep.c:715

5298 msgid "read patterns from file"

5299 msgstr ""

5300

5347 -#: builtin/grep.c:719

5301 +#: builtin/grep.c:717

5302 msgid "match <pattern>"

5303 msgstr ""

5304

5351 -#: builtin/grep.c:721

5305 +#: builtin/grep.c:719

5306 msgid "combine patterns specified with -e"

5307 msgstr ""

5308

5355 -#: builtin/grep.c:733

5309 +#: builtin/grep.c:731

5310 msgid "indicate hit with exit status without output"

5311 msgstr ""

5312

5359 -#: builtin/grep.c:735

5313 +#: builtin/grep.c:733

5314 msgid "show only matches from files that match all patterns"

5315 msgstr ""

5316

5363 -#: builtin/grep.c:737

5317 +#: builtin/grep.c:735

5318 msgid "show parse tree for grep expression"

5319 msgstr ""

5320

5367 -#: builtin/grep.c:741

5321 +#: builtin/grep.c:739

5322 msgid "pager"

5323 msgstr ""

5324

5371 -#: builtin/grep.c:741

5325 +#: builtin/grep.c:739

5326 msgid "show matching files in the pager"

5327 msgstr ""

5328

5375 -#: builtin/grep.c:744

5329 +#: builtin/grep.c:742

5330 msgid "allow calling of grep(1) (ignored by this build)"

5331 msgstr ""

5332

5379 -#: builtin/grep.c:745 builtin/show-ref.c:187

5333 +#: builtin/grep.c:743 builtin/show-ref.c:187

5334 msgid "show usage"

5335 msgstr ""

5336

5383 -#: builtin/grep.c:812

5337 +#: builtin/grep.c:810

5338 msgid "no pattern given."

5339 msgstr ""

5340

5387 -#: builtin/grep.c:870

5341 +#: builtin/grep.c:868

5342 msgid "--open-files-in-pager only works on the worktree"

5343 msgstr ""

5344

5391 -#: builtin/grep.c:893

5345 +#: builtin/grep.c:891

5346 msgid "--cached or --untracked cannot be used with --no-index."

5347 msgstr ""

5348

5395 -#: builtin/grep.c:898

5349 +#: builtin/grep.c:896

5350 msgid "--no-index or --untracked cannot be used with revs."

5351 msgstr ""

5352

5399 -#: builtin/grep.c:901

5353 +#: builtin/grep.c:899

5354 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5355 msgstr ""

5356

5403 -#: builtin/grep.c:909

5357 +#: builtin/grep.c:907

5358 msgid "both --cached and trees are given."

5359 msgstr ""

5360

@@ -5414,7 +5368,7 @@ msgstr ""

5368 msgid "git hash-object --stdin-paths < <list-of-paths>"

5369 msgstr ""

5370

5417 -#: builtin/hash-object.c:72

5371 +#: builtin/hash-object.c:72 builtin/tag.c:521

5372 msgid "type"

5373 msgstr ""

5374

@@ -5649,8 +5603,8 @@ msgstr ""

5603 msgid "SHA1 COLLISION FOUND WITH %s !"

5604 msgstr ""

5605

5652 -#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5653 -#: builtin/pack-objects.c:263

5606 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5607 +#: builtin/pack-objects.c:254

5608 #, c-format

5609 msgid "unable to read %s"

5610 msgstr ""

@@ -5916,72 +5870,70 @@ msgstr ""

5870 msgid "unable to move %s to %s"

5871 msgstr ""

5872

5919 -#.

5920 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

5921 -#. * existing" or "Initialized empty", the second " shared" or

5922 -#. * "", and the last '%s%s' is the verbatim directory name.

5923 -#.

5924 -#: builtin/init-db.c:420

5873 +#. TRANSLATORS: The first '%s' is either "Reinitialized

5874 +#. existing" or "Initialized empty", the second " shared" or

5875 +#. "", and the last '%s%s' is the verbatim directory name.

5876 +#: builtin/init-db.c:418

5877 #, c-format

5878 msgid "%s%s Git repository in %s%s\n"

5879 msgstr ""

5880

5929 -#: builtin/init-db.c:421

5881 +#: builtin/init-db.c:419

5882 msgid "Reinitialized existing"

5883 msgstr ""

5884

5933 -#: builtin/init-db.c:421

5885 +#: builtin/init-db.c:419

5886 msgid "Initialized empty"

5887 msgstr ""

5888

5937 -#: builtin/init-db.c:422

5889 +#: builtin/init-db.c:420

5890 msgid " shared"

5891 msgstr ""

5892

5941 -#: builtin/init-db.c:441

5893 +#: builtin/init-db.c:439

5894 msgid "cannot tell cwd"

5895 msgstr ""

5896

5945 -#: builtin/init-db.c:467

5897 +#: builtin/init-db.c:465

5898 msgid ""

5899 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

5900 "shared[=<permissions>]] [directory]"

5901 msgstr ""

5902

5951 -#: builtin/init-db.c:490

5903 +#: builtin/init-db.c:488

5904 msgid "permissions"

5905 msgstr ""

5906

5955 -#: builtin/init-db.c:491

5907 +#: builtin/init-db.c:489

5908 msgid "specify that the git repository is to be shared amongst several users"

5909 msgstr ""

5910

5959 -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

5911 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

5912 msgid "be quiet"

5913 msgstr ""

5914

5963 -#: builtin/init-db.c:525 builtin/init-db.c:530

5915 +#: builtin/init-db.c:523 builtin/init-db.c:528

5916 #, c-format

5917 msgid "cannot mkdir %s"

5918 msgstr ""

5919

5968 -#: builtin/init-db.c:534

5920 +#: builtin/init-db.c:532

5921 #, c-format

5922 msgid "cannot chdir to %s"

5923 msgstr ""

5924

5973 -#: builtin/init-db.c:556

5925 +#: builtin/init-db.c:554

5926 #, c-format

5927 msgid ""

5928 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

5929 "dir=<directory>)"

5930 msgstr ""

5931

5980 -#: builtin/init-db.c:580

5932 +#: builtin/init-db.c:578

5933 msgid "Cannot access current working directory"

5934 msgstr ""

5935

5984 -#: builtin/init-db.c:587

5936 +#: builtin/init-db.c:585

5937 #, c-format

5938 msgid "Cannot access work tree '%s'"

5939 msgstr ""

@@ -6244,95 +6196,95 @@ msgstr ""

6196 msgid "Unknown commit %s"

6197 msgstr ""

6198

6247 -#: builtin/ls-files.c:398

6199 +#: builtin/ls-files.c:401

6200 msgid "git ls-files [options] [<file>...]"

6201 msgstr ""

6202

6251 -#: builtin/ls-files.c:455

6203 +#: builtin/ls-files.c:458

6204 msgid "identify the file status with tags"

6205 msgstr ""

6206

6255 -#: builtin/ls-files.c:457

6207 +#: builtin/ls-files.c:460

6208 msgid "use lowercase letters for 'assume unchanged' files"

6209 msgstr ""

6210

6259 -#: builtin/ls-files.c:459

6211 +#: builtin/ls-files.c:462

6212 msgid "show cached files in the output (default)"

6213 msgstr ""

6214

6263 -#: builtin/ls-files.c:461

6215 +#: builtin/ls-files.c:464

6216 msgid "show deleted files in the output"

6217 msgstr ""

6218

6267 -#: builtin/ls-files.c:463

6219 +#: builtin/ls-files.c:466

6220 msgid "show modified files in the output"

6221 msgstr ""

6222

6271 -#: builtin/ls-files.c:465

6223 +#: builtin/ls-files.c:468

6224 msgid "show other files in the output"

6225 msgstr ""

6226

6275 -#: builtin/ls-files.c:467

6227 +#: builtin/ls-files.c:470

6228 msgid "show ignored files in the output"

6229 msgstr ""

6230

6279 -#: builtin/ls-files.c:470

6231 +#: builtin/ls-files.c:473

6232 msgid "show staged contents' object name in the output"

6233 msgstr ""

6234

6283 -#: builtin/ls-files.c:472

6235 +#: builtin/ls-files.c:475

6236 msgid "show files on the filesystem that need to be removed"

6237 msgstr ""

6238

6287 -#: builtin/ls-files.c:474

6239 +#: builtin/ls-files.c:477

6240 msgid "show 'other' directories' name only"

6241 msgstr ""

6242

6291 -#: builtin/ls-files.c:477

6243 +#: builtin/ls-files.c:480

6244 msgid "don't show empty directories"

6245 msgstr ""

6246

6295 -#: builtin/ls-files.c:480

6247 +#: builtin/ls-files.c:483

6248 msgid "show unmerged files in the output"

6249 msgstr ""

6250

6299 -#: builtin/ls-files.c:482

6251 +#: builtin/ls-files.c:485

6252 msgid "show resolve-undo information"

6253 msgstr ""

6254

6303 -#: builtin/ls-files.c:484

6255 +#: builtin/ls-files.c:487

6256 msgid "skip files matching pattern"

6257 msgstr ""

6258

6307 -#: builtin/ls-files.c:487

6259 +#: builtin/ls-files.c:490

6260 msgid "exclude patterns are read from <file>"

6261 msgstr ""

6262

6311 -#: builtin/ls-files.c:490

6263 +#: builtin/ls-files.c:493

6264 msgid "read additional per-directory exclude patterns in <file>"

6265 msgstr ""

6266

6315 -#: builtin/ls-files.c:492

6267 +#: builtin/ls-files.c:495

6268 msgid "add the standard git exclusions"

6269 msgstr ""

6270

6319 -#: builtin/ls-files.c:495

6271 +#: builtin/ls-files.c:498

6272 msgid "make the output relative to the project top directory"

6273 msgstr ""

6274

6323 -#: builtin/ls-files.c:498

6275 +#: builtin/ls-files.c:501

6276 msgid "if any <file> is not in the index, treat this as an error"

6277 msgstr ""

6278

6327 -#: builtin/ls-files.c:499

6279 +#: builtin/ls-files.c:502

6280 msgid "tree-ish"

6281 msgstr ""

6282

6331 -#: builtin/ls-files.c:500

6283 +#: builtin/ls-files.c:503

6284 msgid "pretend that paths removed since <tree-ish> are still present"

6285 msgstr ""

6286

6335 -#: builtin/ls-files.c:502

6287 +#: builtin/ls-files.c:505

6288 msgid "show debugging data"

6289 msgstr ""

6290

@@ -6443,7 +6395,7 @@ msgstr ""

6395 msgid "Verify that the named commit has a valid GPG signature"

6396 msgstr ""

6397

6446 -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6398 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89

6399 msgid "strategy"

6400 msgstr ""

6401

@@ -6516,35 +6468,35 @@ msgstr ""

6468 msgid "Bad branch.%s.mergeoptions string: %s"

6469 msgstr ""

6470

6519 -#: builtin/merge.c:650

6471 +#: builtin/merge.c:653

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

6473 msgstr ""

6474

6523 -#: builtin/merge.c:678

6475 +#: builtin/merge.c:681

6476 msgid "Not handling anything other than two heads merge."

6477 msgstr ""

6478

6527 -#: builtin/merge.c:692

6479 +#: builtin/merge.c:695

6480 #, c-format

6481 msgid "Unknown option for merge-recursive: -X%s"

6482 msgstr ""

6483

6532 -#: builtin/merge.c:706

6484 +#: builtin/merge.c:709

6485 #, c-format

6486 msgid "unable to write %s"

6487 msgstr ""

6488

6537 -#: builtin/merge.c:795

6489 +#: builtin/merge.c:798

6490 #, c-format

6491 msgid "Could not read from '%s'"

6492 msgstr ""

6493

6542 -#: builtin/merge.c:804

6494 +#: builtin/merge.c:807

6495 #, c-format

6496 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6497 msgstr ""

6498

6547 -#: builtin/merge.c:810

6499 +#: builtin/merge.c:813

6500 #, c-format

6501 msgid ""

6502 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6554,157 +6506,156 @@ msgid ""

6506 "the commit.\n"

6507 msgstr ""

6508

6557 -#: builtin/merge.c:834

6509 +#: builtin/merge.c:837

6510 msgid "Empty commit message."

6511 msgstr ""

6512

6561 -#: builtin/merge.c:846

6513 +#: builtin/merge.c:849

6514 #, c-format

6515 msgid "Wonderful.\n"

6516 msgstr ""

6517

6566 -#: builtin/merge.c:911

6518 +#: builtin/merge.c:914

6519 #, c-format

6520 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6521 msgstr ""

6522

6571 -#: builtin/merge.c:927

6523 +#: builtin/merge.c:930

6524 #, c-format

6525 msgid "'%s' is not a commit"

6526 msgstr ""

6527

6576 -#: builtin/merge.c:968

6528 +#: builtin/merge.c:971

6529 msgid "No current branch."

6530 msgstr ""

6531

6580 -#: builtin/merge.c:970

6532 +#: builtin/merge.c:973

6533 msgid "No remote for the current branch."

6534 msgstr ""

6535

6584 -#: builtin/merge.c:972

6536 +#: builtin/merge.c:975

6537 msgid "No default upstream defined for the current branch."

6538 msgstr ""

6539

6588 -#: builtin/merge.c:977

6540 +#: builtin/merge.c:980

6541 #, c-format

6542 msgid "No remote-tracking branch for %s from %s"

6543 msgstr ""

6544

6593 -#: builtin/merge.c:1133

6545 +#: builtin/merge.c:1136

6546 msgid "There is no merge to abort (MERGE_HEAD missing)."

6547 msgstr ""

6548

6597 -#: builtin/merge.c:1149 git-pull.sh:31

6549 +#: builtin/merge.c:1152 git-pull.sh:31

6550 msgid ""

6551 "You have not concluded your merge (MERGE_HEAD exists).\n"

6552 "Please, commit your changes before you can merge."

6553 msgstr ""

6554

6603 -#: builtin/merge.c:1152 git-pull.sh:34

6555 +#: builtin/merge.c:1155 git-pull.sh:34

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

6557 msgstr ""

6558

6607 -#: builtin/merge.c:1156

6559 +#: builtin/merge.c:1159

6560 msgid ""

6561 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6562 "Please, commit your changes before you can merge."

6563 msgstr ""

6564

6613 -#: builtin/merge.c:1159

6565 +#: builtin/merge.c:1162

6566 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6567 msgstr ""

6568

6617 -#: builtin/merge.c:1168

6569 +#: builtin/merge.c:1171

6570 msgid "You cannot combine --squash with --no-ff."

6571 msgstr ""

6572

6621 -#: builtin/merge.c:1177

6573 +#: builtin/merge.c:1180

6574 msgid "No commit specified and merge.defaultToUpstream not set."

6575 msgstr ""

6576

6625 -#: builtin/merge.c:1209

6577 +#: builtin/merge.c:1212

6578 msgid "Can merge only exactly one commit into empty head"

6579 msgstr ""

6580

6629 -#: builtin/merge.c:1212

6581 +#: builtin/merge.c:1215

6582 msgid "Squash commit into empty head not supported yet"

6583 msgstr ""

6584

6633 -#: builtin/merge.c:1214

6585 +#: builtin/merge.c:1217

6586 msgid "Non-fast-forward commit does not make sense into an empty head"

6587 msgstr ""

6588

6637 -#: builtin/merge.c:1219

6589 +#: builtin/merge.c:1222

6590 #, c-format

6591 msgid "%s - not something we can merge"

6592 msgstr ""

6593

6642 -#: builtin/merge.c:1270

6594 +#: builtin/merge.c:1273

6595 #, c-format

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

6597 msgstr ""

6598

6647 -#: builtin/merge.c:1273

6599 +#: builtin/merge.c:1276

6600 #, c-format

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

6602 msgstr ""

6603

6652 -#. 'N'

6653 -#: builtin/merge.c:1276

6604 +#: builtin/merge.c:1279

6605 #, c-format

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

6607 msgstr ""

6608

6658 -#: builtin/merge.c:1279

6609 +#: builtin/merge.c:1282

6610 #, c-format

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

6612 msgstr ""

6613

6663 -#: builtin/merge.c:1363

6614 +#: builtin/merge.c:1366

6615 #, c-format

6616 msgid "Updating %s..%s\n"

6617 msgstr ""

6618

6668 -#: builtin/merge.c:1402

6619 +#: builtin/merge.c:1405

6620 #, c-format

6621 msgid "Trying really trivial in-index merge...\n"

6622 msgstr ""

6623

6673 -#: builtin/merge.c:1409

6624 +#: builtin/merge.c:1412

6625 #, c-format

6626 msgid "Nope.\n"

6627 msgstr ""

6628

6678 -#: builtin/merge.c:1441

6629 +#: builtin/merge.c:1444

6630 msgid "Not possible to fast-forward, aborting."

6631 msgstr ""

6632

6682 -#: builtin/merge.c:1464 builtin/merge.c:1543

6633 +#: builtin/merge.c:1467 builtin/merge.c:1546

6634 #, c-format

6635 msgid "Rewinding the tree to pristine...\n"

6636 msgstr ""

6637

6687 -#: builtin/merge.c:1468

6638 +#: builtin/merge.c:1471

6639 #, c-format

6640 msgid "Trying merge strategy %s...\n"

6641 msgstr ""

6642

6692 -#: builtin/merge.c:1534

6643 +#: builtin/merge.c:1537

6644 #, c-format

6645 msgid "No merge strategy handled the merge.\n"

6646 msgstr ""

6647

6697 -#: builtin/merge.c:1536

6648 +#: builtin/merge.c:1539

6649 #, c-format

6650 msgid "Merge with strategy %s failed.\n"

6651 msgstr ""

6652

6702 -#: builtin/merge.c:1545

6653 +#: builtin/merge.c:1548

6654 #, c-format

6655 msgid "Using the %s to prepare resolving by hand.\n"

6656 msgstr ""

6657

6707 -#: builtin/merge.c:1557

6658 +#: builtin/merge.c:1560

6659 #, c-format

6660 msgid "Automatic merge went well; stopped before committing as requested\n"

6661 msgstr ""

@@ -6787,19 +6738,19 @@ msgstr ""

6738 msgid "set labels for file1/orig_file/file2"

6739 msgstr ""

6740

6790 -#: builtin/mktree.c:67

6741 +#: builtin/mktree.c:64

6742 msgid "git mktree [-z] [--missing] [--batch]"

6743 msgstr ""

6744

6794 -#: builtin/mktree.c:153

6745 +#: builtin/mktree.c:150

6746 msgid "input is NUL terminated"

6747 msgstr ""

6748

6798 -#: builtin/mktree.c:154 builtin/write-tree.c:24

6749 +#: builtin/mktree.c:151 builtin/write-tree.c:24

6750 msgid "allow missing objects"

6751 msgstr ""

6752

6802 -#: builtin/mktree.c:155

6753 +#: builtin/mktree.c:152

6754 msgid "allow creation of more than one tree"

6755 msgstr ""

6756

@@ -6846,46 +6797,46 @@ msgstr ""

6797 msgid "Huh? %.*s is in index?"

6798 msgstr ""

6799

6849 -#: builtin/mv.c:168

6800 +#: builtin/mv.c:169

6801 msgid "source directory is empty"

6802 msgstr ""

6803

6853 -#: builtin/mv.c:200

6804 +#: builtin/mv.c:205

6805 msgid "not under version control"

6806 msgstr ""

6807

6857 -#: builtin/mv.c:202

6808 +#: builtin/mv.c:207

6809 msgid "destination exists"

6810 msgstr ""

6811

6861 -#: builtin/mv.c:210

6812 +#: builtin/mv.c:215

6813 #, c-format

6814 msgid "overwriting '%s'"

6815 msgstr ""

6816

6866 -#: builtin/mv.c:213

6817 +#: builtin/mv.c:218

6818 msgid "Cannot overwrite"

6819 msgstr ""

6820

6870 -#: builtin/mv.c:216

6821 +#: builtin/mv.c:221

6822 msgid "multiple sources for the same target"

6823 msgstr ""

6824

6874 -#: builtin/mv.c:218

6825 +#: builtin/mv.c:223

6826 msgid "destination directory does not exist"

6827 msgstr ""

6828

6878 -#: builtin/mv.c:233

6829 +#: builtin/mv.c:243

6830 #, c-format

6831 msgid "%s, source=%s, destination=%s"

6832 msgstr ""

6833

6883 -#: builtin/mv.c:243

6834 +#: builtin/mv.c:253

6835 #, c-format

6836 msgid "Renaming %s to %s\n"

6837 msgstr ""

6838

6888 -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

6839 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

6840 #, c-format

6841 msgid "renaming '%s' failed"

6842 msgstr ""

@@ -7049,7 +7000,7 @@ msgstr ""

7000 msgid "failed to finish 'show' for object '%s'"

7001 msgstr ""

7002

7052 -#: builtin/notes.c:167 builtin/tag.c:341

7003 +#: builtin/notes.c:167 builtin/tag.c:373

7004 #, c-format

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

7006 msgstr ""

@@ -7058,7 +7009,7 @@ msgstr ""

7009 msgid "Please supply the note contents using either -m or -F option"

7010 msgstr ""

7011

7061 -#: builtin/notes.c:207 builtin/notes.c:844

7012 +#: builtin/notes.c:207 builtin/notes.c:848

7013 #, c-format

7014 msgid "Removing note for object %s\n"

7015 msgstr ""

@@ -7072,20 +7023,20 @@ msgstr ""

7023 msgid "The note contents has been left in %s"

7024 msgstr ""

7025

7075 -#: builtin/notes.c:248 builtin/tag.c:537

7026 +#: builtin/notes.c:248 builtin/tag.c:604

7027 #, c-format

7028 msgid "cannot read '%s'"

7029 msgstr ""

7030

7080 -#: builtin/notes.c:250 builtin/tag.c:540

7031 +#: builtin/notes.c:250 builtin/tag.c:607

7032 #, c-format

7033 msgid "could not open or read '%s'"

7034 msgstr ""

7035

7085 -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318

7086 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515

7087 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637

7088 -#: builtin/notes.c:839 builtin/tag.c:553

7036 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322

7037 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519

7038 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641

7039 +#: builtin/notes.c:843 builtin/tag.c:620

7040 #, c-format

7041 msgid "Failed to resolve '%s' as a valid ref."

7042 msgstr ""

@@ -7095,304 +7046,333 @@ msgstr ""

7046 msgid "Failed to read object '%s'."

7047 msgstr ""

7048

7098 -#: builtin/notes.c:312

7049 +#: builtin/notes.c:276

7050 +#, c-format

7051 +msgid "Cannot read note data from non-blob object '%s'."

7052 +msgstr ""

7053 +

7054 +#: builtin/notes.c:316

7055 #, c-format

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

7057 msgstr ""

7058

7103 -#: builtin/notes.c:327

7059 +#: builtin/notes.c:331

7060 #, c-format

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

7062 msgstr ""

7063

7108 -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498

7109 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630

7110 -#: builtin/notes.c:904

7064 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502

7065 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634

7066 +#: builtin/notes.c:908

7067 msgid "too many parameters"

7068 msgstr ""

7069

7114 -#: builtin/notes.c:384 builtin/notes.c:643

7070 +#: builtin/notes.c:388 builtin/notes.c:647

7071 #, c-format

7072 msgid "No note found for object %s."

7073 msgstr ""

7074

7119 -#: builtin/notes.c:406 builtin/notes.c:563

7075 +#: builtin/notes.c:410 builtin/notes.c:567

7076 msgid "note contents as a string"

7077 msgstr ""

7078

7123 -#: builtin/notes.c:409 builtin/notes.c:566

7079 +#: builtin/notes.c:413 builtin/notes.c:570

7080 msgid "note contents in a file"

7081 msgstr ""

7082

7127 -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568

7128 -#: builtin/notes.c:571 builtin/tag.c:474

7083 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572

7084 +#: builtin/notes.c:575 builtin/tag.c:539

7085 msgid "object"

7086 msgstr ""

7087

7132 -#: builtin/notes.c:412 builtin/notes.c:569

7088 +#: builtin/notes.c:416 builtin/notes.c:573

7089 msgid "reuse and edit specified note object"

7090 msgstr ""

7091

7136 -#: builtin/notes.c:415 builtin/notes.c:572

7092 +#: builtin/notes.c:419 builtin/notes.c:576

7093 msgid "reuse specified note object"

7094 msgstr ""

7095

7140 -#: builtin/notes.c:417 builtin/notes.c:485

7096 +#: builtin/notes.c:421 builtin/notes.c:489

7097 msgid "replace existing notes"

7098 msgstr ""

7099

7144 -#: builtin/notes.c:451

7100 +#: builtin/notes.c:455

7101 #, c-format

7102 msgid ""

7103 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

7104 "existing notes"

7105 msgstr ""

7106

7151 -#: builtin/notes.c:456 builtin/notes.c:533

7107 +#: builtin/notes.c:460 builtin/notes.c:537

7108 #, c-format

7109 msgid "Overwriting existing notes for object %s\n"

7110 msgstr ""

7111

7156 -#: builtin/notes.c:486

7112 +#: builtin/notes.c:490

7113 msgid "read objects from stdin"

7114 msgstr ""

7115

7160 -#: builtin/notes.c:488

7116 +#: builtin/notes.c:492

7117 msgid "load rewriting config for <command> (implies --stdin)"

7118 msgstr ""

7119

7164 -#: builtin/notes.c:506

7120 +#: builtin/notes.c:510

7121 msgid "too few parameters"

7122 msgstr ""

7123

7168 -#: builtin/notes.c:527

7124 +#: builtin/notes.c:531

7125 #, c-format

7126 msgid ""

7127 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

7128 "existing notes"

7129 msgstr ""

7130

7175 -#: builtin/notes.c:539

7131 +#: builtin/notes.c:543

7132 #, c-format

7133 msgid "Missing notes on source object %s. Cannot copy."

7134 msgstr ""

7135

7180 -#: builtin/notes.c:588

7136 +#: builtin/notes.c:592

7137 #, c-format

7138 msgid ""

7139 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

7140 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

7141 msgstr ""

7142

7187 -#: builtin/notes.c:735

7143 +#: builtin/notes.c:739

7144 msgid "General options"

7145 msgstr ""

7146

7191 -#: builtin/notes.c:737

7147 +#: builtin/notes.c:741

7148 msgid "Merge options"

7149 msgstr ""

7150

7195 -#: builtin/notes.c:739

7151 +#: builtin/notes.c:743

7152 msgid ""

7153 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7154 "cat_sort_uniq)"

7155 msgstr ""

7156

7201 -#: builtin/notes.c:741

7157 +#: builtin/notes.c:745

7158 msgid "Committing unmerged notes"

7159 msgstr ""

7160

7205 -#: builtin/notes.c:743

7161 +#: builtin/notes.c:747

7162 msgid "finalize notes merge by committing unmerged notes"

7163 msgstr ""

7164

7209 -#: builtin/notes.c:745

7165 +#: builtin/notes.c:749

7166 msgid "Aborting notes merge resolution"

7167 msgstr ""

7168

7213 -#: builtin/notes.c:747

7169 +#: builtin/notes.c:751

7170 msgid "abort notes merge"

7171 msgstr ""

7172

7217 -#: builtin/notes.c:842

7173 +#: builtin/notes.c:846

7174 #, c-format

7175 msgid "Object %s has no note\n"

7176 msgstr ""

7177

7222 -#: builtin/notes.c:854

7178 +#: builtin/notes.c:858

7179 msgid "attempt to remove non-existent note is not an error"

7180 msgstr ""

7181

7226 -#: builtin/notes.c:857

7182 +#: builtin/notes.c:861

7183 msgid "read object names from the standard input"

7184 msgstr ""

7185

7230 -#: builtin/notes.c:938

7231 -msgid "notes_ref"

7186 +#: builtin/notes.c:942

7187 +msgid "notes-ref"

7188 msgstr ""

7189

7234 -#: builtin/notes.c:939

7190 +#: builtin/notes.c:943

7191 msgid "use notes from <notes_ref>"

7192 msgstr ""

7193

7238 -#: builtin/notes.c:974 builtin/remote.c:1593

7194 +#: builtin/notes.c:978 builtin/remote.c:1593

7195 #, c-format

7196 msgid "Unknown subcommand: %s"

7197 msgstr ""

7198

7243 -#: builtin/pack-objects.c:23

7199 +#: builtin/pack-objects.c:25

7200 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"

7201 msgstr ""

7202

7247 -#: builtin/pack-objects.c:24

7203 +#: builtin/pack-objects.c:26

7204 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7205 msgstr ""

7206

7251 -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187

7207 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7208 #, c-format

7209 msgid "deflate error (%d)"

7210 msgstr ""

7211

7256 -#: builtin/pack-objects.c:2396

7212 +#: builtin/pack-objects.c:771

7213 +msgid "Writing objects"

7214 +msgstr ""

7215 +

7216 +#: builtin/pack-objects.c:1012

7217 +msgid "disabling bitmap writing, as some objects are not being packed"

7218 +msgstr ""

7219 +

7220 +#: builtin/pack-objects.c:2174

7221 +msgid "Compressing objects"

7222 +msgstr ""

7223 +

7224 +#: builtin/pack-objects.c:2530

7225 #, c-format

7226 msgid "unsupported index version %s"

7227 msgstr ""

7228

7261 -#: builtin/pack-objects.c:2400

7229 +#: builtin/pack-objects.c:2534

7230 #, c-format

7231 msgid "bad index version '%s'"

7232 msgstr ""

7233

7266 -#: builtin/pack-objects.c:2423

7234 +#: builtin/pack-objects.c:2557

7235 #, c-format

7236 msgid "option %s does not accept negative form"

7237 msgstr ""

7238

7271 -#: builtin/pack-objects.c:2427

7239 +#: builtin/pack-objects.c:2561

7240 #, c-format

7241 msgid "unable to parse value '%s' for option %s"

7242 msgstr ""

7243

7276 -#: builtin/pack-objects.c:2446

7244 +#: builtin/pack-objects.c:2580

7245 msgid "do not show progress meter"

7246 msgstr ""

7247

7280 -#: builtin/pack-objects.c:2448

7248 +#: builtin/pack-objects.c:2582

7249 msgid "show progress meter"

7250 msgstr ""

7251

7284 -#: builtin/pack-objects.c:2450

7252 +#: builtin/pack-objects.c:2584

7253 msgid "show progress meter during object writing phase"

7254 msgstr ""

7255

7288 -#: builtin/pack-objects.c:2453

7256 +#: builtin/pack-objects.c:2587

7257 msgid "similar to --all-progress when progress meter is shown"

7258 msgstr ""

7259

7292 -#: builtin/pack-objects.c:2454

7260 +#: builtin/pack-objects.c:2588

7261 msgid "version[,offset]"

7262 msgstr ""

7263

7296 -#: builtin/pack-objects.c:2455

7264 +#: builtin/pack-objects.c:2589

7265 msgid "write the pack index file in the specified idx format version"

7266 msgstr ""

7267

7300 -#: builtin/pack-objects.c:2458

7268 +#: builtin/pack-objects.c:2592

7269 msgid "maximum size of each output pack file"

7270 msgstr ""

7271

7304 -#: builtin/pack-objects.c:2460

7272 +#: builtin/pack-objects.c:2594

7273 msgid "ignore borrowed objects from alternate object store"

7274 msgstr ""

7275

7308 -#: builtin/pack-objects.c:2462

7276 +#: builtin/pack-objects.c:2596

7277 msgid "ignore packed objects"

7278 msgstr ""

7279

7312 -#: builtin/pack-objects.c:2464

7280 +#: builtin/pack-objects.c:2598

7281 msgid "limit pack window by objects"

7282 msgstr ""

7283

7316 -#: builtin/pack-objects.c:2466

7284 +#: builtin/pack-objects.c:2600

7285 msgid "limit pack window by memory in addition to object limit"

7286 msgstr ""

7287

7320 -#: builtin/pack-objects.c:2468

7288 +#: builtin/pack-objects.c:2602

7289 msgid "maximum length of delta chain allowed in the resulting pack"

7290 msgstr ""

7291

7324 -#: builtin/pack-objects.c:2470

7292 +#: builtin/pack-objects.c:2604

7293 msgid "reuse existing deltas"

7294 msgstr ""

7295

7328 -#: builtin/pack-objects.c:2472

7296 +#: builtin/pack-objects.c:2606

7297 msgid "reuse existing objects"

7298 msgstr ""

7299

7332 -#: builtin/pack-objects.c:2474

7300 +#: builtin/pack-objects.c:2608

7301 msgid "use OFS_DELTA objects"

7302 msgstr ""

7303

7336 -#: builtin/pack-objects.c:2476

7304 +#: builtin/pack-objects.c:2610

7305 msgid "use threads when searching for best delta matches"

7306 msgstr ""

7307

7340 -#: builtin/pack-objects.c:2478

7308 +#: builtin/pack-objects.c:2612

7309 msgid "do not create an empty pack output"

7310 msgstr ""

7311

7344 -#: builtin/pack-objects.c:2480

7312 +#: builtin/pack-objects.c:2614

7313 msgid "read revision arguments from standard input"

7314 msgstr ""

7315

7348 -#: builtin/pack-objects.c:2482

7316 +#: builtin/pack-objects.c:2616

7317 msgid "limit the objects to those that are not yet packed"

7318 msgstr ""

7319

7352 -#: builtin/pack-objects.c:2485

7320 +#: builtin/pack-objects.c:2619

7321 msgid "include objects reachable from any reference"

7322 msgstr ""

7323

7356 -#: builtin/pack-objects.c:2488

7324 +#: builtin/pack-objects.c:2622

7325 msgid "include objects referred by reflog entries"

7326 msgstr ""

7327

7360 -#: builtin/pack-objects.c:2491

7328 +#: builtin/pack-objects.c:2625

7329 msgid "output pack to stdout"

7330 msgstr ""

7331

7364 -#: builtin/pack-objects.c:2493

7332 +#: builtin/pack-objects.c:2627

7333 msgid "include tag objects that refer to objects to be packed"

7334 msgstr ""

7335

7368 -#: builtin/pack-objects.c:2495

7336 +#: builtin/pack-objects.c:2629

7337 msgid "keep unreachable objects"

7338 msgstr ""

7339

7372 -#: builtin/pack-objects.c:2496 parse-options.h:143

7340 +#: builtin/pack-objects.c:2630 parse-options.h:140

7341 msgid "time"

7342 msgstr ""

7343

7376 -#: builtin/pack-objects.c:2497

7344 +#: builtin/pack-objects.c:2631

7345 msgid "unpack unreachable objects newer than <time>"

7346 msgstr ""

7347

7380 -#: builtin/pack-objects.c:2500

7348 +#: builtin/pack-objects.c:2634

7349 msgid "create thin packs"

7350 msgstr ""

7351

7384 -#: builtin/pack-objects.c:2502

7352 +#: builtin/pack-objects.c:2636

7353 msgid "ignore packs that have companion .keep file"

7354 msgstr ""

7355

7388 -#: builtin/pack-objects.c:2504

7356 +#: builtin/pack-objects.c:2638

7357 msgid "pack compression level"

7358 msgstr ""

7359

7392 -#: builtin/pack-objects.c:2506

7360 +#: builtin/pack-objects.c:2640

7361 msgid "do not hide commits by grafts"

7362 msgstr ""

7363

7364 +#: builtin/pack-objects.c:2642

7365 +msgid "use a bitmap index if available to speed up counting objects"

7366 +msgstr ""

7367 +

7368 +#: builtin/pack-objects.c:2644

7369 +msgid "write a bitmap index together with the pack index"

7370 +msgstr ""

7371 +

7372 +#: builtin/pack-objects.c:2723

7373 +msgid "Counting objects"

7374 +msgstr ""

7375 +

7376 #: builtin/pack-refs.c:6

7377 msgid "git pack-refs [options]"

7378 msgstr ""

@@ -7409,6 +7389,10 @@ msgstr ""

7389 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"

7390 msgstr ""

7391

7392 +#: builtin/prune-packed.c:49

7393 +msgid "Removing duplicate objects"

7394 +msgstr ""

7395 +

7396 #: builtin/prune.c:12

7397 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

7398 msgstr ""

@@ -7429,21 +7413,21 @@ msgstr ""

7413 msgid "git push [<options>] [<repository> [<refspec>...]]"

7414 msgstr ""

7415

7432 -#: builtin/push.c:86

7416 +#: builtin/push.c:85

7417 msgid "tag shorthand without <tag>"

7418 msgstr ""

7419

7436 -#: builtin/push.c:96

7420 +#: builtin/push.c:95

7421 msgid "--delete only accepts plain target ref names"

7422 msgstr ""

7423

7440 -#: builtin/push.c:141

7424 +#: builtin/push.c:140

7425 msgid ""

7426 "\n"

7427 "To choose either option permanently, see push.default in 'git help config'."

7428 msgstr ""

7429

7446 -#: builtin/push.c:144

7430 +#: builtin/push.c:143

7431 #, c-format

7432 msgid ""

7433 "The upstream branch of your current branch does not match\n"

@@ -7458,7 +7442,7 @@ msgid ""

7442 "%s"

7443 msgstr ""

7444

7461 -#: builtin/push.c:159

7445 +#: builtin/push.c:158

7446 #, c-format

7447 msgid ""

7448 "You are not currently on a branch.\n"

@@ -7468,7 +7452,7 @@ msgid ""

7452 " git push %s HEAD:<name-of-remote-branch>\n"

7453 msgstr ""

7454

7471 -#: builtin/push.c:173

7455 +#: builtin/push.c:172

7456 #, c-format

7457 msgid ""

7458 "The current branch %s has no upstream branch.\n"

@@ -7477,12 +7461,12 @@ msgid ""

7461 " git push --set-upstream %s %s\n"

7462 msgstr ""

7463

7480 -#: builtin/push.c:181

7464 +#: builtin/push.c:180

7465 #, c-format

7466 msgid "The current branch %s has multiple upstream branches, refusing to push."

7467 msgstr ""

7468

7485 -#: builtin/push.c:184

7469 +#: builtin/push.c:183

7470 #, c-format

7471 msgid ""

7472 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -7490,11 +7474,11 @@ msgid ""

7474 "to update which remote branch."

7475 msgstr ""

7476

7493 -#: builtin/push.c:207

7477 +#: builtin/push.c:206

l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)