msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"POT-Creation-Date: 2015-06-27 19:17+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: archive.c:11
-msgid "git archive [
options] <tree-ish> [<path>...]"
+msgid "git archive [
<options>] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:12
#: archive.c:13
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [
options] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [
<options>] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
+#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
-#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
-#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
-#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
-#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
+#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
+#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
+#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
+#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
msgid "file"
msgstr ""
msgid "list supported archive formats"
msgstr ""
-#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
+#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr ""
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: attr.c:258
+#: attr.c:265
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:770
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
-#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
-#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
+#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
+#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
+#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:444
+#: bundle.c:443
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:454
+#: bundle.c:453
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:475
+#: bundle.c:474
msgid "index-pack died"
msgstr ""
msgid "memory exhausted"
msgstr ""
-#: config.c:469 config.c:471
+#: config.c:474 config.c:476
#, c-format
msgid "bad config file line %d in %s"
msgstr ""
-#: config.c:587
+#: config.c:592
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:589
+#: config.c:594
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:674
+#: config.c:679
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:752 config.c:763
+#: config.c:757 config.c:768
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:885
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1211
+#: config.c:1216
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1272
+#: config.c:1277
msgid "unknown error occured while reading the configuration files"
msgstr ""
-#: config.c:1596
+#: config.c:1601
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:1598
+#: config.c:1603
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:1657
+#: config.c:1662
#, c-format
msgid "%s has multiple values"
msgstr ""
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:516
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr ""
"%s"
msgstr ""
-#: diff.c:2957
+#: diff.c:2997
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3352
+#: diff.c:3393
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3515
+#: diff.c:3556
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3529
+#: diff.c:3570
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
+#: dir.c:1852
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c:1945
+msgid "Untracked cache is disabled on this system."
+msgstr ""
+
#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr ""
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:230
-msgid "The most commonly used git commands are:"
+#: help.c:246
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:289
+#: help.c:311
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:346
+#: help.c:368
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:368
+#: help.c:390
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: help.c:373
+#: help.c:395
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:380
+#: help.c:402
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:384 help.c:444
+#: help.c:406 help.c:466
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: help.c:440
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: lockfile.c:283
+#: lockfile.c:345
msgid "BUG: reopen a lockfile that is still open"
msgstr ""
-#: lockfile.c:285
+#: lockfile.c:347
msgid "BUG: reopen a lockfile that has been committed"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
-#: builtin/clone.c:662
+#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
+#: builtin/clone.c:654
msgid "unable to write new index file"
msgstr ""
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:688
+#: merge-recursive.c:687
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:699
+#: merge-recursive.c:698
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:713 merge-recursive.c:734
+#: merge-recursive.c:712 merge-recursive.c:733
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:724
+#: merge-recursive.c:723
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:764
+#: merge-recursive.c:763
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:766
+#: merge-recursive.c:765
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:789 builtin/clone.c:321
+#: merge-recursive.c:788 builtin/clone.c:313
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: merge-recursive.c:797
+#: merge-recursive.c:796
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
-#: merge-recursive.c:800
+#: merge-recursive.c:799
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:938
+#: merge-recursive.c:937
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:942
+#: merge-recursive.c:941
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:958
+#: merge-recursive.c:957
msgid "unsupported object type in the tree"
msgstr ""
-#: merge-recursive.c:1033 merge-recursive.c:1047
+#: merge-recursive.c:1032 merge-recursive.c:1046
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1039 merge-recursive.c:1052
+#: merge-recursive.c:1038 merge-recursive.c:1051
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1093
+#: merge-recursive.c:1092
msgid "rename"
msgstr ""
-#: merge-recursive.c:1093
+#: merge-recursive.c:1092
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1149
+#: merge-recursive.c:1148
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1171
+#: merge-recursive.c:1170
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1176
+#: merge-recursive.c:1175
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1230
+#: merge-recursive.c:1229
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1260
+#: merge-recursive.c:1259
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1459
+#: merge-recursive.c:1458
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1469
+#: merge-recursive.c:1468
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1474 merge-recursive.c:1672
+#: merge-recursive.c:1473 merge-recursive.c:1671
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1525
+#: merge-recursive.c:1524
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1528
+#: merge-recursive.c:1527
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1576
+#: merge-recursive.c:1575
msgid "modify"
msgstr ""
-#: merge-recursive.c:1576
+#: merge-recursive.c:1575
msgid "modified"
msgstr ""
-#: merge-recursive.c:1586
+#: merge-recursive.c:1585
msgid "content"
msgstr ""
-#: merge-recursive.c:1593
+#: merge-recursive.c:1592
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1627
+#: merge-recursive.c:1626
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1641
+#: merge-recursive.c:1640
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1645 git-submodule.sh:1150
+#: merge-recursive.c:1644 git-submodule.sh:1150
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1646
+#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1732
+#: merge-recursive.c:1731
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1757
+#: merge-recursive.c:1756
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1763
+#: merge-recursive.c:1762
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1768
+#: merge-recursive.c:1767
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1778
+#: merge-recursive.c:1777
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1795
+#: merge-recursive.c:1794
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1814
+#: merge-recursive.c:1813
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1823
+#: merge-recursive.c:1822
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1853
+#: merge-recursive.c:1852
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1898
+#: merge-recursive.c:1900
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1911
+#: merge-recursive.c:1913
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1948
+#: merge-recursive.c:1950
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2005
+#: merge-recursive.c:2007
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2016 builtin/merge.c:667
+#: merge-recursive.c:2018 builtin/merge.c:645
msgid "Unable to write index."
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:241
+#: object.c:242
#, c-format
msgid "unable to parse object: %s"
msgstr ""
msgid "unable to parse --pretty format"
msgstr ""
-#: progress.c:225
+#: progress.c:236
msgid "done"
msgstr ""
-#: read-cache.c:1267
+#: read-cache.c:1295
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1277
+#: read-cache.c:1305
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: remote.c:782
+#: remote.c:792
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:786
+#: remote.c:796
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:790
+#: remote.c:800
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:798
+#: remote.c:808
msgid "Internal error"
msgstr ""
-#: remote.c:1980
+#: remote.c:1723 remote.c:1766
+msgid "HEAD does not point to a branch"
+msgstr ""
+
+#: remote.c:1732
+#, c-format
+msgid "no such branch: '%s'"
+msgstr ""
+
+#: remote.c:1735
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr ""
+
+#: remote.c:1741
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+
+#: remote.c:1756
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+
+#: remote.c:1771
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr ""
+
+#: remote.c:1782
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr ""
+
+#: remote.c:1795
+msgid "push has no destination (push.default is 'nothing')"
+msgstr ""
+
+#: remote.c:1817
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr ""
+
+#: remote.c:2124
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:1984
+#: remote.c:2128
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1987
+#: remote.c:2131
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: remote.c:1991
+#: remote.c:2135
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1997
+#: remote.c:2141
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2000
+#: remote.c:2144
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2008
+#: remote.c:2152
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2011
+#: remote.c:2155
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2021
+#: remote.c:2165
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: run-command.c:87
+#: revision.c:2366
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: run-command.c:83
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:89
+#: run-command.c:85
#, c-format
msgid "dup2(%d,%d) failed"
msgstr ""
-#: send-pack.c:268
+#: send-pack.c:272
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:325
+#: send-pack.c:378
msgid "the receiving end does not support --signed push"
msgstr ""
-#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
-#: builtin/merge.c:1005
+#: send-pack.c:389
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
-#: builtin/merge.c:1010
+#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
+#: builtin/merge.c:988
#, c-format
msgid "Could not write to '%s'"
msgstr ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:211 sequencer.c:856 sequencer.c:939
+#: sequencer.c:211 sequencer.c:861 sequencer.c:944
#, c-format
msgid "Could not write to %s"
msgstr ""
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:406
+#: sequencer.c:411
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:411
+#: sequencer.c:416
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:477
+#: sequencer.c:482
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:496
+#: sequencer.c:501
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:504
+#: sequencer.c:509
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:508
+#: sequencer.c:513
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:521
+#: sequencer.c:526
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:525
+#: sequencer.c:530
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:611
+#: sequencer.c:616
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:612
+#: sequencer.c:617
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:648
+#: sequencer.c:653
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:656
+#: sequencer.c:661
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:660
+#: sequencer.c:665
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:720
+#: sequencer.c:725
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:742
+#: sequencer.c:747
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:747
+#: sequencer.c:752
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:760
+#: sequencer.c:765
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:764
+#: sequencer.c:769
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:771
+#: sequencer.c:776
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:801
+#: sequencer.c:806
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:804
+#: sequencer.c:809
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:816
+#: sequencer.c:821
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:837
+#: sequencer.c:842
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:838
+#: sequencer.c:843
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:842
+#: sequencer.c:847
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:858 sequencer.c:943
+#: sequencer.c:863 sequencer.c:948
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:877 sequencer.c:1013
+#: sequencer.c:882 sequencer.c:1018
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:879
+#: sequencer.c:884
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:881
+#: sequencer.c:886
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:903 builtin/apply.c:4128
+#: sequencer.c:908 builtin/apply.c:4291
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:906
+#: sequencer.c:911
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:907
+#: sequencer.c:912
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:913
+#: sequencer.c:918
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:936
+#: sequencer.c:941
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1081
+#: sequencer.c:1086
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1084
+#: sequencer.c:1089
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1118
+#: sequencer.c:1123
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1119
+#: sequencer.c:1124
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: sha1_name.c:440
+#: setup.c:243
+#, c-format
+msgid "failed to read %s"
+msgstr ""
+
+#: sha1_name.c:453
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: sha1_name.c:1068
-msgid "HEAD does not point to a branch"
-msgstr ""
-
-#: sha1_name.c:1071
-#, c-format
-msgid "No such branch: '%s'"
-msgstr ""
-
-#: sha1_name.c:1073
-#, c-format
-msgid "No upstream configured for branch '%s'"
-msgstr ""
-
-#: sha1_name.c:1077
-#, c-format
-msgid "Upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-
#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:1111 builtin/init-db.c:371
-#, c-format
-msgid "Could not create git link %s"
-msgstr ""
-
-#: submodule.c:1122
+#: submodule.c:1115
#, c-format
msgid "Could not set core.worktree in %s"
msgstr ""
-#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
-#: trailer.c:570
+#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:561
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:552 trailer.c:557 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:590
+#: trailer.c:581
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:710
+#: trailer.c:701
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:713
+#: trailer.c:704
msgid "could not read from stdin"
msgstr ""
-#: unpack-trees.c:202
+#: unpack-trees.c:203
msgid "Checking out files"
msgstr ""
msgid "invalid '..' path segment"
msgstr ""
-#: wrapper.c:509
+#: wrapper.c:523
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: wrapper.c:530
+#: wrapper.c:544
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:541
+#: wrapper.c:555
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: wrapper.c:542
+#: wrapper.c:556
msgid "no such user"
msgstr ""
-#: wrapper.c:550
+#: wrapper.c:564
msgid "unable to get current working directory"
msgstr ""
+#: wrapper.c:575
+#, c-format
+msgid "could not open %s for writing"
+msgstr ""
+
+#: wrapper.c:587
+#, c-format
+msgid "could not write to %s"
+msgstr ""
+
+#: wrapper.c:593
+#, c-format
+msgid "could not close %s"
+msgstr ""
+
#: wt-status.c:150
msgid "Unmerged paths:"
msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:198
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr ""
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:758
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:760
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:839
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:930
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:933
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:936
+#: wt-status.c:955
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:939
+#: wt-status.c:958
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:949
+#: wt-status.c:968
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:952
+#: wt-status.c:971
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:956
+#: wt-status.c:975
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:977
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:960
+#: wt-status.c:979
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1020 wt-status.c:1037
+#: wt-status.c:1039 wt-status.c:1056
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1025 wt-status.c:1042
+#: wt-status.c:1044 wt-status.c:1061
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1028
+#: wt-status.c:1047
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1030
+#: wt-status.c:1049
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1032
+#: wt-status.c:1051
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1045
+#: wt-status.c:1064
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1049
+#: wt-status.c:1068
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1054
+#: wt-status.c:1073
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1057
+#: wt-status.c:1076
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1061
+#: wt-status.c:1080
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1066
+#: wt-status.c:1085
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1069
+#: wt-status.c:1088
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1071
+#: wt-status.c:1090
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1081
+#: wt-status.c:1100
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1086
+#: wt-status.c:1105
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1089
+#: wt-status.c:1108
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1091
+#: wt-status.c:1110
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1100
+#: wt-status.c:1119
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1105
+#: wt-status.c:1124
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1108
+#: wt-status.c:1127
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1110
+#: wt-status.c:1129
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1121
+#: wt-status.c:1140
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1125
+#: wt-status.c:1144
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1128
+#: wt-status.c:1147
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1303
+#: wt-status.c:1324
msgid "On branch "
msgstr ""
-#: wt-status.c:1310
+#: wt-status.c:1331
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1317
+#: wt-status.c:1336
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1319
+#: wt-status.c:1338
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1322
+#: wt-status.c:1341
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1339
+#: wt-status.c:1358
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1353
+#: wt-status.c:1372
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1355
+#: wt-status.c:1374
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1359
+#: wt-status.c:1378
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1365
+#: wt-status.c:1384
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1367
+#: wt-status.c:1386
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1373
+#: wt-status.c:1392
msgid "No changes"
msgstr ""
-#: wt-status.c:1378
+#: wt-status.c:1397
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1381
+#: wt-status.c:1400
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1403
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1387
+#: wt-status.c:1406
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1390
+#: wt-status.c:1409
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1393 wt-status.c:1398
+#: wt-status.c:1412 wt-status.c:1417
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1396
+#: wt-status.c:1415
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1400
+#: wt-status.c:1419
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1509
+#: wt-status.c:1528
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1515
+#: wt-status.c:1534
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1547
+#: wt-status.c:1561
msgid "gone"
msgstr ""
-#: wt-status.c:1549 wt-status.c:1557
+#: wt-status.c:1563 wt-status.c:1571
msgid "behind "
msgstr ""
-#: compat/precompose_utf8.c:55 builtin/clone.c:360
+#: compat/precompose_utf8.c:55 builtin/clone.c:352
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
#: builtin/add.c:22
-msgid "git add [
options] [--] <pathspec>..."
+msgid "git add [
<options>] [--] <pathspec>..."
msgstr ""
#: builtin/add.c:65
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:70 builtin/commit.c:275
+#: builtin/add.c:70 builtin/commit.c:277
msgid "updating files failed"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:194 builtin/rev-parse.c:785
+#: builtin/add.c:194 builtin/rev-parse.c:796
msgid "Could not read the index"
msgstr ""
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:214
+#: builtin/add.c:212
+msgid "editing patch failed"
+msgstr ""
+
+#: builtin/add.c:215
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:216
+#: builtin/add.c:217
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:221
+#: builtin/add.c:222
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:231
+#: builtin/add.c:232
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
-#: builtin/rm.c:269
+#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
+#: builtin/rm.c:268
msgid "dry run"
msgstr ""
-#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
-#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:253
+#: builtin/add.c:254
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:254
+#: builtin/add.c:255
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:255
+#: builtin/add.c:256
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:257
+#: builtin/add.c:258
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:260
+#: builtin/add.c:261
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:262
+#: builtin/add.c:263
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:263
+#: builtin/add.c:264
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:264
+#: builtin/add.c:265
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:286
+#: builtin/add.c:287
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:293
+#: builtin/add.c:294
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:329
+#: builtin/add.c:330
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:336
+#: builtin/add.c:337
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:357
+#: builtin/add.c:358
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:358
+#: builtin/add.c:359
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
-#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
+#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
+#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
+#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: builtin/apply.c:58
-msgid "git apply [
options] [<patch>...]"
+#: builtin/apply.c:59
+msgid "git apply [
<options>] [<patch>...]"
msgstr ""
-#: builtin/apply.c:111
+#: builtin/apply.c:112
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/apply.c:126
+#: builtin/apply.c:127
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:826
+#: builtin/apply.c:822
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:835
+#: builtin/apply.c:831
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:916
+#: builtin/apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:948
+#: builtin/apply.c:944
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:952
+#: builtin/apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:953
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:960
+#: builtin/apply.c:956
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1423
+#: builtin/apply.c:1419
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1480
+#: builtin/apply.c:1476
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1497
+#: builtin/apply.c:1493
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1657
+#: builtin/apply.c:1659
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1659
+#: builtin/apply.c:1661
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1685
+#: builtin/apply.c:1687
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1721
+#: builtin/apply.c:1723
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1723
+#: builtin/apply.c:1725
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1726
+#: builtin/apply.c:1728
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1872
+#: builtin/apply.c:1874
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1901
+#: builtin/apply.c:1903
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:2052
+#: builtin/apply.c:2054
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2142
+#: builtin/apply.c:2144
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2146
+#: builtin/apply.c:2148
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2754
+#: builtin/apply.c:2781
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2872
+#: builtin/apply.c:2900
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:2884
+#: builtin/apply.c:2912
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2890
+#: builtin/apply.c:2918
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2909
+#: builtin/apply.c:2938
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:3010
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:3016
+#: builtin/apply.c:3045
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:3037
+#: builtin/apply.c:3066
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3161
+#: builtin/apply.c:3190
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
+#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3240 builtin/apply.c:3462
+#: builtin/apply.c:3243
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
+
+#: builtin/apply.c:3271 builtin/apply.c:3493
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3321 builtin/apply.c:3476
+#: builtin/apply.c:3352 builtin/apply.c:3507
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
+#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3330 builtin/apply.c:3484
+#: builtin/apply.c:3361 builtin/apply.c:3515
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3432
+#: builtin/apply.c:3463
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3501
+#: builtin/apply.c:3532
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3503
+#: builtin/apply.c:3534
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3604
+#: builtin/apply.c:3693 builtin/apply.c:3695
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: builtin/apply.c:3750
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3607
+#: builtin/apply.c:3753
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3627
+#: builtin/apply.c:3773
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3632
+#: builtin/apply.c:3778
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3640
+#: builtin/apply.c:3798
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr ""
+
+#: builtin/apply.c:3802
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3653
+#: builtin/apply.c:3816
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
+#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:3889
+#: builtin/apply.c:4052
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3918
+#: builtin/apply.c:4081
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/apply.c:3922
+#: builtin/apply.c:4085
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3927
+#: builtin/apply.c:4090
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3930 builtin/apply.c:4038
+#: builtin/apply.c:4093 builtin/apply.c:4201
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3963
+#: builtin/apply.c:4126
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:4012
+#: builtin/apply.c:4175
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:4099
+#: builtin/apply.c:4262
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:4107
+#: builtin/apply.c:4270
msgid "internal error"
msgstr ""
-#: builtin/apply.c:4110
+#: builtin/apply.c:4273
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4120
+#: builtin/apply.c:4283
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4141
+#: builtin/apply.c:4304
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4144
+#: builtin/apply.c:4307
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4234
+#: builtin/apply.c:4397
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4245
+#: builtin/apply.c:4408
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
-#: builtin/fetch.c:93
+#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
+#: builtin/fetch.c:92
msgid "path"
msgstr ""
-#: builtin/apply.c:4363
+#: builtin/apply.c:4526
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4366
+#: builtin/apply.c:4529
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4368
+#: builtin/apply.c:4531
msgid "num"
msgstr ""
-#: builtin/apply.c:4369
+#: builtin/apply.c:4532
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4372
+#: builtin/apply.c:4535
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4374
+#: builtin/apply.c:4537
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4378
+#: builtin/apply.c:4541
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4380
+#: builtin/apply.c:4543
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4382
+#: builtin/apply.c:4545
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4384
+#: builtin/apply.c:4547
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4386
+#: builtin/apply.c:4549
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4388
+#: builtin/apply.c:4551
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: builtin/apply.c:4553
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4390
+#: builtin/apply.c:4555
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4392
+#: builtin/apply.c:4557
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4397
+#: builtin/apply.c:4562
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4398
+#: builtin/apply.c:4563
msgid "action"
msgstr ""
-#: builtin/apply.c:4399
+#: builtin/apply.c:4564
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4402 builtin/apply.c:4405
+#: builtin/apply.c:4567 builtin/apply.c:4570
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4408
+#: builtin/apply.c:4573
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4410
+#: builtin/apply.c:4575
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4412
+#: builtin/apply.c:4577
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4414
+#: builtin/apply.c:4579
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4417
+#: builtin/apply.c:4582
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4420
+#: builtin/apply.c:4585
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4422
+#: builtin/apply.c:4587
msgid "root"
msgstr ""
-#: builtin/apply.c:4423
+#: builtin/apply.c:4588
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4445
+#: builtin/apply.c:4610
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4453
+#: builtin/apply.c:4618
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4456
+#: builtin/apply.c:4621
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4472
+#: builtin/apply.c:4640
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4486
+#: builtin/apply.c:4654
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4492 builtin/apply.c:4502
+#: builtin/apply.c:4660 builtin/apply.c:4670
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/blame.c:30
-msgid "git blame [options] [rev-opts] [rev] [--] file"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:35
-msgid "[rev-opts] are documented in git-rev-list(1)"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2501
+#: builtin/blame.c:2500
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2502
+#: builtin/blame.c:2501
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2503
+#: builtin/blame.c:2502
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2504
+#: builtin/blame.c:2503
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2505
+#: builtin/blame.c:2504
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2506
+#: builtin/blame.c:2505
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2507
+#: builtin/blame.c:2506
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2508
+#: builtin/blame.c:2507
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2509
+#: builtin/blame.c:2508
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2510
+#: builtin/blame.c:2509
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2511
+#: builtin/blame.c:2510
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2512
+#: builtin/blame.c:2511
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2513
+#: builtin/blame.c:2512
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2514
+#: builtin/blame.c:2513
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2515
+#: builtin/blame.c:2514
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2516
+#: builtin/blame.c:2515
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2517
+#: builtin/blame.c:2516
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2518
+#: builtin/blame.c:2517
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2519 builtin/blame.c:2520
+#: builtin/blame.c:2518 builtin/blame.c:2519
msgid "score"
msgstr ""
-#: builtin/blame.c:2519
+#: builtin/blame.c:2518
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2520
+#: builtin/blame.c:2519
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2521
+#: builtin/blame.c:2520
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2521
+#: builtin/blame.c:2520
msgid "Process only line range n,m, counting from 1"
msgstr ""
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:2602
+#: builtin/blame.c:2601
msgid "4 years, 11 months ago"
msgstr ""
#: builtin/branch.c:24
-msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
#: builtin/branch.c:25
-msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
#: builtin/branch.c:26
-msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
#: builtin/branch.c:27
-msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:152
+#: builtin/branch.c:150
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:156
+#: builtin/branch.c:154
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:170
+#: builtin/branch.c:168
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:174
+#: builtin/branch.c:172
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:187
+#: builtin/branch.c:185
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:215
+#: builtin/branch.c:213
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:221
+#: builtin/branch.c:219
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:229
+#: builtin/branch.c:227
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
-#: builtin/branch.c:245
+#: builtin/branch.c:243
#, c-format
-msgid "remote branch '%s' not found."
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:246
+#: builtin/branch.c:244
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:260
+#: builtin/branch.c:258
#, c-format
-msgid "Error deleting remote branch '%s'"
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:261
+#: builtin/branch.c:259
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:268
+#: builtin/branch.c:266
#, c-format
-msgid "Deleted remote branch %s (was %s).\n"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:269
+#: builtin/branch.c:267
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:370
+#: builtin/branch.c:368
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr ""
-#: builtin/branch.c:459
+#: builtin/branch.c:451
#, c-format
msgid "[%s: gone]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:456
#, c-format
msgid "[%s]"
msgstr ""
-#: builtin/branch.c:469
+#: builtin/branch.c:461
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:471
+#: builtin/branch.c:463
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:475
+#: builtin/branch.c:467
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:477
+#: builtin/branch.c:469
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:480
+#: builtin/branch.c:472
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:483
+#: builtin/branch.c:475
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:496
+#: builtin/branch.c:488
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:587
+#: builtin/branch.c:579
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:590
+#: builtin/branch.c:582
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:593
+#: builtin/branch.c:588
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#: builtin/branch.c:591
#, c-format
-msgid "(detached from %s)"
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/branch.c:596
+#: builtin/branch.c:595
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:642
#, c-format
msgid "object '%s' does not point to a commit"
msgstr ""
-#: builtin/branch.c:691
+#: builtin/branch.c:690
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:704
+#: builtin/branch.c:703
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:714
+#: builtin/branch.c:713
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:729
+#: builtin/branch.c:728
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:733
+#: builtin/branch.c:732
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:736
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:744
+#: builtin/branch.c:743
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:759
+#: builtin/branch.c:758
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:783
+#: builtin/branch.c:780
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:810
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:815
+#: builtin/branch.c:812
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:816
+#: builtin/branch.c:813
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:817
+#: builtin/branch.c:814
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:819
+#: builtin/branch.c:816
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:820
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:824
+#: builtin/branch.c:821
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
-#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
-#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
+#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
+#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
+#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
#: builtin/tag.c:622
msgid "commit"
msgstr ""
-#: builtin/branch.c:828 builtin/branch.c:834
+#: builtin/branch.c:825 builtin/branch.c:831
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:840
+#: builtin/branch.c:837
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:841
+#: builtin/branch.c:838
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:843
+#: builtin/branch.c:840
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:844
+#: builtin/branch.c:841
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:845
+#: builtin/branch.c:842
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:846
+#: builtin/branch.c:843
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:847
+#: builtin/branch.c:844
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:848
+#: builtin/branch.c:845
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:850
+#: builtin/branch.c:847
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:851
+#: builtin/branch.c:848
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:854
+#: builtin/branch.c:851
msgid "print only not merged branches"
msgstr ""
-#: builtin/branch.c:860
+#: builtin/branch.c:857
msgid "print only merged branches"
msgstr ""
-#: builtin/branch.c:864
+#: builtin/branch.c:861
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:877
+#: builtin/branch.c:874
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:881 builtin/clone.c:637
+#: builtin/branch.c:878 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:903
+#: builtin/branch.c:900
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:914 builtin/branch.c:953
+#: builtin/branch.c:911 builtin/branch.c:950
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:929
+#: builtin/branch.c:926
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:934
+#: builtin/branch.c:931
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:941
+#: builtin/branch.c:938
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:944
+#: builtin/branch.c:941
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:959
+#: builtin/branch.c:956
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:964
+#: builtin/branch.c:961
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:968
+#: builtin/branch.c:965
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
+#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:975
+#: builtin/branch.c:972
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:987
+#: builtin/branch.c:984
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:991
+#: builtin/branch.c:988
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:997
+#: builtin/branch.c:994
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:1011
+#: builtin/branch.c:1008
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:1017
+#: builtin/branch.c:1014
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:1020
+#: builtin/branch.c:1017
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:1037
+#: builtin/branch.c:1034
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: builtin/branch.c:1038
+#: builtin/branch.c:1035
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1039
+#: builtin/branch.c:1036
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
-#: builtin/bundle.c:47
+#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
msgstr ""
-#: builtin/bundle.c:56
+#: builtin/bundle.c:64
msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/bundle.c:60
+#: builtin/bundle.c:68
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:328
-msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
+#: builtin/cat-file.c:369
+msgid ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:329
-msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
+#: builtin/cat-file.c:370
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
+"objects>"
msgstr ""
-#: builtin/cat-file.c:366
+#: builtin/cat-file.c:407
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:367
+#: builtin/cat-file.c:408
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:368
+#: builtin/cat-file.c:409
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:411
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:371
+#: builtin/cat-file.c:412
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:414
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:375
+#: builtin/cat-file.c:416
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:418
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:378
+#: builtin/cat-file.c:421
msgid "show info about objects fed from the standard input"
msgstr ""
+#: builtin/cat-file.c:424
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | attr...] [--] pathname..."
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
msgstr ""
#: builtin/check-attr.c:19
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
msgid "read file names from stdin"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
+#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [options] <contact>..."
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
#: builtin/check-mailmap.c:13
msgstr ""
#: builtin/checkout-index.c:126
-msgid "git checkout-index [options] [--] [<file>...]"
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
#: builtin/checkout-index.c:188
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:25
-msgid "git checkout [options] <branch>"
+#: builtin/checkout.c:26
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:26
-msgid "git checkout [options] [<branch>] -- <file>..."
+#: builtin/checkout.c:27
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:132 builtin/checkout.c:165
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:140 builtin/checkout.c:173
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:150
+#: builtin/checkout.c:156
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:194
+#: builtin/checkout.c:200
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:211
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:228
+#: builtin/checkout.c:234
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
-#: builtin/checkout.c:258
+#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
+#: builtin/checkout.c:264 builtin/checkout.c:277
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:261 builtin/checkout.c:264
+#: builtin/checkout.c:267 builtin/checkout.c:270
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:267
+#: builtin/checkout.c:273
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:278 builtin/checkout.c:467
+#: builtin/checkout.c:287 builtin/checkout.c:481
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:338 builtin/checkout.c:345
+#: builtin/checkout.c:347 builtin/checkout.c:354
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:489
+#: builtin/checkout.c:503
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:615
+#: builtin/checkout.c:634
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:653
+#: builtin/checkout.c:670
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:660
+#: builtin/checkout.c:677
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:663
+#: builtin/checkout.c:680
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:667
+#: builtin/checkout.c:684
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:669 builtin/checkout.c:1050
+#: builtin/checkout.c:686 builtin/checkout.c:1285
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:671
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:723
+#: builtin/checkout.c:740
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:729
+#: builtin/checkout.c:746
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:747
+#: builtin/checkout.c:765
#, c-format
msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
-" git branch new_branch_name %s\n"
+" git branch <new-branch-name> %s\n"
"\n"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/checkout.c:777
+#: builtin/checkout.c:801
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:781
+#: builtin/checkout.c:805
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:808 builtin/checkout.c:1045
+#: builtin/checkout.c:832 builtin/checkout.c:1280
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:952
+#: builtin/checkout.c:893
+msgid "no branch specified"
+msgstr ""
+
+#: builtin/checkout.c:895
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
+#: builtin/clone.c:853
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/checkout.c:924
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/checkout.c:960
+#, c-format
+msgid "Enter %s (identifier %s)"
+msgstr ""
+
+#: builtin/checkout.c:1070
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1176
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1215
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1020
+#: builtin/checkout.c:1255
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1294
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1062 builtin/checkout.c:1066
+#: builtin/checkout.c:1297 builtin/checkout.c:1301
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
+#: builtin/checkout.c:1316
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1086
+#: builtin/checkout.c:1321
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
+#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
#: builtin/remote.c:159 builtin/remote.c:161
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1109
+#: builtin/checkout.c:1347
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1349
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1112
+#: builtin/checkout.c:1350
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1113
+#: builtin/checkout.c:1351
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1114
+#: builtin/checkout.c:1352
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1354
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1354
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1117
+#: builtin/checkout.c:1355
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1119
+#: builtin/checkout.c:1357
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1359
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1360
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1123 builtin/merge.c:227
+#: builtin/checkout.c:1361 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
+#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
msgid "style"
msgstr ""
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1363
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1366
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1130
-msgid "second guess 'git checkout no-such-branch'"
+#: builtin/checkout.c:1368
+msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1370
+msgid "check a branch out in a separate working directory"
+msgstr ""
+
+#: builtin/checkout.c:1372
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1406
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1423
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1428
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1464
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1471
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1476
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1480
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:517
+#: builtin/clean.c:515
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:659
+#: builtin/clean.c:657
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:696
+#: builtin/clean.c:694
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:717
+#: builtin/clean.c:715
msgid "Select items to delete"
msgstr ""
-#: builtin/clean.c:757
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:756
#, c-format
-msgid "remove %s? "
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:782
+#: builtin/clean.c:781
msgid "Bye."
msgstr ""
-#: builtin/clean.c:790
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:817
+#: builtin/clean.c:816
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:818
+#: builtin/clean.c:817
msgid "What now"
msgstr ""
-#: builtin/clean.c:826
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:843
+#: builtin/clean.c:842
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:874
+#: builtin/clean.c:873
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:876
+#: builtin/clean.c:875
msgid "force"
msgstr ""
-#: builtin/clean.c:877
+#: builtin/clean.c:876
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:879
+#: builtin/clean.c:878
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
+#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
+#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
msgid "pattern"
msgstr ""
-#: builtin/clean.c:881
+#: builtin/clean.c:880
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:882
+#: builtin/clean.c:881
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:884
+#: builtin/clean.c:883
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:902
+#: builtin/clean.c:901
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:905
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:908
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
#: builtin/clone.c:37
-msgid "git clone [options] [--] <repo> [<dir>]"
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/push.c:514
+#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
+#: builtin/push.c:523
msgid "force progress reporting"
msgstr ""
-#: builtin/clone.c:68
+#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:73
+#: builtin/clone.c:64
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:75
+#: builtin/clone.c:66
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:77
+#: builtin/clone.c:68
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:79
+#: builtin/clone.c:70
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:81 builtin/clone.c:83
+#: builtin/clone.c:72 builtin/clone.c:74
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:84 builtin/init-db.c:493
+#: builtin/clone.c:75 builtin/init-db.c:500
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:85 builtin/init-db.c:494
+#: builtin/clone.c:76 builtin/init-db.c:501
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:78
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:80
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:82
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:84
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:86
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
msgid "depth"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:88
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:97
+#: builtin/clone.c:90
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:99
-msgid "use --reference only while cloning"
-msgstr ""
-
-#: builtin/clone.c:100 builtin/init-db.c:502
+#: builtin/clone.c:91 builtin/init-db.c:509
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:101 builtin/init-db.c:503
+#: builtin/clone.c:92 builtin/init-db.c:510
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:102
+#: builtin/clone.c:93
msgid "key=value"
msgstr ""
-#: builtin/clone.c:103
+#: builtin/clone.c:94
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:256
+#: builtin/clone.c:247
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:260
+#: builtin/clone.c:251
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/clone.c:263
+#: builtin/clone.c:254
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/clone.c:325
+#: builtin/clone.c:317
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/clone.c:327 builtin/diff.c:84
+#: builtin/clone.c:319 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:329
+#: builtin/clone.c:321
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:343
+#: builtin/clone.c:335
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:365
+#: builtin/clone.c:357
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:369
+#: builtin/clone.c:361
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:392 builtin/clone.c:566
+#: builtin/clone.c:384 builtin/clone.c:558
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:404
+#: builtin/clone.c:396
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:481
+#: builtin/clone.c:473
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:561
+#: builtin/clone.c:553
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:564
+#: builtin/clone.c:556
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:628
+#: builtin/clone.c:620
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:659
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:746
+#: builtin/clone.c:738
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:748
+#: builtin/clone.c:740
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:778
+#: builtin/clone.c:770
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:782
+#: builtin/clone.c:774
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:793
+#: builtin/clone.c:785
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:796
+#: builtin/clone.c:788
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:809
+#: builtin/clone.c:801
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:815 builtin/fetch.c:1155
+#: builtin/clone.c:807 builtin/fetch.c:1160
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:825
+#: builtin/clone.c:817
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:835
+#: builtin/clone.c:827
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:848 builtin/clone.c:860
+#: builtin/clone.c:845
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:851
-#, c-format
-msgid "could not create work tree dir '%s'."
-msgstr ""
-
-#: builtin/clone.c:870
+#: builtin/clone.c:863
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:872
+#: builtin/clone.c:865
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:897
+#: builtin/clone.c:890
msgid "--dissociate given, but there is no --reference"
msgstr ""
-#: builtin/clone.c:912
+#: builtin/clone.c:907
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:915
+#: builtin/clone.c:910
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:920
+#: builtin/clone.c:915
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:924
+#: builtin/clone.c:919
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:975 builtin/clone.c:983
+#: builtin/clone.c:968 builtin/clone.c:976
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:986
+#: builtin/clone.c:979
msgid "You appear to have cloned an empty repository."
msgstr ""
#: builtin/column.c:9
-msgid "git column [options]"
+msgid "git column [<options>]"
msgstr ""
#: builtin/column.c:26
msgstr ""
#: builtin/commit.c:37
-msgid "git commit [
options] [--] <pathspec>..."
+msgid "git commit [
<options>] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:42
-msgid "git status [
options] [--] <pathspec>..."
+msgid "git status [
<options>] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:47
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:302
+#: builtin/commit.c:304
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:342
+#: builtin/commit.c:344
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:348
+#: builtin/commit.c:350
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:359
+#: builtin/commit.c:361
msgid "unable to write index file"
msgstr ""
-#: builtin/commit.c:361
+#: builtin/commit.c:363
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:363
+#: builtin/commit.c:365
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
+#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:443
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:454
+#: builtin/commit.c:456
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:473
+#: builtin/commit.c:475
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:584
+#: builtin/commit.c:580
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:586
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:605
+#: builtin/commit.c:601
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:613
+#: builtin/commit.c:609
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:657
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:706 builtin/shortlog.c:273
+#: builtin/commit.c:702 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:708
+#: builtin/commit.c:704
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:712
+#: builtin/commit.c:708
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:734
+#: builtin/commit.c:730
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:738
+#: builtin/commit.c:734
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:742
+#: builtin/commit.c:738 builtin/merge.c:1079
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:789
+#: builtin/commit.c:785
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:807
+#: builtin/commit.c:803
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:812
+#: builtin/commit.c:808
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:825
+#: builtin/commit.c:821
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:832
+#: builtin/commit.c:828
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:852
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:860
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:867
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:885
+#: builtin/commit.c:881
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:942
+#: builtin/commit.c:938
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:957 builtin/tag.c:495
+#: builtin/commit.c:953 builtin/tag.c:495
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1059
+#: builtin/commit.c:1055
#, c-format
-msgid "No existing author found with '%s'"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1074 builtin/commit.c:1314
+#: builtin/commit.c:1070 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1111
+#: builtin/commit.c:1107
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1141
+#: builtin/commit.c:1137
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1150
+#: builtin/commit.c:1146
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1153
+#: builtin/commit.c:1149
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1155
+#: builtin/commit.c:1151
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1158
+#: builtin/commit.c:1154
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1168
+#: builtin/commit.c:1164
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1170
+#: builtin/commit.c:1166
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1174
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1195
+#: builtin/commit.c:1191
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1197
+#: builtin/commit.c:1193
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1199
+#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1201
+#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1213 builtin/tag.c:728
+#: builtin/commit.c:1209 builtin/tag.c:728
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1218
+#: builtin/commit.c:1214
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1328 builtin/commit.c:1608
+#: builtin/commit.c:1324 builtin/commit.c:1603
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1330 builtin/commit.c:1610
+#: builtin/commit.c:1326 builtin/commit.c:1605
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
+#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1335 builtin/commit.c:1614
+#: builtin/commit.c:1331 builtin/commit.c:1609
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1338 builtin/commit.c:1617
+#: builtin/commit.c:1334 builtin/commit.c:1612
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
+#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr ""
-#: builtin/commit.c:1341 builtin/commit.c:1620
+#: builtin/commit.c:1337 builtin/commit.c:1615
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1344
+#: builtin/commit.c:1340
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1345 parse-options.h:153
+#: builtin/commit.c:1341 parse-options.h:152
msgid "when"
msgstr ""
-#: builtin/commit.c:1346
+#: builtin/commit.c:1342
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1348
+#: builtin/commit.c:1344
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1435
+#: builtin/commit.c:1430
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1437
+#: builtin/commit.c:1432
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1482
+#: builtin/commit.c:1477
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1485
+#: builtin/commit.c:1480
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1573
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1579
+#: builtin/commit.c:1574
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1581
+#: builtin/commit.c:1576
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1582 builtin/tag.c:601
+#: builtin/commit.c:1577 builtin/tag.c:601
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1583
+#: builtin/commit.c:1578
msgid "author"
msgstr ""
-#: builtin/commit.c:1583
+#: builtin/commit.c:1578
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1584 builtin/gc.c:275
+#: builtin/commit.c:1579 builtin/gc.c:280
msgid "date"
msgstr ""
-#: builtin/commit.c:1584
+#: builtin/commit.c:1579
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
+#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
#: builtin/notes.c:554 builtin/tag.c:599
msgid "message"
msgstr ""
-#: builtin/commit.c:1585
+#: builtin/commit.c:1580
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1586
+#: builtin/commit.c:1581
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1582
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1588
+#: builtin/commit.c:1583
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1589
+#: builtin/commit.c:1584
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1590
+#: builtin/commit.c:1585
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86
+#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1594
+#: builtin/commit.c:1589
msgid "default"
msgstr ""
-#: builtin/commit.c:1594 builtin/tag.c:604
+#: builtin/commit.c:1589 builtin/tag.c:604
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
+#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
#: builtin/tag.c:605
msgid "key-id"
msgstr ""
-#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
+#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1595
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1605
+#: builtin/commit.c:1600
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1606
+#: builtin/commit.c:1601
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1607
+#: builtin/commit.c:1602
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1613
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1614
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1624
+#: builtin/commit.c:1619
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1626
+#: builtin/commit.c:1621
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1655
+#: builtin/commit.c:1650
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1694 builtin/merge.c:519
+#: builtin/commit.c:1689 builtin/merge.c:1076
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1701
+#: builtin/commit.c:1696
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1708
+#: builtin/commit.c:1703
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1727
+#: builtin/commit.c:1722
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1738
+#: builtin/commit.c:1733
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1743
+#: builtin/commit.c:1738
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1791
+#: builtin/commit.c:1786
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgstr ""
#: builtin/config.c:8
-msgid "git config [options]"
+msgid "git config [<options>]"
msgstr ""
#: builtin/config.c:53
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
-"[core]\n"
+"[user]\n"
"# Please adapt and uncomment the following lines:\n"
-"#\tuser = %s\n"
+"#\tname = %s\n"
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:589
+#: builtin/config.c:587
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
msgstr ""
#: builtin/describe.c:17
-msgid "git describe [options] <commit-ish>*"
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
#: builtin/describe.c:18
-msgid "git describe [options] --dirty"
+msgid "git describe [<options>] --dirty"
msgstr ""
#: builtin/describe.c:217
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:20
+#: builtin/fetch.c:19
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:21
+#: builtin/fetch.c:20
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:22
+#: builtin/fetch.c:21
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:23
+#: builtin/fetch.c:22
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:90
+#: builtin/fetch.c:89
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:92
+#: builtin/fetch.c:91
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:94
+#: builtin/fetch.c:93
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:95
+#: builtin/fetch.c:94
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:97
+#: builtin/fetch.c:96
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:99
+#: builtin/fetch.c:98
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:101
+#: builtin/fetch.c:100
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:103
+#: builtin/fetch.c:102
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:104
+#: builtin/fetch.c:103
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:105
+#: builtin/fetch.c:104
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:109
+#: builtin/fetch.c:108
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:111
+#: builtin/fetch.c:110
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:114
+#: builtin/fetch.c:113
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:116
+#: builtin/fetch.c:115
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:118 builtin/log.c:1208
+#: builtin/fetch.c:117 builtin/log.c:1208
msgid "dir"
msgstr ""
-#: builtin/fetch.c:119
+#: builtin/fetch.c:118
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:121
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:124
+#: builtin/fetch.c:123
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:125
+#: builtin/fetch.c:124
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:126
+#: builtin/fetch.c:125
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:376
+#: builtin/fetch.c:377
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:454
+#: builtin/fetch.c:457
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:459
+#: builtin/fetch.c:462
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:473
+#: builtin/fetch.c:476
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:474 builtin/fetch.c:560
+#: builtin/fetch.c:477 builtin/fetch.c:563
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:485
+#: builtin/fetch.c:488
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
+#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:505
+#: builtin/fetch.c:508
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:508
+#: builtin/fetch.c:511
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:511
+#: builtin/fetch.c:514
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:556
+#: builtin/fetch.c:559
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:556
+#: builtin/fetch.c:559
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:562
+#: builtin/fetch.c:565
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:595 builtin/fetch.c:828
+#: builtin/fetch.c:599 builtin/fetch.c:832
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:604
+#: builtin/fetch.c:608
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:622
+#: builtin/fetch.c:626
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:710 builtin/fetch.c:793
+#: builtin/fetch.c:714 builtin/fetch.c:797
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:721
+#: builtin/fetch.c:725
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:773
+#: builtin/fetch.c:777
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:774
+#: builtin/fetch.c:778
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:798
+#: builtin/fetch.c:802
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:799 builtin/remote.c:1060
+#: builtin/fetch.c:803 builtin/remote.c:1057
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:818
+#: builtin/fetch.c:822
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:837
+#: builtin/fetch.c:841
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:840
+#: builtin/fetch.c:844
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:896
+#: builtin/fetch.c:900
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1058
+#: builtin/fetch.c:1063
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1060 builtin/remote.c:90
+#: builtin/fetch.c:1065 builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1078
+#: builtin/fetch.c:1083
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1106
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1143
+#: builtin/fetch.c:1148
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1145
+#: builtin/fetch.c:1150
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1173
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1170
+#: builtin/fetch.c:1175
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1186
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1194
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
#: builtin/fmt-merge-msg.c:13
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
+#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
-#: parse-options.h:132 parse-options.h:239
+#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
+#: parse-options.h:131 parse-options.h:238
msgid "n"
msgstr ""
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:669
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:672
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:675
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:676
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:677
msgid "file to read from"
msgstr ""
-#: builtin/for-each-ref.c:676
+#: builtin/for-each-ref.c:687
msgid "unable to parse format"
msgstr ""
-#: builtin/for-each-ref.c:1064
-msgid "git for-each-ref [
options] [<pattern>]"
+#: builtin/for-each-ref.c:1083
+msgid "git for-each-ref [
<options>] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:1079
+#: builtin/for-each-ref.c:1098
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:1081
+#: builtin/for-each-ref.c:1100
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:1083
+#: builtin/for-each-ref.c:1102
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:1085
+#: builtin/for-each-ref.c:1104
msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/for-each-ref.c:1088
+#: builtin/for-each-ref.c:1107
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:1089 builtin/replace.c:438
+#: builtin/for-each-ref.c:1108 builtin/replace.c:438
msgid "format"
msgstr ""
-#: builtin/for-each-ref.c:1089
+#: builtin/for-each-ref.c:1108
msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:1090
+#: builtin/for-each-ref.c:1109
msgid "key"
msgstr ""
-#: builtin/for-each-ref.c:1091
+#: builtin/for-each-ref.c:1110
msgid "field name to sort on"
msgstr ""
-#: builtin/fsck.c:147 builtin/prune.c:136
+#: builtin/fsck.c:147 builtin/prune.c:236
msgid "Checking connectivity"
msgstr ""
-#: builtin/fsck.c:540
+#: builtin/fsck.c:548
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:603
-msgid "git fsck [options] [<object>...]"
+#: builtin/fsck.c:611
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:609
+#: builtin/fsck.c:617
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:610
+#: builtin/fsck.c:618
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:611
+#: builtin/fsck.c:619
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:612
+#: builtin/fsck.c:620
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:613
+#: builtin/fsck.c:621
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:614
+#: builtin/fsck.c:622
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:615
+#: builtin/fsck.c:623
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:616
+#: builtin/fsck.c:624
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:618
+#: builtin/fsck.c:626
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:619 builtin/prune.c:108
+#: builtin/fsck.c:627 builtin/prune.c:198
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:669
+#: builtin/fsck.c:677
msgid "Checking objects"
msgstr ""
#: builtin/gc.c:24
-msgid "git gc [options]"
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:79
+#: builtin/gc.c:67
#, c-format
-msgid "Invalid gc.pruneexpire: '%s'"
+msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:107
+#: builtin/gc.c:112
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:276
+#: builtin/gc.c:281
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:278
+#: builtin/gc.c:283
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:279
+#: builtin/gc.c:284
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:280
+#: builtin/gc.c:285
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:321
+#: builtin/gc.c:327
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:323
+#: builtin/gc.c:329
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:324
+#: builtin/gc.c:330
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:342
+#: builtin/gc.c:348
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:364
+#: builtin/gc.c:376
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#: builtin/grep.c:23
-msgid "git grep [
options] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgid "git grep [
<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
#: builtin/grep.c:218
msgstr ""
#: builtin/grep.c:644
-msgid "search also in ignored files"
+msgid "ignore files specified via '.gitignore'"
msgstr ""
#: builtin/grep.c:647
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:741 builtin/show-ref.c:187
+#: builtin/grep.c:741 builtin/show-ref.c:189
msgid "show usage"
msgstr ""
msgid "both --cached and trees are given."
msgstr ""
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:80
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
-"<file>..."
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:81
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr ""
-#: builtin/hash-object.c:94 builtin/tag.c:610
+#: builtin/hash-object.c:92 builtin/tag.c:612
msgid "type"
msgstr ""
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:92
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:93
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:95
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:98
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "process file as it were from this path"
msgstr ""
msgstr ""
#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
#: builtin/help.c:64
msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/index-pack.c:150
+#: builtin/index-pack.c:151
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:200
+#: builtin/index-pack.c:201
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:220
+#: builtin/index-pack.c:221
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:224
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:265
+#: builtin/index-pack.c:266
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:275
+#: builtin/index-pack.c:276
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:276
+#: builtin/index-pack.c:277
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:288
+#: builtin/index-pack.c:289
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:296
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:316
+#: builtin/index-pack.c:317
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:330
+#: builtin/index-pack.c:331
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:333
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:350
+#: builtin/index-pack.c:351
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr ""
-#: builtin/index-pack.c:471
+#: builtin/index-pack.c:472
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:520
+#: builtin/index-pack.c:521
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:567
+#: builtin/index-pack.c:568
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:570
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:595
+#: builtin/index-pack.c:596
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
-#: builtin/index-pack.c:749 builtin/index-pack.c:758
+#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
+#: builtin/index-pack.c:805 builtin/index-pack.c:814
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:689 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:745 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:755
+#: builtin/index-pack.c:811
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:769
+#: builtin/index-pack.c:825
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:783
+#: builtin/index-pack.c:839
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:787
+#: builtin/index-pack.c:843
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:789
+#: builtin/index-pack.c:845
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:861 builtin/index-pack.c:890
+#: builtin/index-pack.c:917 builtin/index-pack.c:948
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1081
+#: builtin/index-pack.c:1150
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1086
+#: builtin/index-pack.c:1155
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1089
+#: builtin/index-pack.c:1158
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1100
+#: builtin/index-pack.c:1169
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1194
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1133
+#: builtin/index-pack.c:1205
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1247
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1181
+#: builtin/index-pack.c:1253
#, c-format
msgid "completed with %d local objects"
msgstr ""
-#: builtin/index-pack.c:1191
+#: builtin/index-pack.c:1263
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1267
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1220
+#: builtin/index-pack.c:1291
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1367
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1323
+#: builtin/index-pack.c:1391
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1336
+#: builtin/index-pack.c:1404
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1344
+#: builtin/index-pack.c:1412
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1425
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1436
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1401
+#: builtin/index-pack.c:1469
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1475
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
+#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1537
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1539
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1518
+#: builtin/index-pack.c:1586
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1525
+#: builtin/index-pack.c:1593
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1622
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
-#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
+#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
+#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1635
+#: builtin/index-pack.c:1703
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
+#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1656
+#: builtin/index-pack.c:1724
msgid "--verify with no packfile name given"
msgstr ""
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr ""
-#: builtin/init-db.c:197
+#: builtin/init-db.c:211
#, c-format
msgid "insane git directory %s"
msgstr ""
-#: builtin/init-db.c:331 builtin/init-db.c:334
+#: builtin/init-db.c:343 builtin/init-db.c:346
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:363
+#: builtin/init-db.c:374
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:366
+#: builtin/init-db.c:377
#, c-format
msgid "unable to move %s to %s"
msgstr ""
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:426
+#: builtin/init-db.c:433
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:427
+#: builtin/init-db.c:434
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:427
+#: builtin/init-db.c:434
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:428
+#: builtin/init-db.c:435
msgid " shared"
msgstr ""
-#: builtin/init-db.c:475
+#: builtin/init-db.c:482
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [directory]"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:498
+#: builtin/init-db.c:505
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:499
+#: builtin/init-db.c:506
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
+#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
msgid "be quiet"
msgstr ""
-#: builtin/init-db.c:533 builtin/init-db.c:538
+#: builtin/init-db.c:540 builtin/init-db.c:545
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:542
+#: builtin/init-db.c:549
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:563
+#: builtin/init-db.c:570
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:591
+#: builtin/init-db.c:598
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgstr ""
#: builtin/log.c:41
-msgid "git log [<options>] [<revision
range>] [[--] <path>...]"
+msgid "git log [<options>] [<revision
-range>] [[--] <path>...]"
msgstr ""
#: builtin/log.c:42
-msgid "git show [options] <object>..."
+msgid "git show [<options>] <object>..."
msgstr ""
#: builtin/log.c:81
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:811
+#: builtin/log.c:813
msgid "Not a range."
msgstr ""
msgstr ""
#: builtin/log.c:1026
-msgid "git format-patch [options] [<since> | <revision range>]"
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
#: builtin/log.c:1071
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1638
+#: builtin/log.c:1637
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
+#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:401
-msgid "git ls-files [options] [<file>...]"
+#: builtin/ls-files.c:358
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:415
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:417
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:462
+#: builtin/ls-files.c:419
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:421
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:423
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:425
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:427
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:430
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:432
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:434
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:437
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:483
+#: builtin/ls-files.c:440
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:485
+#: builtin/ls-files.c:442
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:444
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:447
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:493
+#: builtin/ls-files.c:450
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:495
+#: builtin/ls-files.c:452
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:498
+#: builtin/ls-files.c:455
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:501
+#: builtin/ls-files.c:458
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:459
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:503
+#: builtin/ls-files.c:460
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:462
msgid "show debugging data"
msgstr ""
msgstr ""
#: builtin/merge.c:45
-msgid "git merge [options] [<commit>...]"
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
#: builtin/merge.c:46
-msgid "git merge [options] <msg> HEAD <commit>"
+msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr ""
#: builtin/merge.c:47
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:559
+#: builtin/merge.c:537
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:654
+#: builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/merge.c:678
+#: builtin/merge.c:656
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:692
+#: builtin/merge.c:670
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:705
+#: builtin/merge.c:683
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:794
+#: builtin/merge.c:772
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:803
+#: builtin/merge.c:781
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:809
+#: builtin/merge.c:787
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:833
+#: builtin/merge.c:811
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:845
+#: builtin/merge.c:823
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:900
+#: builtin/merge.c:878
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:916
+#: builtin/merge.c:894
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:957
+#: builtin/merge.c:935
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:959
+#: builtin/merge.c:937
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:961
+#: builtin/merge.c:939
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:966
+#: builtin/merge.c:944
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1122
+#: builtin/merge.c:1081
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: builtin/merge.c:1208
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1138
+#: builtin/merge.c:1224
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1141 git-pull.sh:34
+#: builtin/merge.c:1227 git-pull.sh:74
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1145
+#: builtin/merge.c:1231
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1148
+#: builtin/merge.c:1234
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1157
+#: builtin/merge.c:1243
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1166
+#: builtin/merge.c:1251
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1198
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-
-#: builtin/merge.c:1201
+#: builtin/merge.c:1268
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1203
+#: builtin/merge.c:1270
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1276
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1259
+#: builtin/merge.c:1278
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1333
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1262
+#: builtin/merge.c:1336
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1265
+#: builtin/merge.c:1339
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1268
+#: builtin/merge.c:1342
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1349
+#: builtin/merge.c:1423
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1388
+#: builtin/merge.c:1462
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1395
+#: builtin/merge.c:1469
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1427
+#: builtin/merge.c:1501
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1450 builtin/merge.c:1529
+#: builtin/merge.c:1524 builtin/merge.c:1603
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1454
+#: builtin/merge.c:1528
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1520
+#: builtin/merge.c:1594
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1522
+#: builtin/merge.c:1596
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1531
+#: builtin/merge.c:1605
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1543
+#: builtin/merge.c:1617
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/merge-base.c:29
-msgid "git merge-base [-a|--all] <commit> <commit>..."
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
#: builtin/merge-base.c:30
-msgid "git merge-base [-a|--all] --octopus <commit>..."
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
#: builtin/merge-base.c:31
#: builtin/merge-file.c:8
msgid ""
-"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
-"file2"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
#: builtin/merge-file.c:33
msgstr ""
#: builtin/merge-file.c:45
-msgid "set labels for file1/orig_file/file2"
+msgid "set labels for file1/orig-file/file2"
msgstr ""
#: builtin/mktree.c:64
msgstr ""
#: builtin/mv.c:15
-msgid "git mv [options] <source>... <destination>"
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
#: builtin/mv.c:69
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
+#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
#, c-format
msgid "renaming '%s' failed"
msgstr ""
#: builtin/name-rev.c:255
-msgid "git name-rev [options] <commit>..."
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
#: builtin/name-rev.c:256
-msgid "git name-rev [options] --all"
+msgid "git name-rev [<options>] --all"
msgstr ""
#: builtin/name-rev.c:257
-msgid "git name-rev [options] --stdin"
+msgid "git name-rev [<options>] --stdin"
msgstr ""
#: builtin/name-rev.c:309
msgstr ""
#: builtin/notes.c:24
-msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
#: builtin/notes.c:25
msgid ""
-"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:26
-msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
#: builtin/notes.c:27
msgid ""
-"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:28
-msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
#: builtin/notes.c:29
-msgid "git notes [--ref <notes_ref>] show [<object>]"
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
#: builtin/notes.c:30
msgid ""
-"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
#: builtin/notes.c:31
msgstr ""
#: builtin/notes.c:33
-msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
#: builtin/notes.c:34
-msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr ""
#: builtin/notes.c:35
-msgid "git notes [--ref <notes_ref>] get-ref"
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
#: builtin/notes.c:40
msgstr ""
#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes_ref>"
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
#: builtin/notes.c:72
msgstr ""
#: builtin/notes.c:954
-msgid "use notes from <notes_ref>"
+msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:989 builtin/remote.c:1621
+#: builtin/notes.c:989 builtin/remote.c:1618
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:773
+#: builtin/pack-objects.c:771
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1011
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2175
+#: builtin/pack-objects.c:2171
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2568
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2576
+#: builtin/pack-objects.c:2572
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2595
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2603
+#: builtin/pack-objects.c:2599
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2619
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2621
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2623
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2626
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2627
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2628
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2635
+#: builtin/pack-objects.c:2631
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2633
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2635
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2641
+#: builtin/pack-objects.c:2637
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2643
+#: builtin/pack-objects.c:2639
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2645
+#: builtin/pack-objects.c:2641
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2643
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2645
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2647
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2649
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2651
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2653
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2655
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2662
+#: builtin/pack-objects.c:2658
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2661
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2668
+#: builtin/pack-objects.c:2664
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2667
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2669
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2671
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2676 parse-options.h:140
+#: builtin/pack-objects.c:2672 parse-options.h:139
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2673
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2680
+#: builtin/pack-objects.c:2676
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2682
+#: builtin/pack-objects.c:2678
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2680
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2686
+#: builtin/pack-objects.c:2682
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2688
+#: builtin/pack-objects.c:2684
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2686
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2692
+#: builtin/pack-objects.c:2688
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2779
msgid "Counting objects"
msgstr ""
#: builtin/pack-refs.c:6
-msgid "git pack-refs [options]"
+msgid "git pack-refs [<options>]"
msgstr ""
#: builtin/pack-refs.c:14
msgstr ""
#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
#: builtin/prune-packed.c:40
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:106
+#: builtin/prune.c:86
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr ""
+
+#: builtin/prune.c:92
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr ""
+
+#: builtin/prune.c:97
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr ""
+
+#: builtin/prune.c:108
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr ""
+
+#: builtin/prune.c:124
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/prune.c:159
+#, c-format
+msgid "failed to remove: %s"
+msgstr ""
+
+#: builtin/prune.c:196
msgid "do not remove, show only"
msgstr ""
-#: builtin/prune.c:107
+#: builtin/prune.c:197
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:110
+#: builtin/prune.c:199
+msgid "prune .git/worktrees"
+msgstr ""
+
+#: builtin/prune.c:201
msgid "expire objects older than <time>"
msgstr ""
+#: builtin/prune.c:216
+msgid "--worktrees does not take extra arguments"
+msgstr ""
+
#: builtin/push.c:14
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:493
+#: builtin/push.c:502
msgid "repository"
msgstr ""
-#: builtin/push.c:494
+#: builtin/push.c:503
msgid "push all refs"
msgstr ""
-#: builtin/push.c:495
+#: builtin/push.c:504
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:497
+#: builtin/push.c:506
msgid "delete refs"
msgstr ""
-#: builtin/push.c:498
+#: builtin/push.c:507
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:501
+#: builtin/push.c:510
msgid "force updates"
msgstr ""
-#: builtin/push.c:503
+#: builtin/push.c:512
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:504
+#: builtin/push.c:513
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:507
+#: builtin/push.c:516
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:509
+#: builtin/push.c:518
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:510 builtin/push.c:511
+#: builtin/push.c:519 builtin/push.c:520
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:512
+#: builtin/push.c:521
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:515
+#: builtin/push.c:524
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:517
+#: builtin/push.c:526
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:518
+#: builtin/push.c:527
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:520
+#: builtin/push.c:529
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:529
+#: builtin/push.c:530
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:539
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:531
+#: builtin/push.c:541
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:499
+#: builtin/reflog.c:430
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:615 builtin/reflog.c:620
+#: builtin/reflog.c:547 builtin/reflog.c:552
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
#: builtin/remote.c:13
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:16
-msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#: builtin/remote.c:16 builtin/remote.c:43
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
#: builtin/remote.c:17
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:43
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr ""
-
#: builtin/remote.c:48
msgid "git remote set-branches <name> <branch>..."
msgstr ""
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:187 builtin/remote.c:643
+#: builtin/remote.c:187 builtin/remote.c:640
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:647
+#: builtin/remote.c:191 builtin/remote.c:644
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
+#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
+#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:653
+#: builtin/remote.c:650
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:659 builtin/remote.c:847
+#: builtin/remote.c:656 builtin/remote.c:844
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:674
+#: builtin/remote.c:671
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:680
+#: builtin/remote.c:677
#, c-format
msgid "Could not append '%s'"
msgstr ""
-#: builtin/remote.c:691
+#: builtin/remote.c:688
#, c-format
msgid "Could not set '%s'"
msgstr ""
-#: builtin/remote.c:713
+#: builtin/remote.c:710
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:747
+#: builtin/remote.c:744
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:766
+#: builtin/remote.c:763
#, c-format
msgid "Could not remove branch %s"
msgstr ""
-#: builtin/remote.c:833
+#: builtin/remote.c:830
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:948
+#: builtin/remote.c:945
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:951
+#: builtin/remote.c:948
msgid " tracked"
msgstr ""
-#: builtin/remote.c:953
+#: builtin/remote.c:950
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:955
+#: builtin/remote.c:952
msgid " ???"
msgstr ""
-#: builtin/remote.c:996
+#: builtin/remote.c:993
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:1003
+#: builtin/remote.c:1000
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:1006
+#: builtin/remote.c:1003
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:1007
+#: builtin/remote.c:1004
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1009
+#: builtin/remote.c:1006
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:1010
+#: builtin/remote.c:1007
msgid " and with remote"
msgstr ""
-#: builtin/remote.c:1056
+#: builtin/remote.c:1053
msgid "create"
msgstr ""
-#: builtin/remote.c:1059
+#: builtin/remote.c:1056
msgid "delete"
msgstr ""
-#: builtin/remote.c:1063
+#: builtin/remote.c:1060
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1066
+#: builtin/remote.c:1063
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1069
+#: builtin/remote.c:1066
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1076
+#: builtin/remote.c:1073
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1079
+#: builtin/remote.c:1076
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1083
+#: builtin/remote.c:1080
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1086
+#: builtin/remote.c:1083
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1154
+#: builtin/remote.c:1151
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1181
+#: builtin/remote.c:1178
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/remote.c:1179
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1183 builtin/remote.c:1334
+#: builtin/remote.c:1180 builtin/remote.c:1331
msgid "(no URL)"
msgstr ""
-#: builtin/remote.c:1192 builtin/remote.c:1194
+#: builtin/remote.c:1189 builtin/remote.c:1191
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
+#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1199
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1214
+#: builtin/remote.c:1211
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1217 builtin/remote.c:1244
+#: builtin/remote.c:1214 builtin/remote.c:1241
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1226
+#: builtin/remote.c:1223
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1234
+#: builtin/remote.c:1231
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1238
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1262
+#: builtin/remote.c:1259
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1264
+#: builtin/remote.c:1261
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1279
+#: builtin/remote.c:1276
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1278
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1291
+#: builtin/remote.c:1288
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1299
+#: builtin/remote.c:1296
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1301
+#: builtin/remote.c:1298
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1319
+#: builtin/remote.c:1316
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1320
+#: builtin/remote.c:1317
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1330
+#: builtin/remote.c:1327
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1331
+#: builtin/remote.c:1328
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1354
+#: builtin/remote.c:1351
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1357
+#: builtin/remote.c:1354
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1402
+#: builtin/remote.c:1399
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1468 builtin/remote.c:1542
+#: builtin/remote.c:1465 builtin/remote.c:1539
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1488
+#: builtin/remote.c:1485
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1492
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1517
+#: builtin/remote.c:1514
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1519
+#: builtin/remote.c:1516
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1518
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1528
+#: builtin/remote.c:1525
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1568
+#: builtin/remote.c:1565
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1576
+#: builtin/remote.c:1573
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1578
+#: builtin/remote.c:1575
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1592
+#: builtin/remote.c:1589
msgid "be verbose; must be placed before a subcommand"
msgstr ""
#: builtin/repack.c:17
-msgid "git repack [options]"
+msgid "git repack [<options>]"
msgstr ""
#: builtin/repack.c:159
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:371
+#: builtin/repack.c:377
#, c-format
msgid "removing '%s' failed"
msgstr ""
msgstr ""
#: builtin/rerere.c:12
-msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
#: builtin/rerere.c:57
msgstr ""
#: builtin/rev-parse.c:361
-msgid "git rev-parse --parseopt [
options] -- [<args>...]"
+msgid "git rev-parse --parseopt [
<options>] -- [<args>...]"
msgstr ""
#: builtin/rev-parse.c:366
#: builtin/rev-parse.c:499
msgid ""
-"git rev-parse --parseopt [
options] -- [<args>...]\n"
+"git rev-parse --parseopt [
<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [
options] [<arg>...]\n"
+" or: git rev-parse [
<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
#: builtin/revert.c:22
-msgid "git revert [options] <commit-ish>..."
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:23
msgstr ""
#: builtin/revert.c:28
-msgid "git cherry-pick [options] <commit-ish>..."
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:29
msgstr ""
#: builtin/rm.c:17
-msgid "git rm [options] [--] <file>..."
+msgid "git rm [<options>] [--] <file>..."
msgstr ""
#: builtin/rm.c:65
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/rm.c:231
+#: builtin/rm.c:230
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:236
+#: builtin/rm.c:235
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:240
+#: builtin/rm.c:239
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:244 builtin/rm.c:255
+#: builtin/rm.c:243 builtin/rm.c:254
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:252
+#: builtin/rm.c:251
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:270
+#: builtin/rm.c:269
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:271
+#: builtin/rm.c:270
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:272
+#: builtin/rm.c:271
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:273
+#: builtin/rm.c:272
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:275
+#: builtin/rm.c:274
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:318
+#: builtin/rm.c:317
msgid "Please, stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:336
+#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:375
+#: builtin/rm.c:374
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision
range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision
-range>] [[--] [<path>...]]"
msgstr ""
#: builtin/shortlog.c:131
#: builtin/show-branch.c:9
msgid ""
-"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
#: builtin/show-branch.c:13
-msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:659
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:661
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:663
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:665
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:667
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:668
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:670
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:672
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:674
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:676
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:678
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:681
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:683
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:685
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:688
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:682
+#: builtin/show-branch.c:689
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
msgstr ""
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:170
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:171
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:172
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:173 builtin/show-ref.c:175
+#: builtin/show-ref.c:175 builtin/show-ref.c:177
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:179
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:181
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:183
+#: builtin/show-ref.c:185
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:187
msgid "show refs from stdin that aren't in local repository"
msgstr ""
#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [options] name [ref]"
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] name"
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
#: builtin/symbolic-ref.c:40
#: builtin/tag.c:22
msgid ""
-"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
#: builtin/tag.c:23
#: builtin/tag.c:24
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
"\t\t[<pattern>...]"
msgstr ""
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:608
-msgid "show tag list in columns"
+#: builtin/tag.c:609
+msgid "Tag listing options"
msgstr ""
#: builtin/tag.c:610
-msgid "sort tags"
+msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:614
-msgid "Tag listing options"
+#: builtin/tag.c:612
+msgid "sort tags"
msgstr ""
#: builtin/tag.c:617 builtin/tag.c:623
msgid "Unpacking objects"
msgstr ""
-#: builtin/update-index.c:403
-msgid "git update-index [options] [--] [<file>...]"
+#: builtin/update-index.c:70
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:76
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/update-index.c:86
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:94
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:101 builtin/update-index.c:203
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:124
+#, c-format
+msgid "Testing "
+msgstr ""
+
+#: builtin/update-index.c:136
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:149
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:162
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:173
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:184
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:197
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:204
+msgid " OK"
+msgstr ""
+
+#: builtin/update-index.c:564
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:756
+#: builtin/update-index.c:918
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:759
+#: builtin/update-index.c:921
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:762
+#: builtin/update-index.c:924
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:764
+#: builtin/update-index.c:926
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:766
+#: builtin/update-index.c:928
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:768
+#: builtin/update-index.c:930
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:771
+#: builtin/update-index.c:933
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:775
+#: builtin/update-index.c:937
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:779
+#: builtin/update-index.c:941
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:780
+#: builtin/update-index.c:942
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:784
+#: builtin/update-index.c:946
msgid "(+/-)x"
msgstr ""
-#: builtin/update-index.c:785
+#: builtin/update-index.c:947
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/update-index.c:789
+#: builtin/update-index.c:951
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:792
+#: builtin/update-index.c:954
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:795
+#: builtin/update-index.c:957
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:798
+#: builtin/update-index.c:960
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:801
+#: builtin/update-index.c:963
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:803
+#: builtin/update-index.c:965
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:805
+#: builtin/update-index.c:967
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:807
+#: builtin/update-index.c:969
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:811
+#: builtin/update-index.c:973
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:815
+#: builtin/update-index.c:977
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:819
+#: builtin/update-index.c:981
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:823
+#: builtin/update-index.c:985
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:826
+#: builtin/update-index.c:988
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:828
+#: builtin/update-index.c:990
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:832
+#: builtin/update-index.c:994
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:834
+#: builtin/update-index.c:996
msgid "enable or disable split index"
msgstr ""
+#: builtin/update-index.c:998
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1000
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
#: builtin/update-ref.c:9
-msgid "git update-ref [options] -d <refname> [<oldval>]"
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:10
-msgid "git update-ref [options] <refname> <newval> [<oldval>]"
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:11
-msgid "git update-ref [options] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
#: builtin/update-ref.c:359
msgstr ""
#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v|--verbose] <commit>..."
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
#: builtin/verify-commit.c:75
msgstr ""
#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v
|--verbose] [-s|--stat-only] <pack>..."
+msgid "git verify-pack [-v
| --verbose] [-s | --stat-only] <pack>..."
msgstr ""
#: builtin/verify-pack.c:64
msgstr ""
#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v|--verbose] <tag>..."
+msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr ""
#: builtin/verify-tag.c:73
"to read about a specific subcommand or concept."
msgstr ""
-#: common-cmds.h:8
+#: common-cmds.h:10
+msgid "start a working area (see also: git help tutorial)"
+msgstr ""
+
+#: common-cmds.h:11
+msgid "work on the current change (see also: git help everyday)"
+msgstr ""
+
+#: common-cmds.h:12
+msgid "examine the history and state (see also: git help revisions)"
+msgstr ""
+
+#: common-cmds.h:13
+msgid "grow, mark and tweak your common history"
+msgstr ""
+
+#: common-cmds.h:14
+msgid "collaborate (see also: git help workflows)"
+msgstr ""
+
+#: common-cmds.h:18
msgid "Add file contents to the index"
msgstr ""
-#: common-cmds.h:9
+#: common-cmds.h:19
msgid "Find by binary search the change that introduced a bug"
msgstr ""
-#: common-cmds.h:10
+#: common-cmds.h:20
msgid "List, create, or delete branches"
msgstr ""
-#: common-cmds.h:11
+#: common-cmds.h:21
msgid "Checkout a branch or paths to the working tree"
msgstr ""
-#: common-cmds.h:12
+#: common-cmds.h:22
msgid "Clone a repository into a new directory"
msgstr ""
-#: common-cmds.h:13
+#: common-cmds.h:23
msgid "Record changes to the repository"
msgstr ""
-#: common-cmds.h:14
+#: common-cmds.h:24
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: common-cmds.h:15
+#: common-cmds.h:25
msgid "Download objects and refs from another repository"
msgstr ""
-#: common-cmds.h:16
+#: common-cmds.h:26
msgid "Print lines matching a pattern"
msgstr ""
-#: common-cmds.h:17
+#: common-cmds.h:27
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: common-cmds.h:18
+#: common-cmds.h:28
msgid "Show commit logs"
msgstr ""
-#: common-cmds.h:19
+#: common-cmds.h:29
msgid "Join two or more development histories together"
msgstr ""
-#: common-cmds.h:20
+#: common-cmds.h:30
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: common-cmds.h:21
+#: common-cmds.h:31
msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: common-cmds.h:22
+#: common-cmds.h:32
msgid "Update remote refs along with associated objects"
msgstr ""
-#: common-cmds.h:23
+#: common-cmds.h:33
msgid "Forward-port local commits to the updated upstream head"
msgstr ""
-#: common-cmds.h:24
+#: common-cmds.h:34
msgid "Reset current HEAD to the specified state"
msgstr ""
-#: common-cmds.h:25
+#: common-cmds.h:35
msgid "Remove files from the working tree and from the index"
msgstr ""
-#: common-cmds.h:26
+#: common-cmds.h:36
msgid "Show various types of objects"
msgstr ""
-#: common-cmds.h:27
+#: common-cmds.h:37
msgid "Show the working tree status"
msgstr ""
-#: common-cmds.h:28
+#: common-cmds.h:38
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: parse-options.h:143
+#: parse-options.h:142
msgid "expiry-date"
msgstr ""
-#: parse-options.h:158
+#: parse-options.h:157
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:232
+#: parse-options.h:231
msgid "be more verbose"
msgstr ""
-#: parse-options.h:234
+#: parse-options.h:233
msgid "be more quiet"
msgstr ""
-#: parse-options.h:240
+#: parse-options.h:239
msgid "use <n> digits to display SHA-1s"
msgstr ""
msgid "You need to set your committer info first"
msgstr ""
-#: git-am.sh:98
+#: git-am.sh:100
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: git-am.sh:108
+#: git-am.sh:110
#, sh-format
msgid ""
"When you have resolved this problem, run \"$cmdline --continue\".\n"
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:124
+#: git-am.sh:126
msgid "Cannot fall back to three-way merge."
msgstr ""
-#: git-am.sh:140
+#: git-am.sh:142
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: git-am.sh:142
+#: git-am.sh:144
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: git-am.sh:157
+#: git-am.sh:159
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: git-am.sh:166
+#: git-am.sh:168
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: git-am.sh:182
+#: git-am.sh:185
msgid "Failed to merge in the changes."
msgstr ""
-#: git-am.sh:277
+#: git-am.sh:280
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: git-am.sh:364
+#: git-am.sh:367
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
-#: git-am.sh:366
+#: git-am.sh:369
msgid "Patch format detection failed."
msgstr ""
-#: git-am.sh:398
+#: git-am.sh:407
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: git-am.sh:496
+#: git-am.sh:507
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
-#: git-am.sh:501
+#: git-am.sh:512
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
-#: git-am.sh:537
+#: git-am.sh:560
#, sh-format
msgid ""
"Stray $dotest directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: git-am.sh:545
+#: git-am.sh:568
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: git-am.sh:612
+#: git-am.sh:635
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
-#: git-am.sh:722
+#: git-am.sh:747
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:749
+#: git-am.sh:774
msgid "Patch does not have a valid e-mail address."
msgstr ""
-#: git-am.sh:796
+#: git-am.sh:821
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: git-am.sh:800
+#: git-am.sh:825
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#: git-am.sh:807
+#: git-am.sh:832
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-#: git-am.sh:843
+#: git-am.sh:868
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
-#: git-am.sh:864
+#: git-am.sh:889
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: git-am.sh:872
+#: git-am.sh:897
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
-#: git-am.sh:888
+#: git-am.sh:913
msgid "No changes -- Patch already applied."
msgstr ""
-#: git-am.sh:898
+#: git-am.sh:923
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
-#: git-am.sh:901
+#: git-am.sh:926
#, sh-format
msgid ""
"The copy of the patch that failed is found in:\n"
" $dotest/patch"
msgstr ""
-#: git-am.sh:919
+#: git-am.sh:945
msgid "applying to an empty history"
msgstr ""
#: git-bisect.sh:130
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
#: git-bisect.sh:140
msgid "bisect run success"
msgstr ""
-#: git-pull.sh:21
+#: git-pull.sh:61
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: git-pull.sh:25
+#: git-pull.sh:65
msgid "Pull is not possible because you have unmerged files."
msgstr ""
-#: git-pull.sh:31
+#: git-pull.sh:71
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: git-pull.sh:245
+#: git-pull.sh:285
msgid "updating an unborn branch with changes added to the index"
msgstr ""
-#: git-pull.sh:269
+#: git-pull.sh:311
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
"Warning: commit $orig_head."
msgstr ""
-#: git-pull.sh:294
+#: git-pull.sh:336
msgid "Cannot merge multiple branches into empty head"
msgstr ""
-#: git-pull.sh:298
+#: git-pull.sh:340
msgid "Cannot rebase onto multiple branches"
msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:238
+#: git-stash.sh:241
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:259
+#: git-stash.sh:262
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:263
+#: git-stash.sh:266
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:267
+#: git-stash.sh:270
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:285
+#: git-stash.sh:288
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:384
+#: git-stash.sh:389
+#, sh-format
+msgid "unknown option: $opt"
+msgstr ""
+
+#: git-stash.sh:399
msgid "No stash found."
msgstr ""
-#: git-stash.sh:391
+#: git-stash.sh:406
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:397
+#: git-stash.sh:412
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:425
+#: git-stash.sh:440
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:436
+#: git-stash.sh:451
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:444
+#: git-stash.sh:459
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:448
+#: git-stash.sh:463
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:456
+#: git-stash.sh:471
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:458
+#: git-stash.sh:473
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:492
+#: git-stash.sh:507
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:507
+#: git-stash.sh:522
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:530
+#: git-stash.sh:545
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:531
+#: git-stash.sh:546
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:539
+#: git-stash.sh:554
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:611
+#: git-stash.sh:626
msgid "(To restore them type \"git stash apply\")"
msgstr ""