f4f2c8f87e · 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-09-15 06:45+0800\n"

11 +"POT-Creation-Date: 2015-12-11 23:36+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,12 +29,12 @@ msgid ""

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

30 msgstr ""

31

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

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

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

34 msgstr ""

35

36 #: advice.c:103

37 -msgid "Please, commit your changes before you can merge."

37 +msgid "Please, commit your changes before merging."

38 msgstr ""

39

40 #: advice.c:104

@@ -58,76 +58,76 @@ msgstr ""

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

59 msgstr ""

60

61 -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

61 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

62 #, c-format

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

64 msgstr ""

65

66 -#: archive.c:428

66 +#: archive.c:429

67 msgid "fmt"

68 msgstr ""

69

70 -#: archive.c:428

70 +#: archive.c:429

71 msgid "archive format"

72 msgstr ""

73

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

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

75 msgid "prefix"

76 msgstr ""

77

78 -#: archive.c:430

78 +#: archive.c:431

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

80 msgstr ""

81

82 -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

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

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

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

87 msgid "file"

88 msgstr ""

89

90 -#: archive.c:432 builtin/archive.c:89

90 +#: archive.c:433 builtin/archive.c:89

91 msgid "write the archive to this file"

92 msgstr ""

93

94 -#: archive.c:434

94 +#: archive.c:435

95 msgid "read .gitattributes in working directory"

96 msgstr ""

97

98 -#: archive.c:435

98 +#: archive.c:436

99 msgid "report archived files on stderr"

100 msgstr ""

101

102 -#: archive.c:436

102 +#: archive.c:437

103 msgid "store only"

104 msgstr ""

105

106 -#: archive.c:437

106 +#: archive.c:438

107 msgid "compress faster"

108 msgstr ""

109

110 -#: archive.c:445

110 +#: archive.c:446

111 msgid "compress better"

112 msgstr ""

113

114 -#: archive.c:448

114 +#: archive.c:449

115 msgid "list supported archive formats"

116 msgstr ""

117

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

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

119 msgid "repo"

120 msgstr ""

121

122 -#: archive.c:451 builtin/archive.c:91

122 +#: archive.c:452 builtin/archive.c:91

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

124 msgstr ""

125

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

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

127 msgid "command"

128 msgstr ""

129

130 -#: archive.c:453 builtin/archive.c:93

130 +#: archive.c:454 builtin/archive.c:93

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

132 msgstr ""

133

@@ -137,81 +137,81 @@ msgid ""

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

138 msgstr ""

139

140 -#: branch.c:60

140 +#: branch.c:61

141 #, c-format

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

143 msgstr ""

144

145 -#: branch.c:83

145 +#: branch.c:84

146 #, c-format

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

148 msgstr ""

149

150 -#: branch.c:84

150 +#: branch.c:85

151 #, c-format

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

153 msgstr ""

154

155 -#: branch.c:88

155 +#: branch.c:89

156 #, c-format

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

158 msgstr ""

159

160 -#: branch.c:89

160 +#: branch.c:90

161 #, c-format

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

163 msgstr ""

164

165 -#: branch.c:94

165 +#: branch.c:95

166 #, c-format

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

168 msgstr ""

169

170 -#: branch.c:95

170 +#: branch.c:96

171 #, c-format

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

173 msgstr ""

174

175 -#: branch.c:99

175 +#: branch.c:100

176 #, c-format

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

178 msgstr ""

179

180 -#: branch.c:100

180 +#: branch.c:101

181 #, c-format

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

183 msgstr ""

184

185 -#: branch.c:133

185 +#: branch.c:134

186 #, c-format

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

188 msgstr ""

189

190 -#: branch.c:162

190 +#: branch.c:163

191 #, c-format

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

193 msgstr ""

194

195 -#: branch.c:167

195 +#: branch.c:168

196 #, c-format

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

198 msgstr ""

199

200 -#: branch.c:175

200 +#: branch.c:176

201 msgid "Cannot force update the current branch."

202 msgstr ""

203

204 -#: branch.c:195

204 +#: branch.c:196

205 #, c-format

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

207 msgstr ""

208

209 -#: branch.c:197

209 +#: branch.c:198

210 #, c-format

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

212 msgstr ""

213

214 -#: branch.c:199

214 +#: branch.c:200

215 msgid ""

216 "\n"

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

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

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

224 msgstr ""

225

226 -#: branch.c:243

226 +#: branch.c:244

227 #, c-format

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

229 msgstr ""

230

231 -#: branch.c:263

231 +#: branch.c:264

232 #, c-format

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

234 msgstr ""

235

236 -#: branch.c:268

236 +#: branch.c:269

237 #, c-format

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

239 msgstr ""

240

241 -#: branch.c:399

241 +#: branch.c:322

242 #, c-format

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

244 msgstr ""

@@ -253,7 +253,7 @@ msgstr ""

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

254 msgstr ""

255

256 -#: bundle.c:87 builtin/commit.c:765

256 +#: bundle.c:87 builtin/commit.c:766

257 #, c-format

258 msgid "could not open '%s'"

259 msgstr ""

@@ -262,9 +262,9 @@ msgstr ""

262 msgid "Repository lacks these prerequisite commits:"

263 msgstr ""

264

265 -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

266 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

267 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

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:1456 builtin/log.c:1689 builtin/merge.c:358

268 #: builtin/shortlog.c:158

269 msgid "revision walk setup failed"

270 msgstr ""

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

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

305 msgstr ""

306

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

307 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

308 #, c-format

309 msgid "unrecognized argument: %s"

310 msgstr ""

@@ -322,13 +322,13 @@ msgstr ""

322 msgid "index-pack died"

323 msgstr ""

324

325 -#: color.c:260

325 +#: color.c:275

326 #, c-format

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

328 msgstr ""

329

330 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

331 -#: builtin/am.c:2128

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

331 +#: builtin/am.c:2149

332 #, c-format

333 msgid "could not parse %s"

334 msgstr ""

@@ -486,54 +486,54 @@ msgstr ""

486 msgid "Performing inexact rename detection"

487 msgstr ""

488

489 -#: diff.c:116

489 +#: diff.c:115

490 #, c-format

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

492 msgstr ""

493

494 -#: diff.c:121

494 +#: diff.c:120

495 #, c-format

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

497 msgstr ""

498

499 -#: diff.c:216

499 +#: diff.c:215

500 #, c-format

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

502 msgstr ""

503

504 -#: diff.c:268

504 +#: diff.c:267

505 #, c-format

506 msgid ""

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

508 "%s"

509 msgstr ""

510

511 -#: diff.c:2998

511 +#: diff.c:3000

512 #, c-format

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

514 msgstr ""

515

516 -#: diff.c:3394

516 +#: diff.c:3396

517 msgid "--follow requires exactly one pathspec"

518 msgstr ""

519

520 -#: diff.c:3557

520 +#: diff.c:3559

521 #, c-format

522 msgid ""

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

524 "%s"

525 msgstr ""

526

527 -#: diff.c:3571

527 +#: diff.c:3573

528 #, c-format

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

530 msgstr ""

531

532 -#: dir.c:1853

532 +#: dir.c:1915

533 msgid "failed to get kernel name and information"

534 msgstr ""

535

536 -#: dir.c:1936

536 +#: dir.c:1998

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

538 msgstr ""

539

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

634 msgid "failed to read the cache"

635 msgstr ""

636

637 -#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

638 -#: builtin/checkout.c:586 builtin/clone.c:715

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

639 msgid "unable to write new index file"

640 msgstr ""

641

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

653 msgid "error building trees"

654 msgstr ""

655

656 -#: merge-recursive.c:687

656 +#: merge-recursive.c:686

657 #, c-format

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

659 msgstr ""

660

661 -#: merge-recursive.c:698

661 +#: merge-recursive.c:697

662 #, c-format

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

664 msgstr ""

665

666 -#: merge-recursive.c:712 merge-recursive.c:733

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

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

668 msgstr ""

669

670 -#: merge-recursive.c:723

670 +#: merge-recursive.c:722

671 #, c-format

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

673 msgstr ""

674

675 -#: merge-recursive.c:763

675 +#: merge-recursive.c:762

676 #, c-format

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

678 msgstr ""

679

680 -#: merge-recursive.c:765

680 +#: merge-recursive.c:764

681 #, c-format

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

683 msgstr ""

684

685 -#: merge-recursive.c:788 builtin/clone.c:364

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

686 #, c-format

687 msgid "failed to open '%s'"

688 msgstr ""

689

690 -#: merge-recursive.c:796

690 +#: merge-recursive.c:795

691 #, c-format

692 msgid "failed to symlink '%s'"

693 msgstr ""

694

695 -#: merge-recursive.c:799

695 +#: merge-recursive.c:798

696 #, c-format

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

698 msgstr ""

699

700 -#: merge-recursive.c:937

700 +#: merge-recursive.c:936

701 msgid "Failed to execute internal merge"

702 msgstr ""

703

704 -#: merge-recursive.c:941

704 +#: merge-recursive.c:940

705 #, c-format

706 msgid "Unable to add %s to database"

707 msgstr ""

708

709 -#: merge-recursive.c:957

709 +#: merge-recursive.c:956

710 msgid "unsupported object type in the tree"

711 msgstr ""

712

713 -#: merge-recursive.c:1032 merge-recursive.c:1046

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

714 #, c-format

715 msgid ""

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

717 "in tree."

718 msgstr ""

719

720 -#: merge-recursive.c:1038 merge-recursive.c:1051

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

721 #, c-format

722 msgid ""

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

724 "in tree at %s."

725 msgstr ""

726

727 -#: merge-recursive.c:1092

727 +#: merge-recursive.c:1091

728 msgid "rename"

729 msgstr ""

730

731 -#: merge-recursive.c:1092

731 +#: merge-recursive.c:1091

732 msgid "renamed"

733 msgstr ""

734

735 -#: merge-recursive.c:1148

735 +#: merge-recursive.c:1147

736 #, c-format

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

738 msgstr ""

739

740 -#: merge-recursive.c:1170

740 +#: merge-recursive.c:1169

741 #, c-format

742 msgid ""

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

744 "\"->\"%s\" in \"%s\"%s"

745 msgstr ""

746

747 -#: merge-recursive.c:1175

747 +#: merge-recursive.c:1174

748 msgid " (left unresolved)"

749 msgstr ""

750

751 -#: merge-recursive.c:1229

751 +#: merge-recursive.c:1228

752 #, c-format

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

754 msgstr ""

755

756 -#: merge-recursive.c:1259

756 +#: merge-recursive.c:1258

757 #, c-format

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

759 msgstr ""

760

761 -#: merge-recursive.c:1458

761 +#: merge-recursive.c:1457

762 #, c-format

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

764 msgstr ""

765

766 -#: merge-recursive.c:1468

766 +#: merge-recursive.c:1467

767 #, c-format

768 msgid "Adding merged %s"

769 msgstr ""

770

771 -#: merge-recursive.c:1473 merge-recursive.c:1671

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

772 #, c-format

773 msgid "Adding as %s instead"

774 msgstr ""

775

776 -#: merge-recursive.c:1524

776 +#: merge-recursive.c:1523

777 #, c-format

778 msgid "cannot read object %s"

779 msgstr ""

780

781 -#: merge-recursive.c:1527

781 +#: merge-recursive.c:1526

782 #, c-format

783 msgid "object %s is not a blob"

784 msgstr ""

785

786 -#: merge-recursive.c:1575

786 +#: merge-recursive.c:1578

787 msgid "modify"

788 msgstr ""

789

790 -#: merge-recursive.c:1575

790 +#: merge-recursive.c:1578

791 msgid "modified"

792 msgstr ""

793

794 -#: merge-recursive.c:1585

794 +#: merge-recursive.c:1588

795 msgid "content"

796 msgstr ""

797

798 -#: merge-recursive.c:1592

798 +#: merge-recursive.c:1595

799 msgid "add/add"

800 msgstr ""

801

802 -#: merge-recursive.c:1626

802 +#: merge-recursive.c:1629

803 #, c-format

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

805 msgstr ""

806

807 -#: merge-recursive.c:1640

807 +#: merge-recursive.c:1643

808 #, c-format

809 msgid "Auto-merging %s"

810 msgstr ""

811

812 -#: merge-recursive.c:1644 git-submodule.sh:1150

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

813 msgid "submodule"

814 msgstr ""

815

816 -#: merge-recursive.c:1645

816 +#: merge-recursive.c:1648

817 #, c-format

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

819 msgstr ""

820

821 -#: merge-recursive.c:1731

821 +#: merge-recursive.c:1734

822 #, c-format

823 msgid "Removing %s"

824 msgstr ""

825

826 -#: merge-recursive.c:1756

826 +#: merge-recursive.c:1759

827 msgid "file/directory"

828 msgstr ""

829

830 -#: merge-recursive.c:1762

830 +#: merge-recursive.c:1765

831 msgid "directory/file"

832 msgstr ""

833

834 -#: merge-recursive.c:1767

834 +#: merge-recursive.c:1770

835 #, c-format

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

837 msgstr ""

838

839 -#: merge-recursive.c:1777

839 +#: merge-recursive.c:1780

840 #, c-format

841 msgid "Adding %s"

842 msgstr ""

843

844 -#: merge-recursive.c:1794

844 +#: merge-recursive.c:1797

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

846 msgstr ""

847

848 -#: merge-recursive.c:1813

848 +#: merge-recursive.c:1816

849 msgid "Already up-to-date!"

850 msgstr ""

851

852 -#: merge-recursive.c:1822

852 +#: merge-recursive.c:1825

853 #, c-format

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

855 msgstr ""

856

857 -#: merge-recursive.c:1852

857 +#: merge-recursive.c:1855

858 #, c-format

859 msgid "Unprocessed path??? %s"

860 msgstr ""

861

862 -#: merge-recursive.c:1900

862 +#: merge-recursive.c:1903

863 msgid "Merging:"

864 msgstr ""

865

866 -#: merge-recursive.c:1913

866 +#: merge-recursive.c:1916

867 #, c-format

868 msgid "found %u common ancestor:"

869 msgid_plural "found %u common ancestors:"

870 msgstr[0] ""

871 msgstr[1] ""

872

873 -#: merge-recursive.c:1950

873 +#: merge-recursive.c:1953

874 msgid "merge returned no commit"

875 msgstr ""

876

877 -#: merge-recursive.c:2007

877 +#: merge-recursive.c:2010

878 #, c-format

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

880 msgstr ""

881

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

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

883 msgid "Unable to write index."

884 msgstr ""

885

@@ -909,31 +909,41 @@ msgstr ""

909 msgid "unable to parse object: %s"

910 msgstr ""

911

912 -#: parse-options.c:563

912 +#: parse-options.c:570

913 msgid "..."

914 msgstr ""

915

916 -#: parse-options.c:581

916 +#: parse-options.c:588

917 #, c-format

918 msgid "usage: %s"

919 msgstr ""

920

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

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

923 -#: parse-options.c:585

923 +#: parse-options.c:592

924 #, c-format

925 msgid " or: %s"

926 msgstr ""

927

928 -#: parse-options.c:588

928 +#: parse-options.c:595

929 #, c-format

930 msgid " %s"

931 msgstr ""

932

933 -#: parse-options.c:622

933 +#: parse-options.c:629

934 msgid "-NUM"

935 msgstr ""

936

937 +#: parse-options-cb.c:108

938 +#, c-format

939 +msgid "malformed object name '%s'"

940 +msgstr ""

941 +

942 +#: path.c:752

943 +#, c-format

944 +msgid "Could not make %s writable by group"

945 +msgstr ""

946 +

947 #: pathspec.c:133

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

949 msgstr ""

@@ -998,136 +1008,181 @@ msgstr ""

1008 msgid "unable to parse --pretty format"

1009 msgstr ""

1010

1001 -#: progress.c:236

1011 +#: progress.c:235

1012 msgid "done"

1013 msgstr ""

1014

1005 -#: read-cache.c:1296

1015 +#: read-cache.c:1281

1016 #, c-format

1017 msgid ""

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

1019 "Using version %i"

1020 msgstr ""

1021

1012 -#: read-cache.c:1306

1022 +#: read-cache.c:1291

1023 #, c-format

1024 msgid ""

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

1026 "Using version %i"

1027 msgstr ""

1028

1019 -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

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

1030 #: builtin/merge.c:983

1031 #, c-format

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

1033 msgstr ""

1034

1025 -#: refs.c:3001

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

1036 #, c-format

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

1038 msgstr ""

1039

1030 -#: refs.c:3004

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

1041 #, c-format

1042 msgid "could not delete references: %s"

1043 msgstr ""

1044

1035 -#: refs.c:3013

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

1046 #, c-format

1047 msgid "could not remove reference %s"

1048 msgstr ""

1049

1040 -#: ref-filter.c:660

1050 +#: ref-filter.c:245

1051 +#, c-format

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

1053 +msgstr ""

1054 +

1055 +#: ref-filter.c:704

1056 +#, c-format

1057 +msgid "positive value expected contents:lines=%s"

1058 +msgstr ""

1059 +

1060 +#: ref-filter.c:833

1061 +#, c-format

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

1063 +msgstr ""

1064 +

1065 +#: ref-filter.c:835

1066 msgid "unable to parse format"

1067 msgstr ""

1068

1044 -#: remote.c:792

1069 +#: ref-filter.c:870

1070 +#, c-format

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

1072 +msgstr ""

1073 +

1074 +#: ref-filter.c:893

1075 +#, c-format

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

1077 +msgstr ""

1078 +

1079 +#: ref-filter.c:898

1080 +#, c-format

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

1082 +msgstr ""

1083 +

1084 +#: ref-filter.c:1219

1085 +#, c-format

1086 +msgid "malformed object at '%s'"

1087 +msgstr ""

1088 +

1089 +#: ref-filter.c:1561

1090 +#, c-format

1091 +msgid "format: %%(end) atom missing"

1092 +msgstr ""

1093 +

1094 +#: ref-filter.c:1615

1095 +#, c-format

1096 +msgid "malformed object name %s"

1097 +msgstr ""

1098 +

1099 +#: remote.c:756

1100 #, c-format

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

1102 msgstr ""

1103

1049 -#: remote.c:796

1104 +#: remote.c:760

1105 #, c-format

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

1107 msgstr ""

1108

1054 -#: remote.c:800

1109 +#: remote.c:764

1110 #, c-format

1111 msgid "%s tracks both %s and %s"

1112 msgstr ""

1113

1059 -#: remote.c:808

1114 +#: remote.c:772

1115 msgid "Internal error"

1116 msgstr ""

1117

1063 -#: remote.c:1723 remote.c:1766

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

1119 msgid "HEAD does not point to a branch"

1120 msgstr ""

1121

1067 -#: remote.c:1732

1122 +#: remote.c:1696

1123 #, c-format

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

1125 msgstr ""

1126

1072 -#: remote.c:1735

1127 +#: remote.c:1699

1128 #, c-format

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

1130 msgstr ""

1131

1077 -#: remote.c:1741

1132 +#: remote.c:1705

1133 #, c-format

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

1135 msgstr ""

1136

1082 -#: remote.c:1756

1137 +#: remote.c:1720

1138 #, c-format

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

1140 msgstr ""

1141

1087 -#: remote.c:1771

1142 +#: remote.c:1735

1143 #, c-format

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

1145 msgstr ""

1146

1092 -#: remote.c:1782

1147 +#: remote.c:1746

1148 #, c-format

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

1150 msgstr ""

1151

1097 -#: remote.c:1795

1152 +#: remote.c:1759

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

1154 msgstr ""

1155

1101 -#: remote.c:1817

1156 +#: remote.c:1781

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

1158 msgstr ""

1159

1105 -#: remote.c:2124

1160 +#: remote.c:2083

1161 #, c-format

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

1163 msgstr ""

1164

1110 -#: remote.c:2128

1165 +#: remote.c:2087

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

1167 msgstr ""

1168

1114 -#: remote.c:2131

1169 +#: remote.c:2090

1170 #, c-format

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

1172 msgstr ""

1173

1119 -#: remote.c:2135

1174 +#: remote.c:2094

1175 #, c-format

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

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

1178 msgstr[0] ""

1179 msgstr[1] ""

1180

1126 -#: remote.c:2141

1181 +#: remote.c:2100

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

1183 msgstr ""

1184

1130 -#: remote.c:2144

1185 +#: remote.c:2103

1186 #, c-format

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

1188 msgid_plural ""

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

1190 msgstr[0] ""

1191 msgstr[1] ""

1192

1138 -#: remote.c:2152

1193 +#: remote.c:2111

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

1195 msgstr ""

1196

1142 -#: remote.c:2155

1197 +#: remote.c:2114

1198 #, c-format

1199 msgid ""

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

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

1205 msgstr[0] ""

1206 msgstr[1] ""

1207

1153 -#: remote.c:2165

1208 +#: remote.c:2124

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

1210 msgstr ""

1211

1157 -#: revision.c:2198

1212 +#: revision.c:2191

1213 msgid "your current branch appears to be broken"

1214 msgstr ""

1215

1161 -#: revision.c:2201

1216 +#: revision.c:2194

1217 #, c-format

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

1219 msgstr ""

1220

1166 -#: revision.c:2395

1221 +#: revision.c:2388

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

1223 msgstr ""

1224

1170 -#: run-command.c:83

1225 +#: run-command.c:90

1226 msgid "open /dev/null failed"

1227 msgstr ""

1228

1174 -#: run-command.c:85

1229 +#: run-command.c:92

1230 #, c-format

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

1232 msgstr ""

@@ -1382,7 +1437,7 @@ msgstr ""

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

1438 msgstr ""

1439

1385 -#: sequencer.c:887 builtin/apply.c:4291

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

1441 #, c-format

1442 msgid "cannot open %s: %s"

1443 msgstr ""

@@ -1424,12 +1479,12 @@ msgstr ""

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

1480 msgstr ""

1481

1427 -#: setup.c:243

1482 +#: setup.c:248

1483 #, c-format

1484 msgid "failed to read %s"

1485 msgstr ""

1486

1432 -#: sha1_name.c:453

1487 +#: sha1_name.c:463

1488 msgid ""

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

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

@@ -1465,7 +1520,7 @@ msgstr ""

1520 msgid "staging updated .gitmodules failed"

1521 msgstr ""

1522

1468 -#: submodule.c:1045

1523 +#: submodule.c:1040

1524 #, c-format

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

1526 msgstr ""

@@ -1476,7 +1531,7 @@ msgstr ""

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

1532 msgstr ""

1533

1479 -#: trailer.c:543 trailer.c:548 builtin/remote.c:290

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

1535 #, c-format

1536 msgid "more than one %s"

1537 msgstr ""

@@ -1543,8 +1598,8 @@ msgstr ""

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

1599 msgstr ""

1600

1546 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1547 -#: builtin/merge.c:1076 builtin/pull.c:380

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

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

1603 #, c-format

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

1605 msgstr ""

@@ -1572,17 +1627,17 @@ msgstr ""

1627 msgid "unable to get current working directory"

1628 msgstr ""

1629

1575 -#: wrapper.c:631

1630 +#: wrapper.c:647

1631 #, c-format

1632 msgid "could not open %s for writing"

1633 msgstr ""

1634

1580 -#: wrapper.c:642 builtin/am.c:424

1635 +#: wrapper.c:658 builtin/am.c:425

1636 #, c-format

1637 msgid "could not write to %s"

1638 msgstr ""

1639

1585 -#: wrapper.c:648

1640 +#: wrapper.c:664

1641 #, c-format

1642 msgid "could not close %s"

1643 msgstr ""

@@ -1909,27 +1964,27 @@ msgstr ""

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

1965 msgstr ""

1966

1912 -#: wt-status.c:1437

1967 +#: wt-status.c:1438

1968 msgid "On branch "

1969 msgstr ""

1970

1916 -#: wt-status.c:1445

1971 +#: wt-status.c:1444

1972 msgid "interactive rebase in progress; onto "

1973 msgstr ""

1974

1920 -#: wt-status.c:1447

1975 +#: wt-status.c:1446

1976 msgid "rebase in progress; onto "

1977 msgstr ""

1978

1924 -#: wt-status.c:1452

1979 +#: wt-status.c:1451

1980 msgid "HEAD detached at "

1981 msgstr ""

1982

1928 -#: wt-status.c:1454

1983 +#: wt-status.c:1453

1984 msgid "HEAD detached from "

1985 msgstr ""

1986

1932 -#: wt-status.c:1457

1987 +#: wt-status.c:1456

1988 msgid "Not currently on any branch."

1989 msgstr ""

1990

@@ -2008,23 +2063,23 @@ msgstr ""

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

2064 msgstr ""

2065

2011 -#: wt-status.c:1644

2012 -msgid "HEAD (no branch)"

2066 +#: wt-status.c:1642

2067 +msgid "Initial commit on "

2068 msgstr ""

2069

2015 -#: wt-status.c:1650

2016 -msgid "Initial commit on "

2070 +#: wt-status.c:1646

2071 +msgid "HEAD (no branch)"

2072 msgstr ""

2073

2019 -#: wt-status.c:1677

2074 +#: wt-status.c:1675

2075 msgid "gone"

2076 msgstr ""

2077

2023 -#: wt-status.c:1679 wt-status.c:1687

2078 +#: wt-status.c:1677 wt-status.c:1685

2079 msgid "behind "

2080 msgstr ""

2081

2027 -#: compat/precompose_utf8.c:55 builtin/clone.c:403

2082 +#: compat/precompose_utf8.c:56 builtin/clone.c:408

2083 #, c-format

2084 msgid "failed to unlink '%s'"

2085 msgstr ""

@@ -2038,7 +2093,7 @@ msgstr ""

2093 msgid "unexpected diff status %c"

2094 msgstr ""

2095

2041 -#: builtin/add.c:70 builtin/commit.c:277

2096 +#: builtin/add.c:70 builtin/commit.c:278

2097 msgid "updating files failed"

2098 msgstr ""

2099

@@ -2051,7 +2106,7 @@ msgstr ""

2106 msgid "Unstaged changes after refreshing the index:"

2107 msgstr ""

2108

2054 -#: builtin/add.c:194 builtin/rev-parse.c:799

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

2110 msgid "Could not read the index"

2111 msgstr ""

2112

@@ -2086,15 +2141,15 @@ msgstr ""

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

2142 msgstr ""

2143

2089 -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2144 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2145 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2091 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

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

2147 msgid "dry run"

2148 msgstr ""

2149

2095 -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2096 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2097 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

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

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

2152 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2153 msgid "be verbose"

2154 msgstr ""

2155

@@ -2102,7 +2157,7 @@ msgstr ""

2157 msgid "interactive picking"

2158 msgstr ""

2159

2105 -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2160 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2161 msgid "select hunks interactively"

2162 msgstr ""

2163

@@ -2159,181 +2214,181 @@ msgstr ""

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

2215 msgstr ""

2216

2162 -#: builtin/add.c:358

2217 +#: builtin/add.c:352

2218 #, c-format

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

2220 msgstr ""

2221

2167 -#: builtin/add.c:359

2222 +#: builtin/add.c:353

2223 #, c-format

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

2225 msgstr ""

2226

2172 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2173 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

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

2228 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2229 +#: builtin/submodule--helper.c:40

2230 msgid "index file corrupt"

2231 msgstr ""

2232

2177 -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2233 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2234 msgid "Unable to write new index file"

2235 msgstr ""

2236

2181 -#: builtin/am.c:41

2237 +#: builtin/am.c:42

2238 #, c-format

2239 msgid "could not stat %s"

2240 msgstr ""

2241

2186 -#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737

2187 -#: builtin/merge.c:1079

2242 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2243 #, c-format

2244 msgid "could not read '%s'"

2245 msgstr ""

2246

2192 -#: builtin/am.c:444

2247 +#: builtin/am.c:445

2248 msgid "could not parse author script"

2249 msgstr ""

2250

2196 -#: builtin/am.c:521

2251 +#: builtin/am.c:522

2252 #, c-format

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

2254 msgstr ""

2255

2201 -#: builtin/am.c:562 builtin/notes.c:300

2256 +#: builtin/am.c:563 builtin/notes.c:300

2257 #, c-format

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

2259 msgstr ""

2260

2206 -#: builtin/am.c:599 builtin/notes.c:315

2261 +#: builtin/am.c:600 builtin/notes.c:315

2262 #, c-format

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

2264 msgstr ""

2265

2211 -#: builtin/am.c:625

2266 +#: builtin/am.c:626

2267 msgid "fseek failed"

2268 msgstr ""

2269

2215 -#: builtin/am.c:786 builtin/am.c:874

2270 +#: builtin/am.c:787 builtin/am.c:875

2271 #, c-format

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

2273 msgstr ""

2274

2220 -#: builtin/am.c:793

2275 +#: builtin/am.c:794

2276 #, c-format

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

2278 msgstr ""

2279

2225 -#: builtin/am.c:802

2280 +#: builtin/am.c:803

2281 #, c-format

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

2283 msgstr ""

2284

2230 -#: builtin/am.c:867

2285 +#: builtin/am.c:868

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

2287 msgstr ""

2288

2234 -#: builtin/am.c:915

2289 +#: builtin/am.c:916

2290 msgid "invalid timestamp"

2291 msgstr ""

2292

2238 -#: builtin/am.c:918 builtin/am.c:926

2293 +#: builtin/am.c:919 builtin/am.c:927

2294 msgid "invalid Date line"

2295 msgstr ""

2296

2242 -#: builtin/am.c:923

2297 +#: builtin/am.c:924

2298 msgid "invalid timezone offset"

2299 msgstr ""

2300

2246 -#: builtin/am.c:1010

2301 +#: builtin/am.c:1011

2302 msgid "Patch format detection failed."

2303 msgstr ""

2304

2250 -#: builtin/am.c:1015 builtin/clone.c:368

2305 +#: builtin/am.c:1016 builtin/clone.c:373

2306 #, c-format

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

2308 msgstr ""

2309

2255 -#: builtin/am.c:1019

2310 +#: builtin/am.c:1020

2311 msgid "Failed to split patches."

2312 msgstr ""

2313

2259 -#: builtin/am.c:1151 builtin/commit.c:362

2314 +#: builtin/am.c:1152 builtin/commit.c:363

2315 msgid "unable to write index file"

2316 msgstr ""

2317

2263 -#: builtin/am.c:1202

2318 +#: builtin/am.c:1203

2319 #, c-format

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

2321 msgstr ""

2322

2268 -#: builtin/am.c:1203

2323 +#: builtin/am.c:1204

2324 #, c-format

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

2326 msgstr ""

2327

2273 -#: builtin/am.c:1204

2328 +#: builtin/am.c:1205

2329 #, c-format

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

2331 msgstr ""

2332

2278 -#: builtin/am.c:1339

2333 +#: builtin/am.c:1343

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

2335 msgstr ""

2336

2282 -#: builtin/am.c:1413 builtin/log.c:1345

2337 +#: builtin/am.c:1417 builtin/log.c:1344

2338 #, c-format

2339 msgid "invalid ident line: %s"

2340 msgstr ""

2341

2287 -#: builtin/am.c:1440

2342 +#: builtin/am.c:1444

2343 #, c-format

2344 msgid "unable to parse commit %s"

2345 msgstr ""

2346

2292 -#: builtin/am.c:1614

2347 +#: builtin/am.c:1646

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

2349 msgstr ""

2350

2296 -#: builtin/am.c:1616

2351 +#: builtin/am.c:1648

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

2353 msgstr ""

2354

2300 -#: builtin/am.c:1635

2355 +#: builtin/am.c:1667

2356 msgid ""

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

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

2359 msgstr ""

2360

2306 -#: builtin/am.c:1641

2361 +#: builtin/am.c:1673

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

2363 msgstr ""

2364

2310 -#: builtin/am.c:1666

2365 +#: builtin/am.c:1688

2366 msgid "Failed to merge in the changes."

2367 msgstr ""

2368

2314 -#: builtin/am.c:1691 builtin/merge.c:632

2369 +#: builtin/am.c:1712 builtin/merge.c:632

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

2371 msgstr ""

2372

2318 -#: builtin/am.c:1698

2373 +#: builtin/am.c:1719

2374 msgid "applying to an empty history"

2375 msgstr ""

2376

2322 -#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2377 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2378 #: builtin/merge.c:854

2379 msgid "failed to write commit object"

2380 msgstr ""

2381

2327 -#: builtin/am.c:1743 builtin/am.c:1747

2382 +#: builtin/am.c:1764 builtin/am.c:1768

2383 #, c-format

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

2385 msgstr ""

2386

2332 -#: builtin/am.c:1763

2387 +#: builtin/am.c:1784

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

2389 msgstr ""

2390

2336 -#: builtin/am.c:1768

2391 +#: builtin/am.c:1789

2392 msgid "Commit Body is:"

2393 msgstr ""

2394

@@ -2341,229 +2396,231 @@ msgstr ""

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

2397 #. input at this point.

2398 #.

2344 -#: builtin/am.c:1778

2399 +#: builtin/am.c:1799

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

2401 msgstr ""

2402

2348 -#: builtin/am.c:1828

2403 +#: builtin/am.c:1849

2404 #, c-format

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

2406 msgstr ""

2407

2353 -#: builtin/am.c:1863 builtin/am.c:1934

2408 +#: builtin/am.c:1884 builtin/am.c:1955

2409 #, c-format

2410 msgid "Applying: %.*s"

2411 msgstr ""

2412

2358 -#: builtin/am.c:1879

2413 +#: builtin/am.c:1900

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

2415 msgstr ""

2416

2362 -#: builtin/am.c:1887

2417 +#: builtin/am.c:1908

2418 #, c-format

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

2420 msgstr ""

2421

2367 -#: builtin/am.c:1893

2422 +#: builtin/am.c:1914

2423 #, c-format

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

2425 msgstr ""

2426

2372 -#: builtin/am.c:1937

2427 +#: builtin/am.c:1958

2428 msgid ""

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

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

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

2432 msgstr ""

2433

2379 -#: builtin/am.c:1944

2434 +#: builtin/am.c:1965

2435 msgid ""

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

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

2438 msgstr ""

2439

2385 -#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2440 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2441 #: builtin/reset.c:316

2442 #, c-format

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

2444 msgstr ""

2445

2391 -#: builtin/am.c:2104

2446 +#: builtin/am.c:2125

2447 msgid "failed to clean index"

2448 msgstr ""

2449

2395 -#: builtin/am.c:2138

2450 +#: builtin/am.c:2159

2451 msgid ""

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

2453 "Not rewinding to ORIG_HEAD"

2454 msgstr ""

2455

2401 -#: builtin/am.c:2199

2456 +#: builtin/am.c:2220

2457 #, c-format

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

2459 msgstr ""

2460

2406 -#: builtin/am.c:2221

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

2461 +#: builtin/am.c:2253

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

2463 msgstr ""

2464

2410 -#: builtin/am.c:2222

2411 -msgid "git am [options] (--continue | --skip | --abort)"

2465 +#: builtin/am.c:2254

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

2467 msgstr ""

2468

2414 -#: builtin/am.c:2228

2469 +#: builtin/am.c:2260

2470 msgid "run interactively"

2471 msgstr ""

2472

2418 -#: builtin/am.c:2230

2473 +#: builtin/am.c:2262

2474 msgid "historical option -- no-op"

2475 msgstr ""

2476

2422 -#: builtin/am.c:2232

2477 +#: builtin/am.c:2264

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

2479 msgstr ""

2480

2426 -#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

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

2482 #: builtin/repack.c:171

2483 msgid "be quiet"

2484 msgstr ""

2485

2431 -#: builtin/am.c:2235

2486 +#: builtin/am.c:2267

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

2488 msgstr ""

2489

2435 -#: builtin/am.c:2238

2490 +#: builtin/am.c:2270

2491 msgid "recode into utf8 (default)"

2492 msgstr ""

2493

2439 -#: builtin/am.c:2240

2494 +#: builtin/am.c:2272

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

2496 msgstr ""

2497

2443 -#: builtin/am.c:2242

2498 +#: builtin/am.c:2274

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

2500 msgstr ""

2501

2447 -#: builtin/am.c:2244

2502 +#: builtin/am.c:2276

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

2504 msgstr ""

2505

2451 -#: builtin/am.c:2246

2506 +#: builtin/am.c:2278

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

2508 msgstr ""

2509

2455 -#: builtin/am.c:2249

2510 +#: builtin/am.c:2281

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

2512 msgstr ""

2513

2459 -#: builtin/am.c:2252

2514 +#: builtin/am.c:2284

2515 msgid "strip everything before a scissors line"

2516 msgstr ""

2517

2463 -#: builtin/am.c:2253 builtin/apply.c:4563

2518 +#: builtin/am.c:2285 builtin/apply.c:4554

2519 msgid "action"

2520 msgstr ""

2521

2467 -#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2468 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2469 -#: builtin/am.c:2281

2522 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2523 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2524 +#: builtin/am.c:2313

2525 msgid "pass it through git-apply"

2526 msgstr ""

2527

2473 -#: builtin/am.c:2262 builtin/apply.c:4587

2528 +#: builtin/am.c:2294 builtin/apply.c:4578

2529 msgid "root"

2530 msgstr ""

2531

2477 -#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2478 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2479 -#: builtin/pull.c:167

2532 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2533 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

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

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

2536 msgid "path"

2537 msgstr ""

2538

2483 -#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2484 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2485 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2486 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2487 -#: parse-options.h:134 parse-options.h:243

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

2540 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

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

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

2543 +#: parse-options.h:134 parse-options.h:244

2544 msgid "n"

2545 msgstr ""

2546

2491 -#: builtin/am.c:2274 builtin/apply.c:4531

2547 +#: builtin/am.c:2306 builtin/apply.c:4522

2548 msgid "num"

2549 msgstr ""

2550

2495 -#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

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

2552 +#: builtin/tag.c:372

2553 msgid "format"

2554 msgstr ""

2555

2499 -#: builtin/am.c:2278

2556 +#: builtin/am.c:2310

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

2558 msgstr ""

2559

2503 -#: builtin/am.c:2284

2560 +#: builtin/am.c:2316

2561 msgid "override error message when patch failure occurs"

2562 msgstr ""

2563

2507 -#: builtin/am.c:2286

2564 +#: builtin/am.c:2318

2565 msgid "continue applying patches after resolving a conflict"

2566 msgstr ""

2567

2511 -#: builtin/am.c:2289

2568 +#: builtin/am.c:2321

2569 msgid "synonyms for --continue"

2570 msgstr ""

2571

2515 -#: builtin/am.c:2292

2572 +#: builtin/am.c:2324

2573 msgid "skip the current patch"

2574 msgstr ""

2575

2519 -#: builtin/am.c:2295

2576 +#: builtin/am.c:2327

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

2578 msgstr ""

2579

2523 -#: builtin/am.c:2299

2580 +#: builtin/am.c:2331

2581 msgid "lie about committer date"

2582 msgstr ""

2583

2527 -#: builtin/am.c:2301

2584 +#: builtin/am.c:2333

2585 msgid "use current timestamp for author date"

2586 msgstr ""

2587

2531 -#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2532 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2588 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2589 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2590 msgid "key-id"

2591 msgstr ""

2592

2536 -#: builtin/am.c:2304

2593 +#: builtin/am.c:2336

2594 msgid "GPG-sign commits"

2595 msgstr ""

2596

2540 -#: builtin/am.c:2307

2597 +#: builtin/am.c:2339

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

2599 msgstr ""

2600

2544 -#: builtin/am.c:2322

2601 +#: builtin/am.c:2354

2602 msgid ""

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

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

2605 msgstr ""

2606

2550 -#: builtin/am.c:2329

2607 +#: builtin/am.c:2361

2608 msgid "failed to read the index"

2609 msgstr ""

2610

2554 -#: builtin/am.c:2344

2611 +#: builtin/am.c:2376

2612 #, c-format

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

2614 msgstr ""

2615

2559 -#: builtin/am.c:2368

2616 +#: builtin/am.c:2400

2617 #, c-format

2618 msgid ""

2619 "Stray %s directory found.\n"

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

2621 msgstr ""

2622

2566 -#: builtin/am.c:2374

2623 +#: builtin/am.c:2406

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

2625 msgstr ""

2626

@@ -2571,62 +2628,62 @@ msgstr ""

2628 msgid "git apply [<options>] [<patch>...]"

2629 msgstr ""

2630

2574 -#: builtin/apply.c:112

2631 +#: builtin/apply.c:111

2632 #, c-format

2633 msgid "unrecognized whitespace option '%s'"

2634 msgstr ""

2635

2579 -#: builtin/apply.c:127

2636 +#: builtin/apply.c:126

2637 #, c-format

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

2639 msgstr ""

2640

2584 -#: builtin/apply.c:822

2641 +#: builtin/apply.c:818

2642 #, c-format

2643 msgid "Cannot prepare timestamp regexp %s"

2644 msgstr ""

2645

2589 -#: builtin/apply.c:831

2646 +#: builtin/apply.c:827

2647 #, c-format

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

2649 msgstr ""

2650

2594 -#: builtin/apply.c:912

2651 +#: builtin/apply.c:908

2652 #, c-format

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

2654 msgstr ""

2655

2599 -#: builtin/apply.c:944

2656 +#: builtin/apply.c:940

2657 #, c-format

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

2659 msgstr ""

2660

2604 -#: builtin/apply.c:948

2661 +#: builtin/apply.c:944

2662 #, c-format

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

2664 msgstr ""

2665

2609 -#: builtin/apply.c:949

2666 +#: builtin/apply.c:945

2667 #, c-format

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

2669 msgstr ""

2670

2614 -#: builtin/apply.c:956

2671 +#: builtin/apply.c:952

2672 #, c-format

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

2674 msgstr ""

2675

2619 -#: builtin/apply.c:1419

2676 +#: builtin/apply.c:1415

2677 #, c-format

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

2679 msgstr ""

2680

2624 -#: builtin/apply.c:1476

2681 +#: builtin/apply.c:1472

2682 #, c-format

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

2684 msgstr ""

2685

2629 -#: builtin/apply.c:1493

2686 +#: builtin/apply.c:1489

2687 #, c-format

2688 msgid ""

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

@@ -2637,396 +2694,396 @@ msgid_plural ""

2694 msgstr[0] ""

2695 msgstr[1] ""

2696

2640 -#: builtin/apply.c:1659

2697 +#: builtin/apply.c:1655

2698 msgid "new file depends on old contents"

2699 msgstr ""

2700

2644 -#: builtin/apply.c:1661

2701 +#: builtin/apply.c:1657

2702 msgid "deleted file still has contents"

2703 msgstr ""

2704

2648 -#: builtin/apply.c:1687

2705 +#: builtin/apply.c:1683

2706 #, c-format

2707 msgid "corrupt patch at line %d"

2708 msgstr ""

2709

2653 -#: builtin/apply.c:1723

2710 +#: builtin/apply.c:1719

2711 #, c-format

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

2713 msgstr ""

2714

2658 -#: builtin/apply.c:1725

2715 +#: builtin/apply.c:1721

2716 #, c-format

2717 msgid "deleted file %s still has contents"

2718 msgstr ""

2719

2663 -#: builtin/apply.c:1728

2720 +#: builtin/apply.c:1724

2721 #, c-format

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

2723 msgstr ""

2724

2668 -#: builtin/apply.c:1874

2725 +#: builtin/apply.c:1870

2726 #, c-format

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

2728 msgstr ""

2729

2673 -#: builtin/apply.c:1903

2730 +#: builtin/apply.c:1899

2731 #, c-format

2732 msgid "unrecognized binary patch at line %d"

2733 msgstr ""

2734

2678 -#: builtin/apply.c:2054

2735 +#: builtin/apply.c:2050

2736 #, c-format

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

2738 msgstr ""

2739

2683 -#: builtin/apply.c:2144

2740 +#: builtin/apply.c:2140

2741 #, c-format

2742 msgid "unable to read symlink %s"

2743 msgstr ""

2744

2688 -#: builtin/apply.c:2148

2745 +#: builtin/apply.c:2144

2746 #, c-format

2747 msgid "unable to open or read %s"

2748 msgstr ""

2749

2693 -#: builtin/apply.c:2781

2750 +#: builtin/apply.c:2777

2751 #, c-format

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

2753 msgstr ""

2754

2698 -#: builtin/apply.c:2900

2755 +#: builtin/apply.c:2896

2756 #, c-format

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

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

2759 msgstr[0] ""

2760 msgstr[1] ""

2761

2705 -#: builtin/apply.c:2912

2762 +#: builtin/apply.c:2908

2763 #, c-format

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

2765 msgstr ""

2766

2710 -#: builtin/apply.c:2918

2767 +#: builtin/apply.c:2914

2768 #, c-format

2769 msgid ""

2770 "while searching for:\n"

2771 "%.*s"

2772 msgstr ""

2773

2717 -#: builtin/apply.c:2938

2774 +#: builtin/apply.c:2934

2775 #, c-format

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

2777 msgstr ""

2778

2722 -#: builtin/apply.c:3039

2779 +#: builtin/apply.c:3035

2780 #, c-format

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

2782 msgstr ""

2783

2727 -#: builtin/apply.c:3045

2784 +#: builtin/apply.c:3041

2785 #, c-format

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

2787 msgstr ""

2788

2732 -#: builtin/apply.c:3066

2789 +#: builtin/apply.c:3062

2790 #, c-format

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

2792 msgstr ""

2793

2737 -#: builtin/apply.c:3190

2794 +#: builtin/apply.c:3186

2795 #, c-format

2796 msgid "cannot checkout %s"

2797 msgstr ""

2798

2742 -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2799 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

2800 #, c-format

2801 msgid "read of %s failed"

2802 msgstr ""

2803

2747 -#: builtin/apply.c:3243

2804 +#: builtin/apply.c:3239

2805 #, c-format

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

2807 msgstr ""

2808

2752 -#: builtin/apply.c:3271 builtin/apply.c:3493

2809 +#: builtin/apply.c:3267 builtin/apply.c:3489

2810 #, c-format

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

2812 msgstr ""

2813

2757 -#: builtin/apply.c:3352 builtin/apply.c:3507

2814 +#: builtin/apply.c:3348 builtin/apply.c:3503

2815 #, c-format

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

2817 msgstr ""

2818

2762 -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2819 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

2820 #, c-format

2821 msgid "%s: %s"

2822 msgstr ""

2823

2767 -#: builtin/apply.c:3361 builtin/apply.c:3515

2824 +#: builtin/apply.c:3357 builtin/apply.c:3511

2825 #, c-format

2826 msgid "%s: does not match index"

2827 msgstr ""

2828

2772 -#: builtin/apply.c:3463

2829 +#: builtin/apply.c:3459

2830 msgid "removal patch leaves file contents"

2831 msgstr ""

2832

2776 -#: builtin/apply.c:3532

2833 +#: builtin/apply.c:3528

2834 #, c-format

2835 msgid "%s: wrong type"

2836 msgstr ""

2837

2781 -#: builtin/apply.c:3534

2838 +#: builtin/apply.c:3530

2839 #, c-format

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

2841 msgstr ""

2842

2786 -#: builtin/apply.c:3693 builtin/apply.c:3695

2843 +#: builtin/apply.c:3689 builtin/apply.c:3691

2844 #, c-format

2845 msgid "invalid path '%s'"

2846 msgstr ""

2847

2791 -#: builtin/apply.c:3750

2848 +#: builtin/apply.c:3746

2849 #, c-format

2850 msgid "%s: already exists in index"

2851 msgstr ""

2852

2796 -#: builtin/apply.c:3753

2853 +#: builtin/apply.c:3749

2854 #, c-format

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

2856 msgstr ""

2857

2801 -#: builtin/apply.c:3773

2858 +#: builtin/apply.c:3769

2859 #, c-format

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

2861 msgstr ""

2862

2806 -#: builtin/apply.c:3778

2863 +#: builtin/apply.c:3774

2864 #, c-format

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

2866 msgstr ""

2867

2811 -#: builtin/apply.c:3798

2868 +#: builtin/apply.c:3794

2869 #, c-format

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

2871 msgstr ""

2872

2816 -#: builtin/apply.c:3802

2873 +#: builtin/apply.c:3798

2874 #, c-format

2875 msgid "%s: patch does not apply"

2876 msgstr ""

2877

2821 -#: builtin/apply.c:3816

2878 +#: builtin/apply.c:3812

2879 #, c-format

2880 msgid "Checking patch %s..."

2881 msgstr ""

2882

2826 -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

2883 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

2884 #, c-format

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

2886 msgstr ""

2887

2831 -#: builtin/apply.c:4052

2888 +#: builtin/apply.c:4048

2889 #, c-format

2890 msgid "unable to remove %s from index"

2891 msgstr ""

2892

2836 -#: builtin/apply.c:4081

2893 +#: builtin/apply.c:4077

2894 #, c-format

2895 msgid "corrupt patch for submodule %s"

2896 msgstr ""

2897

2841 -#: builtin/apply.c:4085

2898 +#: builtin/apply.c:4081

2899 #, c-format

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

2901 msgstr ""

2902

2846 -#: builtin/apply.c:4090

2903 +#: builtin/apply.c:4086

2904 #, c-format

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

2906 msgstr ""

2907

2851 -#: builtin/apply.c:4093 builtin/apply.c:4201

2908 +#: builtin/apply.c:4089 builtin/apply.c:4197

2909 #, c-format

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

2911 msgstr ""

2912

2856 -#: builtin/apply.c:4126

2913 +#: builtin/apply.c:4122

2914 #, c-format

2915 msgid "closing file '%s'"

2916 msgstr ""

2917

2861 -#: builtin/apply.c:4175

2918 +#: builtin/apply.c:4171

2919 #, c-format

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

2921 msgstr ""

2922

2866 -#: builtin/apply.c:4262

2923 +#: builtin/apply.c:4258

2924 #, c-format

2925 msgid "Applied patch %s cleanly."

2926 msgstr ""

2927

2871 -#: builtin/apply.c:4270

2928 +#: builtin/apply.c:4266

2929 msgid "internal error"

2930 msgstr ""

2931

2875 -#: builtin/apply.c:4273

2932 +#: builtin/apply.c:4269

2933 #, c-format

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

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

2936 msgstr[0] ""

2937 msgstr[1] ""

2938

2882 -#: builtin/apply.c:4283

2939 +#: builtin/apply.c:4279

2940 #, c-format

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

2942 msgstr ""

2943

2887 -#: builtin/apply.c:4304

2944 +#: builtin/apply.c:4300

2945 #, c-format

2946 msgid "Hunk #%d applied cleanly."

2947 msgstr ""

2948

2892 -#: builtin/apply.c:4307

2949 +#: builtin/apply.c:4303

2950 #, c-format

2951 msgid "Rejected hunk #%d."

2952 msgstr ""

2953

2897 -#: builtin/apply.c:4397

2954 +#: builtin/apply.c:4393

2955 msgid "unrecognized input"

2956 msgstr ""

2957

2901 -#: builtin/apply.c:4408

2958 +#: builtin/apply.c:4404

2959 msgid "unable to read index file"

2960 msgstr ""

2961

2905 -#: builtin/apply.c:4526

2962 +#: builtin/apply.c:4517

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

2964 msgstr ""

2965

2909 -#: builtin/apply.c:4529

2966 +#: builtin/apply.c:4520

2967 msgid "apply changes matching the given path"

2968 msgstr ""

2969

2913 -#: builtin/apply.c:4532

2970 +#: builtin/apply.c:4523

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

2972 msgstr ""

2973

2917 -#: builtin/apply.c:4535

2974 +#: builtin/apply.c:4526

2975 msgid "ignore additions made by the patch"

2976 msgstr ""

2977

2921 -#: builtin/apply.c:4537

2978 +#: builtin/apply.c:4528

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

2980 msgstr ""

2981

2925 -#: builtin/apply.c:4541

2982 +#: builtin/apply.c:4532

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

2984 msgstr ""

2985

2929 -#: builtin/apply.c:4543

2986 +#: builtin/apply.c:4534

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

2988 msgstr ""

2989

2933 -#: builtin/apply.c:4545

2990 +#: builtin/apply.c:4536

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

2992 msgstr ""

2993

2937 -#: builtin/apply.c:4547

2994 +#: builtin/apply.c:4538

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

2996 msgstr ""

2997

2941 -#: builtin/apply.c:4549

2998 +#: builtin/apply.c:4540

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

3000 msgstr ""

3001

2945 -#: builtin/apply.c:4551

3002 +#: builtin/apply.c:4542

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

3004 msgstr ""

3005

2949 -#: builtin/apply.c:4553

3006 +#: builtin/apply.c:4544

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

3008 msgstr ""

3009

2953 -#: builtin/apply.c:4555

3010 +#: builtin/apply.c:4546

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

3012 msgstr ""

3013

2957 -#: builtin/apply.c:4557

3014 +#: builtin/apply.c:4548

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

3016 msgstr ""

3017

2961 -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

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

3019 msgid "paths are separated with NUL character"

3020 msgstr ""

3021

2965 -#: builtin/apply.c:4562

3022 +#: builtin/apply.c:4553

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

3024 msgstr ""

3025

2969 -#: builtin/apply.c:4564

3026 +#: builtin/apply.c:4555

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

3028 msgstr ""

3029

2973 -#: builtin/apply.c:4567 builtin/apply.c:4570

3030 +#: builtin/apply.c:4558 builtin/apply.c:4561

3031 msgid "ignore changes in whitespace when finding context"

3032 msgstr ""

3033

2977 -#: builtin/apply.c:4573

3034 +#: builtin/apply.c:4564

3035 msgid "apply the patch in reverse"

3036 msgstr ""

3037

2981 -#: builtin/apply.c:4575

3038 +#: builtin/apply.c:4566

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

3040 msgstr ""

3041

2985 -#: builtin/apply.c:4577

3042 +#: builtin/apply.c:4568

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

3044 msgstr ""

3045

2989 -#: builtin/apply.c:4579

3046 +#: builtin/apply.c:4570

3047 msgid "allow overlapping hunks"

3048 msgstr ""

3049

2993 -#: builtin/apply.c:4582

3050 +#: builtin/apply.c:4573

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

3052 msgstr ""

3053

2997 -#: builtin/apply.c:4585

3054 +#: builtin/apply.c:4576

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

3056 msgstr ""

3057

3001 -#: builtin/apply.c:4588

3058 +#: builtin/apply.c:4579

3059 msgid "prepend <root> to all filenames"

3060 msgstr ""

3061

3005 -#: builtin/apply.c:4610

3062 +#: builtin/apply.c:4601

3063 msgid "--3way outside a repository"

3064 msgstr ""

3065

3009 -#: builtin/apply.c:4618

3066 +#: builtin/apply.c:4609

3067 msgid "--index outside a repository"

3068 msgstr ""

3069

3013 -#: builtin/apply.c:4621

3070 +#: builtin/apply.c:4612

3071 msgid "--cached outside a repository"

3072 msgstr ""

3073

3017 -#: builtin/apply.c:4640

3074 +#: builtin/apply.c:4631

3075 #, c-format

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

3077 msgstr ""

3078

3022 -#: builtin/apply.c:4654

3079 +#: builtin/apply.c:4645

3080 #, c-format

3081 msgid "squelched %d whitespace error"

3082 msgid_plural "squelched %d whitespace errors"

3083 msgstr[0] ""

3084 msgstr[1] ""

3085

3029 -#: builtin/apply.c:4660 builtin/apply.c:4670

3086 +#: builtin/apply.c:4651 builtin/apply.c:4661

3087 #, c-format

3088 msgid "%d line adds whitespace errors."

3089 msgid_plural "%d lines add whitespace errors."

@@ -3088,95 +3145,95 @@ msgstr ""

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

3146 msgstr ""

3147

3091 -#: builtin/blame.c:2500

3148 +#: builtin/blame.c:2519

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

3150 msgstr ""

3151

3095 -#: builtin/blame.c:2501

3152 +#: builtin/blame.c:2520

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

3154 msgstr ""

3155

3099 -#: builtin/blame.c:2502

3156 +#: builtin/blame.c:2521

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

3158 msgstr ""

3159

3103 -#: builtin/blame.c:2503

3160 +#: builtin/blame.c:2522

3161 msgid "Show work cost statistics"

3162 msgstr ""

3163

3107 -#: builtin/blame.c:2504

3164 +#: builtin/blame.c:2523

3165 msgid "Show output score for blame entries"

3166 msgstr ""

3167

3111 -#: builtin/blame.c:2505

3168 +#: builtin/blame.c:2524

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

3170 msgstr ""

3171

3115 -#: builtin/blame.c:2506

3172 +#: builtin/blame.c:2525

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

3174 msgstr ""

3175

3119 -#: builtin/blame.c:2507

3176 +#: builtin/blame.c:2526

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

3178 msgstr ""

3179

3123 -#: builtin/blame.c:2508

3180 +#: builtin/blame.c:2527

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

3182 msgstr ""

3183

3127 -#: builtin/blame.c:2509

3184 +#: builtin/blame.c:2528

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

3186 msgstr ""

3187

3131 -#: builtin/blame.c:2510

3188 +#: builtin/blame.c:2529

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

3190 msgstr ""

3191

3135 -#: builtin/blame.c:2511

3192 +#: builtin/blame.c:2530

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

3194 msgstr ""

3195

3139 -#: builtin/blame.c:2512

3196 +#: builtin/blame.c:2531

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

3198 msgstr ""

3199

3143 -#: builtin/blame.c:2513

3200 +#: builtin/blame.c:2532

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

3202 msgstr ""

3203

3147 -#: builtin/blame.c:2514

3204 +#: builtin/blame.c:2533

3205 msgid "Ignore whitespace differences"

3206 msgstr ""

3207

3151 -#: builtin/blame.c:2515

3208 +#: builtin/blame.c:2534

3209 msgid "Spend extra cycles to find better match"

3210 msgstr ""

3211

3155 -#: builtin/blame.c:2516

3212 +#: builtin/blame.c:2535

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

3214 msgstr ""

3215

3159 -#: builtin/blame.c:2517

3216 +#: builtin/blame.c:2536

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

3218 msgstr ""

3219

3163 -#: builtin/blame.c:2518 builtin/blame.c:2519

3220 +#: builtin/blame.c:2537 builtin/blame.c:2538

3221 msgid "score"

3222 msgstr ""

3223

3167 -#: builtin/blame.c:2518

3224 +#: builtin/blame.c:2537

3225 msgid "Find line copies within and across files"

3226 msgstr ""

3227

3171 -#: builtin/blame.c:2519

3228 +#: builtin/blame.c:2538

3229 msgid "Find line movements within and across files"

3230 msgstr ""

3231

3175 -#: builtin/blame.c:2520

3232 +#: builtin/blame.c:2539

3233 msgid "n,m"

3234 msgstr ""

3235

3179 -#: builtin/blame.c:2520

3236 +#: builtin/blame.c:2539

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

3238 msgstr ""

3239

@@ -3186,396 +3243,392 @@ msgstr ""

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

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

3245 #. fewer display columns.

3189 -#: builtin/blame.c:2601

3246 +#: builtin/blame.c:2620

3247 msgid "4 years, 11 months ago"

3248 msgstr ""

3249

3193 -#: builtin/branch.c:24

3250 +#: builtin/branch.c:25

3251 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3252 msgstr ""

3253

3197 -#: builtin/branch.c:25

3254 +#: builtin/branch.c:26

3255 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3256 msgstr ""

3257

3201 -#: builtin/branch.c:26

3258 +#: builtin/branch.c:27

3259 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3260 msgstr ""

3261

3205 -#: builtin/branch.c:27

3262 +#: builtin/branch.c:28

3263 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3264 msgstr ""

3265

3209 -#: builtin/branch.c:150

3266 +#: builtin/branch.c:29

3267 +msgid "git branch [<options>] [-r | -a] [--points-at]"

3268 +msgstr ""

3269 +

3270 +#: builtin/branch.c:142

3271 #, c-format

3272 msgid ""

3273 "deleting branch '%s' that has been merged to\n"

3274 " '%s', but not yet merged to HEAD."

3275 msgstr ""

3276

3216 -#: builtin/branch.c:154

3277 +#: builtin/branch.c:146

3278 #, c-format

3279 msgid ""

3280 "not deleting branch '%s' that is not yet merged to\n"

3281 " '%s', even though it is merged to HEAD."

3282 msgstr ""

3283

3223 -#: builtin/branch.c:168

3284 +#: builtin/branch.c:160

3285 #, c-format

3286 msgid "Couldn't look up commit object for '%s'"

3287 msgstr ""

3288

3228 -#: builtin/branch.c:172

3289 +#: builtin/branch.c:164

3290 #, c-format

3291 msgid ""

3292 "The branch '%s' is not fully merged.\n"

3293 "If you are sure you want to delete it, run 'git branch -D %s'."

3294 msgstr ""

3295

3235 -#: builtin/branch.c:185

3296 +#: builtin/branch.c:177

3297 msgid "Update of config-file failed"

3298 msgstr ""

3299

3239 -#: builtin/branch.c:213

3300 +#: builtin/branch.c:205

3301 msgid "cannot use -a with -d"

3302 msgstr ""

3303

3243 -#: builtin/branch.c:219

3304 +#: builtin/branch.c:211

3305 msgid "Couldn't look up commit object for HEAD"

3306 msgstr ""

3307

3247 -#: builtin/branch.c:227

3308 +#: builtin/branch.c:219

3309 #, c-format

3310 msgid "Cannot delete the branch '%s' which you are currently on."

3311 msgstr ""

3312

3252 -#: builtin/branch.c:243

3313 +#: builtin/branch.c:235

3314 #, c-format

3315 msgid "remote-tracking branch '%s' not found."

3316 msgstr ""

3317

3257 -#: builtin/branch.c:244

3318 +#: builtin/branch.c:236

3319 #, c-format

3320 msgid "branch '%s' not found."

3321 msgstr ""

3322

3262 -#: builtin/branch.c:259

3323 +#: builtin/branch.c:251

3324 #, c-format

3325 msgid "Error deleting remote-tracking branch '%s'"

3326 msgstr ""

3327

3267 -#: builtin/branch.c:260

3328 +#: builtin/branch.c:252

3329 #, c-format

3330 msgid "Error deleting branch '%s'"

3331 msgstr ""

3332

3272 -#: builtin/branch.c:267

3333 +#: builtin/branch.c:259

3334 #, c-format

3335 msgid "Deleted remote-tracking branch %s (was %s).\n"

3336 msgstr ""

3337

3277 -#: builtin/branch.c:268

3338 +#: builtin/branch.c:260

3339 #, c-format

3340 msgid "Deleted branch %s (was %s).\n"

3341 msgstr ""

3342

3282 -#: builtin/branch.c:369

3283 -#, c-format

3284 -msgid "branch '%s' does not point at a commit"

3285 -msgstr ""

3286 -

3287 -#: builtin/branch.c:452

3343 +#: builtin/branch.c:303

3344 #, c-format

3345 msgid "[%s: gone]"

3346 msgstr ""

3347

3292 -#: builtin/branch.c:457

3348 +#: builtin/branch.c:308

3349 #, c-format

3350 msgid "[%s]"

3351 msgstr ""

3352

3297 -#: builtin/branch.c:462

3353 +#: builtin/branch.c:313

3354 #, c-format

3355 msgid "[%s: behind %d]"

3356 msgstr ""

3357

3302 -#: builtin/branch.c:464

3358 +#: builtin/branch.c:315

3359 #, c-format

3360 msgid "[behind %d]"

3361 msgstr ""

3362

3307 -#: builtin/branch.c:468

3363 +#: builtin/branch.c:319

3364 #, c-format

3365 msgid "[%s: ahead %d]"

3366 msgstr ""

3367

3312 -#: builtin/branch.c:470

3368 +#: builtin/branch.c:321

3369 #, c-format

3370 msgid "[ahead %d]"

3371 msgstr ""

3372

3317 -#: builtin/branch.c:473

3373 +#: builtin/branch.c:324

3374 #, c-format

3375 msgid "[%s: ahead %d, behind %d]"

3376 msgstr ""

3377

3322 -#: builtin/branch.c:476

3378 +#: builtin/branch.c:327

3379 #, c-format

3380 msgid "[ahead %d, behind %d]"

3381 msgstr ""

3382

3327 -#: builtin/branch.c:489

3383 +#: builtin/branch.c:340

3384 msgid " **** invalid ref ****"

3385 msgstr ""

3386

3331 -#: builtin/branch.c:580

3387 +#: builtin/branch.c:366

3388 #, c-format

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

3390 msgstr ""

3391

3336 -#: builtin/branch.c:583

3392 +#: builtin/branch.c:369

3393 #, c-format

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

3395 msgstr ""

3396

3341 -#: builtin/branch.c:589

3397 +#: builtin/branch.c:375

3398 #, c-format

3399 msgid "(HEAD detached at %s)"

3400 msgstr ""

3401

3346 -#: builtin/branch.c:592

3402 +#: builtin/branch.c:378

3403 #, c-format

3404 msgid "(HEAD detached from %s)"

3405 msgstr ""

3406

3351 -#: builtin/branch.c:596

3407 +#: builtin/branch.c:382

3408 msgid "(no branch)"

3409 msgstr ""

3410

3355 -#: builtin/branch.c:643

3356 -#, c-format

3357 -msgid "object '%s' does not point to a commit"

3358 -msgstr ""

3359 -

3360 -#: builtin/branch.c:691

3361 -msgid "some refs could not be read"

3362 -msgstr ""

3363 -

3364 -#: builtin/branch.c:704

3411 +#: builtin/branch.c:524

3412 msgid "cannot rename the current branch while not on any."

3413 msgstr ""

3414

3368 -#: builtin/branch.c:714

3415 +#: builtin/branch.c:534

3416 #, c-format

3417 msgid "Invalid branch name: '%s'"

3418 msgstr ""

3419

3373 -#: builtin/branch.c:729

3420 +#: builtin/branch.c:549

3421 msgid "Branch rename failed"

3422 msgstr ""

3423

3377 -#: builtin/branch.c:733

3424 +#: builtin/branch.c:553

3425 #, c-format

3426 msgid "Renamed a misnamed branch '%s' away"

3427 msgstr ""

3428

3382 -#: builtin/branch.c:737

3429 +#: builtin/branch.c:557

3430 #, c-format

3431 msgid "Branch renamed to %s, but HEAD is not updated!"

3432 msgstr ""

3433

3387 -#: builtin/branch.c:744

3434 +#: builtin/branch.c:564

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

3436 msgstr ""

3437

3391 -#: builtin/branch.c:759

3392 -#, c-format

3393 -msgid "malformed object name %s"

3394 -msgstr ""

3395 -

3396 -#: builtin/branch.c:781

3438 +#: builtin/branch.c:587

3439 #, c-format

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

3441 msgstr ""

3442

3401 -#: builtin/branch.c:811

3443 +#: builtin/branch.c:616

3444 msgid "Generic options"

3445 msgstr ""

3446

3405 -#: builtin/branch.c:813

3447 +#: builtin/branch.c:618

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

3449 msgstr ""

3450

3409 -#: builtin/branch.c:814

3451 +#: builtin/branch.c:619

3452 msgid "suppress informational messages"

3453 msgstr ""

3454

3413 -#: builtin/branch.c:815

3455 +#: builtin/branch.c:620

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

3457 msgstr ""

3458

3417 -#: builtin/branch.c:817

3459 +#: builtin/branch.c:622

3460 msgid "change upstream info"

3461 msgstr ""

3462

3421 -#: builtin/branch.c:821

3463 +#: builtin/branch.c:626

3464 msgid "use colored output"

3465 msgstr ""

3466

3425 -#: builtin/branch.c:822

3467 +#: builtin/branch.c:627

3468 msgid "act on remote-tracking branches"

3469 msgstr ""

3470

3429 -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3430 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3431 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3432 -#: builtin/tag.c:624

3433 -msgid "commit"

3434 -msgstr ""

3435 -

3436 -#: builtin/branch.c:826 builtin/branch.c:832

3471 +#: builtin/branch.c:629 builtin/branch.c:630

3472 msgid "print only branches that contain the commit"

3473 msgstr ""

3474

3440 -#: builtin/branch.c:838

3475 +#: builtin/branch.c:633

3476 msgid "Specific git-branch actions:"

3477 msgstr ""

3478

3444 -#: builtin/branch.c:839

3479 +#: builtin/branch.c:634

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

3481 msgstr ""

3482

3448 -#: builtin/branch.c:841

3483 +#: builtin/branch.c:636

3484 msgid "delete fully merged branch"

3485 msgstr ""

3486

3452 -#: builtin/branch.c:842

3487 +#: builtin/branch.c:637

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

3489 msgstr ""

3490

3456 -#: builtin/branch.c:843

3491 +#: builtin/branch.c:638

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

3493 msgstr ""

3494

3460 -#: builtin/branch.c:844

3495 +#: builtin/branch.c:639

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

3497 msgstr ""

3498

3464 -#: builtin/branch.c:845

3499 +#: builtin/branch.c:640

3500 msgid "list branch names"

3501 msgstr ""

3502

3468 -#: builtin/branch.c:846

3503 +#: builtin/branch.c:641

3504 msgid "create the branch's reflog"

3505 msgstr ""

3506

3472 -#: builtin/branch.c:848

3507 +#: builtin/branch.c:643

3508 msgid "edit the description for the branch"

3509 msgstr ""

3510

3476 -#: builtin/branch.c:849

3511 +#: builtin/branch.c:644

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

3513 msgstr ""

3514

3480 -#: builtin/branch.c:852

3481 -msgid "print only not merged branches"

3515 +#: builtin/branch.c:645

3516 +msgid "print only branches that are merged"

3517 msgstr ""

3518

3484 -#: builtin/branch.c:858

3485 -msgid "print only merged branches"

3519 +#: builtin/branch.c:646

3520 +msgid "print only branches that are not merged"

3521 msgstr ""

3522

3488 -#: builtin/branch.c:862

3523 +#: builtin/branch.c:647

3524 msgid "list branches in columns"

3525 msgstr ""

3526

3492 -#: builtin/branch.c:875

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

3528 +msgid "key"

3529 +msgstr ""

3530 +

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

3532 +msgid "field name to sort on"

3533 +msgstr ""

3534 +

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

3536 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3537 +#: builtin/tag.c:369

3538 +msgid "object"

3539 +msgstr ""

3540 +

3541 +#: builtin/branch.c:652

3542 +msgid "print only branches of the object"

3543 +msgstr ""

3544 +

3545 +#: builtin/branch.c:670

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

3547 msgstr ""

3548

3496 -#: builtin/branch.c:879 builtin/clone.c:690

3549 +#: builtin/branch.c:674 builtin/clone.c:697

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

3551 msgstr ""

3552

3500 -#: builtin/branch.c:901

3553 +#: builtin/branch.c:694

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

3555 msgstr ""

3556

3504 -#: builtin/branch.c:912 builtin/branch.c:951

3557 +#: builtin/branch.c:705 builtin/branch.c:747

3558 msgid "branch name required"

3559 msgstr ""

3560

3508 -#: builtin/branch.c:927

3561 +#: builtin/branch.c:723

3562 msgid "Cannot give description to detached HEAD"

3563 msgstr ""

3564

3512 -#: builtin/branch.c:932

3565 +#: builtin/branch.c:728

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

3567 msgstr ""

3568

3516 -#: builtin/branch.c:939

3569 +#: builtin/branch.c:735

3570 #, c-format

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

3572 msgstr ""

3573

3521 -#: builtin/branch.c:942

3574 +#: builtin/branch.c:738

3575 #, c-format

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

3577 msgstr ""

3578

3526 -#: builtin/branch.c:957

3579 +#: builtin/branch.c:753

3580 msgid "too many branches for a rename operation"

3581 msgstr ""

3582

3530 -#: builtin/branch.c:962

3583 +#: builtin/branch.c:758

3584 msgid "too many branches to set new upstream"

3585 msgstr ""

3586

3534 -#: builtin/branch.c:966

3587 +#: builtin/branch.c:762

3588 #, c-format

3589 msgid ""

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

3591 msgstr ""

3592

3540 -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3593 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3594 #, c-format

3595 msgid "no such branch '%s'"

3596 msgstr ""

3597

3545 -#: builtin/branch.c:973

3598 +#: builtin/branch.c:769

3599 #, c-format

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

3601 msgstr ""

3602

3550 -#: builtin/branch.c:985

3603 +#: builtin/branch.c:781

3604 msgid "too many branches to unset upstream"

3605 msgstr ""

3606

3554 -#: builtin/branch.c:989

3607 +#: builtin/branch.c:785

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

3609 msgstr ""

3610

3558 -#: builtin/branch.c:995

3611 +#: builtin/branch.c:791

3612 #, c-format

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

3614 msgstr ""

3615

3563 -#: builtin/branch.c:1009

3616 +#: builtin/branch.c:805

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

3618 msgstr ""

3619

3567 -#: builtin/branch.c:1015

3620 +#: builtin/branch.c:811

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

3622 msgstr ""

3623

3571 -#: builtin/branch.c:1018

3624 +#: builtin/branch.c:814

3625 #, c-format

3626 msgid ""

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

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

3629 msgstr ""

3630

3578 -#: builtin/branch.c:1035

3631 +#: builtin/branch.c:831

3632 #, c-format

3633 msgid ""

3634 "\n"

@@ -3583,12 +3636,12 @@ msgid ""

3636 "\n"

3637 msgstr ""

3638

3586 -#: builtin/branch.c:1036

3639 +#: builtin/branch.c:832

3640 #, c-format

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

3642 msgstr ""

3643

3591 -#: builtin/branch.c:1037

3644 +#: builtin/branch.c:833

3645 #, c-format

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

3647 msgstr ""

@@ -3613,9 +3666,7 @@ msgid ""

3666 msgstr ""

3667

3668 #: builtin/cat-file.c:429

3616 -msgid ""

3617 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3618 -"objects>"

3669 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3670 msgstr ""

3671

3672 #: builtin/cat-file.c:466

@@ -3671,7 +3722,7 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3722 msgstr ""

3723

3724 #: builtin/check-attr.c:12

3674 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3725 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

3726 msgstr ""

3727

3728 #: builtin/check-attr.c:19

@@ -3690,7 +3741,7 @@ msgstr ""

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

3742 msgstr ""

3743

3693 -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

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

3745 msgid "suppress progress reporting"

3746 msgstr ""

3747

@@ -3776,6 +3827,8 @@ msgid "write the content to temporary files"

3827 msgstr ""

3828

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

3830 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

3831 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

3832 msgid "string"

3833 msgstr ""

3834

@@ -3795,105 +3848,105 @@ msgstr ""

3848 msgid "git checkout [<options>] [<branch>] -- <file>..."

3849 msgstr ""

3850

3798 -#: builtin/checkout.c:133 builtin/checkout.c:166

3851 +#: builtin/checkout.c:134 builtin/checkout.c:167

3852 #, c-format

3853 msgid "path '%s' does not have our version"

3854 msgstr ""

3855

3803 -#: builtin/checkout.c:135 builtin/checkout.c:168

3856 +#: builtin/checkout.c:136 builtin/checkout.c:169

3857 #, c-format

3858 msgid "path '%s' does not have their version"

3859 msgstr ""

3860

3808 -#: builtin/checkout.c:151

3861 +#: builtin/checkout.c:152

3862 #, c-format

3863 msgid "path '%s' does not have all necessary versions"

3864 msgstr ""

3865

3813 -#: builtin/checkout.c:195

3866 +#: builtin/checkout.c:196

3867 #, c-format

3868 msgid "path '%s' does not have necessary versions"

3869 msgstr ""

3870

3818 -#: builtin/checkout.c:212

3871 +#: builtin/checkout.c:213

3872 #, c-format

3873 msgid "path '%s': cannot merge"

3874 msgstr ""

3875

3823 -#: builtin/checkout.c:229

3876 +#: builtin/checkout.c:230

3877 #, c-format

3878 msgid "Unable to add merge result for '%s'"

3879 msgstr ""

3880

3828 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

3829 -#: builtin/checkout.c:259

3881 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3882 +#: builtin/checkout.c:260

3883 #, c-format

3884 msgid "'%s' cannot be used with updating paths"

3885 msgstr ""

3886

3834 -#: builtin/checkout.c:262 builtin/checkout.c:265

3887 +#: builtin/checkout.c:263 builtin/checkout.c:266

3888 #, c-format

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

3890 msgstr ""

3891

3839 -#: builtin/checkout.c:268

3892 +#: builtin/checkout.c:269

3893 #, c-format

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

3895 msgstr ""

3896

3844 -#: builtin/checkout.c:279 builtin/checkout.c:473

3897 +#: builtin/checkout.c:280 builtin/checkout.c:474

3898 msgid "corrupt index file"

3899 msgstr ""

3900

3848 -#: builtin/checkout.c:339 builtin/checkout.c:346

3901 +#: builtin/checkout.c:340 builtin/checkout.c:347

3902 #, c-format

3903 msgid "path '%s' is unmerged"

3904 msgstr ""

3905

3853 -#: builtin/checkout.c:495

3906 +#: builtin/checkout.c:496

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

3908 msgstr ""

3909

3857 -#: builtin/checkout.c:622

3910 +#: builtin/checkout.c:623

3911 #, c-format

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

3913 msgstr ""

3914

3862 -#: builtin/checkout.c:660

3915 +#: builtin/checkout.c:661

3916 msgid "HEAD is now at"

3917 msgstr ""

3918

3866 -#: builtin/checkout.c:667

3919 +#: builtin/checkout.c:668

3920 #, c-format

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

3922 msgstr ""

3923

3871 -#: builtin/checkout.c:670

3924 +#: builtin/checkout.c:671

3925 #, c-format

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

3927 msgstr ""

3928

3876 -#: builtin/checkout.c:674

3929 +#: builtin/checkout.c:675

3930 #, c-format

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

3932 msgstr ""

3933

3881 -#: builtin/checkout.c:676 builtin/checkout.c:1065

3934 +#: builtin/checkout.c:677 builtin/checkout.c:1066

3935 #, c-format

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

3937 msgstr ""

3938

3886 -#: builtin/checkout.c:678

3939 +#: builtin/checkout.c:679

3940 #, c-format

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

3942 msgstr ""

3943

3891 -#: builtin/checkout.c:730

3944 +#: builtin/checkout.c:731

3945 #, c-format

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

3947 msgstr ""

3948

3896 -#: builtin/checkout.c:736

3949 +#: builtin/checkout.c:737

3950 #, c-format

3951 msgid ""

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

@@ -3908,7 +3961,7 @@ msgid_plural ""

3961 msgstr[0] ""

3962 msgstr[1] ""

3963

3911 -#: builtin/checkout.c:755

3964 +#: builtin/checkout.c:756

3965 #, c-format

3966 msgid ""

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

@@ -3925,156 +3978,162 @@ msgid_plural ""

3978 msgstr[0] ""

3979 msgstr[1] ""

3980

3928 -#: builtin/checkout.c:791

3981 +#: builtin/checkout.c:792

3982 msgid "internal error in revision walk"

3983 msgstr ""

3984

3932 -#: builtin/checkout.c:795

3985 +#: builtin/checkout.c:796

3986 msgid "Previous HEAD position was"

3987 msgstr ""

3988

3936 -#: builtin/checkout.c:822 builtin/checkout.c:1060

3989 +#: builtin/checkout.c:823 builtin/checkout.c:1061

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

3991 msgstr ""

3992

3940 -#: builtin/checkout.c:967

3993 +#: builtin/checkout.c:968

3994 #, c-format

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

3996 msgstr ""

3997

3945 -#: builtin/checkout.c:1006 builtin/worktree.c:210

3998 +#: builtin/checkout.c:1007 builtin/worktree.c:213

3999 #, c-format

4000 msgid "invalid reference: %s"

4001 msgstr ""

4002

3950 -#: builtin/checkout.c:1035

4003 +#: builtin/checkout.c:1036

4004 #, c-format

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

4006 msgstr ""

4007

3955 -#: builtin/checkout.c:1074

4008 +#: builtin/checkout.c:1075

4009 msgid "paths cannot be used with switching branches"

4010 msgstr ""

4011

3959 -#: builtin/checkout.c:1077 builtin/checkout.c:1081

4012 +#: builtin/checkout.c:1078 builtin/checkout.c:1082

4013 #, c-format

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

4015 msgstr ""

4016

3964 -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

3965 -#: builtin/checkout.c:1096

4017 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4018 +#: builtin/checkout.c:1097

4019 #, c-format

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

4021 msgstr ""

4022

3970 -#: builtin/checkout.c:1101

4023 +#: builtin/checkout.c:1102

4024 #, c-format

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

4026 msgstr ""

4027

3975 -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

3976 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

3977 -#: builtin/worktree.c:319

4028 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4029 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4030 +#: builtin/worktree.c:322

4031 msgid "branch"

4032 msgstr ""

4033

3981 -#: builtin/checkout.c:1135

4034 +#: builtin/checkout.c:1136

4035 msgid "create and checkout a new branch"

4036 msgstr ""

4037

3985 -#: builtin/checkout.c:1137

4038 +#: builtin/checkout.c:1138

4039 msgid "create/reset and checkout a branch"

4040 msgstr ""

4041

3989 -#: builtin/checkout.c:1138

4042 +#: builtin/checkout.c:1139

4043 msgid "create reflog for new branch"

4044 msgstr ""

4045

3993 -#: builtin/checkout.c:1139

4046 +#: builtin/checkout.c:1140

4047 msgid "detach the HEAD at named commit"

4048 msgstr ""

4049

3997 -#: builtin/checkout.c:1140

4050 +#: builtin/checkout.c:1141

4051 msgid "set upstream info for new branch"

4052 msgstr ""

4053

4001 -#: builtin/checkout.c:1142

4054 +#: builtin/checkout.c:1143

4055 msgid "new-branch"

4056 msgstr ""

4057

4005 -#: builtin/checkout.c:1142

4058 +#: builtin/checkout.c:1143

4059 msgid "new unparented branch"

4060 msgstr ""

4061

4009 -#: builtin/checkout.c:1143

4062 +#: builtin/checkout.c:1144

4063 msgid "checkout our version for unmerged files"

4064 msgstr ""

4065

4013 -#: builtin/checkout.c:1145

4066 +#: builtin/checkout.c:1146

4067 msgid "checkout their version for unmerged files"

4068 msgstr ""

4069

4017 -#: builtin/checkout.c:1147

4070 +#: builtin/checkout.c:1148

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

4072 msgstr ""

4073

4021 -#: builtin/checkout.c:1148

4074 +#: builtin/checkout.c:1149

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

4076 msgstr ""

4077

4025 -#: builtin/checkout.c:1149 builtin/merge.c:227

4078 +#: builtin/checkout.c:1150 builtin/merge.c:227

4079 msgid "update ignored files (default)"

4080 msgstr ""

4081

4029 -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4082 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4083 msgid "style"

4084 msgstr ""

4085

4033 -#: builtin/checkout.c:1151

4086 +#: builtin/checkout.c:1152

4087 msgid "conflict style (merge or diff3)"

4088 msgstr ""

4089

4037 -#: builtin/checkout.c:1154

4090 +#: builtin/checkout.c:1155

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

4092 msgstr ""

4093

4041 -#: builtin/checkout.c:1156

4094 +#: builtin/checkout.c:1157

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

4096 msgstr ""

4097

4045 -#: builtin/checkout.c:1158

4098 +#: builtin/checkout.c:1159

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

4100 msgstr ""

4101

4049 -#: builtin/checkout.c:1181

4102 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4103 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4104 +#: builtin/send-pack.c:168

4105 +msgid "force progress reporting"

4106 +msgstr ""

4107 +

4108 +#: builtin/checkout.c:1191

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

4110 msgstr ""

4111

4053 -#: builtin/checkout.c:1198

4112 +#: builtin/checkout.c:1208

4113 msgid "--track needs a branch name"

4114 msgstr ""

4115

4057 -#: builtin/checkout.c:1203

4116 +#: builtin/checkout.c:1213

4117 msgid "Missing branch name; try -b"

4118 msgstr ""

4119

4061 -#: builtin/checkout.c:1239

4120 +#: builtin/checkout.c:1249

4121 msgid "invalid path specification"

4122 msgstr ""

4123

4065 -#: builtin/checkout.c:1246

4124 +#: builtin/checkout.c:1256

4125 #, c-format

4126 msgid ""

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

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

4129 msgstr ""

4130

4072 -#: builtin/checkout.c:1251

4131 +#: builtin/checkout.c:1261

4132 #, c-format

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

4134 msgstr ""

4135

4077 -#: builtin/checkout.c:1255

4136 +#: builtin/checkout.c:1265

4137 msgid ""

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

4139 "checking out of the index."

@@ -4110,7 +4169,7 @@ msgstr ""

4169 msgid "failed to remove %s"

4170 msgstr ""

4171

4113 -#: builtin/clean.c:317

4172 +#: builtin/clean.c:315

4173 msgid ""

4174 "Prompt help:\n"

4175 "1 - select a numbered item\n"

@@ -4118,7 +4177,7 @@ msgid ""

4177 " - (empty) select nothing"

4178 msgstr ""

4179

4121 -#: builtin/clean.c:321

4180 +#: builtin/clean.c:319

4181 msgid ""

4182 "Prompt help:\n"

4183 "1 - select a single item\n"

@@ -4130,36 +4189,36 @@ msgid ""

4189 " - (empty) finish selecting"

4190 msgstr ""

4191

4133 -#: builtin/clean.c:537

4192 +#: builtin/clean.c:535

4193 #, c-format

4194 msgid "Huh (%s)?"

4195 msgstr ""

4196

4138 -#: builtin/clean.c:679

4197 +#: builtin/clean.c:677

4198 #, c-format

4199 msgid "Input ignore patterns>> "

4200 msgstr ""

4201

4143 -#: builtin/clean.c:716

4202 +#: builtin/clean.c:714

4203 #, c-format

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

4205 msgstr ""

4206

4148 -#: builtin/clean.c:737

4207 +#: builtin/clean.c:735

4208 msgid "Select items to delete"

4209 msgstr ""

4210

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

4153 -#: builtin/clean.c:778

4212 +#: builtin/clean.c:776

4213 #, c-format

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

4215 msgstr ""

4216

4158 -#: builtin/clean.c:803

4217 +#: builtin/clean.c:801

4218 msgid "Bye."

4219 msgstr ""

4220

4162 -#: builtin/clean.c:811

4221 +#: builtin/clean.c:809

4222 msgid ""

4223 "clean - start cleaning\n"

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

@@ -4170,68 +4229,68 @@ msgid ""

4229 "? - help for prompt selection"

4230 msgstr ""

4231

4173 -#: builtin/clean.c:838

4232 +#: builtin/clean.c:836

4233 msgid "*** Commands ***"

4234 msgstr ""

4235

4177 -#: builtin/clean.c:839

4236 +#: builtin/clean.c:837

4237 msgid "What now"

4238 msgstr ""

4239

4181 -#: builtin/clean.c:847

4240 +#: builtin/clean.c:845

4241 msgid "Would remove the following item:"

4242 msgid_plural "Would remove the following items:"

4243 msgstr[0] ""

4244 msgstr[1] ""

4245

4187 -#: builtin/clean.c:864

4246 +#: builtin/clean.c:862

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

4248 msgstr ""

4249

4191 -#: builtin/clean.c:895

4250 +#: builtin/clean.c:893

4251 msgid "do not print names of files removed"

4252 msgstr ""

4253

4195 -#: builtin/clean.c:897

4254 +#: builtin/clean.c:895

4255 msgid "force"

4256 msgstr ""

4257

4199 -#: builtin/clean.c:898

4258 +#: builtin/clean.c:896

4259 msgid "interactive cleaning"

4260 msgstr ""

4261

4203 -#: builtin/clean.c:900

4262 +#: builtin/clean.c:898

4263 msgid "remove whole directories"

4264 msgstr ""

4265

4207 -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4208 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4266 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

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

4268 msgid "pattern"

4269 msgstr ""

4270

4212 -#: builtin/clean.c:902

4271 +#: builtin/clean.c:900

4272 msgid "add <pattern> to ignore rules"

4273 msgstr ""

4274

4216 -#: builtin/clean.c:903

4275 +#: builtin/clean.c:901

4276 msgid "remove ignored files, too"

4277 msgstr ""

4278

4220 -#: builtin/clean.c:905

4279 +#: builtin/clean.c:903

4280 msgid "remove only ignored files"

4281 msgstr ""

4282

4224 -#: builtin/clean.c:923

4283 +#: builtin/clean.c:921

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

4285 msgstr ""

4286

4228 -#: builtin/clean.c:927

4287 +#: builtin/clean.c:925

4288 msgid ""

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

4290 "clean"

4291 msgstr ""

4292

4234 -#: builtin/clean.c:930

4293 +#: builtin/clean.c:928

4294 msgid ""

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

4296 "refusing to clean"

@@ -4241,16 +4300,11 @@ msgstr ""

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

4301 msgstr ""

4302

4244 -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4245 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4246 -msgid "force progress reporting"

4247 -msgstr ""

4248 -

4303 #: builtin/clone.c:59

4304 msgid "don't create a checkout"

4305 msgstr ""

4306

4253 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

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

4308 msgid "create a bare repository"

4309 msgstr ""

4310

@@ -4274,15 +4328,15 @@ msgstr ""

4328 msgid "initialize submodules in the clone"

4329 msgstr ""

4330

4277 -#: builtin/clone.c:75 builtin/init-db.c:501

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

4332 msgid "template-directory"

4333 msgstr ""

4334

4281 -#: builtin/clone.c:76 builtin/init-db.c:502

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

4336 msgid "directory from which templates will be used"

4337 msgstr ""

4338

4285 -#: builtin/clone.c:78

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

4340 msgid "reference repository"

4341 msgstr ""

4342

@@ -4306,7 +4360,7 @@ msgstr ""

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

4361 msgstr ""

4362

4309 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4363 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4364 #: builtin/pull.c:186

4365 msgid "depth"

4366 msgstr ""

@@ -4319,11 +4373,11 @@ msgstr ""

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

4374 msgstr ""

4375

4322 -#: builtin/clone.c:91 builtin/init-db.c:510

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

4377 msgid "gitdir"

4378 msgstr ""

4379

4326 -#: builtin/clone.c:92 builtin/init-db.c:511

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

4381 msgid "separate git dir from working tree"

4382 msgstr ""

4383

@@ -4335,173 +4389,174 @@ msgstr ""

4389 msgid "set config inside the new repository"

4390 msgstr ""

4391

4338 -#: builtin/clone.c:298

4392 +#: builtin/clone.c:300

4393 #, c-format

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

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

4395 msgstr ""

4396

4397 #: builtin/clone.c:302

4398 #, c-format

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

4400 +msgstr ""

4401 +

4402 +#: builtin/clone.c:307

4403 +#, c-format

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

4405 msgstr ""

4406

4348 -#: builtin/clone.c:305

4407 +#: builtin/clone.c:310

4408 #, c-format

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

4410 msgstr ""

4411

4353 -#: builtin/clone.c:370 builtin/diff.c:84

4412 +#: builtin/clone.c:375 builtin/diff.c:84

4413 #, c-format

4414 msgid "failed to stat '%s'"

4415 msgstr ""

4416

4358 -#: builtin/clone.c:372

4417 +#: builtin/clone.c:377

4418 #, c-format

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

4420 msgstr ""

4421

4363 -#: builtin/clone.c:386

4422 +#: builtin/clone.c:391

4423 #, c-format

4424 msgid "failed to stat %s\n"

4425 msgstr ""

4426

4368 -#: builtin/clone.c:408

4427 +#: builtin/clone.c:413

4428 #, c-format

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

4430 msgstr ""

4431

4373 -#: builtin/clone.c:412

4432 +#: builtin/clone.c:417

4433 #, c-format

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

4435 msgstr ""

4436

4378 -#: builtin/clone.c:435 builtin/clone.c:619

4437 +#: builtin/clone.c:442 builtin/clone.c:626

4438 #, c-format

4439 msgid "done.\n"

4440 msgstr ""

4441

4383 -#: builtin/clone.c:447

4442 +#: builtin/clone.c:454

4443 msgid ""

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

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

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

4447 msgstr ""

4448

4390 -#: builtin/clone.c:524

4449 +#: builtin/clone.c:531

4450 #, c-format

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

4452 msgstr ""

4453

4395 -#: builtin/clone.c:614

4454 +#: builtin/clone.c:621

4455 #, c-format

4456 msgid "Checking connectivity... "

4457 msgstr ""

4458

4400 -#: builtin/clone.c:617

4459 +#: builtin/clone.c:624

4460 msgid "remote did not send all necessary objects"

4461 msgstr ""

4462

4404 -#: builtin/clone.c:681

4463 +#: builtin/clone.c:688

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

4465 msgstr ""

4466

4408 -#: builtin/clone.c:712

4467 +#: builtin/clone.c:719

4468 msgid "unable to checkout working tree"

4469 msgstr ""

4470

4412 -#: builtin/clone.c:799

4471 +#: builtin/clone.c:808

4472 msgid "cannot repack to clean up"

4473 msgstr ""

4474

4416 -#: builtin/clone.c:801

4475 +#: builtin/clone.c:810

4476 msgid "cannot unlink temporary alternates file"

4477 msgstr ""

4478

4420 -#: builtin/clone.c:831

4479 +#: builtin/clone.c:842

4480 msgid "Too many arguments."

4481 msgstr ""

4482

4424 -#: builtin/clone.c:835

4483 +#: builtin/clone.c:846

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

4485 msgstr ""

4486

4428 -#: builtin/clone.c:846

4487 +#: builtin/clone.c:857

4488 #, c-format

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

4490 msgstr ""

4491

4433 -#: builtin/clone.c:849

4492 +#: builtin/clone.c:860

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

4494 msgstr ""

4495

4437 -#: builtin/clone.c:862

4496 +#: builtin/clone.c:873

4497 #, c-format

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

4499 msgstr ""

4500

4442 -#: builtin/clone.c:868 builtin/fetch.c:1168

4501 +#: builtin/clone.c:879 builtin/fetch.c:1166

4502 #, c-format

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

4504 msgstr ""

4505

4447 -#: builtin/clone.c:878

4506 +#: builtin/clone.c:889

4507 #, c-format

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

4509 msgstr ""

4510

4452 -#: builtin/clone.c:888

4511 +#: builtin/clone.c:899

4512 #, c-format

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

4514 msgstr ""

4515

4457 -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4458 -#: builtin/worktree.c:245

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

4517 +#: builtin/worktree.c:221 builtin/worktree.c:248

4518 #, c-format

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

4520 msgstr ""

4521

4463 -#: builtin/clone.c:906

4522 +#: builtin/clone.c:917

4523 #, c-format

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

4525 msgstr ""

4526

4468 -#: builtin/clone.c:924

4527 +#: builtin/clone.c:935

4528 #, c-format

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

4530 msgstr ""

4531

4473 -#: builtin/clone.c:926

4532 +#: builtin/clone.c:937

4533 #, c-format

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

4535 msgstr ""

4536

4478 -#: builtin/clone.c:951

4479 -msgid "--dissociate given, but there is no --reference"

4480 -msgstr ""

4481 -

4482 -#: builtin/clone.c:968

4537 +#: builtin/clone.c:975

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

4539 msgstr ""

4540

4486 -#: builtin/clone.c:971

4541 +#: builtin/clone.c:978

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

4543 msgstr ""

4544

4490 -#: builtin/clone.c:976

4545 +#: builtin/clone.c:983

4546 msgid "--local is ignored"

4547 msgstr ""

4548

4494 -#: builtin/clone.c:980

4549 +#: builtin/clone.c:987

4550 #, c-format

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

4552 msgstr ""

4553

4499 -#: builtin/clone.c:1029 builtin/clone.c:1037

4554 +#: builtin/clone.c:1036 builtin/clone.c:1044

4555 #, c-format

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

4557 msgstr ""

4558

4504 -#: builtin/clone.c:1040

4559 +#: builtin/clone.c:1047

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

4561 msgstr ""

4562

@@ -4537,15 +4592,15 @@ msgstr ""

4592 msgid "--command must be the first argument"

4593 msgstr ""

4594

4540 -#: builtin/commit.c:37

4595 +#: builtin/commit.c:38

4596 msgid "git commit [<options>] [--] <pathspec>..."

4597 msgstr ""

4598

4544 -#: builtin/commit.c:42

4599 +#: builtin/commit.c:43

4600 msgid "git status [<options>] [--] <pathspec>..."

4601 msgstr ""

4602

4548 -#: builtin/commit.c:47

4603 +#: builtin/commit.c:48

4604 msgid ""

4605 "Your name and email address were configured automatically based\n"

4606 "on your username and hostname. Please check that they are accurate.\n"

@@ -4560,7 +4615,7 @@ msgid ""

4615 " git commit --amend --reset-author\n"

4616 msgstr ""

4617

4563 -#: builtin/commit.c:60

4618 +#: builtin/commit.c:61

4619 msgid ""

4620 "Your name and email address were configured automatically based\n"

4621 "on your username and hostname. Please check that they are accurate.\n"

@@ -4574,14 +4629,14 @@ msgid ""

4629 " git commit --amend --reset-author\n"

4630 msgstr ""

4631

4577 -#: builtin/commit.c:72

4632 +#: builtin/commit.c:73

4633 msgid ""

4634 "You asked to amend the most recent commit, but doing so would make\n"

4635 "it empty. You can repeat your command with --allow-empty, or you can\n"

4636 "remove the commit entirely with \"git reset HEAD^\".\n"

4637 msgstr ""

4638

4584 -#: builtin/commit.c:77

4639 +#: builtin/commit.c:78

4640 msgid ""

4641 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4642 "If you wish to commit it anyway, use:\n"

@@ -4590,11 +4645,11 @@ msgid ""

4645 "\n"

4646 msgstr ""

4647

4593 -#: builtin/commit.c:84

4648 +#: builtin/commit.c:85

4649 msgid "Otherwise, please use 'git reset'\n"

4650 msgstr ""

4651

4597 -#: builtin/commit.c:87

4652 +#: builtin/commit.c:88

4653 msgid ""

4654 "If you wish to skip this commit, use:\n"

4655 "\n"

@@ -4604,103 +4659,103 @@ msgid ""

4659 "the remaining commits.\n"

4660 msgstr ""

4661

4607 -#: builtin/commit.c:304

4662 +#: builtin/commit.c:305

4663 msgid "failed to unpack HEAD tree object"

4664 msgstr ""

4665

4611 -#: builtin/commit.c:345

4666 +#: builtin/commit.c:346

4667 msgid "unable to create temporary index"

4668 msgstr ""

4669

4615 -#: builtin/commit.c:351

4670 +#: builtin/commit.c:352

4671 msgid "interactive add failed"

4672 msgstr ""

4673

4619 -#: builtin/commit.c:364

4674 +#: builtin/commit.c:365

4675 msgid "unable to update temporary index"

4676 msgstr ""

4677

4623 -#: builtin/commit.c:366

4678 +#: builtin/commit.c:367

4679 msgid "Failed to update main cache tree"

4680 msgstr ""

4681

4627 -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4682 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

4683 msgid "unable to write new_index file"

4684 msgstr ""

4685

4631 -#: builtin/commit.c:444

4686 +#: builtin/commit.c:445

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

4688 msgstr ""

4689

4635 -#: builtin/commit.c:446

4690 +#: builtin/commit.c:447

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

4692 msgstr ""

4693

4639 -#: builtin/commit.c:455

4694 +#: builtin/commit.c:456

4695 msgid "cannot read the index"

4696 msgstr ""

4697

4643 -#: builtin/commit.c:474

4698 +#: builtin/commit.c:475

4699 msgid "unable to write temporary index file"

4700 msgstr ""

4701

4647 -#: builtin/commit.c:579

4702 +#: builtin/commit.c:580

4703 #, c-format

4704 msgid "commit '%s' lacks author header"

4705 msgstr ""

4706

4652 -#: builtin/commit.c:581

4707 +#: builtin/commit.c:582

4708 #, c-format

4709 msgid "commit '%s' has malformed author line"

4710 msgstr ""

4711

4657 -#: builtin/commit.c:600

4712 +#: builtin/commit.c:601

4713 msgid "malformed --author parameter"

4714 msgstr ""

4715

4661 -#: builtin/commit.c:608

4716 +#: builtin/commit.c:609

4717 #, c-format

4718 msgid "invalid date format: %s"

4719 msgstr ""

4720

4666 -#: builtin/commit.c:652

4721 +#: builtin/commit.c:653

4722 msgid ""

4723 "unable to select a comment character that is not used\n"

4724 "in the current commit message"

4725 msgstr ""

4726

4672 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

4727 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

4728 #, c-format

4729 msgid "could not lookup commit %s"

4730 msgstr ""

4731

4677 -#: builtin/commit.c:701 builtin/shortlog.c:273

4732 +#: builtin/commit.c:702 builtin/shortlog.c:273

4733 #, c-format

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

4735 msgstr ""

4736

4682 -#: builtin/commit.c:703

4737 +#: builtin/commit.c:704

4738 msgid "could not read log from standard input"

4739 msgstr ""

4740

4686 -#: builtin/commit.c:707

4741 +#: builtin/commit.c:708

4742 #, c-format

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

4744 msgstr ""

4745

4691 -#: builtin/commit.c:729

4746 +#: builtin/commit.c:730

4747 msgid "could not read MERGE_MSG"

4748 msgstr ""

4749

4695 -#: builtin/commit.c:733

4750 +#: builtin/commit.c:734

4751 msgid "could not read SQUASH_MSG"

4752 msgstr ""

4753

4699 -#: builtin/commit.c:784

4754 +#: builtin/commit.c:785

4755 msgid "could not write commit template"

4756 msgstr ""

4757

4703 -#: builtin/commit.c:802

4758 +#: builtin/commit.c:803

4759 #, c-format

4760 msgid ""

4761 "\n"

@@ -4710,7 +4765,7 @@ msgid ""

4765 "and try again.\n"

4766 msgstr ""

4767

4713 -#: builtin/commit.c:807

4768 +#: builtin/commit.c:808

4769 #, c-format

4770 msgid ""

4771 "\n"

@@ -4720,14 +4775,14 @@ msgid ""

4775 "and try again.\n"

4776 msgstr ""

4777

4723 -#: builtin/commit.c:820

4778 +#: builtin/commit.c:821

4779 #, c-format

4780 msgid ""

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

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

4783 msgstr ""

4784

4730 -#: builtin/commit.c:827

4785 +#: builtin/commit.c:828

4786 #, c-format

4787 msgid ""

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

@@ -4735,335 +4790,341 @@ msgid ""

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

4791 msgstr ""

4792

4738 -#: builtin/commit.c:847

4793 +#: builtin/commit.c:848

4794 #, c-format

4795 msgid "%sAuthor: %.*s <%.*s>"

4796 msgstr ""

4797

4743 -#: builtin/commit.c:855

4798 +#: builtin/commit.c:856

4799 #, c-format

4800 msgid "%sDate: %s"

4801 msgstr ""

4802

4748 -#: builtin/commit.c:862

4803 +#: builtin/commit.c:863

4804 #, c-format

4805 msgid "%sCommitter: %.*s <%.*s>"

4806 msgstr ""

4807

4753 -#: builtin/commit.c:880

4808 +#: builtin/commit.c:881

4809 msgid "Cannot read index"

4810 msgstr ""

4811

4757 -#: builtin/commit.c:937

4812 +#: builtin/commit.c:938

4813 msgid "Error building trees"

4814 msgstr ""

4815

4761 -#: builtin/commit.c:952 builtin/tag.c:495

4816 +#: builtin/commit.c:953 builtin/tag.c:266

4817 #, c-format

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

4819 msgstr ""

4820

4766 -#: builtin/commit.c:1054

4821 +#: builtin/commit.c:1055

4822 #, c-format

4823 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

4824 msgstr ""

4825

4771 -#: builtin/commit.c:1069 builtin/commit.c:1309

4826 +#: builtin/commit.c:1070 builtin/commit.c:1310

4827 #, c-format

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

4829 msgstr ""

4830

4776 -#: builtin/commit.c:1106

4831 +#: builtin/commit.c:1107

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

4833 msgstr ""

4834

4780 -#: builtin/commit.c:1136

4835 +#: builtin/commit.c:1137

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

4837 msgstr ""

4838

4784 -#: builtin/commit.c:1145

4839 +#: builtin/commit.c:1146

4840 msgid "You have nothing to amend."

4841 msgstr ""

4842

4788 -#: builtin/commit.c:1148

4843 +#: builtin/commit.c:1149

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

4845 msgstr ""

4846

4792 -#: builtin/commit.c:1150

4847 +#: builtin/commit.c:1151

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

4849 msgstr ""

4850

4796 -#: builtin/commit.c:1153

4851 +#: builtin/commit.c:1154

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

4853 msgstr ""

4854

4800 -#: builtin/commit.c:1163

4855 +#: builtin/commit.c:1164

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

4857 msgstr ""

4858

4804 -#: builtin/commit.c:1165

4859 +#: builtin/commit.c:1166

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

4861 msgstr ""

4862

4808 -#: builtin/commit.c:1173

4863 +#: builtin/commit.c:1174

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

4865 msgstr ""

4866

4812 -#: builtin/commit.c:1190

4867 +#: builtin/commit.c:1191

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

4869 msgstr ""

4870

4816 -#: builtin/commit.c:1192

4871 +#: builtin/commit.c:1193

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

4873 msgstr ""

4874

4820 -#: builtin/commit.c:1194

4875 +#: builtin/commit.c:1195

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

4877 msgstr ""

4878

4824 -#: builtin/commit.c:1196

4879 +#: builtin/commit.c:1197

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

4881 msgstr ""

4882

4828 -#: builtin/commit.c:1208 builtin/tag.c:730

4883 +#: builtin/commit.c:1209 builtin/tag.c:475

4884 #, c-format

4885 msgid "Invalid cleanup mode %s"

4886 msgstr ""

4887

4833 -#: builtin/commit.c:1213

4888 +#: builtin/commit.c:1214

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

4890 msgstr ""

4891

4837 -#: builtin/commit.c:1323 builtin/commit.c:1602

4892 +#: builtin/commit.c:1324 builtin/commit.c:1605

4893 msgid "show status concisely"

4894 msgstr ""

4895

4841 -#: builtin/commit.c:1325 builtin/commit.c:1604

4896 +#: builtin/commit.c:1326 builtin/commit.c:1607

4897 msgid "show branch information"

4898 msgstr ""

4899

4845 -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

4900 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

4901 +#: builtin/worktree.c:423

4902 msgid "machine-readable output"

4903 msgstr ""

4904

4849 -#: builtin/commit.c:1330 builtin/commit.c:1608

4905 +#: builtin/commit.c:1331 builtin/commit.c:1611

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

4907 msgstr ""

4908

4853 -#: builtin/commit.c:1333 builtin/commit.c:1611

4909 +#: builtin/commit.c:1334 builtin/commit.c:1614

4910 msgid "terminate entries with NUL"

4911 msgstr ""

4912

4857 -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

4858 -#: builtin/fast-export.c:984 builtin/tag.c:604

4913 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

4914 +#: builtin/fast-export.c:984 builtin/tag.c:353

4915 msgid "mode"

4916 msgstr ""

4917

4862 -#: builtin/commit.c:1336 builtin/commit.c:1614

4918 +#: builtin/commit.c:1337 builtin/commit.c:1617

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

4920 msgstr ""

4921

4866 -#: builtin/commit.c:1339

4922 +#: builtin/commit.c:1340

4923 msgid "show ignored files"

4924 msgstr ""

4925

4870 -#: builtin/commit.c:1340 parse-options.h:155

4926 +#: builtin/commit.c:1341 parse-options.h:155

4927 msgid "when"

4928 msgstr ""

4929

4874 -#: builtin/commit.c:1341

4930 +#: builtin/commit.c:1342

4931 msgid ""

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

4933 "(Default: all)"

4934 msgstr ""

4935

4880 -#: builtin/commit.c:1343

4936 +#: builtin/commit.c:1344

4937 msgid "list untracked files in columns"

4938 msgstr ""

4939

4884 -#: builtin/commit.c:1429

4940 +#: builtin/commit.c:1430

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

4942 msgstr ""

4943

4888 -#: builtin/commit.c:1431

4944 +#: builtin/commit.c:1432

4945 msgid "could not parse newly created commit"

4946 msgstr ""

4947

4892 -#: builtin/commit.c:1476

4948 +#: builtin/commit.c:1477

4949 msgid "detached HEAD"

4950 msgstr ""

4951

4896 -#: builtin/commit.c:1479

4952 +#: builtin/commit.c:1480

4953 msgid " (root-commit)"

4954 msgstr ""

4955

4900 -#: builtin/commit.c:1572

4956 +#: builtin/commit.c:1575

4957 msgid "suppress summary after successful commit"

4958 msgstr ""

4959

4904 -#: builtin/commit.c:1573

4960 +#: builtin/commit.c:1576

4961 msgid "show diff in commit message template"

4962 msgstr ""

4963

4908 -#: builtin/commit.c:1575

4964 +#: builtin/commit.c:1578

4965 msgid "Commit message options"

4966 msgstr ""

4967

4912 -#: builtin/commit.c:1576 builtin/tag.c:602

4968 +#: builtin/commit.c:1579 builtin/tag.c:351

4969 msgid "read message from file"

4970 msgstr ""

4971

4916 -#: builtin/commit.c:1577

4972 +#: builtin/commit.c:1580

4973 msgid "author"

4974 msgstr ""

4975

4920 -#: builtin/commit.c:1577

4976 +#: builtin/commit.c:1580

4977 msgid "override author for commit"

4978 msgstr ""

4979

4924 -#: builtin/commit.c:1578 builtin/gc.c:268

4980 +#: builtin/commit.c:1581 builtin/gc.c:326

4981 msgid "date"

4982 msgstr ""

4983

4928 -#: builtin/commit.c:1578

4984 +#: builtin/commit.c:1581

4985 msgid "override date for commit"

4986 msgstr ""

4987

4932 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

4933 -#: builtin/notes.c:555 builtin/tag.c:600

4988 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

4989 +#: builtin/notes.c:555 builtin/tag.c:349

4990 msgid "message"

4991 msgstr ""

4992

4937 -#: builtin/commit.c:1579

4993 +#: builtin/commit.c:1582

4994 msgid "commit message"

4995 msgstr ""

4996

4941 -#: builtin/commit.c:1580

4997 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

4998 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

4999 +msgid "commit"

5000 +msgstr ""

5001 +

5002 +#: builtin/commit.c:1583

5003 msgid "reuse and edit message from specified commit"

5004 msgstr ""

5005

4945 -#: builtin/commit.c:1581

5006 +#: builtin/commit.c:1584

5007 msgid "reuse message from specified commit"

5008 msgstr ""

5009

4949 -#: builtin/commit.c:1582

5010 +#: builtin/commit.c:1585

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

5012 msgstr ""

5013

4953 -#: builtin/commit.c:1583

5014 +#: builtin/commit.c:1586

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

5016 msgstr ""

5017

4957 -#: builtin/commit.c:1584

5018 +#: builtin/commit.c:1587

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

5020 msgstr ""

5021

4961 -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5022 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5023 msgid "add Signed-off-by:"

5024 msgstr ""

5025

4965 -#: builtin/commit.c:1586

5026 +#: builtin/commit.c:1589

5027 msgid "use specified template file"

5028 msgstr ""

5029

4969 -#: builtin/commit.c:1587

5030 +#: builtin/commit.c:1590

5031 msgid "force edit of commit"

5032 msgstr ""

5033

4973 -#: builtin/commit.c:1588

5034 +#: builtin/commit.c:1591

5035 msgid "default"

5036 msgstr ""

5037

4977 -#: builtin/commit.c:1588 builtin/tag.c:605

5038 +#: builtin/commit.c:1591 builtin/tag.c:354

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

5040 msgstr ""

5041

4981 -#: builtin/commit.c:1589

5042 +#: builtin/commit.c:1592

5043 msgid "include status in commit message template"

5044 msgstr ""

5045

4985 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5046 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5047 #: builtin/revert.c:93

5048 msgid "GPG sign commit"

5049 msgstr ""

5050

4990 -#: builtin/commit.c:1594

5051 +#: builtin/commit.c:1597

5052 msgid "Commit contents options"

5053 msgstr ""

5054

4994 -#: builtin/commit.c:1595

5055 +#: builtin/commit.c:1598

5056 msgid "commit all changed files"

5057 msgstr ""

5058

4998 -#: builtin/commit.c:1596

5059 +#: builtin/commit.c:1599

5060 msgid "add specified files to index for commit"

5061 msgstr ""

5062

5002 -#: builtin/commit.c:1597

5063 +#: builtin/commit.c:1600

5064 msgid "interactively add files"

5065 msgstr ""

5066

5006 -#: builtin/commit.c:1598

5067 +#: builtin/commit.c:1601

5068 msgid "interactively add changes"

5069 msgstr ""

5070

5010 -#: builtin/commit.c:1599

5071 +#: builtin/commit.c:1602

5072 msgid "commit only specified files"

5073 msgstr ""

5074

5014 -#: builtin/commit.c:1600

5075 +#: builtin/commit.c:1603

5076 msgid "bypass pre-commit hook"

5077 msgstr ""

5078

5018 -#: builtin/commit.c:1601

5079 +#: builtin/commit.c:1604

5080 msgid "show what would be committed"

5081 msgstr ""

5082

5022 -#: builtin/commit.c:1612

5083 +#: builtin/commit.c:1615

5084 msgid "amend previous commit"

5085 msgstr ""

5086

5026 -#: builtin/commit.c:1613

5087 +#: builtin/commit.c:1616

5088 msgid "bypass post-rewrite hook"

5089 msgstr ""

5090

5030 -#: builtin/commit.c:1618

5091 +#: builtin/commit.c:1621

5092 msgid "ok to record an empty change"

5093 msgstr ""

5094

5034 -#: builtin/commit.c:1620

5095 +#: builtin/commit.c:1623

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

5097 msgstr ""

5098

5038 -#: builtin/commit.c:1649

5099 +#: builtin/commit.c:1652

5100 msgid "could not parse HEAD commit"

5101 msgstr ""

5102

5042 -#: builtin/commit.c:1695

5103 +#: builtin/commit.c:1698

5104 #, c-format

5105 msgid "Corrupt MERGE_HEAD file (%s)"

5106 msgstr ""

5107

5047 -#: builtin/commit.c:1702

5108 +#: builtin/commit.c:1705

5109 msgid "could not read MERGE_MODE"

5110 msgstr ""

5111

5051 -#: builtin/commit.c:1721

5112 +#: builtin/commit.c:1724

5113 #, c-format

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

5115 msgstr ""

5116

5056 -#: builtin/commit.c:1732

5117 +#: builtin/commit.c:1735

5118 #, c-format

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

5120 msgstr ""

5121

5061 -#: builtin/commit.c:1737

5122 +#: builtin/commit.c:1740

5123 #, c-format

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

5125 msgstr ""

5126

5066 -#: builtin/commit.c:1785

5127 +#: builtin/commit.c:1788

5128 msgid ""

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

5130 "new_index file. Check that disk is not full and quota is\n"

@@ -5198,11 +5259,11 @@ msgstr ""

5259 msgid "respect include directives on lookup"

5260 msgstr ""

5261

5201 -#: builtin/config.c:311

5262 +#: builtin/config.c:303

5263 msgid "unable to parse default color value"

5264 msgstr ""

5265

5205 -#: builtin/config.c:449

5266 +#: builtin/config.c:441

5267 #, c-format

5268 msgid ""

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

@@ -5212,16 +5273,16 @@ msgid ""

5273 "#\temail = %s\n"

5274 msgstr ""

5275

5215 -#: builtin/config.c:583

5276 +#: builtin/config.c:575

5277 #, c-format

5278 msgid "cannot create configuration file %s"

5279 msgstr ""

5280

5220 -#: builtin/count-objects.c:55

5281 +#: builtin/count-objects.c:77

5282 msgid "git count-objects [-v] [-H | --human-readable]"

5283 msgstr ""

5284

5224 -#: builtin/count-objects.c:65

5285 +#: builtin/count-objects.c:87

5286 msgid "print sizes in human readable format"

5287 msgstr ""

5288

@@ -5335,7 +5396,7 @@ msgstr ""

5396 msgid "only consider tags matching <pattern>"

5397 msgstr ""

5398

5338 -#: builtin/describe.c:410 builtin/name-rev.c:318

5399 +#: builtin/describe.c:410 builtin/name-rev.c:314

5400 msgid "show abbreviated commit object as fallback"

5401 msgstr ""

5402

@@ -5512,7 +5573,7 @@ msgstr ""

5573 msgid "convert to a complete repository"

5574 msgstr ""

5575

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

5576 +#: builtin/fetch.c:118 builtin/log.c:1232

5577 msgid "dir"

5578 msgstr ""

5579

@@ -5554,7 +5615,7 @@ msgstr ""

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

5616 msgstr ""

5617

5557 -#: builtin/fetch.c:478 builtin/fetch.c:564

5618 +#: builtin/fetch.c:478 builtin/fetch.c:566

5619 msgid "[rejected]"

5620 msgstr ""

5621

@@ -5578,125 +5639,125 @@ msgstr ""

5639 msgid "[new ref]"

5640 msgstr ""

5641

5581 -#: builtin/fetch.c:560

5642 +#: builtin/fetch.c:561

5643 msgid "unable to update local ref"

5644 msgstr ""

5645

5585 -#: builtin/fetch.c:560

5646 +#: builtin/fetch.c:561

5647 msgid "forced update"

5648 msgstr ""

5649

5589 -#: builtin/fetch.c:566

5650 +#: builtin/fetch.c:568

5651 msgid "(non-fast-forward)"

5652 msgstr ""

5653

5593 -#: builtin/fetch.c:600 builtin/fetch.c:842

5654 +#: builtin/fetch.c:602 builtin/fetch.c:843

5655 #, c-format

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

5657 msgstr ""

5658

5598 -#: builtin/fetch.c:609

5659 +#: builtin/fetch.c:611

5660 #, c-format

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

5662 msgstr ""

5663

5603 -#: builtin/fetch.c:627

5664 +#: builtin/fetch.c:629

5665 #, c-format

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

5667 msgstr ""

5668

5608 -#: builtin/fetch.c:715 builtin/fetch.c:807

5669 +#: builtin/fetch.c:716 builtin/fetch.c:808

5670 #, c-format

5671 msgid "From %.*s\n"

5672 msgstr ""

5673

5613 -#: builtin/fetch.c:726

5674 +#: builtin/fetch.c:727

5675 #, c-format

5676 msgid ""

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

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

5679 msgstr ""

5680

5620 -#: builtin/fetch.c:778

5681 +#: builtin/fetch.c:779

5682 #, c-format

5683 msgid " (%s will become dangling)"

5684 msgstr ""

5685

5625 -#: builtin/fetch.c:779

5686 +#: builtin/fetch.c:780

5687 #, c-format

5688 msgid " (%s has become dangling)"

5689 msgstr ""

5690

5630 -#: builtin/fetch.c:811

5691 +#: builtin/fetch.c:812

5692 msgid "[deleted]"

5693 msgstr ""

5694

5634 -#: builtin/fetch.c:812 builtin/remote.c:1034

5695 +#: builtin/fetch.c:813 builtin/remote.c:1040

5696 msgid "(none)"

5697 msgstr ""

5698

5638 -#: builtin/fetch.c:832

5699 +#: builtin/fetch.c:833

5700 #, c-format

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

5702 msgstr ""

5703

5643 -#: builtin/fetch.c:851

5704 +#: builtin/fetch.c:852

5705 #, c-format

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

5707 msgstr ""

5708

5648 -#: builtin/fetch.c:854

5709 +#: builtin/fetch.c:855

5710 #, c-format

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

5712 msgstr ""

5713

5653 -#: builtin/fetch.c:910

5714 +#: builtin/fetch.c:911

5715 #, c-format

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

5717 msgstr ""

5718

5658 -#: builtin/fetch.c:1071

5719 +#: builtin/fetch.c:1072

5720 #, c-format

5721 msgid "Fetching %s\n"

5722 msgstr ""

5723

5663 -#: builtin/fetch.c:1073 builtin/remote.c:90

5724 +#: builtin/fetch.c:1074 builtin/remote.c:96

5725 #, c-format

5726 msgid "Could not fetch %s"

5727 msgstr ""

5728

5668 -#: builtin/fetch.c:1091

5729 +#: builtin/fetch.c:1092

5730 msgid ""

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

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

5733 msgstr ""

5734

5674 -#: builtin/fetch.c:1114

5735 +#: builtin/fetch.c:1115

5736 msgid "You need to specify a tag name."

5737 msgstr ""

5738

5678 -#: builtin/fetch.c:1156

5739 +#: builtin/fetch.c:1157

5740 msgid "--depth and --unshallow cannot be used together"

5741 msgstr ""

5742

5682 -#: builtin/fetch.c:1158

5743 +#: builtin/fetch.c:1159

5744 msgid "--unshallow on a complete repository does not make sense"

5745 msgstr ""

5746

5686 -#: builtin/fetch.c:1181

5747 +#: builtin/fetch.c:1179

5748 msgid "fetch --all does not take a repository argument"

5749 msgstr ""

5750

5690 -#: builtin/fetch.c:1183

5751 +#: builtin/fetch.c:1181

5752 msgid "fetch --all does not make sense with refspecs"

5753 msgstr ""

5754

5694 -#: builtin/fetch.c:1194

5755 +#: builtin/fetch.c:1192

5756 #, c-format

5757 msgid "No such remote or remote group: %s"

5758 msgstr ""

5759

5699 -#: builtin/fetch.c:1202

5760 +#: builtin/fetch.c:1200

5761 msgid "Fetching a group and specifying refspecs does not make sense"

5762 msgstr ""

5763

@@ -5705,23 +5766,23 @@ msgid ""

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

5767 msgstr ""

5768

5708 -#: builtin/fmt-merge-msg.c:670

5769 +#: builtin/fmt-merge-msg.c:667

5770 msgid "populate log with at most <n> entries from shortlog"

5771 msgstr ""

5772

5712 -#: builtin/fmt-merge-msg.c:673

5773 +#: builtin/fmt-merge-msg.c:670

5774 msgid "alias for --log (deprecated)"

5775 msgstr ""

5776

5716 -#: builtin/fmt-merge-msg.c:676

5777 +#: builtin/fmt-merge-msg.c:673

5778 msgid "text"

5779 msgstr ""

5780

5720 -#: builtin/fmt-merge-msg.c:677

5781 +#: builtin/fmt-merge-msg.c:674

5782 msgid "use <text> as start of message"

5783 msgstr ""

5784

5724 -#: builtin/fmt-merge-msg.c:678

5785 +#: builtin/fmt-merge-msg.c:675

5786 msgid "file to read from"

5787 msgstr ""

5788

@@ -5729,95 +5790,115 @@ msgstr ""

5790 msgid "git for-each-ref [<options>] [<pattern>]"

5791 msgstr ""

5792

5732 -#: builtin/for-each-ref.c:24

5793 +#: builtin/for-each-ref.c:10

5794 +msgid "git for-each-ref [--points-at <object>]"

5795 +msgstr ""

5796 +

5797 +#: builtin/for-each-ref.c:11

5798 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"

5799 +msgstr ""

5800 +

5801 +#: builtin/for-each-ref.c:12

5802 +msgid "git for-each-ref [--contains [<object>]]"

5803 +msgstr ""

5804 +

5805 +#: builtin/for-each-ref.c:27

5806 msgid "quote placeholders suitably for shells"

5807 msgstr ""

5808

5736 -#: builtin/for-each-ref.c:26

5809 +#: builtin/for-each-ref.c:29

5810 msgid "quote placeholders suitably for perl"

5811 msgstr ""

5812

5740 -#: builtin/for-each-ref.c:28

5813 +#: builtin/for-each-ref.c:31

5814 msgid "quote placeholders suitably for python"

5815 msgstr ""

5816

5744 -#: builtin/for-each-ref.c:30

5817 +#: builtin/for-each-ref.c:33

5818 msgid "quote placeholders suitably for Tcl"

5819 msgstr ""

5820

5748 -#: builtin/for-each-ref.c:33

5821 +#: builtin/for-each-ref.c:36

5822 msgid "show only <n> matched refs"

5823 msgstr ""

5824

5752 -#: builtin/for-each-ref.c:34

5825 +#: builtin/for-each-ref.c:37 builtin/tag.c:372

5826 msgid "format to use for the output"

5827 msgstr ""

5828

5756 -#: builtin/for-each-ref.c:35

5757 -msgid "key"

5829 +#: builtin/for-each-ref.c:41

5830 +msgid "print only refs which points at the given object"

5831 msgstr ""

5832

5760 -#: builtin/for-each-ref.c:36

5761 -msgid "field name to sort on"

5833 +#: builtin/for-each-ref.c:43

5834 +msgid "print only refs that are merged"

5835 msgstr ""

5836

5764 -#: builtin/fsck.c:163 builtin/prune.c:137

5837 +#: builtin/for-each-ref.c:44

5838 +msgid "print only refs that are not merged"

5839 +msgstr ""

5840 +

5841 +#: builtin/for-each-ref.c:45

5842 +msgid "print only refs which contain the commit"

5843 +msgstr ""

5844 +

5845 +#: builtin/fsck.c:156 builtin/prune.c:140

5846 msgid "Checking connectivity"

5847 msgstr ""

5848

5768 -#: builtin/fsck.c:568

5849 +#: builtin/fsck.c:486

5850 msgid "Checking object directories"

5851 msgstr ""

5852

5772 -#: builtin/fsck.c:631

5853 +#: builtin/fsck.c:553

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

5855 msgstr ""

5856

5776 -#: builtin/fsck.c:637

5857 +#: builtin/fsck.c:559

5858 msgid "show unreachable objects"

5859 msgstr ""

5860

5780 -#: builtin/fsck.c:638

5861 +#: builtin/fsck.c:560

5862 msgid "show dangling objects"

5863 msgstr ""

5864

5784 -#: builtin/fsck.c:639

5865 +#: builtin/fsck.c:561

5866 msgid "report tags"

5867 msgstr ""

5868

5788 -#: builtin/fsck.c:640

5869 +#: builtin/fsck.c:562

5870 msgid "report root nodes"

5871 msgstr ""

5872

5792 -#: builtin/fsck.c:641

5873 +#: builtin/fsck.c:563

5874 msgid "make index objects head nodes"

5875 msgstr ""

5876

5796 -#: builtin/fsck.c:642

5877 +#: builtin/fsck.c:564

5878 msgid "make reflogs head nodes (default)"

5879 msgstr ""

5880

5800 -#: builtin/fsck.c:643

5881 +#: builtin/fsck.c:565

5882 msgid "also consider packs and alternate objects"

5883 msgstr ""

5884

5804 -#: builtin/fsck.c:644

5885 +#: builtin/fsck.c:566

5886 msgid "check only connectivity"

5887 msgstr ""

5888

5808 -#: builtin/fsck.c:645

5889 +#: builtin/fsck.c:567

5890 msgid "enable more strict checking"

5891 msgstr ""

5892

5812 -#: builtin/fsck.c:647

5893 +#: builtin/fsck.c:569

5894 msgid "write dangling objects in .git/lost-found"

5895 msgstr ""

5896

5816 -#: builtin/fsck.c:648 builtin/prune.c:107

5897 +#: builtin/fsck.c:570 builtin/prune.c:107

5898 msgid "show progress"

5899 msgstr ""

5900

5820 -#: builtin/fsck.c:707

5901 +#: builtin/fsck.c:631

5902 msgid "Checking objects"

5903 msgstr ""

5904

@@ -5825,54 +5906,64 @@ msgstr ""

5906 msgid "git gc [<options>]"

5907 msgstr ""

5908

5828 -#: builtin/gc.c:55

5909 +#: builtin/gc.c:72

5910 #, c-format

5911 msgid "Invalid %s: '%s'"

5912 msgstr ""

5913

5833 -#: builtin/gc.c:100

5914 +#: builtin/gc.c:139

5915 #, c-format

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

5917 msgstr ""

5918

5838 -#: builtin/gc.c:269

5919 +#: builtin/gc.c:290

5920 +#, c-format

5921 +msgid ""

5922 +"The last gc run reported the following. Please correct the root cause\n"

5923 +"and remove %s.\n"

5924 +"Automatic cleanup will not be performed until the file is removed.\n"

5925 +"\n"

5926 +"%s"

5927 +msgstr ""

5928 +

5929 +#: builtin/gc.c:327

5930 msgid "prune unreferenced objects"

5931 msgstr ""

5932

5842 -#: builtin/gc.c:271

5933 +#: builtin/gc.c:329

5934 msgid "be more thorough (increased runtime)"

5935 msgstr ""

5936

5846 -#: builtin/gc.c:272

5937 +#: builtin/gc.c:330

5938 msgid "enable auto-gc mode"

5939 msgstr ""

5940

5850 -#: builtin/gc.c:273

5941 +#: builtin/gc.c:331

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

5943 msgstr ""

5944

5854 -#: builtin/gc.c:315

5945 +#: builtin/gc.c:373

5946 #, c-format

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

5948 msgstr ""

5949

5859 -#: builtin/gc.c:317

5950 +#: builtin/gc.c:375

5951 #, c-format

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

5953 msgstr ""

5954

5864 -#: builtin/gc.c:318

5955 +#: builtin/gc.c:376

5956 #, c-format

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

5958 msgstr ""

5959

5869 -#: builtin/gc.c:336

5960 +#: builtin/gc.c:397

5961 #, c-format

5962 msgid ""

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

5964 msgstr ""

5965

5875 -#: builtin/gc.c:364

5966 +#: builtin/gc.c:441

5967 msgid ""

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

5969 msgstr ""

@@ -5906,199 +5997,195 @@ msgstr ""

5997 msgid "cannot open '%s'"

5998 msgstr ""

5999

5909 -#: builtin/grep.c:638

6000 +#: builtin/grep.c:633

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

6002 msgstr ""

6003

5913 -#: builtin/grep.c:640

6004 +#: builtin/grep.c:635

6005 msgid "find in contents not managed by git"

6006 msgstr ""

6007

5917 -#: builtin/grep.c:642

6008 +#: builtin/grep.c:637

6009 msgid "search in both tracked and untracked files"

6010 msgstr ""

6011

5921 -#: builtin/grep.c:644

6012 +#: builtin/grep.c:639

6013 msgid "ignore files specified via '.gitignore'"

6014 msgstr ""

6015

5925 -#: builtin/grep.c:647

6016 +#: builtin/grep.c:642

6017 msgid "show non-matching lines"

6018 msgstr ""

6019

5929 -#: builtin/grep.c:649

6020 +#: builtin/grep.c:644

6021 msgid "case insensitive matching"

6022 msgstr ""

6023

5933 -#: builtin/grep.c:651

6024 +#: builtin/grep.c:646

6025 msgid "match patterns only at word boundaries"

6026 msgstr ""

6027

5937 -#: builtin/grep.c:653

6028 +#: builtin/grep.c:648

6029 msgid "process binary files as text"

6030 msgstr ""

6031

5941 -#: builtin/grep.c:655

6032 +#: builtin/grep.c:650

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

6034 msgstr ""

6035

5945 -#: builtin/grep.c:658

6036 +#: builtin/grep.c:653

6037 msgid "process binary files with textconv filters"

6038 msgstr ""

6039

5949 -#: builtin/grep.c:660

6040 +#: builtin/grep.c:655

6041 msgid "descend at most <depth> levels"

6042 msgstr ""

6043

5953 -#: builtin/grep.c:664

6044 +#: builtin/grep.c:659

6045 msgid "use extended POSIX regular expressions"

6046 msgstr ""

6047

5957 -#: builtin/grep.c:667

6048 +#: builtin/grep.c:662

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

6050 msgstr ""

6051

5961 -#: builtin/grep.c:670

6052 +#: builtin/grep.c:665

6053 msgid "interpret patterns as fixed strings"

6054 msgstr ""

6055

5965 -#: builtin/grep.c:673

6056 +#: builtin/grep.c:668

6057 msgid "use Perl-compatible regular expressions"

6058 msgstr ""

6059

5969 -#: builtin/grep.c:676

6060 +#: builtin/grep.c:671

6061 msgid "show line numbers"

6062 msgstr ""

6063

5973 -#: builtin/grep.c:677

6064 +#: builtin/grep.c:672

6065 msgid "don't show filenames"

6066 msgstr ""

6067

5977 -#: builtin/grep.c:678

6068 +#: builtin/grep.c:673

6069 msgid "show filenames"

6070 msgstr ""

6071

5981 -#: builtin/grep.c:680

6072 +#: builtin/grep.c:675

6073 msgid "show filenames relative to top directory"

6074 msgstr ""

6075

5985 -#: builtin/grep.c:682

6076 +#: builtin/grep.c:677

6077 msgid "show only filenames instead of matching lines"

6078 msgstr ""

6079

5989 -#: builtin/grep.c:684

6080 +#: builtin/grep.c:679

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

6082 msgstr ""

6083

5993 -#: builtin/grep.c:687

6084 +#: builtin/grep.c:682

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

6086 msgstr ""

6087

5997 -#: builtin/grep.c:689

6088 +#: builtin/grep.c:684

6089 msgid "print NUL after filenames"

6090 msgstr ""

6091

6001 -#: builtin/grep.c:691

6092 +#: builtin/grep.c:686

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

6094 msgstr ""

6095

6005 -#: builtin/grep.c:692

6096 +#: builtin/grep.c:687

6097 msgid "highlight matches"

6098 msgstr ""

6099

6009 -#: builtin/grep.c:694

6100 +#: builtin/grep.c:689

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

6102 msgstr ""

6103

6013 -#: builtin/grep.c:696

6104 +#: builtin/grep.c:691

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

6106 msgstr ""

6107

6017 -#: builtin/grep.c:699

6108 +#: builtin/grep.c:694

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

6110 msgstr ""

6111

6021 -#: builtin/grep.c:702

6112 +#: builtin/grep.c:697

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

6114 msgstr ""

6115

6025 -#: builtin/grep.c:704

6116 +#: builtin/grep.c:699

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

6118 msgstr ""

6119

6029 -#: builtin/grep.c:705

6120 +#: builtin/grep.c:700

6121 msgid "shortcut for -C NUM"

6122 msgstr ""

6123

6033 -#: builtin/grep.c:708

6124 +#: builtin/grep.c:703

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

6126 msgstr ""

6127

6037 -#: builtin/grep.c:710

6128 +#: builtin/grep.c:705

6129 msgid "show the surrounding function"

6130 msgstr ""

6131

6041 -#: builtin/grep.c:713

6132 +#: builtin/grep.c:708

6133 msgid "read patterns from file"

6134 msgstr ""

6135

6045 -#: builtin/grep.c:715

6136 +#: builtin/grep.c:710

6137 msgid "match <pattern>"

6138 msgstr ""

6139

6049 -#: builtin/grep.c:717

6140 +#: builtin/grep.c:712

6141 msgid "combine patterns specified with -e"

6142 msgstr ""

6143

6053 -#: builtin/grep.c:729

6144 +#: builtin/grep.c:724

6145 msgid "indicate hit with exit status without output"

6146 msgstr ""

6147

6057 -#: builtin/grep.c:731

6148 +#: builtin/grep.c:726

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

6150 msgstr ""

6151

6061 -#: builtin/grep.c:733

6152 +#: builtin/grep.c:728

6153 msgid "show parse tree for grep expression"

6154 msgstr ""

6155

6065 -#: builtin/grep.c:737

6156 +#: builtin/grep.c:732

6157 msgid "pager"

6158 msgstr ""

6159

6069 -#: builtin/grep.c:737

6160 +#: builtin/grep.c:732

6161 msgid "show matching files in the pager"

6162 msgstr ""

6163

6073 -#: builtin/grep.c:740

6164 +#: builtin/grep.c:735

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

6166 msgstr ""

6167

6077 -#: builtin/grep.c:741 builtin/show-ref.c:189

6078 -msgid "show usage"

6079 -msgstr ""

6080 -

6081 -#: builtin/grep.c:808

6168 +#: builtin/grep.c:793

6169 msgid "no pattern given."

6170 msgstr ""

6171

6085 -#: builtin/grep.c:866

6172 +#: builtin/grep.c:851

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

6174 msgstr ""

6175

6089 -#: builtin/grep.c:892

6176 +#: builtin/grep.c:877

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

6178 msgstr ""

6179

6093 -#: builtin/grep.c:897

6180 +#: builtin/grep.c:882

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

6182 msgstr ""

6183

6097 -#: builtin/grep.c:900

6184 +#: builtin/grep.c:885

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

6186 msgstr ""

6187

6101 -#: builtin/grep.c:908

6188 +#: builtin/grep.c:893

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

6190 msgstr ""

6191

@@ -6109,10 +6196,10 @@ msgid ""

6196 msgstr ""

6197

6198 #: builtin/hash-object.c:81

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

6199 +msgid "git hash-object --stdin-paths"

6200 msgstr ""

6201

6115 -#: builtin/hash-object.c:92 builtin/tag.c:614

6202 +#: builtin/hash-object.c:92

l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)