9eb3984b81 · 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: 2015-12-22 22:50+0800\n"

11 +"POT-Creation-Date: 2016-02-28 20:31+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"

@@ -29,7 +29,7 @@ msgid ""

29 "as appropriate to mark resolution and make a commit."

30 msgstr ""

31

32 -#: advice.c:101 builtin/merge.c:1225

32 +#: advice.c:101 builtin/merge.c:1226

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

34 msgstr ""

35

@@ -71,7 +71,7 @@ msgstr ""

71 msgid "archive format"

72 msgstr ""

73

74 -#: archive.c:430 builtin/log.c:1229

74 +#: archive.c:430 builtin/log.c:1232

75 msgid "prefix"

76 msgstr ""

77

@@ -79,11 +79,11 @@ msgstr ""

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

80 msgstr ""

81

82 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535

83 -#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987

84 -#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99

85 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

86 -#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

82 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547

83 +#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987

84 +#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100

85 +#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

86 +#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

87 msgid "file"

88 msgstr ""

89

@@ -115,7 +115,7 @@ msgstr ""

115 msgid "list supported archive formats"

116 msgstr ""

117

118 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

118 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

119 msgid "repo"

120 msgstr ""

121

@@ -123,7 +123,7 @@ msgstr ""

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

124 msgstr ""

125

126 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

126 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

127 msgid "command"

128 msgstr ""

129

@@ -131,87 +131,100 @@ msgstr ""

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

132 msgstr ""

133

134 -#: attr.c:265

134 +#: attr.c:263

135 msgid ""

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

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

138 msgstr ""

139

140 -#: branch.c:61

140 +#: branch.c:53

141 +#, c-format

142 +msgid ""

143 +"\n"

144 +"After fixing the error cause you may try to fix up\n"

145 +"the remote tracking information by invoking\n"

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

147 +msgstr ""

148 +

149 +#: branch.c:67

150 #, c-format

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

152 msgstr ""

153

145 -#: branch.c:84

154 +#: branch.c:93

155 #, c-format

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

157 msgstr ""

158

150 -#: branch.c:85

159 +#: branch.c:94

160 #, c-format

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

162 msgstr ""

163

155 -#: branch.c:89

164 +#: branch.c:98

165 #, c-format

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

167 msgstr ""

168

160 -#: branch.c:90

169 +#: branch.c:99

170 #, c-format

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

172 msgstr ""

173

165 -#: branch.c:95

174 +#: branch.c:104

175 #, c-format

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

177 msgstr ""

178

170 -#: branch.c:96

179 +#: branch.c:105

180 #, c-format

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

182 msgstr ""

183

175 -#: branch.c:100

184 +#: branch.c:109

185 #, c-format

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

187 msgstr ""

188

180 -#: branch.c:101

189 +#: branch.c:110

190 #, c-format

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

192 msgstr ""

193

185 -#: branch.c:134

194 +#: branch.c:119

195 +msgid "Unable to write upstream branch configuration"

196 +msgstr ""

197 +

198 +#: branch.c:156

199 #, c-format

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

201 msgstr ""

202

190 -#: branch.c:163

203 +#: branch.c:185

204 #, c-format

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

206 msgstr ""

207

195 -#: branch.c:168

208 +#: branch.c:190

209 #, c-format

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

211 msgstr ""

212

200 -#: branch.c:176

213 +#: branch.c:198

214 msgid "Cannot force update the current branch."

215 msgstr ""

216

204 -#: branch.c:196

217 +#: branch.c:218

218 #, c-format

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

220 msgstr ""

221

209 -#: branch.c:198

222 +#: branch.c:220

223 #, c-format

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

225 msgstr ""

226

214 -#: branch.c:200

227 +#: branch.c:222

228 msgid ""

229 "\n"

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

@@ -223,22 +236,22 @@ msgid ""

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

237 msgstr ""

238

226 -#: branch.c:244

239 +#: branch.c:266

240 #, c-format

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

242 msgstr ""

243

231 -#: branch.c:264

244 +#: branch.c:286

245 #, c-format

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

247 msgstr ""

248

236 -#: branch.c:269

249 +#: branch.c:291

250 #, c-format

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

252 msgstr ""

253

241 -#: branch.c:322

254 +#: branch.c:344

255 #, c-format

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

257 msgstr ""

@@ -262,10 +275,10 @@ msgstr ""

275 msgid "Repository lacks these prerequisite commits:"

276 msgstr ""

277

265 -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

266 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

267 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

268 -#: builtin/shortlog.c:158

278 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

279 +#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

280 +#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

281 +#: builtin/shortlog.c:170

282 msgid "revision walk setup failed"

283 msgstr ""

284

@@ -304,7 +317,7 @@ msgstr ""

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

318 msgstr ""

319

307 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

320 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

321 #, c-format

322 msgid "unrecognized argument: %s"

323 msgstr ""

@@ -327,8 +340,8 @@ msgstr ""

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

341 msgstr ""

342

330 -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

331 -#: builtin/am.c:2149

343 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

344 +#: builtin/am.c:2135

345 #, c-format

346 msgid "could not parse %s"

347 msgstr ""

@@ -342,59 +355,64 @@ msgstr ""

355 msgid "memory exhausted"

356 msgstr ""

357

345 -#: config.c:474 config.c:476

358 +#: config.c:475 config.c:477

359 #, c-format

347 -msgid "bad config file line %d in %s"

360 +msgid "bad config line %d in %s %s"

361 msgstr ""

362

350 -#: config.c:592

363 +#: config.c:593

364 #, c-format

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

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

366 msgstr ""

367

355 -#: config.c:594

368 +#: config.c:595

369 #, c-format

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

371 msgstr ""

372

360 -#: config.c:679

373 +#: config.c:680

374 #, c-format

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

376 msgstr ""

377

365 -#: config.c:757 config.c:768

378 +#: config.c:758 config.c:769

379 #, c-format

380 msgid "bad zlib compression level %d"

381 msgstr ""

382

370 -#: config.c:890

383 +#: config.c:891

384 #, c-format

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

386 msgstr ""

387

375 -#: config.c:1216

388 +#: config.c:1220

389 msgid "unable to parse command-line config"

390 msgstr ""

391

379 -#: config.c:1277

392 +#: config.c:1281

393 msgid "unknown error occured while reading the configuration files"

394 msgstr ""

395

383 -#: config.c:1601

396 +#: config.c:1629

397 #, c-format

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

399 msgstr ""

400

388 -#: config.c:1603

401 +#: config.c:1631

402 #, c-format

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

404 msgstr ""

405

393 -#: config.c:1662

406 +#: config.c:1690

407 #, c-format

408 msgid "%s has multiple values"

409 msgstr ""

410

411 +#: config.c:2226

412 +#, c-format

413 +msgid "Could not set '%s' to '%s'"

414 +msgstr ""

415 +

416 #: connected.c:69

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

418 msgstr ""

@@ -508,33 +526,33 @@ msgid ""

526 "%s"

527 msgstr ""

528

511 -#: diff.c:3000

529 +#: diff.c:2997

530 #, c-format

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

532 msgstr ""

533

516 -#: diff.c:3396

534 +#: diff.c:3393

535 msgid "--follow requires exactly one pathspec"

536 msgstr ""

537

520 -#: diff.c:3559

538 +#: diff.c:3556

539 #, c-format

540 msgid ""

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

542 "%s"

543 msgstr ""

544

527 -#: diff.c:3573

545 +#: diff.c:3570

546 #, c-format

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

548 msgstr ""

549

532 -#: dir.c:1915

550 +#: dir.c:2004

551 msgid "failed to get kernel name and information"

552 msgstr ""

553

536 -#: dir.c:1998

537 -msgid "Untracked cache is disabled on this system."

554 +#: dir.c:2123

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

556 msgstr ""

557

558 #: gpg-interface.c:166 gpg-interface.c:237

@@ -574,48 +592,48 @@ msgstr ""

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

593 msgstr ""

594

577 -#: help.c:207

595 +#: help.c:205

596 #, c-format

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

598 msgstr ""

599

582 -#: help.c:214

600 +#: help.c:212

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

602 msgstr ""

603

586 -#: help.c:246

604 +#: help.c:244

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

606 msgstr ""

607

590 -#: help.c:311

608 +#: help.c:309

609 #, c-format

610 msgid ""

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

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

613 msgstr ""

614

597 -#: help.c:368

615 +#: help.c:366

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

617 msgstr ""

618

601 -#: help.c:390

619 +#: help.c:388

620 #, c-format

621 msgid ""

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

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

624 msgstr ""

625

608 -#: help.c:395

626 +#: help.c:393

627 #, c-format

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

629 msgstr ""

630

613 -#: help.c:402

631 +#: help.c:400

632 #, c-format

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

634 msgstr ""

635

618 -#: help.c:406 help.c:466

636 +#: help.c:404 help.c:464

637 msgid ""

638 "\n"

639 "Did you mean this?"

@@ -625,7 +643,7 @@ msgid_plural ""

643 msgstr[0] ""

644 msgstr[1] ""

645

628 -#: help.c:462

646 +#: help.c:460

647 #, c-format

648 msgid "%s: %s - %s"

649 msgstr ""

@@ -634,8 +652,8 @@ msgstr ""

652 msgid "failed to read the cache"

653 msgstr ""

654

637 -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

638 -#: builtin/checkout.c:587 builtin/clone.c:722

655 +#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

656 +#: builtin/checkout.c:587 builtin/clone.c:730

657 msgid "unable to write new index file"

658 msgstr ""

659

@@ -653,233 +671,233 @@ msgstr ""

671 msgid "error building trees"

672 msgstr ""

673

656 -#: merge-recursive.c:686

674 +#: merge-recursive.c:689

675 #, c-format

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

677 msgstr ""

678

661 -#: merge-recursive.c:697

679 +#: merge-recursive.c:700

680 #, c-format

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

682 msgstr ""

683

666 -#: merge-recursive.c:711 merge-recursive.c:732

684 +#: merge-recursive.c:714 merge-recursive.c:735

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

686 msgstr ""

687

670 -#: merge-recursive.c:722

688 +#: merge-recursive.c:725

689 #, c-format

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

691 msgstr ""

692

675 -#: merge-recursive.c:762

693 +#: merge-recursive.c:765

694 #, c-format

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

696 msgstr ""

697

680 -#: merge-recursive.c:764

698 +#: merge-recursive.c:767

699 #, c-format

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

701 msgstr ""

702

685 -#: merge-recursive.c:787 builtin/clone.c:369

703 +#: merge-recursive.c:790 builtin/clone.c:374

704 #, c-format

705 msgid "failed to open '%s'"

706 msgstr ""

707

690 -#: merge-recursive.c:795

708 +#: merge-recursive.c:798

709 #, c-format

710 msgid "failed to symlink '%s'"

711 msgstr ""

712

695 -#: merge-recursive.c:798

713 +#: merge-recursive.c:801

714 #, c-format

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

716 msgstr ""

717

700 -#: merge-recursive.c:936

718 +#: merge-recursive.c:939

719 msgid "Failed to execute internal merge"

720 msgstr ""

721

704 -#: merge-recursive.c:940

722 +#: merge-recursive.c:943

723 #, c-format

724 msgid "Unable to add %s to database"

725 msgstr ""

726

709 -#: merge-recursive.c:956

727 +#: merge-recursive.c:959

728 msgid "unsupported object type in the tree"

729 msgstr ""

730

713 -#: merge-recursive.c:1031 merge-recursive.c:1045

731 +#: merge-recursive.c:1034 merge-recursive.c:1048

732 #, c-format

733 msgid ""

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

735 "in tree."

736 msgstr ""

737

720 -#: merge-recursive.c:1037 merge-recursive.c:1050

738 +#: merge-recursive.c:1040 merge-recursive.c:1053

739 #, c-format

740 msgid ""

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

742 "in tree at %s."

743 msgstr ""

744

727 -#: merge-recursive.c:1091

745 +#: merge-recursive.c:1094

746 msgid "rename"

747 msgstr ""

748

731 -#: merge-recursive.c:1091

749 +#: merge-recursive.c:1094

750 msgid "renamed"

751 msgstr ""

752

735 -#: merge-recursive.c:1147

753 +#: merge-recursive.c:1150

754 #, c-format

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

756 msgstr ""

757

740 -#: merge-recursive.c:1169

758 +#: merge-recursive.c:1172

759 #, c-format

760 msgid ""

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

762 "\"->\"%s\" in \"%s\"%s"

763 msgstr ""

764

747 -#: merge-recursive.c:1174

765 +#: merge-recursive.c:1177

766 msgid " (left unresolved)"

767 msgstr ""

768

751 -#: merge-recursive.c:1228

769 +#: merge-recursive.c:1231

770 #, c-format

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

772 msgstr ""

773

756 -#: merge-recursive.c:1258

774 +#: merge-recursive.c:1261

775 #, c-format

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

777 msgstr ""

778

761 -#: merge-recursive.c:1457

779 +#: merge-recursive.c:1460

780 #, c-format

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

782 msgstr ""

783

766 -#: merge-recursive.c:1467

784 +#: merge-recursive.c:1470

785 #, c-format

786 msgid "Adding merged %s"

787 msgstr ""

788

771 -#: merge-recursive.c:1472 merge-recursive.c:1674

789 +#: merge-recursive.c:1475 merge-recursive.c:1677

790 #, c-format

791 msgid "Adding as %s instead"

792 msgstr ""

793

776 -#: merge-recursive.c:1523

794 +#: merge-recursive.c:1526

795 #, c-format

796 msgid "cannot read object %s"

797 msgstr ""

798

781 -#: merge-recursive.c:1526

799 +#: merge-recursive.c:1529

800 #, c-format

801 msgid "object %s is not a blob"

802 msgstr ""

803

786 -#: merge-recursive.c:1578

804 +#: merge-recursive.c:1581

805 msgid "modify"

806 msgstr ""

807

790 -#: merge-recursive.c:1578

808 +#: merge-recursive.c:1581

809 msgid "modified"

810 msgstr ""

811

794 -#: merge-recursive.c:1588

812 +#: merge-recursive.c:1591

813 msgid "content"

814 msgstr ""

815

798 -#: merge-recursive.c:1595

816 +#: merge-recursive.c:1598

817 msgid "add/add"

818 msgstr ""

819

802 -#: merge-recursive.c:1629

820 +#: merge-recursive.c:1632

821 #, c-format

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

823 msgstr ""

824

807 -#: merge-recursive.c:1643

825 +#: merge-recursive.c:1646

826 #, c-format

827 msgid "Auto-merging %s"

828 msgstr ""

829

812 -#: merge-recursive.c:1647 git-submodule.sh:1025

830 +#: merge-recursive.c:1650 git-submodule.sh:1048

831 msgid "submodule"

832 msgstr ""

833

816 -#: merge-recursive.c:1648

834 +#: merge-recursive.c:1651

835 #, c-format

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

837 msgstr ""

838

821 -#: merge-recursive.c:1734

839 +#: merge-recursive.c:1737

840 #, c-format

841 msgid "Removing %s"

842 msgstr ""

843

826 -#: merge-recursive.c:1759

844 +#: merge-recursive.c:1762

845 msgid "file/directory"

846 msgstr ""

847

830 -#: merge-recursive.c:1765

848 +#: merge-recursive.c:1768

849 msgid "directory/file"

850 msgstr ""

851

834 -#: merge-recursive.c:1770

852 +#: merge-recursive.c:1773

853 #, c-format

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

855 msgstr ""

856

839 -#: merge-recursive.c:1780

857 +#: merge-recursive.c:1783

858 #, c-format

859 msgid "Adding %s"

860 msgstr ""

861

844 -#: merge-recursive.c:1797

862 +#: merge-recursive.c:1800

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

864 msgstr ""

865

848 -#: merge-recursive.c:1816

866 +#: merge-recursive.c:1819

867 msgid "Already up-to-date!"

868 msgstr ""

869

852 -#: merge-recursive.c:1825

870 +#: merge-recursive.c:1828

871 #, c-format

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

873 msgstr ""

874

857 -#: merge-recursive.c:1855

875 +#: merge-recursive.c:1858

876 #, c-format

877 msgid "Unprocessed path??? %s"

878 msgstr ""

879

862 -#: merge-recursive.c:1903

880 +#: merge-recursive.c:1906

881 msgid "Merging:"

882 msgstr ""

883

866 -#: merge-recursive.c:1916

884 +#: merge-recursive.c:1919

885 #, c-format

886 msgid "found %u common ancestor:"

887 msgid_plural "found %u common ancestors:"

888 msgstr[0] ""

889 msgstr[1] ""

890

873 -#: merge-recursive.c:1953

891 +#: merge-recursive.c:1956

892 msgid "merge returned no commit"

893 msgstr ""

894

877 -#: merge-recursive.c:2010

895 +#: merge-recursive.c:2013

896 #, c-format

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

898 msgstr ""

899

882 -#: merge-recursive.c:2021 builtin/merge.c:645

900 +#: merge-recursive.c:2024 builtin/merge.c:646

901 msgid "Unable to write index."

902 msgstr ""

903

@@ -993,12 +1011,12 @@ msgstr ""

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

1012 msgstr ""

1013

996 -#: pathspec.c:432

1014 +#: pathspec.c:433

1015 #, c-format

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

1017 msgstr ""

1018

1001 -#: pathspec.c:441

1019 +#: pathspec.c:442

1020 msgid ""

1021 "There is nothing to exclude from by :(exclude) patterns.\n"

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

@@ -1026,163 +1044,189 @@ msgid ""

1044 "Using version %i"

1045 msgstr ""

1046

1029 -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1030 -#: builtin/merge.c:983

1047 +#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1048 +#: builtin/merge.c:984

1049 #, c-format

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

1051 msgstr ""

1052

1035 -#: refs/files-backend.c:2359

1053 +#: refs/files-backend.c:2374

1054 #, c-format

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

1056 msgstr ""

1057

1040 -#: refs/files-backend.c:2362

1058 +#: refs/files-backend.c:2377

1059 #, c-format

1060 msgid "could not delete references: %s"

1061 msgstr ""

1062

1045 -#: refs/files-backend.c:2371

1063 +#: refs/files-backend.c:2386

1064 #, c-format

1065 msgid "could not remove reference %s"

1066 msgstr ""

1067

1050 -#: ref-filter.c:245

1068 +#: ref-filter.c:55

1069 #, c-format

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

1070 +msgid "expected format: %%(color:<color>)"

1071 +msgstr ""

1072 +

1073 +#: ref-filter.c:57

1074 +#, c-format

1075 +msgid "unrecognized color: %%(color:%s)"

1076 +msgstr ""

1077 +

1078 +#: ref-filter.c:71

1079 +#, c-format

1080 +msgid "unrecognized format: %%(%s)"

1081 msgstr ""

1082

1055 -#: ref-filter.c:704

1083 +#: ref-filter.c:101

1084 #, c-format

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

1086 msgstr ""

1087

1060 -#: ref-filter.c:833

1088 +#: ref-filter.c:103

1089 #, c-format

1062 -msgid "expected format: %%(color:<color>)"

1090 +msgid "unrecognized %%(contents) argument: %s"

1091 msgstr ""

1092

1065 -#: ref-filter.c:835

1066 -msgid "unable to parse format"

1093 +#: ref-filter.c:113

1094 +#, c-format

1095 +msgid "unrecognized %%(objectname) argument: %s"

1096 msgstr ""

1097

1069 -#: ref-filter.c:870

1098 +#: ref-filter.c:135

1099 #, c-format

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

1101 msgstr ""

1102

1074 -#: ref-filter.c:893

1103 +#: ref-filter.c:147

1104 +#, c-format

1105 +msgid "unrecognized position:%s"

1106 +msgstr ""

1107 +

1108 +#: ref-filter.c:151

1109 +#, c-format

1110 +msgid "unrecognized width:%s"

1111 +msgstr ""

1112 +

1113 +#: ref-filter.c:157

1114 #, c-format

1076 -msgid "improper format entered align:%s"

1115 +msgid "unrecognized %%(align) argument: %s"

1116 msgstr ""

1117

1079 -#: ref-filter.c:898

1118 +#: ref-filter.c:161

1119 #, c-format

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

1121 msgstr ""

1122

1084 -#: ref-filter.c:1219

1123 +#: ref-filter.c:372

1124 +#, c-format

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

1126 +msgstr ""

1127 +

1128 +#: ref-filter.c:1311

1129 #, c-format

1130 msgid "malformed object at '%s'"

1131 msgstr ""

1132

1089 -#: ref-filter.c:1561

1133 +#: ref-filter.c:1651

1134 #, c-format

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

1136 msgstr ""

1137

1094 -#: ref-filter.c:1615

1138 +#: ref-filter.c:1705

1139 #, c-format

1140 msgid "malformed object name %s"

1141 msgstr ""

1142

1099 -#: remote.c:756

1143 +#: remote.c:745

1144 #, c-format

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

1146 msgstr ""

1147

1104 -#: remote.c:760

1148 +#: remote.c:749

1149 #, c-format

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

1151 msgstr ""

1152

1109 -#: remote.c:764

1153 +#: remote.c:753

1154 #, c-format

1155 msgid "%s tracks both %s and %s"

1156 msgstr ""

1157

1114 -#: remote.c:772

1158 +#: remote.c:761

1159 msgid "Internal error"

1160 msgstr ""

1161

1118 -#: remote.c:1687 remote.c:1730

1162 +#: remote.c:1677 remote.c:1720

1163 msgid "HEAD does not point to a branch"

1164 msgstr ""

1165

1122 -#: remote.c:1696

1166 +#: remote.c:1686

1167 #, c-format

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

1169 msgstr ""

1170

1127 -#: remote.c:1699

1171 +#: remote.c:1689

1172 #, c-format

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

1174 msgstr ""

1175

1132 -#: remote.c:1705

1176 +#: remote.c:1695

1177 #, c-format

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

1179 msgstr ""

1180

1137 -#: remote.c:1720

1181 +#: remote.c:1710

1182 #, c-format

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

1184 msgstr ""

1185

1142 -#: remote.c:1735

1186 +#: remote.c:1725

1187 #, c-format

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

1189 msgstr ""

1190

1147 -#: remote.c:1746

1191 +#: remote.c:1736

1192 #, c-format

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

1194 msgstr ""

1195

1152 -#: remote.c:1759

1196 +#: remote.c:1749

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

1198 msgstr ""

1199

1156 -#: remote.c:1781

1200 +#: remote.c:1771

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

1202 msgstr ""

1203

1160 -#: remote.c:2083

1204 +#: remote.c:2073

1205 #, c-format

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

1207 msgstr ""

1208

1165 -#: remote.c:2087

1209 +#: remote.c:2077

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

1211 msgstr ""

1212

1169 -#: remote.c:2090

1213 +#: remote.c:2080

1214 #, c-format

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

1216 msgstr ""

1217

1174 -#: remote.c:2094

1218 +#: remote.c:2084

1219 #, c-format

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

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

1222 msgstr[0] ""

1223 msgstr[1] ""

1224

1181 -#: remote.c:2100

1225 +#: remote.c:2090

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

1227 msgstr ""

1228

1185 -#: remote.c:2103

1229 +#: remote.c:2093

1230 #, c-format

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

1232 msgid_plural ""

@@ -1190,11 +1234,11 @@ msgid_plural ""

1234 msgstr[0] ""

1235 msgstr[1] ""

1236

1193 -#: remote.c:2111

1237 +#: remote.c:2101

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

1239 msgstr ""

1240

1197 -#: remote.c:2114

1241 +#: remote.c:2104

1242 #, c-format

1243 msgid ""

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

@@ -1205,28 +1249,28 @@ msgid_plural ""

1249 msgstr[0] ""

1250 msgstr[1] ""

1251

1208 -#: remote.c:2124

1252 +#: remote.c:2114

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

1254 msgstr ""

1255

1212 -#: revision.c:2193

1256 +#: revision.c:2131

1257 msgid "your current branch appears to be broken"

1258 msgstr ""

1259

1216 -#: revision.c:2196

1260 +#: revision.c:2134

1261 #, c-format

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

1263 msgstr ""

1264

1221 -#: revision.c:2390

1265 +#: revision.c:2328

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

1267 msgstr ""

1268

1225 -#: run-command.c:90

1269 +#: run-command.c:92

1270 msgid "open /dev/null failed"

1271 msgstr ""

1272

1229 -#: run-command.c:92

1273 +#: run-command.c:94

1274 #, c-format

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

1276 msgstr ""

@@ -1249,242 +1293,242 @@ msgstr ""

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

1294 msgstr ""

1295

1252 -#: sequencer.c:183

1296 +#: sequencer.c:174

1297 msgid ""

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

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

1300 msgstr ""

1301

1258 -#: sequencer.c:186

1302 +#: sequencer.c:177

1303 msgid ""

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

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

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

1307 msgstr ""

1308

1265 -#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1309 +#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1310 #, c-format

1311 msgid "Could not write to %s"

1312 msgstr ""

1313

1270 -#: sequencer.c:202

1314 +#: sequencer.c:193

1315 #, c-format

1316 msgid "Error wrapping up %s"

1317 msgstr ""

1318

1275 -#: sequencer.c:217

1319 +#: sequencer.c:208

1320 msgid "Your local changes would be overwritten by cherry-pick."

1321 msgstr ""

1322

1279 -#: sequencer.c:219

1323 +#: sequencer.c:210

1324 msgid "Your local changes would be overwritten by revert."

1325 msgstr ""

1326

1283 -#: sequencer.c:222

1327 +#: sequencer.c:213

1328 msgid "Commit your changes or stash them to proceed."

1329 msgstr ""

1330

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

1288 -#: sequencer.c:309

1332 +#: sequencer.c:300

1333 #, c-format

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

1335 msgstr ""

1336

1293 -#: sequencer.c:327

1337 +#: sequencer.c:318

1338 msgid "Could not resolve HEAD commit\n"

1339 msgstr ""

1340

1297 -#: sequencer.c:347

1341 +#: sequencer.c:338

1342 msgid "Unable to update cache tree\n"

1343 msgstr ""

1344

1301 -#: sequencer.c:399

1345 +#: sequencer.c:390

1346 #, c-format

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

1348 msgstr ""

1349

1306 -#: sequencer.c:404

1350 +#: sequencer.c:395

1351 #, c-format

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

1353 msgstr ""

1354

1311 -#: sequencer.c:469

1355 +#: sequencer.c:460

1356 msgid "Your index file is unmerged."

1357 msgstr ""

1358

1315 -#: sequencer.c:488

1359 +#: sequencer.c:479

1360 #, c-format

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

1362 msgstr ""

1363

1320 -#: sequencer.c:496

1364 +#: sequencer.c:487

1365 #, c-format

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

1367 msgstr ""

1368

1325 -#: sequencer.c:500

1369 +#: sequencer.c:491

1370 #, c-format

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

1372 msgstr ""

1373

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

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

1332 -#: sequencer.c:513

1376 +#: sequencer.c:504

1377 #, c-format

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

1379 msgstr ""

1380

1337 -#: sequencer.c:517

1381 +#: sequencer.c:508

1382 #, c-format

1383 msgid "Cannot get commit message for %s"

1384 msgstr ""

1385

1342 -#: sequencer.c:603

1386 +#: sequencer.c:594

1387 #, c-format

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

1389 msgstr ""

1390

1347 -#: sequencer.c:604

1391 +#: sequencer.c:595

1392 #, c-format

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

1394 msgstr ""

1395

1352 -#: sequencer.c:639

1396 +#: sequencer.c:630

1397 msgid "empty commit set passed"

1398 msgstr ""

1399

1356 -#: sequencer.c:647

1400 +#: sequencer.c:638

1401 #, c-format

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

1403 msgstr ""

1404

1361 -#: sequencer.c:651

1405 +#: sequencer.c:642

1406 #, c-format

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

1408 msgstr ""

1409

1366 -#: sequencer.c:711

1410 +#: sequencer.c:702

1411 #, c-format

1412 msgid "Cannot %s during a %s"

1413 msgstr ""

1414

1371 -#: sequencer.c:733

1415 +#: sequencer.c:724

1416 #, c-format

1417 msgid "Could not parse line %d."

1418 msgstr ""

1419

1376 -#: sequencer.c:738

1420 +#: sequencer.c:729

1421 msgid "No commits parsed."

1422 msgstr ""

1423

1380 -#: sequencer.c:750

1424 +#: sequencer.c:741

1425 #, c-format

1426 msgid "Could not open %s"

1427 msgstr ""

1428

1385 -#: sequencer.c:754

1429 +#: sequencer.c:745

1430 #, c-format

1431 msgid "Could not read %s."

1432 msgstr ""

1433

1390 -#: sequencer.c:761

1434 +#: sequencer.c:752

1435 #, c-format

1436 msgid "Unusable instruction sheet: %s"

1437 msgstr ""

1438

1395 -#: sequencer.c:791

1439 +#: sequencer.c:782

1440 #, c-format

1441 msgid "Invalid key: %s"

1442 msgstr ""

1443

1400 -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1444 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1445 #, c-format

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

1447 msgstr ""

1448

1405 -#: sequencer.c:804

1449 +#: sequencer.c:795

1450 #, c-format

1451 msgid "Malformed options sheet: %s"

1452 msgstr ""

1453

1410 -#: sequencer.c:823

1454 +#: sequencer.c:814

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

1456 msgstr ""

1457

1414 -#: sequencer.c:824

1458 +#: sequencer.c:815

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

1460 msgstr ""

1461

1418 -#: sequencer.c:828

1462 +#: sequencer.c:819

1463 #, c-format

1464 msgid "Could not create sequencer directory %s"

1465 msgstr ""

1466

1423 -#: sequencer.c:844 sequencer.c:926

1467 +#: sequencer.c:835 sequencer.c:917

1468 #, c-format

1469 msgid "Error wrapping up %s."

1470 msgstr ""

1471

1428 -#: sequencer.c:863 sequencer.c:996

1472 +#: sequencer.c:854 sequencer.c:987

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

1474 msgstr ""

1475

1432 -#: sequencer.c:865

1476 +#: sequencer.c:856

1477 msgid "cannot resolve HEAD"

1478 msgstr ""

1479

1436 -#: sequencer.c:867

1480 +#: sequencer.c:858

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

1482 msgstr ""

1483

1440 -#: sequencer.c:887 builtin/apply.c:4287

1484 +#: sequencer.c:878 builtin/apply.c:4287

1485 #, c-format

1486 msgid "cannot open %s: %s"

1487 msgstr ""

1488

1445 -#: sequencer.c:890

1489 +#: sequencer.c:881

1490 #, c-format

1491 msgid "cannot read %s: %s"

1492 msgstr ""

1493

1450 -#: sequencer.c:891

1494 +#: sequencer.c:882

1495 msgid "unexpected end of file"

1496 msgstr ""

1497

1454 -#: sequencer.c:897

1498 +#: sequencer.c:888

1499 #, c-format

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

1501 msgstr ""

1502

1459 -#: sequencer.c:919

1503 +#: sequencer.c:910

1504 #, c-format

1505 msgid "Could not format %s."

1506 msgstr ""

1507

1464 -#: sequencer.c:1064

1508 +#: sequencer.c:1055

1509 #, c-format

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

1511 msgstr ""

1512

1469 -#: sequencer.c:1067

1513 +#: sequencer.c:1058

1514 #, c-format

1515 msgid "%s: bad revision"

1516 msgstr ""

1517

1474 -#: sequencer.c:1101

1518 +#: sequencer.c:1092

1519 msgid "Can't revert as initial commit"

1520 msgstr ""

1521

1478 -#: sequencer.c:1102

1522 +#: sequencer.c:1093

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

1524 msgstr ""

1525

1482 -#: setup.c:248

1526 +#: setup.c:246

1527 #, c-format

1528 msgid "failed to read %s"

1529 msgstr ""

1530

1487 -#: sha1_name.c:463

1531 +#: sha1_name.c:462

1532 msgid ""

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

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

@@ -1497,60 +1541,79 @@ msgid ""

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

1542 msgstr ""

1543

1500 -#: submodule.c:61 submodule.c:95

1544 +#: submodule.c:62 submodule.c:96

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

1546 msgstr ""

1547

1504 -#: submodule.c:65 submodule.c:99

1548 +#: submodule.c:66 submodule.c:100

1549 #, c-format

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

1551 msgstr ""

1552

1509 -#: submodule.c:73

1553 +#: submodule.c:74

1554 #, c-format

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

1556 msgstr ""

1557

1514 -#: submodule.c:106

1558 +#: submodule.c:107

1559 #, c-format

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

1561 msgstr ""

1562

1519 -#: submodule.c:117

1563 +#: submodule.c:118

1564 msgid "staging updated .gitmodules failed"

1565 msgstr ""

1566

1523 -#: submodule.c:1040

1524 -#, c-format

1525 -msgid "Could not set core.worktree in %s"

1526 -msgstr ""

1527 -

1528 -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1529 -#: trailer.c:561

1567 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1568 +#: trailer.c:562

1569 #, c-format

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

1571 msgstr ""

1572

1534 -#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1573 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289

1574 #, c-format

1575 msgid "more than one %s"

1576 msgstr ""

1577

1539 -#: trailer.c:581

1578 +#: trailer.c:582

1579 #, c-format

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

1581 msgstr ""

1582

1544 -#: trailer.c:701

1583 +#: trailer.c:702

1584 #, c-format

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

1586 msgstr ""

1587

1549 -#: trailer.c:704

1588 +#: trailer.c:705

1589 msgid "could not read from stdin"

1590 msgstr ""

1591

1553 -#: transport-helper.c:1025

1592 +#: trailer.c:857 builtin/am.c:42

1593 +#, c-format

1594 +msgid "could not stat %s"

1595 +msgstr ""

1596 +

1597 +#: trailer.c:859

1598 +#, c-format

1599 +msgid "file %s is not a regular file"

1600 +msgstr ""

1601 +

1602 +#: trailer.c:861

1603 +#, c-format

1604 +msgid "file %s is not writable by user"

1605 +msgstr ""

1606 +

1607 +#: trailer.c:873

1608 +msgid "could not open temporary file"

1609 +msgstr ""

1610 +

1611 +#: trailer.c:912

1612 +#, c-format

1613 +msgid "could not rename temporary file to %s"

1614 +msgstr ""

1615 +

1616 +#: transport-helper.c:1041

1617 #, c-format

1618 msgid "Could not read ref %s"

1619 msgstr ""

@@ -1588,47 +1651,47 @@ msgstr ""

1651 msgid "invalid '..' path segment"

1652 msgstr ""

1653

1591 -#: wrapper.c:219 wrapper.c:362

1654 +#: wrapper.c:222 wrapper.c:381

1655 #, c-format

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

1657 msgstr ""

1658

1596 -#: wrapper.c:221 wrapper.c:364

1659 +#: wrapper.c:224 wrapper.c:383

1660 #, c-format

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

1662 msgstr ""

1663

1601 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1602 -#: builtin/merge.c:1074 builtin/pull.c:380

1664 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1665 +#: builtin/merge.c:1075 builtin/pull.c:387

1666 #, c-format

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

1668 msgstr ""

1669

1607 -#: wrapper.c:579

1670 +#: wrapper.c:611

1671 #, c-format

1672 msgid "unable to access '%s': %s"

1673 msgstr ""

1674

1612 -#: wrapper.c:600

1675 +#: wrapper.c:632

1676 #, c-format

1677 msgid "unable to access '%s'"

1678 msgstr ""

1679

1617 -#: wrapper.c:608

1680 +#: wrapper.c:640

1681 msgid "unable to get current working directory"

1682 msgstr ""

1683

1621 -#: wrapper.c:635

1684 +#: wrapper.c:667

1685 #, c-format

1686 msgid "could not open %s for writing"

1687 msgstr ""

1688

1626 -#: wrapper.c:646 builtin/am.c:425

1689 +#: wrapper.c:678 builtin/am.c:410

1690 #, c-format

1691 msgid "could not write to %s"

1692 msgstr ""

1693

1631 -#: wrapper.c:652

1694 +#: wrapper.c:684

1695 #, c-format

1696 msgid "could not close %s"

1697 msgstr ""

@@ -2070,7 +2133,7 @@ msgstr ""

2133 msgid "behind "

2134 msgstr ""

2135

2073 -#: compat/precompose_utf8.c:56 builtin/clone.c:408

2136 +#: compat/precompose_utf8.c:57 builtin/clone.c:413

2137 #, c-format

2138 msgid "failed to unlink '%s'"

2139 msgstr ""

@@ -2097,7 +2160,7 @@ msgstr ""

2160 msgid "Unstaged changes after refreshing the index:"

2161 msgstr ""

2162

2100 -#: builtin/add.c:194 builtin/rev-parse.c:796

2163 +#: builtin/add.c:194 builtin/rev-parse.c:797

2164 msgid "Could not read the index"

2165 msgstr ""

2166

@@ -2132,15 +2195,15 @@ msgstr ""

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

2196 msgstr ""

2197

2135 -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2136 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2137 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2198 +#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2199 +#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2200 +#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2201 msgid "dry run"

2202 msgstr ""

2203

2141 -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2204 +#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2205 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2143 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

2206 +#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2207 msgid "be verbose"

2208 msgstr ""

2209

@@ -2148,7 +2211,7 @@ msgstr ""

2211 msgid "interactive picking"

2212 msgstr ""

2213

2151 -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2214 +#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2215 msgid "select hunks interactively"

2216 msgstr ""

2217

@@ -2215,171 +2278,166 @@ msgstr ""

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

2279 msgstr ""

2280

2218 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2219 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2220 -#: builtin/submodule--helper.c:40

2281 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2282 +#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2283 +#: builtin/submodule--helper.c:35

2284 msgid "index file corrupt"

2285 msgstr ""

2286

2224 -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2287 +#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2288 msgid "Unable to write new index file"

2289 msgstr ""

2290

2228 -#: builtin/am.c:42

2229 -#, c-format

2230 -msgid "could not stat %s"

2231 -msgstr ""

2232 -

2233 -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2291 +#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2292 #, c-format

2293 msgid "could not read '%s'"

2294 msgstr ""

2295

2238 -#: builtin/am.c:445

2296 +#: builtin/am.c:430

2297 msgid "could not parse author script"

2298 msgstr ""

2299

2242 -#: builtin/am.c:522

2300 +#: builtin/am.c:507

2301 #, c-format

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

2303 msgstr ""

2304

2247 -#: builtin/am.c:563 builtin/notes.c:300

2305 +#: builtin/am.c:548 builtin/notes.c:300

2306 #, c-format

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

2308 msgstr ""

2309

2252 -#: builtin/am.c:600 builtin/notes.c:315

2310 +#: builtin/am.c:585 builtin/notes.c:315

2311 #, c-format

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

2313 msgstr ""

2314

2257 -#: builtin/am.c:626

2315 +#: builtin/am.c:611

2316 msgid "fseek failed"

2317 msgstr ""

2318

2261 -#: builtin/am.c:787 builtin/am.c:875

2319 +#: builtin/am.c:772 builtin/am.c:860

2320 #, c-format

2321 msgid "could not open '%s' for reading: %s"

2322 msgstr ""

2323

2266 -#: builtin/am.c:794

2324 +#: builtin/am.c:779

2325 #, c-format

2326 msgid "could not open '%s' for writing: %s"

2327 msgstr ""

2328

2271 -#: builtin/am.c:803

2329 +#: builtin/am.c:788

2330 #, c-format

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

2332 msgstr ""

2333

2276 -#: builtin/am.c:868

2334 +#: builtin/am.c:853

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

2336 msgstr ""

2337

2280 -#: builtin/am.c:916

2338 +#: builtin/am.c:901

2339 msgid "invalid timestamp"

2340 msgstr ""

2341

2284 -#: builtin/am.c:919 builtin/am.c:927

2342 +#: builtin/am.c:904 builtin/am.c:912

2343 msgid "invalid Date line"

2344 msgstr ""

2345

2288 -#: builtin/am.c:924

2346 +#: builtin/am.c:909

2347 msgid "invalid timezone offset"

2348 msgstr ""

2349

2292 -#: builtin/am.c:1011

2350 +#: builtin/am.c:996

2351 msgid "Patch format detection failed."

2352 msgstr ""

2353

2296 -#: builtin/am.c:1016 builtin/clone.c:373

2354 +#: builtin/am.c:1001 builtin/clone.c:378

2355 #, c-format

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

2357 msgstr ""

2358

2301 -#: builtin/am.c:1020

2359 +#: builtin/am.c:1005

2360 msgid "Failed to split patches."

2361 msgstr ""

2362

2305 -#: builtin/am.c:1152 builtin/commit.c:363

2363 +#: builtin/am.c:1137 builtin/commit.c:363

2364 msgid "unable to write index file"

2365 msgstr ""

2366

2309 -#: builtin/am.c:1203

2367 +#: builtin/am.c:1188

2368 #, c-format

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

2370 msgstr ""

2371

2314 -#: builtin/am.c:1204

2372 +#: builtin/am.c:1189

2373 #, c-format

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

2375 msgstr ""

2376

2319 -#: builtin/am.c:1205

2377 +#: builtin/am.c:1190

2378 #, c-format

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

2380 msgstr ""

2381

2324 -#: builtin/am.c:1343

2382 +#: builtin/am.c:1328

2383 msgid "Patch is empty. Was it split wrong?"

2384 msgstr ""

2385

2328 -#: builtin/am.c:1417 builtin/log.c:1347

2386 +#: builtin/am.c:1402 builtin/log.c:1350

2387 #, c-format

2388 msgid "invalid ident line: %s"

2389 msgstr ""

2390

2333 -#: builtin/am.c:1444

2391 +#: builtin/am.c:1429

2392 #, c-format

2393 msgid "unable to parse commit %s"

2394 msgstr ""

2395

2338 -#: builtin/am.c:1646

2396 +#: builtin/am.c:1631

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

2398 msgstr ""

2399

2342 -#: builtin/am.c:1648

2400 +#: builtin/am.c:1633

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

2402 msgstr ""

2403

2346 -#: builtin/am.c:1667

2404 +#: builtin/am.c:1652

2405 msgid ""

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

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

2408 msgstr ""

2409

2352 -#: builtin/am.c:1673

2410 +#: builtin/am.c:1658

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

2412 msgstr ""

2413

2356 -#: builtin/am.c:1688

2414 +#: builtin/am.c:1673

2415 msgid "Failed to merge in the changes."

2416 msgstr ""

2417

2360 -#: builtin/am.c:1712 builtin/merge.c:632

2418 +#: builtin/am.c:1697 builtin/merge.c:633

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

2420 msgstr ""

2421

2364 -#: builtin/am.c:1719

2422 +#: builtin/am.c:1704

2423 msgid "applying to an empty history"

2424 msgstr ""

2425

2368 -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2369 -#: builtin/merge.c:854

2426 +#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2427 +#: builtin/merge.c:855

2428 msgid "failed to write commit object"

2429 msgstr ""

2430

2373 -#: builtin/am.c:1764 builtin/am.c:1768

2431 +#: builtin/am.c:1749 builtin/am.c:1753

2432 #, c-format

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

2434 msgstr ""

2435

2378 -#: builtin/am.c:1784

2436 +#: builtin/am.c:1769

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

2438 msgstr ""

2439

2382 -#: builtin/am.c:1789

2440 +#: builtin/am.c:1774

2441 msgid "Commit Body is:"

2442 msgstr ""

2443

@@ -2387,231 +2445,231 @@ msgstr ""

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

2446 #. input at this point.

2447 #.

2390 -#: builtin/am.c:1799

2448 +#: builtin/am.c:1784

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

2450 msgstr ""

2451

2394 -#: builtin/am.c:1849

2452 +#: builtin/am.c:1834

2453 #, c-format

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

2455 msgstr ""

2456

2399 -#: builtin/am.c:1884 builtin/am.c:1955

2457 +#: builtin/am.c:1869 builtin/am.c:1941

2458 #, c-format

2459 msgid "Applying: %.*s"

2460 msgstr ""

2461

2404 -#: builtin/am.c:1900

2462 +#: builtin/am.c:1885

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

2464 msgstr ""

2465

2408 -#: builtin/am.c:1908

2466 +#: builtin/am.c:1893

2467 #, c-format

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

2469 msgstr ""

2470

2413 -#: builtin/am.c:1914

2471 +#: builtin/am.c:1899

2472 #, c-format

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

2474 msgstr ""

2475

2418 -#: builtin/am.c:1958

2476 +#: builtin/am.c:1944

2477 msgid ""

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

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

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

2481 msgstr ""

2482

2425 -#: builtin/am.c:1965

2483 +#: builtin/am.c:1951

2484 msgid ""

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

2486 "Did you forget to use 'git add'?"

2487 msgstr ""

2488

2431 -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2489 +#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2490 #: builtin/reset.c:316

2491 #, c-format

2492 msgid "Could not parse object '%s'."

2493 msgstr ""

2494

2437 -#: builtin/am.c:2125

2495 +#: builtin/am.c:2111

2496 msgid "failed to clean index"

2497 msgstr ""

2498

2441 -#: builtin/am.c:2159

2499 +#: builtin/am.c:2145

2500 msgid ""

2501 "You seem to have moved HEAD since the last 'am' failure.\n"

2502 "Not rewinding to ORIG_HEAD"

2503 msgstr ""

2504

2447 -#: builtin/am.c:2220

2505 +#: builtin/am.c:2206

2506 #, c-format

2507 msgid "Invalid value for --patch-format: %s"

2508 msgstr ""

2509

2452 -#: builtin/am.c:2253

2510 +#: builtin/am.c:2239

2511 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2512 msgstr ""

2513

2456 -#: builtin/am.c:2254

2514 +#: builtin/am.c:2240

2515 msgid "git am [<options>] (--continue | --skip | --abort)"

2516 msgstr ""

2517

2460 -#: builtin/am.c:2260

2518 +#: builtin/am.c:2246

2519 msgid "run interactively"

2520 msgstr ""

2521

2464 -#: builtin/am.c:2262

2522 +#: builtin/am.c:2248

2523 msgid "historical option -- no-op"

2524 msgstr ""

2525

2468 -#: builtin/am.c:2264

2526 +#: builtin/am.c:2250

2527 msgid "allow fall back on 3way merging if needed"

2528 msgstr ""

2529

2472 -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2530 +#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

2531 #: builtin/repack.c:171

2532 msgid "be quiet"

2533 msgstr ""

2534

2477 -#: builtin/am.c:2267

2535 +#: builtin/am.c:2253

2536 msgid "add a Signed-off-by line to the commit message"

2537 msgstr ""

2538

2481 -#: builtin/am.c:2270

2539 +#: builtin/am.c:2256

2540 msgid "recode into utf8 (default)"

2541 msgstr ""

2542

2485 -#: builtin/am.c:2272

2543 +#: builtin/am.c:2258

2544 msgid "pass -k flag to git-mailinfo"

2545 msgstr ""

2546

2489 -#: builtin/am.c:2274

2547 +#: builtin/am.c:2260

2548 msgid "pass -b flag to git-mailinfo"

2549 msgstr ""

2550

2493 -#: builtin/am.c:2276

2551 +#: builtin/am.c:2262

2552 msgid "pass -m flag to git-mailinfo"

2553 msgstr ""

2554

2497 -#: builtin/am.c:2278

2555 +#: builtin/am.c:2264

2556 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2557 msgstr ""

2558

2501 -#: builtin/am.c:2281

2559 +#: builtin/am.c:2267

2560 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2561 msgstr ""

2562

2505 -#: builtin/am.c:2284

2563 +#: builtin/am.c:2270

2564 msgid "strip everything before a scissors line"

2565 msgstr ""

2566

2509 -#: builtin/am.c:2285 builtin/apply.c:4554

2567 +#: builtin/am.c:2271 builtin/apply.c:4544

2568 msgid "action"

2569 msgstr ""

2570

2513 -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2514 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2515 -#: builtin/am.c:2313

2571 +#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2572 +#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2573 +#: builtin/am.c:2299

2574 msgid "pass it through git-apply"

2575 msgstr ""

2576

2519 -#: builtin/am.c:2294 builtin/apply.c:4578

2577 +#: builtin/am.c:2280 builtin/apply.c:4568

2578 msgid "root"

2579 msgstr ""

2580

2523 -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2524 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2525 -#: builtin/pull.c:167 builtin/submodule--helper.c:78

2526 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2581 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2582 +#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2583 +#: builtin/pull.c:171 builtin/submodule--helper.c:72

2584 +#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

2585 msgid "path"

2586 msgstr ""

2587

2530 -#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2531 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2532 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2533 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2534 -#: parse-options.h:134 parse-options.h:244

2588 +#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2589 +#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2590 +#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

2591 +#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

2592 +#: parse-options.h:132 parse-options.h:134 parse-options.h:244

2593 msgid "n"

2594 msgstr ""

2595

2538 -#: builtin/am.c:2306 builtin/apply.c:4522

2596 +#: builtin/am.c:2292 builtin/apply.c:4512

2597 msgid "num"

2598 msgstr ""

2599

2542 -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2600 +#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

2601 #: builtin/tag.c:372

2602 msgid "format"

2603 msgstr ""

2604

2547 -#: builtin/am.c:2310

2605 +#: builtin/am.c:2296

2606 msgid "format the patch(es) are in"

2607 msgstr ""

2608

2551 -#: builtin/am.c:2316

2609 +#: builtin/am.c:2302

2610 msgid "override error message when patch failure occurs"

2611 msgstr ""

2612

2555 -#: builtin/am.c:2318

2613 +#: builtin/am.c:2304

2614 msgid "continue applying patches after resolving a conflict"

2615 msgstr ""

2616

2559 -#: builtin/am.c:2321

2617 +#: builtin/am.c:2307

2618 msgid "synonyms for --continue"

2619 msgstr ""

2620

2563 -#: builtin/am.c:2324

2621 +#: builtin/am.c:2310

2622 msgid "skip the current patch"

2623 msgstr ""

2624

2567 -#: builtin/am.c:2327

2625 +#: builtin/am.c:2313

2626 msgid "restore the original branch and abort the patching operation."

2627 msgstr ""

2628

2571 -#: builtin/am.c:2331

2629 +#: builtin/am.c:2317

2630 msgid "lie about committer date"

2631 msgstr ""

2632

2575 -#: builtin/am.c:2333

2633 +#: builtin/am.c:2319

2634 msgid "use current timestamp for author date"

2635 msgstr ""

2636

2579 -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2580 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2637 +#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2638 +#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

2639 msgid "key-id"

2640 msgstr ""

2641

2584 -#: builtin/am.c:2336

2642 +#: builtin/am.c:2322

2643 msgid "GPG-sign commits"

2644 msgstr ""

2645

2588 -#: builtin/am.c:2339

2646 +#: builtin/am.c:2325

2647 msgid "(internal use for git-rebase)"

2648 msgstr ""

2649

2592 -#: builtin/am.c:2354

2650 +#: builtin/am.c:2340

2651 msgid ""

2652 "The -b/--binary option has been a no-op for long time, and\n"

2653 "it will be removed. Please do not use it anymore."

2654 msgstr ""

2655

2598 -#: builtin/am.c:2361

2656 +#: builtin/am.c:2347

2657 msgid "failed to read the index"

2658 msgstr ""

2659

2602 -#: builtin/am.c:2376

2660 +#: builtin/am.c:2362

2661 #, c-format

2662 msgid "previous rebase directory %s still exists but mbox given."

2663 msgstr ""

2664

2607 -#: builtin/am.c:2400

2665 +#: builtin/am.c:2386

2666 #, c-format

2667 msgid ""

2668 "Stray %s directory found.\n"

2669 "Use \"git am --abort\" to remove it."

2670 msgstr ""

2671

2614 -#: builtin/am.c:2406

2672 +#: builtin/am.c:2392

2673 msgid "Resolve operation not in progress, we are not resuming."

2674 msgstr ""

2675

@@ -2950,131 +3008,131 @@ msgstr ""

3008 msgid "unable to read index file"

3009 msgstr ""

3010

2953 -#: builtin/apply.c:4517

3011 +#: builtin/apply.c:4507

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

3013 msgstr ""

3014

2957 -#: builtin/apply.c:4520

3015 +#: builtin/apply.c:4510

3016 msgid "apply changes matching the given path"

3017 msgstr ""

3018

2961 -#: builtin/apply.c:4523

3019 +#: builtin/apply.c:4513

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

3021 msgstr ""

3022

2965 -#: builtin/apply.c:4526

3023 +#: builtin/apply.c:4516

3024 msgid "ignore additions made by the patch"

3025 msgstr ""

3026

2969 -#: builtin/apply.c:4528

3027 +#: builtin/apply.c:4518

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

3029 msgstr ""

3030

2973 -#: builtin/apply.c:4532

3031 +#: builtin/apply.c:4522

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

3033 msgstr ""

3034

2977 -#: builtin/apply.c:4534

3035 +#: builtin/apply.c:4524

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

3037 msgstr ""

3038

2981 -#: builtin/apply.c:4536

3039 +#: builtin/apply.c:4526

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

3041 msgstr ""

3042

2985 -#: builtin/apply.c:4538

3043 +#: builtin/apply.c:4528

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

3045 msgstr ""

3046

2989 -#: builtin/apply.c:4540

3047 +#: builtin/apply.c:4530

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

3049 msgstr ""

3050

2993 -#: builtin/apply.c:4542

3051 +#: builtin/apply.c:4532

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

3053 msgstr ""

3054

2997 -#: builtin/apply.c:4544

3055 +#: builtin/apply.c:4534

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

3057 msgstr ""

3058

3001 -#: builtin/apply.c:4546

3059 +#: builtin/apply.c:4536

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

3061 msgstr ""

3062

3005 -#: builtin/apply.c:4548

3063 +#: builtin/apply.c:4538

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

3065 msgstr ""

3066

3009 -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3067 +#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3068 msgid "paths are separated with NUL character"

3069 msgstr ""

3070

3013 -#: builtin/apply.c:4553

3071 +#: builtin/apply.c:4543

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

3073 msgstr ""

3074

3017 -#: builtin/apply.c:4555

3075 +#: builtin/apply.c:4545

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

3077 msgstr ""

3078

3021 -#: builtin/apply.c:4558 builtin/apply.c:4561

3079 +#: builtin/apply.c:4548 builtin/apply.c:4551

3080 msgid "ignore changes in whitespace when finding context"

3081 msgstr ""

3082

3025 -#: builtin/apply.c:4564

3083 +#: builtin/apply.c:4554

3084 msgid "apply the patch in reverse"

3085 msgstr ""

3086

3029 -#: builtin/apply.c:4566

3087 +#: builtin/apply.c:4556

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

3089 msgstr ""

3090

3033 -#: builtin/apply.c:4568

3091 +#: builtin/apply.c:4558

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

3093 msgstr ""

3094

3037 -#: builtin/apply.c:4570

3095 +#: builtin/apply.c:4560

3096 msgid "allow overlapping hunks"

3097 msgstr ""

3098

3041 -#: builtin/apply.c:4573

3099 +#: builtin/apply.c:4563

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

3101 msgstr ""

3102

3045 -#: builtin/apply.c:4576

3103 +#: builtin/apply.c:4566

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

3105 msgstr ""

3106

3049 -#: builtin/apply.c:4579

3107 +#: builtin/apply.c:4569

3108 msgid "prepend <root> to all filenames"

3109 msgstr ""

3110

3053 -#: builtin/apply.c:4601

3111 +#: builtin/apply.c:4591

3112 msgid "--3way outside a repository"

3113 msgstr ""

3114

3057 -#: builtin/apply.c:4609

3115 +#: builtin/apply.c:4599

3116 msgid "--index outside a repository"

3117 msgstr ""

3118

3061 -#: builtin/apply.c:4612

3119 +#: builtin/apply.c:4602

3120 msgid "--cached outside a repository"

3121 msgstr ""

3122

3065 -#: builtin/apply.c:4631

3123 +#: builtin/apply.c:4621

3124 #, c-format

3125 msgid "can't open patch '%s'"

3126 msgstr ""

3127

3070 -#: builtin/apply.c:4645

3128 +#: builtin/apply.c:4635

3129 #, c-format

3130 msgid "squelched %d whitespace error"

3131 msgid_plural "squelched %d whitespace errors"

3132 msgstr[0] ""

3133 msgstr[1] ""

3134

3077 -#: builtin/apply.c:4651 builtin/apply.c:4661

3135 +#: builtin/apply.c:4641 builtin/apply.c:4651

3136 #, c-format

3137 msgid "%d line adds whitespace errors."

3138 msgid_plural "%d lines add whitespace errors."

@@ -3128,103 +3186,111 @@ msgstr ""

3186 msgid "update BISECT_HEAD instead of checking out the current commit"

3187 msgstr ""

3188

3131 -#: builtin/blame.c:32

3189 +#: builtin/blame.c:33

3190 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3191 msgstr ""

3192

3135 -#: builtin/blame.c:37

3193 +#: builtin/blame.c:38

3194 msgid "<rev-opts> are documented in git-rev-list(1)"

3195 msgstr ""

3196

3139 -#: builtin/blame.c:2519

3197 +#: builtin/blame.c:1782

3198 +msgid "Blaming lines"

3199 +msgstr ""

3200 +

3201 +#: builtin/blame.c:2530

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

3203 msgstr ""

3204

3143 -#: builtin/blame.c:2520

3205 +#: builtin/blame.c:2531

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

3207 msgstr ""

3208

3147 -#: builtin/blame.c:2521

3209 +#: builtin/blame.c:2532

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

3211 msgstr ""

3212

3151 -#: builtin/blame.c:2522

3213 +#: builtin/blame.c:2533

3214 msgid "Show work cost statistics"

3215 msgstr ""

3216

3155 -#: builtin/blame.c:2523

3217 +#: builtin/blame.c:2534

3218 +msgid "Force progress reporting"

3219 +msgstr ""

3220 +

3221 +#: builtin/blame.c:2535

3222 msgid "Show output score for blame entries"

3223 msgstr ""

3224

3159 -#: builtin/blame.c:2524

3225 +#: builtin/blame.c:2536

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

3227 msgstr ""

3228

3163 -#: builtin/blame.c:2525

3229 +#: builtin/blame.c:2537

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

3231 msgstr ""

3232

3167 -#: builtin/blame.c:2526

3233 +#: builtin/blame.c:2538

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

3235 msgstr ""

3236

3171 -#: builtin/blame.c:2527

3237 +#: builtin/blame.c:2539

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

3239 msgstr ""

3240

3175 -#: builtin/blame.c:2528

3241 +#: builtin/blame.c:2540

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

3243 msgstr ""

3244

3179 -#: builtin/blame.c:2529

3245 +#: builtin/blame.c:2541

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

3247 msgstr ""

3248

3183 -#: builtin/blame.c:2530

3249 +#: builtin/blame.c:2542

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

3251 msgstr ""

3252

3187 -#: builtin/blame.c:2531

3253 +#: builtin/blame.c:2543

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

3255 msgstr ""

3256

3191 -#: builtin/blame.c:2532

3257 +#: builtin/blame.c:2544

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

3259 msgstr ""

3260

3195 -#: builtin/blame.c:2533

3261 +#: builtin/blame.c:2545

3262 msgid "Ignore whitespace differences"

3263 msgstr ""

3264

3199 -#: builtin/blame.c:2534

3265 +#: builtin/blame.c:2546

3266 msgid "Spend extra cycles to find better match"

3267 msgstr ""

3268

3203 -#: builtin/blame.c:2535

3269 +#: builtin/blame.c:2547

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

3271 msgstr ""

3272

3207 -#: builtin/blame.c:2536

3273 +#: builtin/blame.c:2548

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

3275 msgstr ""

3276

3211 -#: builtin/blame.c:2537 builtin/blame.c:2538

3277 +#: builtin/blame.c:2549 builtin/blame.c:2550

3278 msgid "score"

3279 msgstr ""

3280

3215 -#: builtin/blame.c:2537

3281 +#: builtin/blame.c:2549

3282 msgid "Find line copies within and across files"

3283 msgstr ""

3284

3219 -#: builtin/blame.c:2538

3285 +#: builtin/blame.c:2550

3286 msgid "Find line movements within and across files"

3287 msgstr ""

3288

3223 -#: builtin/blame.c:2539

3289 +#: builtin/blame.c:2551

3290 msgid "n,m"

3291 msgstr ""

3292

3227 -#: builtin/blame.c:2539

3293 +#: builtin/blame.c:2551

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

3295 msgstr ""

3296

@@ -3234,7 +3300,7 @@ msgstr ""

3300 #. takes 22 places, is the longest among various forms of

3301 #. relative timestamps, but your language may need more or

3302 #. fewer display columns.

3237 -#: builtin/blame.c:2620

3303 +#: builtin/blame.c:2640

3304 msgid "4 years, 11 months ago"

3305 msgstr ""

3306

@@ -3426,200 +3492,200 @@ msgstr ""

3492 msgid "Branch is renamed, but update of config-file failed"

3493 msgstr ""

3494

3429 -#: builtin/branch.c:587

3495 +#: builtin/branch.c:586

3496 #, c-format

3497 msgid "could not write branch description template: %s"

3498 msgstr ""

3499

3434 -#: builtin/branch.c:616

3500 +#: builtin/branch.c:615

3501 msgid "Generic options"

3502 msgstr ""

3503

3438 -#: builtin/branch.c:618

3504 +#: builtin/branch.c:617

3505 msgid "show hash and subject, give twice for upstream branch"

3506 msgstr ""

3507

3442 -#: builtin/branch.c:619

3508 +#: builtin/branch.c:618

3509 msgid "suppress informational messages"

3510 msgstr ""

3511

3446 -#: builtin/branch.c:620

3512 +#: builtin/branch.c:619

3513 msgid "set up tracking mode (see git-pull(1))"

3514 msgstr ""

3515

3450 -#: builtin/branch.c:622

3516 +#: builtin/branch.c:621

3517 msgid "change upstream info"

3518 msgstr ""

3519

3454 -#: builtin/branch.c:626

3520 +#: builtin/branch.c:625

3521 msgid "use colored output"

3522 msgstr ""

3523

3458 -#: builtin/branch.c:627

3524 +#: builtin/branch.c:626

3525 msgid "act on remote-tracking branches"

3526 msgstr ""

3527

3462 -#: builtin/branch.c:629 builtin/branch.c:630

3528 +#: builtin/branch.c:628 builtin/branch.c:629

3529 msgid "print only branches that contain the commit"

3530 msgstr ""

3531

3466 -#: builtin/branch.c:633

3532 +#: builtin/branch.c:632

3533 msgid "Specific git-branch actions:"

3534 msgstr ""

3535

3470 -#: builtin/branch.c:634

3536 +#: builtin/branch.c:633

3537 msgid "list both remote-tracking and local branches"

3538 msgstr ""

3539

3474 -#: builtin/branch.c:636

3540 +#: builtin/branch.c:635

3541 msgid "delete fully merged branch"

3542 msgstr ""

3543

3478 -#: builtin/branch.c:637

3544 +#: builtin/branch.c:636

3545 msgid "delete branch (even if not merged)"

3546 msgstr ""

3547

3482 -#: builtin/branch.c:638

3548 +#: builtin/branch.c:637

3549 msgid "move/rename a branch and its reflog"

3550 msgstr ""

3551

3486 -#: builtin/branch.c:639

3552 +#: builtin/branch.c:638

3553 msgid "move/rename a branch, even if target exists"

3554 msgstr ""

3555

3490 -#: builtin/branch.c:640

3556 +#: builtin/branch.c:639

3557 msgid "list branch names"

3558 msgstr ""

3559

3494 -#: builtin/branch.c:641

3560 +#: builtin/branch.c:640

3561 msgid "create the branch's reflog"

3562 msgstr ""

3563

3498 -#: builtin/branch.c:643

3564 +#: builtin/branch.c:642

3565 msgid "edit the description for the branch"

3566 msgstr ""

3567

3502 -#: builtin/branch.c:644

3568 +#: builtin/branch.c:643

3569 msgid "force creation, move/rename, deletion"

3570 msgstr ""

3571

3506 -#: builtin/branch.c:645

3572 +#: builtin/branch.c:644

3573 msgid "print only branches that are merged"

3574 msgstr ""

3575

3510 -#: builtin/branch.c:646

3576 +#: builtin/branch.c:645

3577 msgid "print only branches that are not merged"

3578 msgstr ""

3579

3514 -#: builtin/branch.c:647

3580 +#: builtin/branch.c:646

3581 msgid "list branches in columns"

3582 msgstr ""

3583

3518 -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3584 +#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

3585 msgid "key"

3586 msgstr ""

3587

3522 -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3588 +#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

3589 msgid "field name to sort on"

3590 msgstr ""

3591

3526 -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3527 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3592 +#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

3593 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

3594 #: builtin/tag.c:369

3595 msgid "object"

3596 msgstr ""

3597

3532 -#: builtin/branch.c:652

3598 +#: builtin/branch.c:651

3599 msgid "print only branches of the object"

3600 msgstr ""

3601

3536 -#: builtin/branch.c:670

3602 +#: builtin/branch.c:669

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

3604 msgstr ""

3605

3540 -#: builtin/branch.c:674 builtin/clone.c:697

3606 +#: builtin/branch.c:673 builtin/clone.c:705

3607 msgid "HEAD not found below refs/heads!"

3608 msgstr ""

3609

3544 -#: builtin/branch.c:694

3610 +#: builtin/branch.c:693

3611 msgid "--column and --verbose are incompatible"

3612 msgstr ""

3613

3548 -#: builtin/branch.c:705 builtin/branch.c:747

3614 +#: builtin/branch.c:704 builtin/branch.c:746

3615 msgid "branch name required"

3616 msgstr ""

3617

3552 -#: builtin/branch.c:723

3618 +#: builtin/branch.c:722

3619 msgid "Cannot give description to detached HEAD"

3620 msgstr ""

3621

3556 -#: builtin/branch.c:728

3622 +#: builtin/branch.c:727

3623 msgid "cannot edit description of more than one branch"

3624 msgstr ""

3625

3560 -#: builtin/branch.c:735

3626 +#: builtin/branch.c:734

3627 #, c-format

3628 msgid "No commit on branch '%s' yet."

3629 msgstr ""

3630

3565 -#: builtin/branch.c:738

3631 +#: builtin/branch.c:737

3632 #, c-format

3633 msgid "No branch named '%s'."

3634 msgstr ""

3635

3570 -#: builtin/branch.c:753

3636 +#: builtin/branch.c:752

3637 msgid "too many branches for a rename operation"

3638 msgstr ""

3639

3574 -#: builtin/branch.c:758

3640 +#: builtin/branch.c:757

3641 msgid "too many branches to set new upstream"

3642 msgstr ""

3643

3578 -#: builtin/branch.c:762

3644 +#: builtin/branch.c:761

3645 #, c-format

3646 msgid ""

3647 "could not set upstream of HEAD to %s when it does not point to any branch."

3648 msgstr ""

3649

3584 -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3650 +#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

3651 #, c-format

3652 msgid "no such branch '%s'"

3653 msgstr ""

3654

3589 -#: builtin/branch.c:769

3655 +#: builtin/branch.c:768

3656 #, c-format

3657 msgid "branch '%s' does not exist"

3658 msgstr ""

3659

3594 -#: builtin/branch.c:781

3660 +#: builtin/branch.c:780

3661 msgid "too many branches to unset upstream"

3662 msgstr ""

3663

3598 -#: builtin/branch.c:785

3664 +#: builtin/branch.c:784

3665 msgid "could not unset upstream of HEAD when it does not point to any branch."

3666 msgstr ""

3667

3602 -#: builtin/branch.c:791

3668 +#: builtin/branch.c:790

3669 #, c-format

3670 msgid "Branch '%s' has no upstream information"

3671 msgstr ""

3672

3607 -#: builtin/branch.c:805

3673 +#: builtin/branch.c:804

3674 msgid "it does not make sense to create 'HEAD' manually"

3675 msgstr ""

3676

3611 -#: builtin/branch.c:811

3677 +#: builtin/branch.c:810

3678 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3679 msgstr ""

3680

3615 -#: builtin/branch.c:814

3681 +#: builtin/branch.c:813

3682 #, c-format

3683 msgid ""

3684 "The --set-upstream flag is deprecated and will be removed. Consider using --"

3685 "track or --set-upstream-to\n"

3686 msgstr ""

3687

3622 -#: builtin/branch.c:831

3688 +#: builtin/branch.c:830

3689 #, c-format

3690 msgid ""

3691 "\n"

@@ -3627,12 +3693,12 @@ msgid ""

3693 "\n"

3694 msgstr ""

3695

3630 -#: builtin/branch.c:832

3696 +#: builtin/branch.c:831

3697 #, c-format

3698 msgid " git branch -d %s\n"

3699 msgstr ""

3700

3635 -#: builtin/branch.c:833

3701 +#: builtin/branch.c:832

3702 #, c-format

3703 msgid " git branch --set-upstream-to %s\n"

3704 msgstr ""

@@ -3724,7 +3790,7 @@ msgstr ""

3790 msgid "use .gitattributes only from the index"

3791 msgstr ""

3792

3727 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3793 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97

3794 msgid "read file names from stdin"

3795 msgstr ""

3796

@@ -3732,7 +3798,7 @@ msgstr ""

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

3799 msgstr ""

3800

3735 -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

3801 +#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

3802 msgid "suppress progress reporting"

3803 msgstr ""

3804

@@ -3785,49 +3851,53 @@ msgstr ""

3851 msgid "no contacts specified"

3852 msgstr ""

3853

3788 -#: builtin/checkout-index.c:126

3854 +#: builtin/checkout-index.c:127

3855 msgid "git checkout-index [<options>] [--] [<file>...]"

3856 msgstr ""

3857

3792 -#: builtin/checkout-index.c:188

3858 +#: builtin/checkout-index.c:144

3859 +msgid "stage should be between 1 and 3 or all"

3860 +msgstr ""

3861 +

3862 +#: builtin/checkout-index.c:160

3863 msgid "check out all files in the index"

3864 msgstr ""

3865

3796 -#: builtin/checkout-index.c:189

3866 +#: builtin/checkout-index.c:161

3867 msgid "force overwrite of existing files"

3868 msgstr ""

3869

3800 -#: builtin/checkout-index.c:191

3870 +#: builtin/checkout-index.c:163

3871 msgid "no warning for existing files and files not in index"

3872 msgstr ""

3873

3804 -#: builtin/checkout-index.c:193

3874 +#: builtin/checkout-index.c:165

3875 msgid "don't checkout new files"

3876 msgstr ""

3877

3808 -#: builtin/checkout-index.c:195

3878 +#: builtin/checkout-index.c:167

3879 msgid "update stat information in the index file"

3880 msgstr ""

3881

3812 -#: builtin/checkout-index.c:201

3882 +#: builtin/checkout-index.c:171

3883 msgid "read list of paths from the standard input"

3884 msgstr ""

3885

3816 -#: builtin/checkout-index.c:203

3886 +#: builtin/checkout-index.c:173

3887 msgid "write the content to temporary files"

3888 msgstr ""

3889

3820 -#: builtin/checkout-index.c:204 builtin/column.c:30

3890 +#: builtin/checkout-index.c:174 builtin/column.c:30

3891 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

3892 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

3822 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

3893 msgid "string"

3894 msgstr ""

3895

3826 -#: builtin/checkout-index.c:205

3896 +#: builtin/checkout-index.c:175

3897 msgid "when creating files, prepend <string>"

3898 msgstr ""

3899

3830 -#: builtin/checkout-index.c:208

3900 +#: builtin/checkout-index.c:177

3901 msgid "copy out the files from named stage"

3902 msgstr ""

3903

@@ -3907,37 +3977,37 @@ msgstr ""

3977 msgid "HEAD is now at"

3978 msgstr ""

3979

3910 -#: builtin/checkout.c:668

3980 +#: builtin/checkout.c:669

3981 #, c-format

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

3983 msgstr ""

3984

3915 -#: builtin/checkout.c:671

3985 +#: builtin/checkout.c:672

3986 #, c-format

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

3988 msgstr ""

3989

3920 -#: builtin/checkout.c:675

3990 +#: builtin/checkout.c:676

3991 #, c-format

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

3993 msgstr ""

3994

3925 -#: builtin/checkout.c:677 builtin/checkout.c:1066

3995 +#: builtin/checkout.c:678 builtin/checkout.c:1068

3996 #, c-format

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

3998 msgstr ""

3999

3930 -#: builtin/checkout.c:679

4000 +#: builtin/checkout.c:680

4001 #, c-format

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

4003 msgstr ""

4004

3935 -#: builtin/checkout.c:731

4005 +#: builtin/checkout.c:732

4006 #, c-format

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

4008 msgstr ""

4009

3940 -#: builtin/checkout.c:737

4010 +#: builtin/checkout.c:738

4011 #, c-format

4012 msgid ""

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

@@ -3952,7 +4022,7 @@ msgid_plural ""

4022 msgstr[0] ""

4023 msgstr[1] ""

4024

3955 -#: builtin/checkout.c:756

4025 +#: builtin/checkout.c:757

4026 #, c-format

4027 msgid ""

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

@@ -3969,162 +4039,162 @@ msgid_plural ""

4039 msgstr[0] ""

4040 msgstr[1] ""

4041

3972 -#: builtin/checkout.c:792

4042 +#: builtin/checkout.c:793

4043 msgid "internal error in revision walk"

4044 msgstr ""

4045

3976 -#: builtin/checkout.c:796

4046 +#: builtin/checkout.c:797

4047 msgid "Previous HEAD position was"

4048 msgstr ""

4049

3980 -#: builtin/checkout.c:823 builtin/checkout.c:1061

4050 +#: builtin/checkout.c:824 builtin/checkout.c:1063

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

4052 msgstr ""

4053

3984 -#: builtin/checkout.c:968

4054 +#: builtin/checkout.c:969

4055 #, c-format

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

4057 msgstr ""

4058

3989 -#: builtin/checkout.c:1007 builtin/worktree.c:213

4059 +#: builtin/checkout.c:1009 builtin/worktree.c:211

4060 #, c-format

4061 msgid "invalid reference: %s"

4062 msgstr ""

4063

3994 -#: builtin/checkout.c:1036

4064 +#: builtin/checkout.c:1038

4065 #, c-format

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

4067 msgstr ""

4068

3999 -#: builtin/checkout.c:1075

4069 +#: builtin/checkout.c:1077

4070 msgid "paths cannot be used with switching branches"

4071 msgstr ""

4072

4003 -#: builtin/checkout.c:1078 builtin/checkout.c:1082

4073 +#: builtin/checkout.c:1080 builtin/checkout.c:1084

4074 #, c-format

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

4076 msgstr ""

4077

4008 -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4009 -#: builtin/checkout.c:1097

4078 +#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4079 +#: builtin/checkout.c:1099

4080 #, c-format

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

4082 msgstr ""

4083

4014 -#: builtin/checkout.c:1102

4084 +#: builtin/checkout.c:1104

4085 #, c-format

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

4087 msgstr ""

4088

4019 -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4020 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4021 -#: builtin/worktree.c:322

4089 +#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4090 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4091 +#: builtin/worktree.c:320

4092 msgid "branch"

4093 msgstr ""

4094

4025 -#: builtin/checkout.c:1136

4095 +#: builtin/checkout.c:1138

4096 msgid "create and checkout a new branch"

4097 msgstr ""

4098

4029 -#: builtin/checkout.c:1138

4099 +#: builtin/checkout.c:1140

4100 msgid "create/reset and checkout a branch"

4101 msgstr ""

4102

4033 -#: builtin/checkout.c:1139

4103 +#: builtin/checkout.c:1141

4104 msgid "create reflog for new branch"

4105 msgstr ""

4106

4037 -#: builtin/checkout.c:1140

4107 +#: builtin/checkout.c:1142

4108 msgid "detach the HEAD at named commit"

4109 msgstr ""

4110

4041 -#: builtin/checkout.c:1141

4111 +#: builtin/checkout.c:1143

4112 msgid "set upstream info for new branch"

4113 msgstr ""

4114

4045 -#: builtin/checkout.c:1143

4115 +#: builtin/checkout.c:1145

4116 msgid "new-branch"

4117 msgstr ""

4118

4049 -#: builtin/checkout.c:1143

4119 +#: builtin/checkout.c:1145

4120 msgid "new unparented branch"

4121 msgstr ""

4122

4053 -#: builtin/checkout.c:1144

4123 +#: builtin/checkout.c:1146

4124 msgid "checkout our version for unmerged files"

4125 msgstr ""

4126

4057 -#: builtin/checkout.c:1146

4127 +#: builtin/checkout.c:1148

4128 msgid "checkout their version for unmerged files"

4129 msgstr ""

4130

4061 -#: builtin/checkout.c:1148

4131 +#: builtin/checkout.c:1150

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

4133 msgstr ""

4134

4065 -#: builtin/checkout.c:1149

4135 +#: builtin/checkout.c:1151

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

4137 msgstr ""

4138

4069 -#: builtin/checkout.c:1150 builtin/merge.c:227

4139 +#: builtin/checkout.c:1152 builtin/merge.c:227

4140 msgid "update ignored files (default)"

4141 msgstr ""

4142

4073 -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4143 +#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4144 msgid "style"

4145 msgstr ""

4146

4077 -#: builtin/checkout.c:1152

4147 +#: builtin/checkout.c:1154

4148 msgid "conflict style (merge or diff3)"

4149 msgstr ""

4150

4081 -#: builtin/checkout.c:1155

4151 +#: builtin/checkout.c:1157

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

4153 msgstr ""

4154

4085 -#: builtin/checkout.c:1157

4155 +#: builtin/checkout.c:1159

4156 msgid "second guess 'git checkout <no-such-branch>'"

4157 msgstr ""

4158

4089 -#: builtin/checkout.c:1159

4159 +#: builtin/checkout.c:1161

4160 msgid "do not check if another worktree is holding the given ref"

4161 msgstr ""

4162

4093 -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4094 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4163 +#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4164 +#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4165 #: builtin/send-pack.c:168

4166 msgid "force progress reporting"

4167 msgstr ""

4168

4099 -#: builtin/checkout.c:1191

4169 +#: builtin/checkout.c:1193

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

4171 msgstr ""

4172

4103 -#: builtin/checkout.c:1208

4173 +#: builtin/checkout.c:1210

4174 msgid "--track needs a branch name"

4175 msgstr ""

4176

4107 -#: builtin/checkout.c:1213

4177 +#: builtin/checkout.c:1215

4178 msgid "Missing branch name; try -b"

4179 msgstr ""

4180

4111 -#: builtin/checkout.c:1249

4181 +#: builtin/checkout.c:1251

4182 msgid "invalid path specification"

4183 msgstr ""

4184

4115 -#: builtin/checkout.c:1256

4185 +#: builtin/checkout.c:1258

4186 #, c-format

4187 msgid ""

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

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

4190 msgstr ""

4191

4122 -#: builtin/checkout.c:1261

4192 +#: builtin/checkout.c:1263

4193 #, c-format

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

4195 msgstr ""

4196

4127 -#: builtin/checkout.c:1265

4197 +#: builtin/checkout.c:1267

4198 msgid ""

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

4200 "checking out of the index."

@@ -4160,7 +4230,7 @@ msgstr ""

4230 msgid "failed to remove %s"

4231 msgstr ""

4232

4163 -#: builtin/clean.c:315

4233 +#: builtin/clean.c:291

4234 msgid ""

4235 "Prompt help:\n"

4236 "1 - select a numbered item\n"

@@ -4168,7 +4238,7 @@ msgid ""

4238 " - (empty) select nothing"

4239 msgstr ""

4240

4171 -#: builtin/clean.c:319

4241 +#: builtin/clean.c:295

4242 msgid ""

4243 "Prompt help:\n"

4244 "1 - select a single item\n"

@@ -4180,36 +4250,36 @@ msgid ""

4250 " - (empty) finish selecting"

4251 msgstr ""

4252

4183 -#: builtin/clean.c:535

4253 +#: builtin/clean.c:511

4254 #, c-format

4255 msgid "Huh (%s)?"

4256 msgstr ""

4257

4188 -#: builtin/clean.c:677

4258 +#: builtin/clean.c:653

4259 #, c-format

4260 msgid "Input ignore patterns>> "

4261 msgstr ""

4262

4193 -#: builtin/clean.c:714

4263 +#: builtin/clean.c:690

4264 #, c-format

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

4266 msgstr ""

4267

4198 -#: builtin/clean.c:735

4268 +#: builtin/clean.c:711

4269 msgid "Select items to delete"

4270 msgstr ""

4271

4272 #. TRANSLATORS: Make sure to keep [y/N] as is

4203 -#: builtin/clean.c:776

4273 +#: builtin/clean.c:752

4274 #, c-format

4275 msgid "Remove %s [y/N]? "

4276 msgstr ""

4277

4208 -#: builtin/clean.c:801

4278 +#: builtin/clean.c:777

4279 msgid "Bye."

4280 msgstr ""

4281

4212 -#: builtin/clean.c:809

4282 +#: builtin/clean.c:785

4283 msgid ""

4284 "clean - start cleaning\n"

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

@@ -4220,68 +4290,68 @@ msgid ""

4290 "? - help for prompt selection"

4291 msgstr ""

4292

4223 -#: builtin/clean.c:836

4293 +#: builtin/clean.c:812

4294 msgid "*** Commands ***"

4295 msgstr ""

4296

4227 -#: builtin/clean.c:837

4297 +#: builtin/clean.c:813

4298 msgid "What now"

4299 msgstr ""

4300

4231 -#: builtin/clean.c:845

4301 +#: builtin/clean.c:821

4302 msgid "Would remove the following item:"

4303 msgid_plural "Would remove the following items:"

4304 msgstr[0] ""

4305 msgstr[1] ""

4306

4237 -#: builtin/clean.c:862

4307 +#: builtin/clean.c:838

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

4309 msgstr ""

4310

4241 -#: builtin/clean.c:893

4311 +#: builtin/clean.c:869

4312 msgid "do not print names of files removed"

4313 msgstr ""

4314

4245 -#: builtin/clean.c:895

4315 +#: builtin/clean.c:871

4316 msgid "force"

4317 msgstr ""

4318

4249 -#: builtin/clean.c:896

4319 +#: builtin/clean.c:872

4320 msgid "interactive cleaning"

4321 msgstr ""

4322

4253 -#: builtin/clean.c:898

4323 +#: builtin/clean.c:874

4324 msgid "remove whole directories"

4325 msgstr ""

4326

4257 -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4258 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4327 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4328 +#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4329 msgid "pattern"

4330 msgstr ""

4331

4262 -#: builtin/clean.c:900

4332 +#: builtin/clean.c:876

4333 msgid "add <pattern> to ignore rules"

4334 msgstr ""

4335

4266 -#: builtin/clean.c:901

4336 +#: builtin/clean.c:877

4337 msgid "remove ignored files, too"

4338 msgstr ""

4339

4270 -#: builtin/clean.c:903

4340 +#: builtin/clean.c:879

4341 msgid "remove only ignored files"

4342 msgstr ""

4343

4274 -#: builtin/clean.c:921

4344 +#: builtin/clean.c:897

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

4346 msgstr ""

4347

4278 -#: builtin/clean.c:925

4348 +#: builtin/clean.c:901

4349 msgid ""

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

4351 "clean"

4352 msgstr ""

4353

4284 -#: builtin/clean.c:928

4354 +#: builtin/clean.c:904

4355 msgid ""

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

4357 "refusing to clean"

@@ -4291,263 +4361,271 @@ msgstr ""

4361 msgid "git clone [<options>] [--] <repo> [<dir>]"

4362 msgstr ""

4363

4294 -#: builtin/clone.c:59

4364 +#: builtin/clone.c:60

4365 msgid "don't create a checkout"

4366 msgstr ""

4367

4298 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4368 +#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4369 msgid "create a bare repository"

4370 msgstr ""

4371

4302 -#: builtin/clone.c:64

4372 +#: builtin/clone.c:65

4373 msgid "create a mirror repository (implies bare)"

4374 msgstr ""

4375

4306 -#: builtin/clone.c:66

4376 +#: builtin/clone.c:67

4377 msgid "to clone from a local repository"

4378 msgstr ""

4379

4310 -#: builtin/clone.c:68

4380 +#: builtin/clone.c:69

4381 msgid "don't use local hardlinks, always copy"

4382 msgstr ""

4383

4314 -#: builtin/clone.c:70

4384 +#: builtin/clone.c:71

4385 msgid "setup as shared repository"

4386 msgstr ""

4387

4318 -#: builtin/clone.c:72 builtin/clone.c:74

4388 +#: builtin/clone.c:73 builtin/clone.c:75

4389 msgid "initialize submodules in the clone"

4390 msgstr ""

4391

4322 -#: builtin/clone.c:75 builtin/init-db.c:466

4392 +#: builtin/clone.c:76 builtin/init-db.c:466

4393 msgid "template-directory"

4394 msgstr ""

4395

4326 -#: builtin/clone.c:76 builtin/init-db.c:467

4396 +#: builtin/clone.c:77 builtin/init-db.c:467

4397 msgid "directory from which templates will be used"

4398 msgstr ""

4399

4330 -#: builtin/clone.c:78 builtin/submodule--helper.c:179

4400 +#: builtin/clone.c:79 builtin/submodule--helper.c:173

4401 msgid "reference repository"

4402 msgstr ""

4403

4334 -#: builtin/clone.c:80

4404 +#: builtin/clone.c:81

4405 msgid "use --reference only while cloning"

4406 msgstr ""

4407

4338 -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4408 +#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4409 msgid "name"

4410 msgstr ""

4411

4342 -#: builtin/clone.c:82

4412 +#: builtin/clone.c:83

4413 msgid "use <name> instead of 'origin' to track upstream"

4414 msgstr ""

4415

4346 -#: builtin/clone.c:84

4416 +#: builtin/clone.c:85

4417 msgid "checkout <branch> instead of the remote's HEAD"

4418 msgstr ""

4419

4350 -#: builtin/clone.c:86

4420 +#: builtin/clone.c:87

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

4422 msgstr ""

4423

4354 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4355 -#: builtin/pull.c:186

4424 +#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4425 +#: builtin/pull.c:193

4426 msgid "depth"

4427 msgstr ""

4428

4359 -#: builtin/clone.c:88

4429 +#: builtin/clone.c:89

4430 msgid "create a shallow clone of that depth"

4431 msgstr ""

4432

4363 -#: builtin/clone.c:90

4433 +#: builtin/clone.c:91

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

4435 msgstr ""

4436

4367 -#: builtin/clone.c:91 builtin/init-db.c:475

4437 +#: builtin/clone.c:92 builtin/init-db.c:475

4438 msgid "gitdir"

4439 msgstr ""

4440

4371 -#: builtin/clone.c:92 builtin/init-db.c:476

4441 +#: builtin/clone.c:93 builtin/init-db.c:476

4442 msgid "separate git dir from working tree"

4443 msgstr ""

4444

4375 -#: builtin/clone.c:93

4445 +#: builtin/clone.c:94

4446 msgid "key=value"

4447 msgstr ""

4448

4379 -#: builtin/clone.c:94

4449 +#: builtin/clone.c:95

4450 msgid "set config inside the new repository"

4451 msgstr ""

4452

4383 -#: builtin/clone.c:300

4453 +#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

4454 +msgid "use IPv4 addresses only"

4455 +msgstr ""

4456 +

4457 +#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

4458 +msgid "use IPv6 addresses only"

4459 +msgstr ""

4460 +

4461 +#: builtin/clone.c:305

4462 #, c-format

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

4464 msgstr ""

4465

4388 -#: builtin/clone.c:302

4466 +#: builtin/clone.c:307

4467 #, c-format

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

4469 msgstr ""

4470

4393 -#: builtin/clone.c:307

4471 +#: builtin/clone.c:312

4472 #, c-format

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

4474 msgstr ""

4475

4398 -#: builtin/clone.c:310

4476 +#: builtin/clone.c:315

4477 #, c-format

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

4479 msgstr ""

4480

4403 -#: builtin/clone.c:375 builtin/diff.c:84

4481 +#: builtin/clone.c:380 builtin/diff.c:84

4482 #, c-format

4483 msgid "failed to stat '%s'"

4484 msgstr ""

4485

4408 -#: builtin/clone.c:377

4486 +#: builtin/clone.c:382

4487 #, c-format

4488 msgid "%s exists and is not a directory"

4489 msgstr ""

4490

4413 -#: builtin/clone.c:391

4491 +#: builtin/clone.c:396

4492 #, c-format

4493 msgid "failed to stat %s\n"

4494 msgstr ""

4495

4418 -#: builtin/clone.c:413

4496 +#: builtin/clone.c:418

4497 #, c-format

4498 msgid "failed to create link '%s'"

4499 msgstr ""

4500

4423 -#: builtin/clone.c:417

4501 +#: builtin/clone.c:422

4502 #, c-format

4503 msgid "failed to copy file to '%s'"

4504 msgstr ""

4505

4428 -#: builtin/clone.c:442 builtin/clone.c:626

4506 +#: builtin/clone.c:447 builtin/clone.c:631

4507 #, c-format

4508 msgid "done.\n"

4509 msgstr ""

4510

4433 -#: builtin/clone.c:454

4511 +#: builtin/clone.c:459

4512 msgid ""

4513 "Clone succeeded, but checkout failed.\n"

4514 "You can inspect what was checked out with 'git status'\n"

4515 "and retry the checkout with 'git checkout -f HEAD'\n"

4516 msgstr ""

4517

4440 -#: builtin/clone.c:531

4518 +#: builtin/clone.c:536

4519 #, c-format

4520 msgid "Could not find remote branch %s to clone."

4521 msgstr ""

4522

4445 -#: builtin/clone.c:621

4523 +#: builtin/clone.c:626

4524 #, c-format

4525 msgid "Checking connectivity... "

4526 msgstr ""

4527

4450 -#: builtin/clone.c:624

4528 +#: builtin/clone.c:629

4529 msgid "remote did not send all necessary objects"

4530 msgstr ""

4531

4454 -#: builtin/clone.c:688

4532 +#: builtin/clone.c:696

4533 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4534 msgstr ""

4535

4458 -#: builtin/clone.c:719

4536 +#: builtin/clone.c:727

4537 msgid "unable to checkout working tree"

4538 msgstr ""

4539

4462 -#: builtin/clone.c:808

4540 +#: builtin/clone.c:816

4541 msgid "cannot repack to clean up"

4542 msgstr ""

4543

4466 -#: builtin/clone.c:810

4544 +#: builtin/clone.c:818

4545 msgid "cannot unlink temporary alternates file"

4546 msgstr ""

4547

4470 -#: builtin/clone.c:842

4548 +#: builtin/clone.c:850

4549 msgid "Too many arguments."

4550 msgstr ""

4551

4474 -#: builtin/clone.c:846

4552 +#: builtin/clone.c:854

4553 msgid "You must specify a repository to clone."

4554 msgstr ""

4555

4478 -#: builtin/clone.c:857

4556 +#: builtin/clone.c:865

4557 #, c-format

4558 msgid "--bare and --origin %s options are incompatible."

4559 msgstr ""

4560

4483 -#: builtin/clone.c:860

4561 +#: builtin/clone.c:868

4562 msgid "--bare and --separate-git-dir are incompatible."

4563 msgstr ""

4564

4487 -#: builtin/clone.c:873

4565 +#: builtin/clone.c:881

4566 #, c-format

4567 msgid "repository '%s' does not exist"

4568 msgstr ""

4569

4492 -#: builtin/clone.c:879 builtin/fetch.c:1166

4570 +#: builtin/clone.c:887 builtin/fetch.c:1174

4571 #, c-format

4572 msgid "depth %s is not a positive number"

4573 msgstr ""

4574

4497 -#: builtin/clone.c:889

4575 +#: builtin/clone.c:897

4576 #, c-format

4577 msgid "destination path '%s' already exists and is not an empty directory."

4578 msgstr ""

4579

4502 -#: builtin/clone.c:899

4580 +#: builtin/clone.c:907

4581 #, c-format

4582 msgid "working tree '%s' already exists."

4583 msgstr ""

4584

4507 -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4508 -#: builtin/worktree.c:221 builtin/worktree.c:248

4585 +#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4586 +#: builtin/worktree.c:219 builtin/worktree.c:246

4587 #, c-format

4588 msgid "could not create leading directories of '%s'"

4589 msgstr ""

4590

4513 -#: builtin/clone.c:917

4591 +#: builtin/clone.c:925

4592 #, c-format

4593 msgid "could not create work tree dir '%s'"

4594 msgstr ""

4595

4518 -#: builtin/clone.c:935

4596 +#: builtin/clone.c:943

4597 #, c-format

4598 msgid "Cloning into bare repository '%s'...\n"

4599 msgstr ""

4600

4523 -#: builtin/clone.c:937

4601 +#: builtin/clone.c:945

4602 #, c-format

4603 msgid "Cloning into '%s'...\n"

4604 msgstr ""

4605

4528 -#: builtin/clone.c:975

4606 +#: builtin/clone.c:984

4607 msgid "--depth is ignored in local clones; use file:// instead."

4608 msgstr ""

4609

4532 -#: builtin/clone.c:978

4610 +#: builtin/clone.c:987

4611 msgid "source repository is shallow, ignoring --local"

4612 msgstr ""

4613

4536 -#: builtin/clone.c:983

4614 +#: builtin/clone.c:992

4615 msgid "--local is ignored"

4616 msgstr ""

4617

4540 -#: builtin/clone.c:987

4618 +#: builtin/clone.c:996

4619 #, c-format

4620 msgid "Don't know how to clone %s"

4621 msgstr ""

4622

4545 -#: builtin/clone.c:1036 builtin/clone.c:1044

4623 +#: builtin/clone.c:1045 builtin/clone.c:1053

4624 #, c-format

4625 msgid "Remote branch %s not found in upstream %s"

4626 msgstr ""

4627

4550 -#: builtin/clone.c:1047

4628 +#: builtin/clone.c:1056

4629 msgid "You appear to have cloned an empty repository."

4630 msgstr ""

4631

@@ -4720,7 +4798,7 @@ msgstr ""

4798 msgid "could not lookup commit %s"

4799 msgstr ""

4800

4723 -#: builtin/commit.c:702 builtin/shortlog.c:273

4801 +#: builtin/commit.c:702 builtin/shortlog.c:285

4802 #, c-format

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

4804 msgstr ""

@@ -4888,8 +4966,8 @@ msgstr ""

4966 msgid "show branch information"

4967 msgstr ""

4968

4891 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

4892 -#: builtin/worktree.c:423

4969 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

4970 +#: builtin/worktree.c:430

4971 msgid "machine-readable output"

4972 msgstr ""

4973

@@ -4976,8 +5054,8 @@ msgstr ""

5054 msgid "override date for commit"

5055 msgstr ""

5056

4979 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

4980 -#: builtin/notes.c:555 builtin/tag.c:349

5057 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5058 +#: builtin/notes.c:558 builtin/tag.c:349

5059 msgid "message"

5060 msgstr ""

5061

@@ -5010,7 +5088,7 @@ msgstr ""

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

5089 msgstr ""

5090

5013 -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5091 +#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5092 msgid "add Signed-off-by:"

5093 msgstr ""

5094

@@ -5034,7 +5112,7 @@ msgstr ""

5112 msgid "include status in commit message template"

5113 msgstr ""

5114

5037 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5115 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5116 #: builtin/revert.c:93

5117 msgid "GPG sign commit"

5118 msgstr ""

@@ -5122,139 +5200,143 @@ msgid ""

5200 "not exceeded, and then \"git reset HEAD\" to recover."

5201 msgstr ""

5202

5125 -#: builtin/config.c:8

5203 +#: builtin/config.c:9

5204 msgid "git config [<options>]"

5205 msgstr ""

5206

5129 -#: builtin/config.c:54

5207 +#: builtin/config.c:56

5208 msgid "Config file location"

5209 msgstr ""

5210

5133 -#: builtin/config.c:55

5211 +#: builtin/config.c:57

5212 msgid "use global config file"

5213 msgstr ""

5214

5137 -#: builtin/config.c:56

5215 +#: builtin/config.c:58

5216 msgid "use system config file"

5217 msgstr ""

5218

5141 -#: builtin/config.c:57

5219 +#: builtin/config.c:59

5220 msgid "use repository config file"

5221 msgstr ""

5222

5145 -#: builtin/config.c:58

5223 +#: builtin/config.c:60

5224 msgid "use given config file"

5225 msgstr ""

5226

5149 -#: builtin/config.c:59

5227 +#: builtin/config.c:61

5228 msgid "blob-id"

5229 msgstr ""

5230

5153 -#: builtin/config.c:59

5231 +#: builtin/config.c:61

5232 msgid "read config from given blob object"

5233 msgstr ""

5234

5157 -#: builtin/config.c:60

5235 +#: builtin/config.c:62

5236 msgid "Action"

5237 msgstr ""

5238

5161 -#: builtin/config.c:61

5239 +#: builtin/config.c:63

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

5241 msgstr ""

5242

5165 -#: builtin/config.c:62

5243 +#: builtin/config.c:64

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

5245 msgstr ""

5246

5169 -#: builtin/config.c:63

5247 +#: builtin/config.c:65

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

5249 msgstr ""

5250

5173 -#: builtin/config.c:64

5251 +#: builtin/config.c:66

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

5253 msgstr ""

5254

5177 -#: builtin/config.c:65

5255 +#: builtin/config.c:67

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

5257 msgstr ""

5258

5181 -#: builtin/config.c:66

5259 +#: builtin/config.c:68

5260 msgid "add a new variable: name value"

5261 msgstr ""

5262

5185 -#: builtin/config.c:67

5263 +#: builtin/config.c:69

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

5265 msgstr ""

5266

5189 -#: builtin/config.c:68

5267 +#: builtin/config.c:70

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

5269 msgstr ""

5270

5193 -#: builtin/config.c:69

5271 +#: builtin/config.c:71

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

5273 msgstr ""

5274

5197 -#: builtin/config.c:70

5275 +#: builtin/config.c:72

5276 msgid "remove a section: name"

5277 msgstr ""

5278

5201 -#: builtin/config.c:71

5279 +#: builtin/config.c:73

5280 msgid "list all"

5281 msgstr ""

5282

5205 -#: builtin/config.c:72

5283 +#: builtin/config.c:74

5284 msgid "open an editor"

5285 msgstr ""

5286

5209 -#: builtin/config.c:73

5287 +#: builtin/config.c:75

5288 msgid "find the color configured: slot [default]"

5289 msgstr ""

5290

5213 -#: builtin/config.c:74

5291 +#: builtin/config.c:76

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

5293 msgstr ""

5294

5217 -#: builtin/config.c:75

5295 +#: builtin/config.c:77

5296 msgid "Type"

5297 msgstr ""

5298

5221 -#: builtin/config.c:76

5299 +#: builtin/config.c:78

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

5301 msgstr ""

5302

5225 -#: builtin/config.c:77

5303 +#: builtin/config.c:79

5304 msgid "value is decimal number"

5305 msgstr ""

5306

5229 -#: builtin/config.c:78

5307 +#: builtin/config.c:80

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

5309 msgstr ""

5310

5233 -#: builtin/config.c:79

5311 +#: builtin/config.c:81

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

5313 msgstr ""

5314

5237 -#: builtin/config.c:80

5315 +#: builtin/config.c:82

5316 msgid "Other"

5317 msgstr ""

5318

5241 -#: builtin/config.c:81

5319 +#: builtin/config.c:83

5320 msgid "terminate values with NUL byte"

5321 msgstr ""

5322

5245 -#: builtin/config.c:82

5323 +#: builtin/config.c:84

5324 msgid "show variable names only"

5325 msgstr ""

5326

5249 -#: builtin/config.c:83

5327 +#: builtin/config.c:85

5328 msgid "respect include directives on lookup"

5329 msgstr ""

5330

5253 -#: builtin/config.c:303

5331 +#: builtin/config.c:86

5332 +msgid "show origin of config (file, standard input, blob, command line)"

5333 +msgstr ""

5334 +

5335 +#: builtin/config.c:328

5336 msgid "unable to parse default color value"

5337 msgstr ""

5338

5257 -#: builtin/config.c:441

5339 +#: builtin/config.c:469

5340 #, c-format

5341 msgid ""

5342 "# This is Git's per-user configuration file.\n"

@@ -5264,7 +5346,7 @@ msgid ""

5346 "#\temail = %s\n"

5347 msgstr ""

5348

5267 -#: builtin/config.c:575

5349 +#: builtin/config.c:611

5350 #, c-format

5351 msgid "cannot create configuration file %s"

5352 msgstr ""

@@ -5508,247 +5590,251 @@ msgstr ""

5590 msgid "git fetch --all [<options>]"

5591 msgstr ""

5592

5511 -#: builtin/fetch.c:90 builtin/pull.c:162

5593 +#: builtin/fetch.c:92 builtin/pull.c:166

5594 msgid "fetch from all remotes"

5595 msgstr ""

5596

5515 -#: builtin/fetch.c:92 builtin/pull.c:165

5597 +#: builtin/fetch.c:94 builtin/pull.c:169

5598 msgid "append to .git/FETCH_HEAD instead of overwriting"

5599 msgstr ""

5600

5519 -#: builtin/fetch.c:94 builtin/pull.c:168

5601 +#: builtin/fetch.c:96 builtin/pull.c:172

5602 msgid "path to upload pack on remote end"

5603 msgstr ""

5604

5523 -#: builtin/fetch.c:95 builtin/pull.c:170

5605 +#: builtin/fetch.c:97 builtin/pull.c:174

5606 msgid "force overwrite of local branch"

5607 msgstr ""

5608

5527 -#: builtin/fetch.c:97

5609 +#: builtin/fetch.c:99

5610 msgid "fetch from multiple remotes"

5611 msgstr ""

5612

5531 -#: builtin/fetch.c:99 builtin/pull.c:172

5613 +#: builtin/fetch.c:101 builtin/pull.c:176

5614 msgid "fetch all tags and associated objects"

5615 msgstr ""

5616

5535 -#: builtin/fetch.c:101

5617 +#: builtin/fetch.c:103

5618 msgid "do not fetch all tags (--no-tags)"

5619 msgstr ""

5620

5539 -#: builtin/fetch.c:103 builtin/pull.c:175

5621 +#: builtin/fetch.c:105

5622 +msgid "number of submodules fetched in parallel"

5623 +msgstr ""

5624 +

5625 +#: builtin/fetch.c:107 builtin/pull.c:179

5626 msgid "prune remote-tracking branches no longer on remote"

5627 msgstr ""

5628

5543 -#: builtin/fetch.c:104 builtin/pull.c:178

5629 +#: builtin/fetch.c:108 builtin/pull.c:182

5630 msgid "on-demand"

5631 msgstr ""

5632

5547 -#: builtin/fetch.c:105 builtin/pull.c:179

5633 +#: builtin/fetch.c:109 builtin/pull.c:183

5634 msgid "control recursive fetching of submodules"

5635 msgstr ""

5636

5551 -#: builtin/fetch.c:109 builtin/pull.c:184

5637 +#: builtin/fetch.c:113 builtin/pull.c:191

5638 msgid "keep downloaded pack"

5639 msgstr ""

5640

5555 -#: builtin/fetch.c:111

5641 +#: builtin/fetch.c:115

5642 msgid "allow updating of HEAD ref"

5643 msgstr ""

5644

5559 -#: builtin/fetch.c:114 builtin/pull.c:187

5645 +#: builtin/fetch.c:118 builtin/pull.c:194

5646 msgid "deepen history of shallow clone"

5647 msgstr ""

5648

5563 -#: builtin/fetch.c:116 builtin/pull.c:190

5649 +#: builtin/fetch.c:120 builtin/pull.c:197

5650 msgid "convert to a complete repository"

5651 msgstr ""

5652

5567 -#: builtin/fetch.c:118 builtin/log.c:1233

5653 +#: builtin/fetch.c:122 builtin/log.c:1236

5654 msgid "dir"

5655 msgstr ""

5656

5571 -#: builtin/fetch.c:119

5657 +#: builtin/fetch.c:123

5658 msgid "prepend this to submodule path output"

5659 msgstr ""

5660

5575 -#: builtin/fetch.c:122

5661 +#: builtin/fetch.c:126

5662 msgid "default mode for recursion"

5663 msgstr ""

5664

5579 -#: builtin/fetch.c:124 builtin/pull.c:193

5665 +#: builtin/fetch.c:128 builtin/pull.c:200

5666 msgid "accept refs that update .git/shallow"

5667 msgstr ""

5668

5583 -#: builtin/fetch.c:125 builtin/pull.c:195

5669 +#: builtin/fetch.c:129 builtin/pull.c:202

5670 msgid "refmap"

5671 msgstr ""

5672

5587 -#: builtin/fetch.c:126 builtin/pull.c:196

5673 +#: builtin/fetch.c:130 builtin/pull.c:203

5674 msgid "specify fetch refmap"

5675 msgstr ""

5676

5591 -#: builtin/fetch.c:378

5677 +#: builtin/fetch.c:386

5678 msgid "Couldn't find remote ref HEAD"

5679 msgstr ""

5680

5595 -#: builtin/fetch.c:458

5681 +#: builtin/fetch.c:466

5682 #, c-format

5683 msgid "object %s not found"

5684 msgstr ""

5685

5600 -#: builtin/fetch.c:463

5686 +#: builtin/fetch.c:471

5687 msgid "[up to date]"

5688 msgstr ""

5689

5604 -#: builtin/fetch.c:477

5690 +#: builtin/fetch.c:485

5691 #, c-format

5692 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5693 msgstr ""

5694

5609 -#: builtin/fetch.c:478 builtin/fetch.c:566

5695 +#: builtin/fetch.c:486 builtin/fetch.c:574

5696 msgid "[rejected]"

5697 msgstr ""

5698

5613 -#: builtin/fetch.c:489

5699 +#: builtin/fetch.c:497

5700 msgid "[tag update]"

5701 msgstr ""

5702

5617 -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5703 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552

5704 msgid " (unable to update local ref)"

5705 msgstr ""

5706

5621 -#: builtin/fetch.c:509

5707 +#: builtin/fetch.c:517

5708 msgid "[new tag]"

5709 msgstr ""

5710

5625 -#: builtin/fetch.c:512

5711 +#: builtin/fetch.c:520

5712 msgid "[new branch]"

5713 msgstr ""

5714

5629 -#: builtin/fetch.c:515

5715 +#: builtin/fetch.c:523

5716 msgid "[new ref]"

5717 msgstr ""

5718

5633 -#: builtin/fetch.c:561

5719 +#: builtin/fetch.c:569

5720 msgid "unable to update local ref"

5721 msgstr ""

5722

5637 -#: builtin/fetch.c:561

5723 +#: builtin/fetch.c:569

5724 msgid "forced update"

5725 msgstr ""

5726

5641 -#: builtin/fetch.c:568

5727 +#: builtin/fetch.c:576

5728 msgid "(non-fast-forward)"

5729 msgstr ""

5730

5645 -#: builtin/fetch.c:602 builtin/fetch.c:843

5731 +#: builtin/fetch.c:610 builtin/fetch.c:851

5732 #, c-format

5733 msgid "cannot open %s: %s\n"

5734 msgstr ""

5735

5650 -#: builtin/fetch.c:611

5736 +#: builtin/fetch.c:619

5737 #, c-format

5738 msgid "%s did not send all necessary objects\n"

5739 msgstr ""

5740

5655 -#: builtin/fetch.c:629

5741 +#: builtin/fetch.c:637

5742 #, c-format

5743 msgid "reject %s because shallow roots are not allowed to be updated"

5744 msgstr ""

5745

5660 -#: builtin/fetch.c:716 builtin/fetch.c:808

5746 +#: builtin/fetch.c:724 builtin/fetch.c:816

5747 #, c-format

5748 msgid "From %.*s\n"

5749 msgstr ""

5750

5665 -#: builtin/fetch.c:727

5751 +#: builtin/fetch.c:735

5752 #, c-format

5753 msgid ""

5754 "some local refs could not be updated; try running\n"

5755 " 'git remote prune %s' to remove any old, conflicting branches"

5756 msgstr ""

5757

5672 -#: builtin/fetch.c:779

5758 +#: builtin/fetch.c:787

5759 #, c-format

5760 msgid " (%s will become dangling)"

5761 msgstr ""

5762

5677 -#: builtin/fetch.c:780

5763 +#: builtin/fetch.c:788

5764 #, c-format

5765 msgid " (%s has become dangling)"

5766 msgstr ""

5767

5682 -#: builtin/fetch.c:812

5768 +#: builtin/fetch.c:820

5769 msgid "[deleted]"

5770 msgstr ""

5771

5686 -#: builtin/fetch.c:813 builtin/remote.c:1040

5772 +#: builtin/fetch.c:821 builtin/remote.c:1025

5773 msgid "(none)"

5774 msgstr ""

5775

5690 -#: builtin/fetch.c:833

5776 +#: builtin/fetch.c:841

5777 #, c-format

5778 msgid "Refusing to fetch into current branch %s of non-bare repository"

5779 msgstr ""

5780

5695 -#: builtin/fetch.c:852

5781 +#: builtin/fetch.c:860

5782 #, c-format

5783 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5784 msgstr ""

5785

5700 -#: builtin/fetch.c:855

5786 +#: builtin/fetch.c:863

5787 #, c-format

5788 msgid "Option \"%s\" is ignored for %s\n"

5789 msgstr ""

5790

5705 -#: builtin/fetch.c:911

5791 +#: builtin/fetch.c:920

5792 #, c-format

5793 msgid "Don't know how to fetch from %s"

5794 msgstr ""

5795

5710 -#: builtin/fetch.c:1072

5796 +#: builtin/fetch.c:1080

5797 #, c-format

5798 msgid "Fetching %s\n"

5799 msgstr ""

5800

5715 -#: builtin/fetch.c:1074 builtin/remote.c:96

5801 +#: builtin/fetch.c:1082 builtin/remote.c:96

5802 #, c-format

5803 msgid "Could not fetch %s"

5804 msgstr ""

5805

5720 -#: builtin/fetch.c:1092

5806 +#: builtin/fetch.c:1100

5807 msgid ""

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

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

5810 msgstr ""

5811

5726 -#: builtin/fetch.c:1115

5812 +#: builtin/fetch.c:1123

5813 msgid "You need to specify a tag name."

5814 msgstr ""

5815

5730 -#: builtin/fetch.c:1157

5816 +#: builtin/fetch.c:1165

5817 msgid "--depth and --unshallow cannot be used together"

5818 msgstr ""

5819

5734 -#: builtin/fetch.c:1159

5820 +#: builtin/fetch.c:1167

5821 msgid "--unshallow on a complete repository does not make sense"

5822 msgstr ""

5823

5738 -#: builtin/fetch.c:1179

5824 +#: builtin/fetch.c:1187

5825 msgid "fetch --all does not take a repository argument"

5826 msgstr ""

5827

5742 -#: builtin/fetch.c:1181

5828 +#: builtin/fetch.c:1189

5829 msgid "fetch --all does not make sense with refspecs"

5830 msgstr ""

5831

5746 -#: builtin/fetch.c:1192

5832 +#: builtin/fetch.c:1200

5833 #, c-format

5834 msgid "No such remote or remote group: %s"

5835 msgstr ""

5836

5751 -#: builtin/fetch.c:1200

5837 +#: builtin/fetch.c:1208

5838 msgid "Fetching a group and specifying refspecs does not make sense"

5839 msgstr ""

5840

@@ -5963,259 +6049,273 @@ msgstr ""

6049 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

6050 msgstr ""

6051

5966 -#: builtin/grep.c:218

6052 +#: builtin/grep.c:219

6053 #, c-format

6054 msgid "grep: failed to create thread: %s"

6055 msgstr ""

6056

5971 -#: builtin/grep.c:441 builtin/grep.c:476

6057 +#: builtin/grep.c:277

6058 +#, c-format

6059 +msgid "invalid number of threads specified (%d) for %s"

6060 +msgstr ""

6061 +

6062 +#: builtin/grep.c:452 builtin/grep.c:487

6063 #, c-format

6064 msgid "unable to read tree (%s)"

6065 msgstr ""

6066

5976 -#: builtin/grep.c:491

6067 +#: builtin/grep.c:502

6068 #, c-format

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

6070 msgstr ""

6071

5981 -#: builtin/grep.c:547

6072 +#: builtin/grep.c:558

6073 #, c-format

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

6075 msgstr ""

6076

5986 -#: builtin/grep.c:564

6077 +#: builtin/grep.c:575

6078 #, c-format

6079 msgid "cannot open '%s'"

6080 msgstr ""

6081

5991 -#: builtin/grep.c:633

6082 +#: builtin/grep.c:644

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

6084 msgstr ""

6085

5995 -#: builtin/grep.c:635

6086 +#: builtin/grep.c:646

6087 msgid "find in contents not managed by git"

6088 msgstr ""

6089

5999 -#: builtin/grep.c:637

6090 +#: builtin/grep.c:648

6091 msgid "search in both tracked and untracked files"

6092 msgstr ""

6093

6003 -#: builtin/grep.c:639

6094 +#: builtin/grep.c:650

6095 msgid "ignore files specified via '.gitignore'"

6096 msgstr ""

6097

6007 -#: builtin/grep.c:642

6098 +#: builtin/grep.c:653

6099 msgid "show non-matching lines"

6100 msgstr ""

6101

6011 -#: builtin/grep.c:644

6102 +#: builtin/grep.c:655

6103 msgid "case insensitive matching"

6104 msgstr ""

6105

6015 -#: builtin/grep.c:646

6106 +#: builtin/grep.c:657

6107 msgid "match patterns only at word boundaries"

6108 msgstr ""

6109

6019 -#: builtin/grep.c:648

6110 +#: builtin/grep.c:659

6111 msgid "process binary files as text"

6112 msgstr ""

6113

6023 -#: builtin/grep.c:650

6114 +#: builtin/grep.c:661

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

6116 msgstr ""

6117

6027 -#: builtin/grep.c:653

6118 +#: builtin/grep.c:664

6119 msgid "process binary files with textconv filters"

6120 msgstr ""

6121

6031 -#: builtin/grep.c:655

6122 +#: builtin/grep.c:666

6123 msgid "descend at most <depth> levels"

6124 msgstr ""

6125

6035 -#: builtin/grep.c:659

6126 +#: builtin/grep.c:670

6127 msgid "use extended POSIX regular expressions"

6128 msgstr ""

6129

6039 -#: builtin/grep.c:662

6130 +#: builtin/grep.c:673

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

6132 msgstr ""

6133

6043 -#: builtin/grep.c:665

6134 +#: builtin/grep.c:676

6135 msgid "interpret patterns as fixed strings"

6136 msgstr ""

6137

6047 -#: builtin/grep.c:668

6138 +#: builtin/grep.c:679

6139 msgid "use Perl-compatible regular expressions"

6140 msgstr ""

6141

6051 -#: builtin/grep.c:671

6142 +#: builtin/grep.c:682

6143 msgid "show line numbers"

6144 msgstr ""

6145

6055 -#: builtin/grep.c:672

6146 +#: builtin/grep.c:683

6147 msgid "don't show filenames"

6148 msgstr ""

6149

6059 -#: builtin/grep.c:673

6150 +#: builtin/grep.c:684

6151 msgid "show filenames"

6152 msgstr ""

6153

6063 -#: builtin/grep.c:675

6154 +#: builtin/grep.c:686

6155 msgid "show filenames relative to top directory"

6156 msgstr ""

6157

6067 -#: builtin/grep.c:677

6158 +#: builtin/grep.c:688

6159 msgid "show only filenames instead of matching lines"

6160 msgstr ""

6161

6071 -#: builtin/grep.c:679

6162 +#: builtin/grep.c:690

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

6164 msgstr ""

6165

6075 -#: builtin/grep.c:682

6166 +#: builtin/grep.c:693

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

6168 msgstr ""

6169

6079 -#: builtin/grep.c:684

6170 +#: builtin/grep.c:695

6171 msgid "print NUL after filenames"

6172 msgstr ""

6173

6083 -#: builtin/grep.c:686

6174 +#: builtin/grep.c:697

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

6176 msgstr ""

6177

6087 -#: builtin/grep.c:687

6178 +#: builtin/grep.c:698

6179 msgid "highlight matches"

6180 msgstr ""

6181

6091 -#: builtin/grep.c:689

6182 +#: builtin/grep.c:700

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

6184 msgstr ""

6185

6095 -#: builtin/grep.c:691

6186 +#: builtin/grep.c:702

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

6188 msgstr ""

6189

6099 -#: builtin/grep.c:694

6190 +#: builtin/grep.c:705

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

6192 msgstr ""

6193

6103 -#: builtin/grep.c:697

6194 +#: builtin/grep.c:708

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

6196 msgstr ""

6197

6107 -#: builtin/grep.c:699

6198 +#: builtin/grep.c:710

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

6200 msgstr ""

6201

6111 -#: builtin/grep.c:700

6202 +#: builtin/grep.c:712

6203 +msgid "use <n> worker threads"

6204 +msgstr ""

6205 +

6206 +#: builtin/grep.c:713

6207 msgid "shortcut for -C NUM"

6208 msgstr ""

6209

6115 -#: builtin/grep.c:703

6210 +#: builtin/grep.c:716

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

6212 msgstr ""

6213

6119 -#: builtin/grep.c:705

6214 +#: builtin/grep.c:718

6215 msgid "show the surrounding function"

6216 msgstr ""

6217

6123 -#: builtin/grep.c:708

6218 +#: builtin/grep.c:721

6219 msgid "read patterns from file"

6220 msgstr ""

6221

6127 -#: builtin/grep.c:710

6222 +#: builtin/grep.c:723

6223 msgid "match <pattern>"

6224 msgstr ""

6225

6131 -#: builtin/grep.c:712

6226 +#: builtin/grep.c:725

6227 msgid "combine patterns specified with -e"

6228 msgstr ""

6229

6135 -#: builtin/grep.c:724

6230 +#: builtin/grep.c:737

6231 msgid "indicate hit with exit status without output"

6232 msgstr ""

6233

6139 -#: builtin/grep.c:726

6234 +#: builtin/grep.c:739

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

6236 msgstr ""

6237

6143 -#: builtin/grep.c:728

6238 +#: builtin/grep.c:741

6239 msgid "show parse tree for grep expression"

6240 msgstr ""

6241

6147 -#: builtin/grep.c:732

6242 +#: builtin/grep.c:745

6243 msgid "pager"

6244 msgstr ""

6245

6151 -#: builtin/grep.c:732

6246 +#: builtin/grep.c:745

6247 msgid "show matching files in the pager"

6248 msgstr ""

6249

6155 -#: builtin/grep.c:735

6250 +#: builtin/grep.c:748

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

6252 msgstr ""

6253

6159 -#: builtin/grep.c:793

6254 +#: builtin/grep.c:811

6255 msgid "no pattern given."

6256 msgstr ""

6257

6163 -#: builtin/grep.c:851

6258 +#: builtin/grep.c:843 builtin/index-pack.c:1475

6259 +#, c-format

6260 +msgid "invalid number of threads specified (%d)"

6261 +msgstr ""

6262 +

6263 +#: builtin/grep.c:873

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

6265 msgstr ""

6266

6167 -#: builtin/grep.c:877

6267 +#: builtin/grep.c:899

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

6269 msgstr ""

6270

6171 -#: builtin/grep.c:882

6271 +#: builtin/grep.c:904

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

6273 msgstr ""

6274

6175 -#: builtin/grep.c:885

6275 +#: builtin/grep.c:907

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

6277 msgstr ""

6278

6179 -#: builtin/grep.c:893

6279 +#: builtin/grep.c:915

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

6281 msgstr ""

6282

6183 -#: builtin/hash-object.c:80

6283 +#: builtin/hash-object.c:81

6284 msgid ""

6285 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6286 "[--] <file>..."

6287 msgstr ""

6288

6189 -#: builtin/hash-object.c:81

6289 +#: builtin/hash-object.c:82

6290 msgid "git hash-object --stdin-paths"

6291 msgstr ""

6292

6193 -#: builtin/hash-object.c:92

6293 +#: builtin/hash-object.c:93

6294 msgid "type"

6295 msgstr ""

6296

6197 -#: builtin/hash-object.c:92

6297 +#: builtin/hash-object.c:93

6298 msgid "object type"

6299 msgstr ""

6300

6201 -#: builtin/hash-object.c:93

6301 +#: builtin/hash-object.c:94

6302 msgid "write the object into the object database"

6303 msgstr ""

6304

6205 -#: builtin/hash-object.c:95

6305 +#: builtin/hash-object.c:96

6306 msgid "read the object from stdin"

6307 msgstr ""

6308

6209 -#: builtin/hash-object.c:97

6309 +#: builtin/hash-object.c:98

6310 msgid "store file as is without filters"

6311 msgstr ""

6312

6213 -#: builtin/hash-object.c:98

6313 +#: builtin/hash-object.c:99

6314 msgid ""

6315 "just hash any random garbage to create corrupt objects for debugging Git"

6316 msgstr ""

6317

6218 -#: builtin/hash-object.c:99

6318 +#: builtin/hash-object.c:100

6319 msgid "process file as it were from this path"

6320 msgstr ""

6321

@@ -6266,75 +6366,75 @@ msgstr ""

6366 msgid "failed to exec '%s': %s"

6367 msgstr ""

6368

6269 -#: builtin/help.c:208

6369 +#: builtin/help.c:205

6370 #, c-format

6371 msgid ""

6372 "'%s': path for unsupported man viewer.\n"

6373 "Please consider using 'man.<tool>.cmd' instead."

6374 msgstr ""

6375

6276 -#: builtin/help.c:220

6376 +#: builtin/help.c:217

6377 #, c-format

6378 msgid ""

6379 "'%s': cmd for supported man viewer.\n"

6380 "Please consider using 'man.<tool>.path' instead."

6381 msgstr ""

6382

6283 -#: builtin/help.c:337

6383 +#: builtin/help.c:334

6384 #, c-format

6385 msgid "'%s': unknown man viewer."

6386 msgstr ""

6387

6288 -#: builtin/help.c:354

6388 +#: builtin/help.c:351

6389 msgid "no man viewer handled the request"

6390 msgstr ""

6391

6292 -#: builtin/help.c:362

6392 +#: builtin/help.c:359

6393 msgid "no info viewer handled the request"

6394 msgstr ""

6395

6296 -#: builtin/help.c:411

6396 +#: builtin/help.c:408

6397 msgid "Defining attributes per path"

6398 msgstr ""

6399

6300 -#: builtin/help.c:412

6400 +#: builtin/help.c:409

6401 msgid "Everyday Git With 20 Commands Or So"

6402 msgstr ""

6403

6304 -#: builtin/help.c:413

6404 +#: builtin/help.c:410

6405 msgid "A Git glossary"

6406 msgstr ""

6407

6308 -#: builtin/help.c:414

6408 +#: builtin/help.c:411

6409 msgid "Specifies intentionally untracked files to ignore"

6410 msgstr ""

6411

6312 -#: builtin/help.c:415

6412 +#: builtin/help.c:412

6413 msgid "Defining submodule properties"

6414 msgstr ""

6415

6316 -#: builtin/help.c:416

6416 +#: builtin/help.c:413

6417 msgid "Specifying revisions and ranges for Git"

6418 msgstr ""

6419

6320 -#: builtin/help.c:417

6420 +#: builtin/help.c:414

6421 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

6422 msgstr ""

6423

6324 -#: builtin/help.c:418

6424 +#: builtin/help.c:415

6425 msgid "An overview of recommended workflows with Git"

6426 msgstr ""

6427

6328 -#: builtin/help.c:430

6428 +#: builtin/help.c:427

6429 msgid "The common Git guides are:\n"

6430 msgstr ""

6431

6332 -#: builtin/help.c:451 builtin/help.c:468

6432 +#: builtin/help.c:448 builtin/help.c:465

6433 #, c-format

6434 msgid "usage: %s%s"

6435 msgstr ""

6436

6337 -#: builtin/help.c:484

6437 +#: builtin/help.c:481

6438 #, c-format

6439 msgid "`git %s' is aliased to `%s'"

6440 msgstr ""

@@ -6570,11 +6670,6 @@ msgstr ""

6670 msgid "bad pack.indexversion=%<PRIu32>"

6671 msgstr ""

6672

6573 -#: builtin/index-pack.c:1475

6574 -#, c-format

6575 -msgid "invalid number of threads specified (%d)"

6576 -msgstr ""

6577 -

6673 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6674 #, c-format

6675 msgid "no threads support, ignoring %s"

@@ -6745,22 +6840,30 @@ msgstr ""

6840

6841 #: builtin/interpret-trailers.c:15

6842 msgid ""

6748 -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

6749 -"[<file>...]"

6843 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

6844 +"<token>[(=|:)<value>])...] [<file>...]"

6845 msgstr ""

6846

6752 -#: builtin/interpret-trailers.c:25

6847 +#: builtin/interpret-trailers.c:26

6848 +msgid "edit files in place"

6849 +msgstr ""

6850 +

6851 +#: builtin/interpret-trailers.c:27

6852 msgid "trim empty trailers"

6853 msgstr ""

6854

6756 -#: builtin/interpret-trailers.c:26

6855 +#: builtin/interpret-trailers.c:28

6856 msgid "trailer"

6857 msgstr ""

6858

6760 -#: builtin/interpret-trailers.c:27

6859 +#: builtin/interpret-trailers.c:29

6860 msgid "trailer(s) to add"

6861 msgstr ""

6862

6863 +#: builtin/interpret-trailers.c:42

6864 +msgid "no input file given for in-place editing"

6865 +msgstr ""

6866 +

6867 #: builtin/log.c:43

6868 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6869 msgstr ""

@@ -6814,325 +6917,372 @@ msgstr ""

6917 msgid "Unknown type: %d"

6918 msgstr ""

6919

6817 -#: builtin/log.c:714

6920 +#: builtin/log.c:715

6921 msgid "format.headers without value"

6922 msgstr ""

6923

6821 -#: builtin/log.c:798

6924 +#: builtin/log.c:801

6925 msgid "name of output directory is too long"

6926 msgstr ""

6927

6825 -#: builtin/log.c:813

6928 +#: builtin/log.c:816

6929 #, c-format

6930 msgid "Cannot open patch file %s"

6931 msgstr ""

6932

6830 -#: builtin/log.c:827

6933 +#: builtin/log.c:830

6934 msgid "Need exactly one range."

6935 msgstr ""

6936

6834 -#: builtin/log.c:837

6937 +#: builtin/log.c:840

6938 msgid "Not a range."

6939 msgstr ""

6940

6838 -#: builtin/log.c:943

6941 +#: builtin/log.c:946

6942 msgid "Cover letter needs email format"

6943 msgstr ""

6944

6842 -#: builtin/log.c:1022

6945 +#: builtin/log.c:1025

6946 #, c-format

6947 msgid "insane in-reply-to: %s"

6948 msgstr ""

6949

6847 -#: builtin/log.c:1050

6950 +#: builtin/log.c:1053

6951 msgid "git format-patch [<options>] [<since> | <revision-range>]"

6952 msgstr ""

6953

6851 -#: builtin/log.c:1095

6954 +#: builtin/log.c:1098

6955 msgid "Two output directories?"

6956 msgstr ""

6957

6855 -#: builtin/log.c:1211

6958 +#: builtin/log.c:1214

6959 msgid "use [PATCH n/m] even with a single patch"

6960 msgstr ""

6961

6859 -#: builtin/log.c:1214

6962 +#: builtin/log.c:1217

6963 msgid "use [PATCH] even with multiple patches"

6964 msgstr ""

6965

6863 -#: builtin/log.c:1218

6966 +#: builtin/log.c:1221

6967 msgid "print patches to standard out"

6968 msgstr ""

6969

6867 -#: builtin/log.c:1220

6970 +#: builtin/log.c:1223

6971 msgid "generate a cover letter"

6972 msgstr ""

6973

6871 -#: builtin/log.c:1222

6974 +#: builtin/log.c:1225

6975 msgid "use simple number sequence for output file names"

6976 msgstr ""

6977

6875 -#: builtin/log.c:1223

6978 +#: builtin/log.c:1226

6979 msgid "sfx"

6980 msgstr ""

6981

6879 -#: builtin/log.c:1224

6982 +#: builtin/log.c:1227

6983 msgid "use <sfx> instead of '.patch'"

6984 msgstr ""

6985

6883 -#: builtin/log.c:1226

6986 +#: builtin/log.c:1229

6987 msgid "start numbering patches at <n> instead of 1"

6988 msgstr ""

6989

6887 -#: builtin/log.c:1228

6990 +#: builtin/log.c:1231

6991 msgid "mark the series as Nth re-roll"

6992 msgstr ""

6993

6891 -#: builtin/log.c:1230

6994 +#: builtin/log.c:1233

6995 msgid "Use [<prefix>] instead of [PATCH]"

6996 msgstr ""

6997

6895 -#: builtin/log.c:1233

6998 +#: builtin/log.c:1236

6999 msgid "store resulting files in <dir>"

7000 msgstr ""

7001

6899 -#: builtin/log.c:1236

7002 +#: builtin/log.c:1239

7003 msgid "don't strip/add [PATCH]"

7004 msgstr ""

7005

6903 -#: builtin/log.c:1239

7006 +#: builtin/log.c:1242

7007 msgid "don't output binary diffs"

7008 msgstr ""

7009

6907 -#: builtin/log.c:1241

7010 +#: builtin/log.c:1244

7011 msgid "output all-zero hash in From header"

7012 msgstr ""

7013

6911 -#: builtin/log.c:1243

7014 +#: builtin/log.c:1246

7015 msgid "don't include a patch matching a commit upstream"

7016 msgstr ""

7017

6915 -#: builtin/log.c:1245

7018 +#: builtin/log.c:1248

7019 msgid "show patch format instead of default (patch + stat)"

7020 msgstr ""

7021

6919 -#: builtin/log.c:1247

7022 +#: builtin/log.c:1250

7023 msgid "Messaging"

7024 msgstr ""

7025

6923 -#: builtin/log.c:1248

7026 +#: builtin/log.c:1251

7027 msgid "header"

7028 msgstr ""

7029

6927 -#: builtin/log.c:1249

7030 +#: builtin/log.c:1252

7031 msgid "add email header"

7032 msgstr ""

7033

6931 -#: builtin/log.c:1250 builtin/log.c:1252

7034 +#: builtin/log.c:1253 builtin/log.c:1255

7035 msgid "email"

7036 msgstr ""

7037

6935 -#: builtin/log.c:1250

7038 +#: builtin/log.c:1253

7039 msgid "add To: header"

7040 msgstr ""

7041

6939 -#: builtin/log.c:1252

7042 +#: builtin/log.c:1255

7043 msgid "add Cc: header"

7044 msgstr ""

7045

6943 -#: builtin/log.c:1254

7046 +#: builtin/log.c:1257

7047 msgid "ident"

7048 msgstr ""

7049

6947 -#: builtin/log.c:1255

7050 +#: builtin/log.c:1258

7051 msgid "set From address to <ident> (or committer ident if absent)"

7052 msgstr ""

7053

6951 -#: builtin/log.c:1257

7054 +#: builtin/log.c:1260

7055 msgid "message-id"

7056 msgstr ""

7057

6955 -#: builtin/log.c:1258

7058 +#: builtin/log.c:1261

7059 msgid "make first mail a reply to <message-id>"

7060 msgstr ""

7061

6959 -#: builtin/log.c:1259 builtin/log.c:1262

7062 +#: builtin/log.c:1262 builtin/log.c:1265

7063 msgid "boundary"

7064 msgstr ""

7065

6963 -#: builtin/log.c:1260

7066 +#: builtin/log.c:1263

7067 msgid "attach the patch"

7068 msgstr ""

7069

6967 -#: builtin/log.c:1263

7070 +#: builtin/log.c:1266

7071 msgid "inline the patch"

7072 msgstr ""

7073

6971 -#: builtin/log.c:1267

7074 +#: builtin/log.c:1270

7075 msgid "enable message threading, styles: shallow, deep"

7076 msgstr ""

7077

6975 -#: builtin/log.c:1269

7078 +#: builtin/log.c:1272

7079 msgid "signature"

7080 msgstr ""

7081

6979 -#: builtin/log.c:1270

7082 +#: builtin/log.c:1273

7083 msgid "add a signature"

7084 msgstr ""

7085

6983 -#: builtin/log.c:1272

7086 +#: builtin/log.c:1275

7087 msgid "add a signature from a file"

7088 msgstr ""

7089

6987 -#: builtin/log.c:1273

7090 +#: builtin/log.c:1276

7091 msgid "don't print the patch filenames"

7092 msgstr ""

7093

6991 -#: builtin/log.c:1362

7094 +#: builtin/log.c:1365

7095 msgid "-n and -k are mutually exclusive."

7096 msgstr ""

7097

6995 -#: builtin/log.c:1364

7098 +#: builtin/log.c:1367

7099 msgid "--subject-prefix and -k are mutually exclusive."

7100 msgstr ""

7101

6999 -#: builtin/log.c:1372

7102 +#: builtin/log.c:1375

7103 msgid "--name-only does not make sense"

7104 msgstr ""

7105

7003 -#: builtin/log.c:1374

7106 +#: builtin/log.c:1377

7107 msgid "--name-status does not make sense"

7108 msgstr ""

7109

7007 -#: builtin/log.c:1376

7110 +#: builtin/log.c:1379

7111 msgid "--check does not make sense"

7112 msgstr ""

7113

7011 -#: builtin/log.c:1401

7114 +#: builtin/log.c:1407

7115 msgid "standard output, or directory, which one?"

7116 msgstr ""

7117

7015 -#: builtin/log.c:1403

7118 +#: builtin/log.c:1409

7119 #, c-format

7120 msgid "Could not create directory '%s'"

7121 msgstr ""

7122

7020 -#: builtin/log.c:1500

7123 +#: builtin/log.c:1506

7124 #, c-format

7125 msgid "unable to read signature file '%s'"

7126 msgstr ""

7127

7025 -#: builtin/log.c:1563

7128 +#: builtin/log.c:1569

7129 msgid "Failed to create output files"

7130 msgstr ""

7131

7029 -#: builtin/log.c:1611

7132 +#: builtin/log.c:1617

7133 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7134 msgstr ""

7135

7033 -#: builtin/log.c:1665

7136 +#: builtin/log.c:1671

7137 #, c-format

7138 msgid ""

7139 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

7140 msgstr ""

7141

7039 -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7142 +#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696

7143 #, c-format

7144 msgid "Unknown commit %s"

7145 msgstr ""

7146

7044 -#: builtin/ls-files.c:358

7147 +#: builtin/ls-files.c:378

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

7149 msgstr ""

7150

7048 -#: builtin/ls-files.c:415

7151 +#: builtin/ls-files.c:427

7152 msgid "identify the file status with tags"

7153 msgstr ""

7154

7052 -#: builtin/ls-files.c:417

7155 +#: builtin/ls-files.c:429

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

7157 msgstr ""

7158

7056 -#: builtin/ls-files.c:419

7159 +#: builtin/ls-files.c:431

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

7161 msgstr ""

7162

7060 -#: builtin/ls-files.c:421

7163 +#: builtin/ls-files.c:433

7164 msgid "show deleted files in the output"

7165 msgstr ""

7166

7064 -#: builtin/ls-files.c:423

7167 +#: builtin/ls-files.c:435

7168 msgid "show modified files in the output"

7169 msgstr ""

7170

7068 -#: builtin/ls-files.c:425

7171 +#: builtin/ls-files.c:437

7172 msgid "show other files in the output"

7173 msgstr ""

7174

7072 -#: builtin/ls-files.c:427

7175 +#: builtin/ls-files.c:439

7176 msgid "show ignored files in the output"

7177 msgstr ""

7178

7076 -#: builtin/ls-files.c:430

7179 +#: builtin/ls-files.c:442

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

7181 msgstr ""

7182

7080 -#: builtin/ls-files.c:432

7183 +#: builtin/ls-files.c:444

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

7185 msgstr ""

7186

7084 -#: builtin/ls-files.c:434

7187 +#: builtin/ls-files.c:446

7188 msgid "show 'other' directories' names only"

7189 msgstr ""

7190

7088 -#: builtin/ls-files.c:437

7191 +#: builtin/ls-files.c:448

7192 +msgid "show line endings of files"

7193 +msgstr ""

7194 +

7195 +#: builtin/ls-files.c:450

7196 msgid "don't show empty directories"

7197 msgstr ""

7198

7092 -#: builtin/ls-files.c:440

7199 +#: builtin/ls-files.c:453

7200 msgid "show unmerged files in the output"

7201 msgstr ""

7202

7096 -#: builtin/ls-files.c:442

7203 +#: builtin/ls-files.c:455

7204 msgid "show resolve-undo information"

7205 msgstr ""

7206

7100 -#: builtin/ls-files.c:444

7207 +#: builtin/ls-files.c:457

7208 msgid "skip files matching pattern"

7209 msgstr ""

7210

7104 -#: builtin/ls-files.c:447

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

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

7213 msgstr ""

7214

7108 -#: builtin/ls-files.c:450

7215 +#: builtin/ls-files.c:463

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

7217 msgstr ""

7218

7112 -#: builtin/ls-files.c:452

7219 +#: builtin/ls-files.c:465

7220 msgid "add the standard git exclusions"

7221 msgstr ""

7222

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

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

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

7225 msgstr ""

7226

7120 -#: builtin/ls-files.c:458

7227 +#: builtin/ls-files.c:471

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

7229 msgstr ""

7230

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

7231 +#: builtin/ls-files.c:472

7232 msgid "tree-ish"

7233 msgstr ""

7234

7128 -#: builtin/ls-files.c:460

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

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

7237 msgstr ""

7238

7132 -#: builtin/ls-files.c:462

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

7240 msgid "show debugging data"

7241 msgstr ""

7242

7243 +#: builtin/ls-remote.c:7

7244 +msgid ""

7245 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7246 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7247 +" [--symref] [<repository> [<refs>...]]"

7248 +msgstr ""

7249 +

7250 +#: builtin/ls-remote.c:50

7251 +msgid "do not print remote URL"

7252 +msgstr ""

7253 +

7254 +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53

7255 +msgid "exec"

7256 +msgstr ""

7257 +

7258 +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54

7259 +msgid "path of git-upload-pack on the remote host"

7260 +msgstr ""

7261 +

7262 +#: builtin/ls-remote.c:56

7263 +msgid "limit to tags"

7264 +msgstr ""

7265 +

7266 +#: builtin/ls-remote.c:57

7267 +msgid "limit to heads"

7268 +msgstr ""

7269 +

7270 +#: builtin/ls-remote.c:58

7271 +msgid "do not show peeled tags"

7272 +msgstr ""

7273 +

7274 +#: builtin/ls-remote.c:60

7275 +msgid "take url.<base>.insteadOf into account"

7276 +msgstr ""

7277 +

7278 +#: builtin/ls-remote.c:62

7279 +msgid "exit with exit code 2 if no matching refs are found"

7280 +msgstr ""

7281 +

7282 +#: builtin/ls-remote.c:64

7283 +msgid "show underlying ref in addition to the object pointed by it"

7284 +msgstr ""

7285 +

7286 #: builtin/ls-tree.c:28

7287 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

7288 msgstr ""

@@ -7200,31 +7350,31 @@ msgstr ""

7350 msgid "Available custom strategies are:"

7351 msgstr ""

7352

7203 -#: builtin/merge.c:193 builtin/pull.c:119

7353 +#: builtin/merge.c:193 builtin/pull.c:123

7354 msgid "do not show a diffstat at the end of the merge"

7355 msgstr ""

7356

7207 -#: builtin/merge.c:196 builtin/pull.c:122

7357 +#: builtin/merge.c:196 builtin/pull.c:126

7358 msgid "show a diffstat at the end of the merge"

7359 msgstr ""

7360

7211 -#: builtin/merge.c:197 builtin/pull.c:125

7361 +#: builtin/merge.c:197 builtin/pull.c:129

7362 msgid "(synonym to --stat)"

7363 msgstr ""

7364

7215 -#: builtin/merge.c:199 builtin/pull.c:128

7365 +#: builtin/merge.c:199 builtin/pull.c:132

7366 msgid "add (at most <n>) entries from shortlog to merge commit message"

7367 msgstr ""

7368

7219 -#: builtin/merge.c:202 builtin/pull.c:131

7369 +#: builtin/merge.c:202 builtin/pull.c:135

7370 msgid "create a single commit instead of doing a merge"

7371 msgstr ""

7372

7223 -#: builtin/merge.c:204 builtin/pull.c:134

7373 +#: builtin/merge.c:204 builtin/pull.c:138

7374 msgid "perform a commit if the merge succeeds (default)"

7375 msgstr ""

7376

7227 -#: builtin/merge.c:206 builtin/pull.c:137

7377 +#: builtin/merge.c:206 builtin/pull.c:141

7378 msgid "edit message before committing"

7379 msgstr ""

7380

@@ -7232,7 +7382,7 @@ msgstr ""

7382 msgid "allow fast-forward (default)"

7383 msgstr ""

7384

7235 -#: builtin/merge.c:209 builtin/pull.c:143

7385 +#: builtin/merge.c:209 builtin/pull.c:147

7386 msgid "abort if fast-forward is not possible"

7387 msgstr ""

7388

@@ -7240,20 +7390,20 @@ msgstr ""

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

7391 msgstr ""

7392

7243 -#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148

7393 +#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152

7394 #: builtin/revert.c:89

7395 msgid "strategy"

7396 msgstr ""

7397

7248 -#: builtin/merge.c:215 builtin/pull.c:149

7398 +#: builtin/merge.c:215 builtin/pull.c:153

7399 msgid "merge strategy to use"

7400 msgstr ""

7401

7252 -#: builtin/merge.c:216 builtin/pull.c:152

7402 +#: builtin/merge.c:216 builtin/pull.c:156

7403 msgid "option=value"

7404 msgstr ""

7405

7256 -#: builtin/merge.c:217 builtin/pull.c:153

7406 +#: builtin/merge.c:217 builtin/pull.c:157

7407 msgid "option for selected merge strategy"

7408 msgstr ""

7409

@@ -7291,8 +7441,8 @@ msgstr ""

7441 msgid "Squash commit -- not updating HEAD\n"

7442 msgstr ""

7443

7294 -#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

7295 -#: builtin/merge.c:988

7444 +#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976

7445 +#: builtin/merge.c:989

7446 #, c-format

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

7448 msgstr ""

@@ -7310,41 +7460,41 @@ msgstr ""

7460 msgid "No merge message -- not updating HEAD\n"

7461 msgstr ""

7462

7313 -#: builtin/merge.c:447

7463 +#: builtin/merge.c:448

7464 #, c-format

7465 msgid "'%s' does not point to a commit"

7466 msgstr ""

7467

7318 -#: builtin/merge.c:537

7468 +#: builtin/merge.c:538

7469 #, c-format

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

7471 msgstr ""

7472

7323 -#: builtin/merge.c:656

7473 +#: builtin/merge.c:657

7474 msgid "Not handling anything other than two heads merge."

7475 msgstr ""

7476

7327 -#: builtin/merge.c:670

7477 +#: builtin/merge.c:671

7478 #, c-format

7479 msgid "Unknown option for merge-recursive: -X%s"

7480 msgstr ""

7481

7332 -#: builtin/merge.c:683

7482 +#: builtin/merge.c:684

7483 #, c-format

7484 msgid "unable to write %s"

7485 msgstr ""

7486

7337 -#: builtin/merge.c:772

7487 +#: builtin/merge.c:773

7488 #, c-format

7489 msgid "Could not read from '%s'"

7490 msgstr ""

7491

7342 -#: builtin/merge.c:781

7492 +#: builtin/merge.c:782

7493 #, c-format

l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)