msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-08-06 23:47+0800\n"
+"POT-Creation-Date: 2012-10-16 08:38+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"
"or use 'git commit -a'."
msgstr ""
+#: archive.c:10
+msgid "git archive [options] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:11
+msgid "git archive --list"
+msgstr ""
+
+#: archive.c:12
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:13
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr ""
+
+#: archive.c:322
+msgid "fmt"
+msgstr ""
+
+#: archive.c:322
+msgid "archive format"
+msgstr ""
+
+#: archive.c:323 builtin/log.c:1079
+msgid "prefix"
+msgstr ""
+
+#: archive.c:324
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389
+#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642
+#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77
+#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
+#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
+msgid "file"
+msgstr ""
+
+#: archive.c:326 builtin/archive.c:92
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:328
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:329
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:330
+msgid "store only"
+msgstr ""
+
+#: archive.c:331
+msgid "compress faster"
+msgstr ""
+
+#: archive.c:339
+msgid "compress better"
+msgstr ""
+
+#: archive.c:342
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
+msgid "repo"
+msgstr ""
+
+#: archive.c:345 builtin/archive.c:94
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
+msgid "command"
+msgstr ""
+
+#: archive.c:347 builtin/archive.c:96
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:699
+#: bundle.c:89 builtin/commit.c:672
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
-#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
+#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
+#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
msgid "rev-list died"
msgstr ""
-#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
+#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "index-pack died"
msgstr ""
-#: commit.c:48
+#: commit.c:50
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
"%s"
msgstr ""
-#: diff.c:1400
-msgid " 0 files changed"
-msgstr ""
-
-#: diff.c:1404
-#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:1421
-#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:1432
-#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diff.c:3461
+#: diff.c:3458
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgid "gpg failed to sign the data"
msgstr ""
-#: grep.c:1320
+#: grep.c:1441
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1337
+#: grep.c:1458
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1348
+#: grep.c:1469
#, c-format
msgid "'%s': short read %s"
msgstr ""
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:497
-msgid "diff setup failed"
-msgstr ""
-
-#: merge-recursive.c:627
-msgid "merge-recursive: disk full?"
-msgstr ""
-
-#: merge-recursive.c:690
+#: merge-recursive.c:672
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:701
+#: merge-recursive.c:683
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
#. something else exists
#. .. but not some other error (who really cares what?)
-#: merge-recursive.c:715 merge-recursive.c:736
+#: merge-recursive.c:697 merge-recursive.c:718
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:726
+#: merge-recursive.c:708
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:766
+#: merge-recursive.c:748
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:768
+#: merge-recursive.c:750
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:791 builtin/clone.c:302
+#: merge-recursive.c:773 builtin/clone.c:302
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: merge-recursive.c:799
+#: merge-recursive.c:781
#, c-format
msgid "failed to symlink '%s'"
msgstr ""
-#: merge-recursive.c:802
+#: merge-recursive.c:784
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:939
+#: merge-recursive.c:922
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:943
+#: merge-recursive.c:926
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:959
+#: merge-recursive.c:942
msgid "unsupported object type in the tree"
msgstr ""
-#: merge-recursive.c:1038 merge-recursive.c:1052
+#: merge-recursive.c:1021 merge-recursive.c:1035
#, 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:1044 merge-recursive.c:1057
+#: merge-recursive.c:1027 merge-recursive.c:1040
#, 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:1098
+#: merge-recursive.c:1081
msgid "rename"
msgstr ""
-#: merge-recursive.c:1098
+#: merge-recursive.c:1081
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1154
+#: merge-recursive.c:1137
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1176
+#: merge-recursive.c:1159
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1181
+#: merge-recursive.c:1164
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1235
+#: merge-recursive.c:1218
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1265
+#: merge-recursive.c:1248
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1464
+#: merge-recursive.c:1447
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1474
+#: merge-recursive.c:1457
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1479 merge-recursive.c:1677
+#: merge-recursive.c:1462 merge-recursive.c:1660
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1530
+#: merge-recursive.c:1513
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1533
+#: merge-recursive.c:1516
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1581
+#: merge-recursive.c:1564
msgid "modify"
msgstr ""
-#: merge-recursive.c:1581
+#: merge-recursive.c:1564
msgid "modified"
msgstr ""
-#: merge-recursive.c:1591
+#: merge-recursive.c:1574
msgid "content"
msgstr ""
-#: merge-recursive.c:1598
+#: merge-recursive.c:1581
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1632
+#: merge-recursive.c:1615
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1646
+#: merge-recursive.c:1629
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1650 git-submodule.sh:844
+#: merge-recursive.c:1633 git-submodule.sh:869
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1651
+#: merge-recursive.c:1634
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1741
+#: merge-recursive.c:1724
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1766
+#: merge-recursive.c:1749
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1772
+#: merge-recursive.c:1755
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1777
+#: merge-recursive.c:1760
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1787
+#: merge-recursive.c:1770
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1804
+#: merge-recursive.c:1787
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1823
+#: merge-recursive.c:1806
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1832
+#: merge-recursive.c:1815
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1862
+#: merge-recursive.c:1845
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1907
+#: merge-recursive.c:1890
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1920
+#: merge-recursive.c:1903
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1957
+#: merge-recursive.c:1940
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2014
+#: merge-recursive.c:1997
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2026 builtin/merge.c:697
+#: merge-recursive.c:2009 builtin/merge.c:696
msgid "Unable to write index."
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
-#: builtin/merge.c:1088 builtin/merge.c:1098
+#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977
+#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
-#: builtin/merge.c:1090 builtin/merge.c:1103
+#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867
+#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr ""
-#: sequencer.c:144
+#: sequencer.c:146
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:147
+#: sequencer.c:149
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:160 sequencer.c:758 sequencer.c:841
+#: sequencer.c:162 sequencer.c:770 sequencer.c:853
#, c-format
msgid "Could not write to %s"
msgstr ""
-#: sequencer.c:163
+#: sequencer.c:165
#, c-format
msgid "Error wrapping up %s"
msgstr ""
-#: sequencer.c:178
+#: sequencer.c:180
msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
-#: sequencer.c:180
+#: sequencer.c:182
msgid "Your local changes would be overwritten by revert."
msgstr ""
-#: sequencer.c:183
+#: sequencer.c:185
msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:233
+#: sequencer.c:235
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:261
+#: sequencer.c:266
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:282
+#: sequencer.c:287
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:324
+#: sequencer.c:332
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:329
+#: sequencer.c:337
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:395
+#: sequencer.c:403
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:398
+#: sequencer.c:406
msgid "You do not have a valid HEAD"
msgstr ""
-#: sequencer.c:413
+#: sequencer.c:421
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:421
+#: sequencer.c:429
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:425
+#: sequencer.c:433
#, 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:436
+#: sequencer.c:444
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:440
+#: sequencer.c:448
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:524
+#: sequencer.c:532
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:525
+#: sequencer.c:533
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:553
+#: sequencer.c:565
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:561
+#: sequencer.c:573
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:566
+#: sequencer.c:578
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:624
+#: sequencer.c:636
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:646
+#: sequencer.c:658
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:651
+#: sequencer.c:663
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:664
+#: sequencer.c:676
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:668
+#: sequencer.c:680
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:675
+#: sequencer.c:687
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:703
+#: sequencer.c:715
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:706
+#: sequencer.c:718
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:718
+#: sequencer.c:730
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:739
+#: sequencer.c:751
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:740
+#: sequencer.c:752
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:744
+#: sequencer.c:756
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:760 sequencer.c:845
+#: sequencer.c:772 sequencer.c:857
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:779 sequencer.c:913
+#: sequencer.c:791 sequencer.c:925
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:781
+#: sequencer.c:793
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:783
+#: sequencer.c:795
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:805 builtin/apply.c:3988
+#: sequencer.c:817 builtin/apply.c:4005
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:808
+#: sequencer.c:820
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:809
+#: sequencer.c:821
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:815
+#: sequencer.c:827
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:838
+#: sequencer.c:850
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1000
+#: sequencer.c:1012
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1001
+#: sequencer.c:1013
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wrapper.c:413
+#: wrapper.c:408
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: wrapper.c:426
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: wrapper.c:414
+#: wrapper.c:427
msgid "no such user"
msgstr ""
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:224
-#, c-format
-msgid "%s files:"
-msgstr ""
-
#: wt-status.c:227
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
#: wt-status.c:1011
-msgid "Untracked"
+msgid "Untracked files"
msgstr ""
#: wt-status.c:1013
-msgid "Ignored"
+msgid "Ignored files"
msgstr ""
#: wt-status.c:1015
msgid "No changes"
msgstr ""
-#: wt-status.c:1027
+#: wt-status.c:1028
#, c-format
-msgid "no changes added to commit%s\n"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1029
-msgid " (use \"git add\" and/or \"git commit -a\")"
+#: wt-status.c:1031
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1031
+#: wt-status.c:1034
#, c-format
-msgid "nothing added to commit but untracked files present%s\n"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: wt-status.c:1033
-msgid " (use \"git add\" to track)"
+#: wt-status.c:1037
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
+#: wt-status.c:1040
#, c-format
-msgid "nothing to commit%s\n"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1036
-msgid " (create/copy files and use \"git add\" to track)"
+#: wt-status.c:1043 wt-status.c:1048
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1039
-msgid " (use -u to show untracked files)"
+#: wt-status.c:1046
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1042
-msgid " (working directory clean)"
+#: wt-status.c:1050
+#, c-format
+msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1150
+#: wt-status.c:1158
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1156
+#: wt-status.c:1164
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1171
+#: wt-status.c:1179
msgid "behind "
msgstr ""
-#: wt-status.c:1174 wt-status.c:1177
+#: wt-status.c:1182 wt-status.c:1185
msgid "ahead "
msgstr ""
-#: wt-status.c:1179
+#: wt-status.c:1187
msgid ", behind "
msgstr ""
+#: compat/precompose_utf8.c:58 builtin/clone.c:341
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/add.c:19
+msgid "git add [options] [--] <filepattern>..."
+msgstr ""
+
#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:229
+#: builtin/add.c:67 builtin/commit.c:230
msgid "updating files failed"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
+#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:312
+#: builtin/add.c:313
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:352
+#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
+#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
+#: builtin/rm.c:133
+msgid "dry run"
+msgstr ""
+
+#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154
+#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
+#: builtin/mv.c:62 builtin/read-tree.c:112
+msgid "be verbose"
+msgstr ""
+
+#: builtin/add.c:322
+msgid "interactive picking"
+msgstr ""
+
+#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
+msgid "select hunks interactively"
+msgstr ""
+
+#: builtin/add.c:324
+msgid "edit current diff and apply"
+msgstr ""
+
+#: builtin/add.c:325
+msgid "allow adding otherwise ignored files"
+msgstr ""
+
+#: builtin/add.c:326
+msgid "update tracked files"
+msgstr ""
+
+#: builtin/add.c:327
+msgid "record only the fact that the path will be added later"
+msgstr ""
+
+#: builtin/add.c:328
+msgid "add changes from all tracked and untracked files"
+msgstr ""
+
+#: builtin/add.c:329
+msgid "don't add, only refresh the index"
+msgstr ""
+
+#: builtin/add.c:330
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+
+#: builtin/add.c:331
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+
+#: builtin/add.c:353
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:353
+#: builtin/add.c:354
msgid "no files added"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:360
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:391
+#: builtin/add.c:392
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:393
+#: builtin/add.c:394
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:413
+#: builtin/add.c:414
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:414
+#: builtin/add.c:415
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
+#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr ""
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/apply.c:824
+#: builtin/apply.c:823
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/apply.c:833
+#: builtin/apply.c:832
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/apply.c:914
+#: builtin/apply.c:913
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:946
+#: builtin/apply.c:945
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:950
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:951
+#: builtin/apply.c:950
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:958
+#: builtin/apply.c:957
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1403
+#: builtin/apply.c:1420
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1460
+#: builtin/apply.c:1477
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1477
+#: builtin/apply.c:1494
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1637
+#: builtin/apply.c:1654
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1639
+#: builtin/apply.c:1656
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1665
+#: builtin/apply.c:1682
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1701
+#: builtin/apply.c:1718
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1703
+#: builtin/apply.c:1720
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1706
+#: builtin/apply.c:1723
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1852
+#: builtin/apply.c:1869
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1881
+#: builtin/apply.c:1898
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:1967
+#: builtin/apply.c:1984
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2057
+#: builtin/apply.c:2074
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2061
+#: builtin/apply.c:2078
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2132
+#: builtin/apply.c:2149
msgid "oops"
msgstr ""
-#: builtin/apply.c:2654
+#: builtin/apply.c:2671
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2772
+#: builtin/apply.c:2789
#, 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:2784
+#: builtin/apply.c:2801
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2790
+#: builtin/apply.c:2807
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2809
+#: builtin/apply.c:2826
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:2912
+#: builtin/apply.c:2929
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:2918
+#: builtin/apply.c:2935
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:2939
+#: builtin/apply.c:2956
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3061
+#: builtin/apply.c:3078
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
+#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3139 builtin/apply.c:3361
+#: builtin/apply.c:3156 builtin/apply.c:3378
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3220 builtin/apply.c:3375
+#: builtin/apply.c:3237 builtin/apply.c:3392
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
+#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3229 builtin/apply.c:3383
+#: builtin/apply.c:3246 builtin/apply.c:3400
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3331
+#: builtin/apply.c:3348
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3400
+#: builtin/apply.c:3417
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3402
+#: builtin/apply.c:3419
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3503
+#: builtin/apply.c:3520
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3506
+#: builtin/apply.c:3523
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3526
+#: builtin/apply.c:3543
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3531
+#: builtin/apply.c:3548
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3539
+#: builtin/apply.c:3556
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3552
+#: builtin/apply.c:3569
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
+#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:3750
+#: builtin/apply.c:3767
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3778
+#: builtin/apply.c:3795
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
-#: builtin/apply.c:3782
+#: builtin/apply.c:3799
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3787
+#: builtin/apply.c:3804
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3790 builtin/apply.c:3898
+#: builtin/apply.c:3807 builtin/apply.c:3915
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3823
+#: builtin/apply.c:3840
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:3872
+#: builtin/apply.c:3889
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:3959
+#: builtin/apply.c:3976
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:3967
+#: builtin/apply.c:3984
msgid "internal error"
msgstr ""
#. Say this even without --verbose
-#: builtin/apply.c:3970
+#: builtin/apply.c:3987
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:3980
+#: builtin/apply.c:3997
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4001
+#: builtin/apply.c:4018
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4004
+#: builtin/apply.c:4021
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4154
+#: builtin/apply.c:4171
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4165
+#: builtin/apply.c:4182
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4284 builtin/apply.c:4287
+#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
+#: builtin/fetch.c:63
msgid "path"
msgstr ""
-#: builtin/apply.c:4285
+#: builtin/apply.c:4302
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4288
+#: builtin/apply.c:4305
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4290
+#: builtin/apply.c:4307
msgid "num"
msgstr ""
-#: builtin/apply.c:4291
+#: builtin/apply.c:4308
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4294
+#: builtin/apply.c:4311
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4296
+#: builtin/apply.c:4313
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4300
-msgid "shows number of added and deleted lines in decimal notation"
+#: builtin/apply.c:4317
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4302
+#: builtin/apply.c:4319
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4304
+#: builtin/apply.c:4321
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4306
+#: builtin/apply.c:4323
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4308
+#: builtin/apply.c:4325
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4310
+#: builtin/apply.c:4327
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4312
+#: builtin/apply.c:4329
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4314
+#: builtin/apply.c:4331
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4316
+#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4319
+#: builtin/apply.c:4336
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4320
+#: builtin/apply.c:4337
msgid "action"
msgstr ""
-#: builtin/apply.c:4321
+#: builtin/apply.c:4338
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4324 builtin/apply.c:4327
+#: builtin/apply.c:4341 builtin/apply.c:4344
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4330
+#: builtin/apply.c:4347
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4332
+#: builtin/apply.c:4349
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4334
+#: builtin/apply.c:4351
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4336
+#: builtin/apply.c:4353
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4337
-msgid "be verbose"
-msgstr ""
-
-#: builtin/apply.c:4339
+#: builtin/apply.c:4356
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4342
+#: builtin/apply.c:4359
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4344
+#: builtin/apply.c:4361
msgid "root"
msgstr ""
-#: builtin/apply.c:4345
+#: builtin/apply.c:4362
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4367
+#: builtin/apply.c:4384
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4375
+#: builtin/apply.c:4392
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4378
+#: builtin/apply.c:4395
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4394
+#: builtin/apply.c:4411
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4408
+#: builtin/apply.c:4425
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4414 builtin/apply.c:4424
+#: builtin/apply.c:4431 builtin/apply.c:4441
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "git archive: expected a flush"
msgstr ""
-#: builtin/branch.c:144
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr ""
+
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
+msgstr ""
+
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr ""
+
+#: builtin/blame.c:25
+msgid "git blame [options] [rev-opts] [rev] [--] file"
+msgstr ""
+
+#: builtin/blame.c:30 builtin/shortlog.c:15
+msgid "[rev-opts] are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:2373
+msgid "Show blame entries as we find them, incrementally"
+msgstr ""
+
+#: builtin/blame.c:2374
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2375
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2376
+msgid "Show work cost statistics"
+msgstr ""
+
+#: builtin/blame.c:2377
+msgid "Show output score for blame entries"
+msgstr ""
+
+#: builtin/blame.c:2378
+msgid "Show original filename (Default: auto)"
+msgstr ""
+
+#: builtin/blame.c:2379
+msgid "Show original linenumber (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2380
+msgid "Show in a format designed for machine consumption"
+msgstr ""
+
+#: builtin/blame.c:2381
+msgid "Show porcelain format with per-line commit information"
+msgstr ""
+
+#: builtin/blame.c:2382
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2383
+msgid "Show raw timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2384
+msgid "Show long commit SHA1 (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2385
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2386
+msgid "Show author email instead of name (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:2387
+msgid "Ignore whitespace differences"
+msgstr ""
+
+#: builtin/blame.c:2388
+msgid "Spend extra cycles to find better match"
+msgstr ""
+
+#: builtin/blame.c:2389
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr ""
+
+#: builtin/blame.c:2390
+msgid "Use <file>'s contents as the final image"
+msgstr ""
+
+#: builtin/blame.c:2391 builtin/blame.c:2392
+msgid "score"
+msgstr ""
+
+#: builtin/blame.c:2391
+msgid "Find line copies within and across files"
+msgstr ""
+
+#: builtin/blame.c:2392
+msgid "Find line movements within and across files"
+msgstr ""
+
+#: builtin/blame.c:2393
+msgid "n,m"
+msgstr ""
+
+#: builtin/blame.c:2393
+msgid "Process only line range n,m, counting from 1"
+msgstr ""
+
+#: builtin/branch.c:23
+msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+msgstr ""
+
+#: builtin/branch.c:24
+msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+msgstr ""
+
+#: builtin/branch.c:25
+msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+msgstr ""
+
+#: builtin/branch.c:26
+msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+msgstr ""
+
+#: builtin/branch.c:145
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:148
+#: builtin/branch.c:149
#, 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:180
+#: builtin/branch.c:181
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:186
+#: builtin/branch.c:187
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:191
+#: builtin/branch.c:192
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
-#: builtin/branch.c:202
+#: builtin/branch.c:203
#, c-format
msgid "remote branch '%s' not found."
msgstr ""
-#: builtin/branch.c:203
+#: builtin/branch.c:204
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:210
+#: builtin/branch.c:211
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:216
+#: builtin/branch.c:217
#, 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:225
+#: builtin/branch.c:226
#, c-format
msgid "Error deleting remote branch '%s'"
msgstr ""
-#: builtin/branch.c:226
+#: builtin/branch.c:227
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:233
+#: builtin/branch.c:234
#, c-format
msgid "Deleted remote branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:234
+#: builtin/branch.c:235
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:239
+#: builtin/branch.c:240
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:337
+#: builtin/branch.c:338
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr ""
-#: builtin/branch.c:409
+#: builtin/branch.c:410
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:411
+#: builtin/branch.c:412
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:415
+#: builtin/branch.c:416
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:417
+#: builtin/branch.c:418
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:420
+#: builtin/branch.c:421
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:423
+#: builtin/branch.c:424
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:535
+#: builtin/branch.c:537
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:600
+#: builtin/branch.c:602
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:613
+#: builtin/branch.c:615
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:623
+#: builtin/branch.c:625
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:640
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:644
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/branch.c:648
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:653
+#: builtin/branch.c:655
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/branch.c:670
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:692
+#: builtin/branch.c:694
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:783
-msgid "Failed to resolve HEAD as a valid ref."
+#: builtin/branch.c:724
+msgid "Generic options"
msgstr ""
-#: builtin/branch.c:788 builtin/clone.c:561
-msgid "HEAD not found below refs/heads!"
+#: builtin/branch.c:726
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:808
-msgid "--column and --verbose are incompatible"
+#: builtin/branch.c:727
+msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:857
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:728
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/bundle.c:47
-#, c-format
-msgid "%s is okay\n"
+#: builtin/branch.c:730
+msgid "change upstream info"
msgstr ""
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
+#: builtin/branch.c:734
+msgid "use colored output"
msgstr ""
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
+#: builtin/branch.c:735
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/checkout.c:114 builtin/checkout.c:147
-#, c-format
-msgid "path '%s' does not have our version"
+#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
+#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363
+#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470
+msgid "commit"
msgstr ""
-#: builtin/checkout.c:116 builtin/checkout.c:149
-#, c-format
-msgid "path '%s' does not have their version"
+#: builtin/branch.c:739 builtin/branch.c:745
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/checkout.c:132
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: builtin/branch.c:751
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/checkout.c:176
-#, c-format
-msgid "path '%s' does not have necessary versions"
+#: builtin/branch.c:752
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/checkout.c:193
-#, c-format
-msgid "path '%s': cannot merge"
+#: builtin/branch.c:754
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/checkout.c:210
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: builtin/branch.c:755
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/checkout.c:235 builtin/checkout.c:393
-msgid "corrupt index file"
+#: builtin/branch.c:756
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:272
-#, c-format
-msgid "path '%s' is unmerged"
+#: builtin/branch.c:757
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
-#: builtin/merge.c:812
-msgid "unable to write new index file"
+#: builtin/branch.c:758
+msgid "list branch names"
msgstr ""
-#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
+#: builtin/branch.c:759
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/checkout.c:415
-msgid "you need to resolve your current index first"
+#: builtin/branch.c:761
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/checkout.c:534
-#, c-format
-msgid "Can not do reflog for '%s'\n"
+#: builtin/branch.c:762
+msgid "force creation (when already exists)"
msgstr ""
-#: builtin/checkout.c:567
-msgid "HEAD is now at"
+#: builtin/branch.c:765
+msgid "print only not merged branches"
msgstr ""
-#: builtin/checkout.c:574
-#, c-format
-msgid "Reset branch '%s'\n"
+#: builtin/branch.c:771
+msgid "print only merged branches"
msgstr ""
-#: builtin/checkout.c:577
-#, c-format
-msgid "Already on '%s'\n"
+#: builtin/branch.c:775
+msgid "list branches in columns"
msgstr ""
-#: builtin/checkout.c:581
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
+#: builtin/branch.c:788
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/checkout.c:583
-#, c-format
-msgid "Switched to a new branch '%s'\n"
+#: builtin/branch.c:793 builtin/clone.c:561
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/checkout.c:585
-#, c-format
-msgid "Switched to branch '%s'\n"
+#: builtin/branch.c:813
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/checkout.c:641
+#: builtin/branch.c:864
#, c-format
-msgid " ... and %d more.\n"
+msgid "branch '%s' does not exist"
msgstr ""
-#. The singular version
-#: builtin/checkout.c:647
+#: builtin/branch.c:876
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr ""
+
+#: builtin/branch.c:891
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/branch.c:894
#, c-format
msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
+msgstr ""
-#: builtin/checkout.c:665
+#: builtin/branch.c:911
#, c-format
msgid ""
-"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"
+"If you wanted to make '%s' track '%s', do this:\n"
"\n"
msgstr ""
-#: builtin/checkout.c:695
-msgid "internal error in revision walk"
-msgstr ""
-
-#: builtin/checkout.c:699
-msgid "Previous HEAD position was"
+#: builtin/branch.c:912
+#, c-format
+msgid " git branch -d %s\n"
msgstr ""
-#: builtin/checkout.c:725 builtin/checkout.c:920
-msgid "You are on a branch yet to be born"
+#: builtin/branch.c:913
+#, c-format
+msgid " git branch --set-upstream-to %s\n"
msgstr ""
-#. case (1)
-#: builtin/checkout.c:856
+#: builtin/bundle.c:47
#, c-format
-msgid "invalid reference: %s"
+msgid "%s is okay\n"
msgstr ""
-#. case (1): want a tree
-#: builtin/checkout.c:895
-#, c-format
-msgid "reference is not a tree: %s"
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/checkout.c:977
-msgid "-B cannot be used with -b"
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/checkout.c:986
-msgid "--patch is incompatible with all other options"
+#: builtin/cat-file.c:247
+msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr ""
-#: builtin/checkout.c:989
-msgid "--detach cannot be used with -b/-B/--orphan"
+#: builtin/cat-file.c:248
+msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr ""
-#: builtin/checkout.c:991
-msgid "--detach cannot be used with -t"
+#: builtin/cat-file.c:266
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/checkout.c:997
-msgid "--track needs a branch name"
+#: builtin/cat-file.c:267
+msgid "show object type"
msgstr ""
-#: builtin/checkout.c:1004
-msgid "Missing branch name; try -b"
+#: builtin/cat-file.c:268
+msgid "show object size"
msgstr ""
-#: builtin/checkout.c:1010
-msgid "--orphan and -b|-B are mutually exclusive"
+#: builtin/cat-file.c:270
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/checkout.c:1012
-msgid "--orphan cannot be used with -t"
+#: builtin/cat-file.c:271
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/checkout.c:1022
-msgid "git checkout: -f and -m are incompatible"
+#: builtin/cat-file.c:273
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/checkout.c:1056
-msgid "invalid path specification"
+#: builtin/cat-file.c:275
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/checkout.c:1064
-#, c-format
-msgid ""
-"git checkout: updating paths is incompatible with switching branches.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+#: builtin/cat-file.c:278
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/checkout.c:1066
-msgid "git checkout: updating paths is incompatible with switching branches."
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | attr...] [--] pathname..."
msgstr ""
-#: builtin/checkout.c:1071
-msgid "git checkout: --detach does not take a path argument"
+#: builtin/check-attr.c:12
+msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
msgstr ""
-#: builtin/checkout.c:1074
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/checkout.c:1093
-msgid "Cannot switch branch to a non-commit."
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/checkout.c:1096
-msgid "--ours/--theirs is incompatible with switching branches."
+#: builtin/check-attr.c:21 builtin/hash-object.c:75
+msgid "read file names from stdin"
msgstr ""
-#: builtin/clean.c:78
-msgid "-x and -X cannot be used together"
+#: builtin/check-attr.c:23
+msgid "input paths are terminated by a null character"
msgstr ""
-#: builtin/clean.c:82
-msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+#: builtin/checkout-index.c:126
+msgid "git checkout-index [options] [--] [<file>...]"
msgstr ""
-#: builtin/clean.c:85
-msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
+#: builtin/checkout-index.c:187
+msgid "check out all files in the index"
msgstr ""
-#: builtin/clean.c:155 builtin/clean.c:176
-#, c-format
-msgid "Would remove %s\n"
+#: builtin/checkout-index.c:188
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/clean.c:159 builtin/clean.c:179
-#, c-format
-msgid "Removing %s\n"
+#: builtin/checkout-index.c:190
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/clean.c:162 builtin/clean.c:182
-#, c-format
-msgid "failed to remove %s"
+#: builtin/checkout-index.c:192
+msgid "don't checkout new files"
msgstr ""
-#: builtin/clean.c:166
-#, c-format
-msgid "Would not remove %s\n"
+#: builtin/checkout-index.c:194
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/clean.c:168
-#, c-format
-msgid "Not removing %s\n"
+#: builtin/checkout-index.c:200
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/clone.c:243
-#, c-format
-msgid "reference repository '%s' is not a local directory."
+#: builtin/checkout-index.c:202
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/clone.c:306
-#, c-format
-msgid "failed to create directory '%s'"
+#: builtin/checkout-index.c:203 builtin/column.c:30
+msgid "string"
msgstr ""
-#: builtin/clone.c:308 builtin/diff.c:75
-#, c-format
-msgid "failed to stat '%s'"
+#: builtin/checkout-index.c:204
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/clone.c:310
-#, c-format
-msgid "%s exists and is not a directory"
+#: builtin/checkout-index.c:207
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/clone.c:324
-#, c-format
-msgid "failed to stat %s\n"
+#: builtin/checkout.c:25
+msgid "git checkout [options] <branch>"
msgstr ""
-#: builtin/clone.c:341
-#, c-format
-msgid "failed to unlink '%s'"
+#: builtin/checkout.c:26
+msgid "git checkout [options] [<branch>] -- <file>..."
msgstr ""
-#: builtin/clone.c:346
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
-msgid "failed to create link '%s'"
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/clone.c:350
+#: builtin/checkout.c:118 builtin/checkout.c:151
#, c-format
-msgid "failed to copy file to '%s'"
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/clone.c:373
+#: builtin/checkout.c:134
#, c-format
-msgid "done.\n"
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/clone.c:443
+#: builtin/checkout.c:178
#, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/clone.c:552
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/checkout.c:195
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/clone.c:642
-msgid "Too many arguments."
+#: builtin/checkout.c:212
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/clone.c:646
-msgid "You must specify a repository to clone."
+#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
+#: builtin/checkout.c:245
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/clone.c:657
+#: builtin/checkout.c:248 builtin/checkout.c:251
#, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/clone.c:671
+#: builtin/checkout.c:254
#, c-format
-msgid "repository '%s' does not exist"
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/clone.c:676
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/checkout.c:265 builtin/checkout.c:426
+msgid "corrupt index file"
msgstr ""
-#: builtin/clone.c:686
+#: builtin/checkout.c:295 builtin/checkout.c:302
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/clone.c:696
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586
+#: builtin/merge.c:811
+msgid "unable to write new index file"
msgstr ""
-#: builtin/clone.c:709 builtin/clone.c:723
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: builtin/checkout.c:448
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/clone.c:712
+#: builtin/checkout.c:569
#, c-format
-msgid "could not create work tree dir '%s'."
+msgid "Can not do reflog for '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:602
+msgid "HEAD is now at"
msgstr ""
-#: builtin/clone.c:731
+#: builtin/checkout.c:609
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/clone.c:733
+#: builtin/checkout.c:612
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/clone.c:789
+#: builtin/checkout.c:616
#, c-format
-msgid "Don't know how to clone %s"
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/clone.c:838
+#: builtin/checkout.c:618
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/clone.c:845
-msgid "You appear to have cloned an empty repository."
+#: builtin/checkout.c:620
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/checkout.c:676
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/commit.c:43
+#. The singular version
+#: builtin/checkout.c:682
+#, c-format
msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-
-#: builtin/commit.c:55
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
-msgstr ""
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/commit.c:60
+#: builtin/checkout.c:700
+#, c-format
msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
+"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 commit --allow-empty\n"
+" git branch new_branch_name %s\n"
"\n"
-"Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:256
-msgid "failed to unpack HEAD tree object"
+#: builtin/checkout.c:730
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/commit.c:298
-msgid "unable to create temporary index"
+#: builtin/checkout.c:734
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/commit.c:304
-msgid "interactive add failed"
+#: builtin/checkout.c:761 builtin/checkout.c:950
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
-msgid "unable to write new_index file"
+#. case (1)
+#: builtin/checkout.c:886
+#, c-format
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/commit.c:389
-msgid "cannot do a partial commit during a merge."
+#. case (1): want a tree
+#: builtin/checkout.c:925
+#, c-format
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/commit.c:391
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/checkout.c:961
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/commit.c:401
-msgid "cannot read the index"
+#: builtin/checkout.c:964 builtin/checkout.c:968
+#, c-format
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/commit.c:421
-msgid "unable to write temporary index file"
+#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
+#: builtin/checkout.c:983
+#, c-format
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/commit.c:496 builtin/commit.c:502
+#: builtin/checkout.c:988
#, c-format
-msgid "invalid commit: %s"
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/commit.c:525
-msgid "malformed --author parameter"
+#: builtin/checkout.c:1009 builtin/gc.c:177
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/commit.c:585
-#, c-format
-msgid "Malformed ident string: '%s'"
+#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
+#: builtin/remote.c:169 builtin/remote.c:171
+msgid "branch"
msgstr ""
-#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
-#, c-format
-msgid "could not lookup commit %s"
+#: builtin/checkout.c:1011
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/commit.c:635 builtin/shortlog.c:296
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/checkout.c:1013
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/commit.c:637
-msgid "could not read log from standard input"
+#: builtin/checkout.c:1014
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/commit.c:641
-#, c-format
-msgid "could not read log file '%s'"
+#: builtin/checkout.c:1015
+msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/commit.c:647
-msgid "commit has empty message"
+#: builtin/checkout.c:1016
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/commit.c:663
-msgid "could not read MERGE_MSG"
+#: builtin/checkout.c:1018
+msgid "new branch"
msgstr ""
-#: builtin/commit.c:667
-msgid "could not read SQUASH_MSG"
+#: builtin/checkout.c:1018
+msgid "new unparented branch"
msgstr ""
-#: builtin/commit.c:671
-#, c-format
-msgid "could not read '%s'"
+#: builtin/checkout.c:1019
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/commit.c:723
-msgid "could not write commit template"
+#: builtin/checkout.c:1021
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/commit.c:734
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/checkout.c:1023
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/commit.c:739
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/checkout.c:1024
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/commit.c:751
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
+#: builtin/checkout.c:1025 builtin/merge.c:215
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/commit.c:756
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
+msgid "style"
msgstr ""
-#: builtin/commit.c:769
-#, c-format
-msgid "%sAuthor: %s"
+#: builtin/checkout.c:1027
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/commit.c:776
-#, c-format
-msgid "%sCommitter: %s"
+#: builtin/checkout.c:1030
+msgid "second guess 'git checkout no-such-branch'"
msgstr ""
-#: builtin/commit.c:796
-msgid "Cannot read index"
+#: builtin/checkout.c:1054
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/commit.c:833
-msgid "Error building trees"
+#: builtin/checkout.c:1071
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/commit.c:848 builtin/tag.c:361
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/checkout.c:1078
+msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/commit.c:945
-#, c-format
-msgid "No existing author found with '%s'"
+#: builtin/checkout.c:1113
+msgid "invalid path specification"
msgstr ""
-#: builtin/commit.c:960 builtin/commit.c:1160
+#: builtin/checkout.c:1120
#, c-format
-msgid "Invalid untracked files mode '%s'"
+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/commit.c:1000
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/checkout.c:1125
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/commit.c:1011
-msgid "You have nothing to amend."
+#: builtin/checkout.c:1129
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/commit.c:1014
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/clean.c:19
+msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/commit.c:1016
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/clean.c:51
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/commit.c:1019
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/clean.c:53
+msgid "force"
msgstr ""
-#: builtin/commit.c:1029
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/clean.c:55
+msgid "remove whole directories"
msgstr ""
-#: builtin/commit.c:1031
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803
+#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
+msgid "pattern"
msgstr ""
-#: builtin/commit.c:1039
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/clean.c:57
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/commit.c:1056
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/clean.c:58
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/commit.c:1058
-msgid "No paths with --include/--only does not make sense."
+#: builtin/clean.c:60
+msgid "remove only ignored files"
msgstr ""
-#: builtin/commit.c:1060
-msgid "Clever... amending the last one with dirty index."
+#: builtin/clean.c:78
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/commit.c:1062
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: builtin/clean.c:82
+msgid ""
+"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+msgstr ""
+
+#: builtin/clean.c:85
+msgid ""
+"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/commit.c:1072 builtin/tag.c:577
+#: builtin/clean.c:155 builtin/clean.c:176
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/commit.c:1077
-msgid "Paths with -a does not make sense."
+#: builtin/clean.c:159 builtin/clean.c:179
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/commit.c:1260
-msgid "couldn't look up newly created commit"
+#: builtin/clean.c:162 builtin/clean.c:182
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/commit.c:1262
-msgid "could not parse newly created commit"
+#: builtin/clean.c:166
+#, c-format
+msgid "Would not remove %s\n"
msgstr ""
-#: builtin/commit.c:1303
-msgid "detached HEAD"
+#: builtin/clean.c:168
+#, c-format
+msgid "Not removing %s\n"
msgstr ""
-#: builtin/commit.c:1305
-msgid " (root-commit)"
+#: builtin/clone.c:36
+msgid "git clone [options] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/commit.c:1449
-msgid "could not parse HEAD commit"
+#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
+#: builtin/push.c:399
+msgid "force progress reporting"
msgstr ""
-#: builtin/commit.c:1487 builtin/merge.c:509
-#, c-format
-msgid "could not open '%s' for reading"
+#: builtin/clone.c:66
+msgid "don't create a checkout"
msgstr ""
-#: builtin/commit.c:1494
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
+msgid "create a bare repository"
msgstr ""
-#: builtin/commit.c:1501
-msgid "could not read MERGE_MODE"
+#: builtin/clone.c:72
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/commit.c:1520
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/clone.c:74
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/commit.c:1534
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/clone.c:76
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/commit.c:1539
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/clone.c:78
+msgid "setup as shared repository"
msgstr ""
-#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
-msgid "failed to write commit object"
+#: builtin/clone.c:80 builtin/clone.c:82
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/commit.c:1575
-msgid "cannot lock HEAD ref"
+#: builtin/clone.c:83 builtin/init-db.c:485
+msgid "template-directory"
msgstr ""
-#: builtin/commit.c:1579
-msgid "cannot update HEAD ref"
+#: builtin/clone.c:84 builtin/init-db.c:486
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/commit.c:1590
-msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+#: builtin/clone.c:86
+msgid "reference repository"
msgstr ""
-#: builtin/describe.c:234
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+msgid "name"
msgstr ""
-#: builtin/describe.c:238
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: builtin/clone.c:88
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/describe.c:240
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/clone.c:90
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/describe.c:267
+#: builtin/clone.c:92
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:94
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:96
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:97 builtin/init-db.c:494
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:98 builtin/init-db.c:495
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:99
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:100
+msgid "set config inside the new repository"
+msgstr ""
+
+#: builtin/clone.c:243
#, c-format
-msgid "Not a valid object name %s"
+msgid "reference repository '%s' is not a local directory."
msgstr ""
-#: builtin/describe.c:270
+#: builtin/clone.c:306
#, c-format
-msgid "%s is not a valid '%s' object"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/describe.c:287
+#: builtin/clone.c:308 builtin/diff.c:77
#, c-format
-msgid "no tag exactly matches '%s'"
+msgid "failed to stat '%s'"
msgstr ""
-#: builtin/describe.c:289
+#: builtin/clone.c:310
#, c-format
-msgid "searching to describe %s\n"
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/describe.c:329
+#: builtin/clone.c:324
#, c-format
-msgid "finished search at %s\n"
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/describe.c:353
+#: builtin/clone.c:346
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/describe.c:357
+#: builtin/clone.c:350
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/clone.c:373
#, c-format
-msgid "traversed %lu commits\n"
+msgid "done.\n"
msgstr ""
-#: builtin/describe.c:381
+#: builtin/clone.c:443
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/describe.c:436
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/clone.c:552
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/describe.c:462
-msgid "No names found, cannot describe anything."
+#: builtin/clone.c:690
+msgid "Too many arguments."
msgstr ""
-#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+#: builtin/clone.c:694
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/diff.c:77
+#: builtin/clone.c:705
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/diff.c:220
+#: builtin/clone.c:719
#, c-format
-msgid "invalid option: %s"
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/diff.c:297
-msgid "Not a git repository"
+#: builtin/clone.c:724
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/diff.c:341
+#: builtin/clone.c:734
#, c-format
-msgid "invalid object '%s' given."
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/diff.c:346
+#: builtin/clone.c:744
#, c-format
-msgid "more than %d trees given: '%s'"
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/diff.c:356
+#: builtin/clone.c:757 builtin/clone.c:771
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/diff.c:364
+#: builtin/clone.c:760
#, c-format
-msgid "unhandled object '%s' given."
+msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/fetch.c:200
-msgid "Couldn't find remote ref HEAD"
+#: builtin/clone.c:779
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/fetch.c:253
+#: builtin/clone.c:781
#, c-format
-msgid "object %s not found"
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/fetch.c:259
-msgid "[up to date]"
+#: builtin/clone.c:823
+#, c-format
+msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/fetch.c:273
+#: builtin/clone.c:872
#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/fetch.c:274 builtin/fetch.c:360
-msgid "[rejected]"
+#: builtin/clone.c:879
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/fetch.c:285
-msgid "[tag update]"
+#: builtin/column.c:9
+msgid "git column [options]"
msgstr ""
-#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
-msgid " (unable to update local ref)"
+#: builtin/column.c:26
+msgid "lookup config vars"
msgstr ""
-#: builtin/fetch.c:305
-msgid "[new tag]"
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
msgstr ""
-#: builtin/fetch.c:308
-msgid "[new branch]"
+#: builtin/column.c:29
+msgid "Maximum width"
msgstr ""
-#: builtin/fetch.c:311
-msgid "[new ref]"
+#: builtin/column.c:30
+msgid "Padding space on left border"
msgstr ""
-#: builtin/fetch.c:356
-msgid "unable to update local ref"
+#: builtin/column.c:31
+msgid "Padding space on right border"
msgstr ""
-#: builtin/fetch.c:356
-msgid "forced update"
+#: builtin/column.c:32
+msgid "Padding space between columns"
msgstr ""
-#: builtin/fetch.c:362
-msgid "(non-fast-forward)"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/fetch.c:393 builtin/fetch.c:685
-#, c-format
-msgid "cannot open %s: %s\n"
+#: builtin/commit.c:34
+msgid "git commit [options] [--] <filepattern>..."
msgstr ""
-#: builtin/fetch.c:402
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/commit.c:39
+msgid "git status [options] [--] <filepattern>..."
msgstr ""
-#: builtin/fetch.c:488
-#, c-format
-msgid "From %.*s\n"
+#: builtin/commit.c:44
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/fetch.c:499
-#, c-format
+#: builtin/commit.c:56
msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/fetch.c:549
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/commit.c:61
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+"Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/fetch.c:550
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/commit.c:257
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/fetch.c:557
-msgid "[deleted]"
+#: builtin/commit.c:299
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/fetch.c:558 builtin/remote.c:1055
-msgid "(none)"
+#: builtin/commit.c:305
+msgid "interactive add failed"
msgstr ""
-#: builtin/fetch.c:675
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/fetch.c:709
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/commit.c:390
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/fetch.c:786
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/commit.c:392
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/fetch.c:789
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/commit.c:402
+msgid "cannot read the index"
msgstr ""
-#: builtin/fetch.c:888
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/commit.c:422
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/fetch.c:890 builtin/remote.c:100
+#: builtin/commit.c:509 builtin/commit.c:515
#, c-format
-msgid "Could not fetch %s"
+msgid "invalid commit: %s"
msgstr ""
-#: builtin/fetch.c:907
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/commit.c:538
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/fetch.c:927
-msgid "You need to specify a tag name."
+#: builtin/commit.c:558
+#, c-format
+msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/fetch.c:979
-msgid "fetch --all does not take a repository argument"
+#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/fetch.c:981
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/commit.c:608 builtin/shortlog.c:296
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:610
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/fetch.c:992
+#: builtin/commit.c:614
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/fetch.c:1000
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/commit.c:620
+msgid "commit has empty message"
msgstr ""
-#: builtin/gc.c:63
-#, c-format
-msgid "Invalid %s: '%s'"
+#: builtin/commit.c:636
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/commit.c:640
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:644
#, c-format
-msgid "insanely long object directory %.*s"
+msgid "could not read '%s'"
msgstr ""
-#: builtin/gc.c:221
+#: builtin/commit.c:705
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:716
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
msgstr ""
-#: builtin/gc.c:224
+#: builtin/commit.c:721
#, c-format
msgid ""
-"Auto packing the repository for optimum performance. You may also\n"
-"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
msgstr ""
-#: builtin/gc.c:251
+#: builtin/commit.c:733
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"Please enter the commit message for your changes. Lines starting\n"
+"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/grep.c:216
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/commit.c:738
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '#' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/grep.c:402
+#: builtin/commit.c:751
#, c-format
-msgid "Failed to chdir: %s"
+msgid "%sAuthor: %s"
msgstr ""
-#: builtin/grep.c:478 builtin/grep.c:512
+#: builtin/commit.c:758
#, c-format
-msgid "unable to read tree (%s)"
+msgid "%sCommitter: %s"
+msgstr ""
+
+#: builtin/commit.c:778
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:815
+msgid "Error building trees"
msgstr ""
-#: builtin/grep.c:526
+#: builtin/commit.c:830 builtin/tag.c:361
#, c-format
-msgid "unable to grep from object of type %s"
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/grep.c:584
+#: builtin/commit.c:927
#, c-format
-msgid "switch `%c' expects a numerical value"
+msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/grep.c:601
+#: builtin/commit.c:942 builtin/commit.c:1142
#, c-format
-msgid "cannot open '%s'"
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/grep.c:885
-msgid "no pattern given."
+#: builtin/commit.c:982
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/grep.c:899
-#, c-format
-msgid "bad object %s"
+#: builtin/commit.c:993
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/grep.c:940
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/commit.c:996
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/grep.c:963
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/commit.c:998
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/grep.c:968
-msgid "--no-index or --untracked cannot be used with revs."
+#: builtin/commit.c:1001
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/grep.c:971
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/commit.c:1011
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/grep.c:979
-msgid "both --cached and trees are given."
+#: builtin/commit.c:1013
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/help.c:65
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/commit.c:1021
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/help.c:93
-msgid "Failed to start emacsclient."
+#: builtin/commit.c:1038
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/help.c:106
-msgid "Failed to parse emacsclient version."
+#: builtin/commit.c:1040
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/help.c:114
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/commit.c:1042
+msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
-#, c-format
-msgid "failed to exec '%s': %s"
+#: builtin/commit.c:1044
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/help.c:217
+#: builtin/commit.c:1054 builtin/tag.c:577
#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/help.c:229
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/commit.c:1059
+msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/help.c:299
-msgid "The most commonly used git commands are:"
+#: builtin/commit.c:1156 builtin/commit.c:1384
+msgid "show status concisely"
msgstr ""
-#: builtin/help.c:367
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/commit.c:1158 builtin/commit.c:1386
+msgid "show branch information"
msgstr ""
-#: builtin/help.c:384
-msgid "no man viewer handled the request"
+#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389
+msgid "machine-readable output"
msgstr ""
-#: builtin/help.c:392
-msgid "no info viewer handled the request"
+#: builtin/commit.c:1163 builtin/commit.c:1390
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/help.c:447 builtin/help.c:454
-#, c-format
-msgid "usage: %s%s"
+#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636
+#: builtin/fast-export.c:639 builtin/tag.c:461
+msgid "mode"
msgstr ""
-#: builtin/help.c:470
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/commit.c:1166 builtin/commit.c:1393
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/index-pack.c:170
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/commit.c:1169
+msgid "show ignored files"
msgstr ""
-#: builtin/index-pack.c:190
-msgid "object of unexpected type"
+#: builtin/commit.c:1170 parse-options.h:151
+msgid "when"
msgstr ""
-#: builtin/index-pack.c:227
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/commit.c:1171
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
-#: builtin/index-pack.c:237
-msgid "early EOF"
+#: builtin/commit.c:1173
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/index-pack.c:238
-msgid "read error on input"
+#: builtin/commit.c:1242
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/index-pack.c:250
-msgid "used more bytes than were available"
+#: builtin/commit.c:1244
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/index-pack.c:257
-msgid "pack too large for current definition of off_t"
+#: builtin/commit.c:1285
+msgid "detached HEAD"
msgstr ""
-#: builtin/index-pack.c:273
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/commit.c:1287
+msgid " (root-commit)"
msgstr ""
-#: builtin/index-pack.c:278
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/commit.c:1354
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/index-pack.c:292
-msgid "pack signature mismatch"
+#: builtin/commit.c:1355
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/index-pack.c:312
-#, c-format
-msgid "pack has bad object at offset %lu: %s"
+#: builtin/commit.c:1357
+msgid "Commit message options"
msgstr ""
-#: builtin/index-pack.c:434
-#, c-format
-msgid "inflate returned %d"
+#: builtin/commit.c:1358 builtin/tag.c:459
+msgid "read message from file"
msgstr ""
-#: builtin/index-pack.c:483
-msgid "offset value overflow for delta base object"
+#: builtin/commit.c:1359
+msgid "author"
msgstr ""
-#: builtin/index-pack.c:491
-msgid "delta base offset is out of bound"
+#: builtin/commit.c:1359
+msgid "override author for commit"
msgstr ""
-#: builtin/index-pack.c:499
-#, c-format
-msgid "unknown object type %d"
+#: builtin/commit.c:1360 builtin/gc.c:178
+msgid "date"
msgstr ""
-#: builtin/index-pack.c:530
-msgid "cannot pread pack file"
+#: builtin/commit.c:1360
+msgid "override date for commit"
msgstr ""
-#: builtin/index-pack.c:532
-#, 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/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537
+#: builtin/notes.c:694 builtin/tag.c:457
+msgid "message"
+msgstr ""
-#: builtin/index-pack.c:558
-msgid "serious inflate inconsistency"
+#: builtin/commit.c:1361
+msgid "commit message"
msgstr ""
-#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
-#: builtin/index-pack.c:712 builtin/index-pack.c:721
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/commit.c:1362
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/index-pack.c:652 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
-#, c-format
-msgid "unable to read %s"
+#: builtin/commit.c:1363
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/index-pack.c:718
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/commit.c:1364
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/index-pack.c:732
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/commit.c:1365
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/index-pack.c:747
-#, c-format
-msgid "invalid %s"
+#: builtin/commit.c:1366
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/index-pack.c:749
-msgid "Error in object"
+#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/index-pack.c:751
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/commit.c:1368
+msgid "use specified template file"
msgstr ""
-#: builtin/index-pack.c:821 builtin/index-pack.c:847
-msgid "failed to apply delta"
+#: builtin/commit.c:1369
+msgid "force edit of commit"
msgstr ""
-#: builtin/index-pack.c:986
-msgid "Receiving objects"
+#: builtin/commit.c:1370
+msgid "default"
msgstr ""
-#: builtin/index-pack.c:986
-msgid "Indexing objects"
+#: builtin/commit.c:1370 builtin/tag.c:462
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/index-pack.c:1012
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/commit.c:1371
+msgid "include status in commit message template"
msgstr ""
-#: builtin/index-pack.c:1017
-msgid "cannot fstat packfile"
+#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463
+msgid "key id"
msgstr ""
-#: builtin/index-pack.c:1020
-msgid "pack has junk at the end"
+#: builtin/commit.c:1373 builtin/merge.c:214
+msgid "GPG sign commit"
msgstr ""
-#: builtin/index-pack.c:1031
-msgid "confusion beyond insanity in parse_pack_objects()"
+#. end commit message options
+#: builtin/commit.c:1376
+msgid "Commit contents options"
msgstr ""
-#: builtin/index-pack.c:1054
-msgid "Resolving deltas"
+#: builtin/commit.c:1377
+msgid "commit all changed files"
msgstr ""
-#: builtin/index-pack.c:1105
-msgid "confusion beyond insanity"
+#: builtin/commit.c:1378
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/index-pack.c:1124
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/commit.c:1379
+msgid "interactively add files"
+msgstr ""
-#: builtin/index-pack.c:1149
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/commit.c:1380
+msgid "interactively add changes"
msgstr ""
-#: builtin/index-pack.c:1228
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/commit.c:1381
+msgid "commit only specified files"
msgstr ""
-#: builtin/index-pack.c:1252
-msgid "error while closing pack file"
+#: builtin/commit.c:1382
+msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/index-pack.c:1265
-#, c-format
-msgid "cannot write keep file '%s'"
+#: builtin/commit.c:1383
+msgid "show what would be committed"
msgstr ""
-#: builtin/index-pack.c:1273
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: builtin/commit.c:1391
+msgid "amend previous commit"
msgstr ""
-#: builtin/index-pack.c:1286
-msgid "cannot store pack file"
+#: builtin/commit.c:1392
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/index-pack.c:1297
-msgid "cannot store index file"
+#: builtin/commit.c:1397
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/index-pack.c:1398
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/commit.c:1400
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1432
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/index-pack.c:1400
+#: builtin/commit.c:1470 builtin/merge.c:508
#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/index-pack.c:1447
+#: builtin/commit.c:1477
#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1454
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1481
-msgid "Cannot come back to cwd"
-msgstr ""
-
-#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
-#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
-#, c-format
-msgid "bad %s"
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/index-pack.c:1558
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/commit.c:1484
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
+#: builtin/commit.c:1503
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/index-pack.c:1581
-msgid "--verify with no packfile name given"
+#: builtin/commit.c:1517
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/init-db.c:35
+#: builtin/commit.c:1522
#, c-format
-msgid "Could not make %s writable by group"
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
+#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960
+msgid "failed to write commit object"
msgstr ""
-#: builtin/init-db.c:67
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/commit.c:1558
+msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/init-db.c:73
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/commit.c:1562
+msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/commit.c:1573
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full or quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/init-db.c:97
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/config.c:7
+msgid "git config [options]"
msgstr ""
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
+#: builtin/config.c:52
+msgid "Config file location"
msgstr ""
-#: builtin/init-db.c:102
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/config.c:53
+msgid "use global config file"
msgstr ""
-#: builtin/init-db.c:106
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/config.c:54
+msgid "use system config file"
msgstr ""
-#: builtin/init-db.c:110
-#, c-format
-msgid "ignoring template %s"
+#: builtin/config.c:55
+msgid "use repository config file"
msgstr ""
-#: builtin/init-db.c:133
-#, c-format
-msgid "insanely long template path %s"
+#: builtin/config.c:56
+msgid "use given config file"
msgstr ""
-#: builtin/init-db.c:141
-#, c-format
-msgid "templates not found %s"
+#: builtin/config.c:57
+msgid "Action"
msgstr ""
-#: builtin/init-db.c:154
-#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+#: builtin/config.c:58
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
+#: builtin/config.c:59
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/init-db.c:323 builtin/init-db.c:326
-#, c-format
-msgid "%s already exists"
+#: builtin/config.c:60
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/init-db.c:355
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/config.c:61
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/init-db.c:358
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/config.c:62
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
+#: builtin/config.c:63
+msgid "remove a variable: name [value-regex]"
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:420
-#, c-format
-msgid "%s%s Git repository in %s%s\n"
+#: builtin/config.c:64
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/init-db.c:421
-msgid "Reinitialized existing"
+#: builtin/config.c:65
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/init-db.c:421
-msgid "Initialized empty"
+#: builtin/config.c:66
+msgid "remove a section: name"
msgstr ""
-#: builtin/init-db.c:422
-msgid " shared"
+#: builtin/config.c:67
+msgid "list all"
msgstr ""
-#: builtin/init-db.c:441
-msgid "cannot tell cwd"
+#: builtin/config.c:68
+msgid "open an editor"
msgstr ""
-#: builtin/init-db.c:522 builtin/init-db.c:529
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/config.c:69 builtin/config.c:70
+msgid "slot"
msgstr ""
-#: builtin/init-db.c:533
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/config.c:69
+msgid "find the color configured: [default]"
msgstr ""
-#: builtin/init-db.c:555
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: builtin/config.c:70
+msgid "find the color setting: [stdout-is-tty]"
msgstr ""
-#: builtin/init-db.c:579
-msgid "Cannot access current working directory"
+#: builtin/config.c:71
+msgid "Type"
msgstr ""
-#: builtin/init-db.c:586
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/config.c:72
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/log.c:189
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/config.c:73
+msgid "value is decimal number"
msgstr ""
-#: builtin/log.c:403 builtin/log.c:494
-#, c-format
-msgid "Could not read object %s"
+#: builtin/config.c:74
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/log.c:518
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/config.c:75
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/log.c:608
-msgid "format.headers without value"
+#: builtin/config.c:76
+msgid "Other"
msgstr ""
-#: builtin/log.c:682
-msgid "name of output directory is too long"
+#: builtin/config.c:77
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/log.c:693
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/config.c:78
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/log.c:707
-msgid "Need exactly one range."
+#: builtin/count-objects.c:69
+msgid "git count-objects [-v]"
msgstr ""
-#: builtin/log.c:715
-msgid "Not a range."
+#: builtin/describe.c:15
+msgid "git describe [options] <committish>*"
msgstr ""
-#: builtin/log.c:792
-msgid "Cover letter needs email format"
+#: builtin/describe.c:16
+msgid "git describe [options] --dirty"
msgstr ""
-#: builtin/log.c:865
+#: builtin/describe.c:234
#, c-format
-msgid "insane in-reply-to: %s"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/log.c:938
-msgid "Two output directories?"
+#: builtin/describe.c:238
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/log.c:1160
+#: builtin/describe.c:240
#, c-format
-msgid "bogus committer info %s"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/log.c:1205
-msgid "-n and -k are mutually exclusive."
+#: builtin/describe.c:267
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/log.c:1207
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/describe.c:270
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/log.c:1215
-msgid "--name-only does not make sense"
+#: builtin/describe.c:287
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/log.c:1217
-msgid "--name-status does not make sense"
+#: builtin/describe.c:289
+#, c-format
+msgid "searching to describe %s\n"
msgstr ""
-#: builtin/log.c:1219
-msgid "--check does not make sense"
+#: builtin/describe.c:329
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/log.c:1242
-msgid "standard output, or directory, which one?"
+#: builtin/describe.c:353
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/log.c:1244
+#: builtin/describe.c:357
#, c-format
-msgid "Could not create directory '%s'"
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/log.c:1397
-msgid "Failed to create output files"
+#: builtin/describe.c:378
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/log.c:1501
+#: builtin/describe.c:381
#, c-format
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/describe.c:403
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/merge.c:90
-msgid "switch `m' requires a value"
+#: builtin/describe.c:404
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/merge.c:127
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/describe.c:405
+msgid "use any ref in .git/refs"
msgstr ""
-#: builtin/merge.c:128
-#, c-format
-msgid "Available strategies are:"
+#: builtin/describe.c:406
+msgid "use any tag in .git/refs/tags"
msgstr ""
-#: builtin/merge.c:133
-#, c-format
-msgid "Available custom strategies are:"
+#: builtin/describe.c:407
+msgid "always use long format"
msgstr ""
-#: builtin/merge.c:240
-msgid "could not run stash."
+#: builtin/describe.c:410
+msgid "only output exact matches"
msgstr ""
-#: builtin/merge.c:245
-msgid "stash failed"
+#: builtin/describe.c:412
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/merge.c:250
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/describe.c:414
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/merge.c:269 builtin/merge.c:286
-msgid "read-tree failed"
+#: builtin/describe.c:416 builtin/name-rev.c:238
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/merge.c:316
-msgid " (nothing to squash)"
+#: builtin/describe.c:417
+msgid "mark"
msgstr ""
-#: builtin/merge.c:329
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/describe.c:418
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/merge.c:361
-msgid "Writing SQUASH_MSG"
+#: builtin/describe.c:436
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/merge.c:363
-msgid "Finishing SQUASH_MSG"
+#: builtin/describe.c:462
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/merge.c:386
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/describe.c:482
+msgid "--dirty is incompatible with committishes"
msgstr ""
-#: builtin/merge.c:437
+#: builtin/diff.c:79
#, c-format
-msgid "'%s' does not point to a commit"
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/merge.c:536
+#: builtin/diff.c:224
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+msgid "invalid option: %s"
msgstr ""
-#: builtin/merge.c:629
-msgid "git write-tree failed to write a tree"
+#: builtin/diff.c:301
+msgid "Not a git repository"
msgstr ""
-#: builtin/merge.c:679
-msgid "failed to read the cache"
+#: builtin/diff.c:344
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/merge.c:710
-msgid "Not handling anything other than two heads merge."
+#: builtin/diff.c:349
+#, c-format
+msgid "more than %d trees given: '%s'"
msgstr ""
-#: builtin/merge.c:724
+#: builtin/diff.c:359
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/merge.c:738
+#: builtin/diff.c:367
#, c-format
-msgid "unable to write %s"
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/merge.c:877
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/fast-export.c:22
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/merge.c:886
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/fast-export.c:635
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/merge.c:892
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '#' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+#: builtin/fast-export.c:637
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/merge.c:916
-msgid "Empty commit message."
+#: builtin/fast-export.c:640
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/merge.c:928
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/fast-export.c:643
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/merge.c:993
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/fast-export.c:645
+msgid "Import marks from this file"
msgstr ""
-#: builtin/merge.c:1009
-#, c-format
-msgid "'%s' is not a commit"
+#: builtin/fast-export.c:647
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/merge.c:1050
-msgid "No current branch."
+#: builtin/fast-export.c:649
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/merge.c:1052
-msgid "No remote for the current branch."
+#: builtin/fast-export.c:651
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/merge.c:1054
-msgid "No default upstream defined for the current branch."
+#: builtin/fast-export.c:652
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/merge.c:1059
-#, c-format
-msgid "No remote tracking branch for %s from %s"
+#: builtin/fetch.c:20
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/merge.c:1146 builtin/merge.c:1303
-#, c-format
-msgid "%s - not something we can merge"
+#: builtin/fetch.c:21
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/merge.c:1214
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/fetch.c:22
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/merge.c:1230 git-pull.sh:31
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: builtin/fetch.c:23
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/merge.c:1233 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
+#: builtin/fetch.c:60
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/merge.c:1237
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: builtin/fetch.c:62
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/merge.c:1240
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/fetch.c:64
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/merge.c:1249
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/fetch.c:65
+msgid "force overwrite of local branch"
msgstr ""
-#: builtin/merge.c:1254
-msgid "You cannot combine --no-ff with --ff-only."
+#: builtin/fetch.c:67
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/merge.c:1261
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/fetch.c:69
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/merge.c:1293
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/fetch.c:71
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/merge.c:1296
-msgid "Squash commit into empty head not supported yet"
+#: builtin/fetch.c:73
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/merge.c:1298
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/fetch.c:74
+msgid "on-demand"
msgstr ""
-#: builtin/merge.c:1413
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/fetch.c:75
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/merge.c:1451
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/fetch.c:79
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/merge.c:1458
-#, c-format
-msgid "Nope.\n"
+#: builtin/fetch.c:81
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/merge.c:1490
-msgid "Not possible to fast-forward, aborting."
+#: builtin/fetch.c:84
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/merge.c:1513 builtin/merge.c:1592
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/fetch.c:85 builtin/log.c:1083
+msgid "dir"
msgstr ""
-#: builtin/merge.c:1517
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/fetch.c:86
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/merge.c:1583
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/fetch.c:89
+msgid "default mode for recursion"
msgstr ""
-#: builtin/merge.c:1585
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/fetch.c:201
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/merge.c:1594
+#: builtin/fetch.c:254
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "object %s not found"
msgstr ""
-#: builtin/merge.c:1606
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+#: builtin/fetch.c:259
+msgid "[up to date]"
msgstr ""
-#: builtin/mv.c:108
+#: builtin/fetch.c:273
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/mv.c:112
-msgid "bad source"
+#: builtin/fetch.c:274 builtin/fetch.c:360
+msgid "[rejected]"
msgstr ""
-#: builtin/mv.c:115
-msgid "can not move directory into itself"
+#: builtin/fetch.c:285
+msgid "[tag update]"
msgstr ""
-#: builtin/mv.c:118
-msgid "cannot move directory over file"
+#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
+msgid " (unable to update local ref)"
msgstr ""
-#: builtin/mv.c:128
-#, c-format
-msgid "Huh? %.*s is in index?"
+#: builtin/fetch.c:305
+msgid "[new tag]"
msgstr ""
-#: builtin/mv.c:140
-msgid "source directory is empty"
+#: builtin/fetch.c:308
+msgid "[new branch]"
msgstr ""
-#: builtin/mv.c:171
-msgid "not under version control"
+#: builtin/fetch.c:311
+msgid "[new ref]"
msgstr ""
-#: builtin/mv.c:173
-msgid "destination exists"
+#: builtin/fetch.c:356
+msgid "unable to update local ref"
msgstr ""
-#: builtin/mv.c:181
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/fetch.c:356
+msgid "forced update"
msgstr ""
-#: builtin/mv.c:184
-msgid "Cannot overwrite"
+#: builtin/fetch.c:362
+msgid "(non-fast-forward)"
msgstr ""
-#: builtin/mv.c:187
-msgid "multiple sources for the same target"
+#: builtin/fetch.c:393 builtin/fetch.c:685
+#, c-format
+msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/fetch.c:402
#, c-format
-msgid "%s, source=%s, destination=%s"
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/mv.c:212
+#: builtin/fetch.c:488
#, c-format
-msgid "Renaming %s to %s\n"
+msgid "From %.*s\n"
msgstr ""
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/fetch.c:499
#, c-format
-msgid "renaming '%s' failed"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/notes.c:139
+#: builtin/fetch.c:549
#, c-format
-msgid "unable to start 'show' for object '%s'"
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/notes.c:145
-msgid "can't fdopen 'show' output fd"
+#: builtin/fetch.c:550
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/notes.c:155
-#, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
+#: builtin/fetch.c:557
+msgid "[deleted]"
msgstr ""
-#: builtin/notes.c:158
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/fetch.c:558 builtin/remote.c:1055
+msgid "(none)"
msgstr ""
-#: builtin/notes.c:175 builtin/tag.c:347
+#: builtin/fetch.c:675
#, c-format
-msgid "could not create file '%s'"
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/notes.c:189
-msgid "Please supply the note contents using either -m or -F option"
+#: builtin/fetch.c:709
+#, c-format
+msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/notes.c:210 builtin/notes.c:973
+#: builtin/fetch.c:786
#, c-format
-msgid "Removing note for object %s\n"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/notes.c:215
-msgid "unable to write note object"
+#: builtin/fetch.c:789
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/notes.c:217
+#: builtin/fetch.c:891
#, c-format
-msgid "The note contents has been left in %s"
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/notes.c:251 builtin/tag.c:542
+#: builtin/fetch.c:893 builtin/remote.c:100
#, c-format
-msgid "cannot read '%s'"
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/notes.c:253 builtin/tag.c:545
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/fetch.c:912
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/fetch.c:932
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/notes.c:275
-#, c-format
-msgid "Failed to read object '%s'."
+#: builtin/fetch.c:984
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/notes.c:299
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: builtin/fetch.c:986
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/notes.c:340
+#: builtin/fetch.c:997
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/notes.c:350
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: builtin/fetch.c:1005
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: builtin/notes.c:377
-#, c-format
-msgid "Bad %s value: '%s'"
+#: builtin/fmt-merge-msg.c:13
+msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
-#: builtin/notes.c:441
-#, c-format
-msgid "Malformed input line: '%s'."
+#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787
+#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
+#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
+msgid "n"
msgstr ""
-#: builtin/notes.c:456
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+#: builtin/fmt-merge-msg.c:654
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:1033
-msgid "too many parameters"
+#: builtin/fmt-merge-msg.c:657
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/notes.c:513 builtin/notes.c:772
-#, c-format
-msgid "No note found for object %s."
+#: builtin/fmt-merge-msg.c:660
+msgid "text"
msgstr ""
-#: builtin/notes.c:580
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/fmt-merge-msg.c:661
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/notes.c:585 builtin/notes.c:662
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/fmt-merge-msg.c:662
+msgid "file to read from"
msgstr ""
-#: builtin/notes.c:635
-msgid "too few parameters"
+#: builtin/for-each-ref.c:979
+msgid "git for-each-ref [options] [<pattern>]"
msgstr ""
-#: builtin/notes.c:656
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/for-each-ref.c:994
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/notes.c:668
-#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+#: builtin/for-each-ref.c:996
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/notes.c:717
-#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+#: builtin/for-each-ref.c:998
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/notes.c:971
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/for-each-ref.c:1000
+msgid "quote placeholders suitably for tcl"
msgstr ""
-#: builtin/notes.c:1103 builtin/remote.c:1598
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/for-each-ref.c:1003
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/for-each-ref.c:1004
+msgid "format"
msgstr ""
-#: builtin/pack-objects.c:2398
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/for-each-ref.c:1004
+msgid "format to use for the output"
msgstr ""
-#: builtin/pack-objects.c:2402
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/for-each-ref.c:1005
+msgid "key"
msgstr ""
-#: builtin/pack-objects.c:2425
-#, c-format
-msgid "option %s does not accept negative form"
+#: builtin/for-each-ref.c:1006
+msgid "field name to sort on"
msgstr ""
-#: builtin/pack-objects.c:2429
-#, c-format
-msgid "unable to parse value '%s' for option %s"
+#: builtin/fsck.c:608
+msgid "git fsck [options] [<object>...]"
msgstr ""
-#: builtin/push.c:45
-msgid "tag shorthand without <tag>"
+#: builtin/fsck.c:614
+msgid "show unreachable objects"
msgstr ""
-#: builtin/push.c:64
-msgid "--delete only accepts plain target ref names"
+#: builtin/fsck.c:615
+msgid "show dangling objects"
msgstr ""
-#: builtin/push.c:99
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/fsck.c:616
+msgid "report tags"
msgstr ""
-#: builtin/push.c:102
-#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
+#: builtin/fsck.c:617
+msgid "report root nodes"
msgstr ""
-#: builtin/push.c:121
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+#: builtin/fsck.c:618
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/push.c:128
-#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+#: builtin/fsck.c:619
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/push.c:136
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/fsck.c:620
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/push.c:139
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+#: builtin/fsck.c:621
+msgid "enable more strict checking"
msgstr ""
-#: builtin/push.c:174
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/fsck.c:623
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/push.c:181
-msgid ""
+#: builtin/fsck.c:624 builtin/prune.c:134
+msgid "show progress"
+msgstr ""
+
+#: builtin/gc.c:22
+msgid "git gc [options]"
+msgstr ""
+
+#: builtin/gc.c:63
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: builtin/gc.c:90
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr ""
+
+#: builtin/gc.c:179
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:181
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:182
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:222
+#, c-format
+msgid ""
+"Auto packing the repository for optimum performance. You may also\n"
+"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+msgstr ""
+
+#: builtin/gc.c:249
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:22
+msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+
+#: builtin/grep.c:217
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:455
+#, c-format
+msgid "Failed to chdir: %s"
+msgstr ""
+
+#: builtin/grep.c:531 builtin/grep.c:565
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:579
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:637
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:654
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+#: builtin/grep.c:729
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:731
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:733
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:735
+msgid "search also in ignored files"
+msgstr ""
+
+#: builtin/grep.c:738
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:740
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:742
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:744
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:746
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:749
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:753
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:756
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:759
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:762
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:765
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:766
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:767
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:769
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:771
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:773
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:776
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:778
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:780
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:781
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:783
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:785
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:788
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:791
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:793
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:794
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:797
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:799
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:802
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:804
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:806
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:818
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:820
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:822
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:826
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:826
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:829
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:830 builtin/show-ref.c:201
+msgid "show usage"
+msgstr ""
+
+#: builtin/grep.c:921
+msgid "no pattern given."
+msgstr ""
+
+#: builtin/grep.c:935
+#, c-format
+msgid "bad object %s"
+msgstr ""
+
+#: builtin/grep.c:976
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:999
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr ""
+
+#: builtin/grep.c:1004
+msgid "--no-index or --untracked cannot be used with revs."
+msgstr ""
+
+#: builtin/grep.c:1007
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr ""
+
+#: builtin/grep.c:1015
+msgid "both --cached and trees are given."
+msgstr ""
+
+#: builtin/hash-object.c:60
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
+"<file>..."
+msgstr ""
+
+#: builtin/hash-object.c:61
+msgid "git hash-object --stdin-paths < <list-of-paths>"
+msgstr ""
+
+#: builtin/hash-object.c:72
+msgid "type"
+msgstr ""
+
+#: builtin/hash-object.c:72
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:73
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:74
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:76
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:77
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:43
+msgid "print all available commands"
+msgstr ""
+
+#: builtin/help.c:44
+msgid "show man page"
+msgstr ""
+
+#: builtin/help.c:45
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:47
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:53
+msgid "git help [--all] [--man|--web|--info] [command]"
+msgstr ""
+
+#: builtin/help.c:65
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:93
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:106
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:114
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
+#, c-format
+msgid "failed to exec '%s': %s"
+msgstr ""
+
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:299
+msgid "The most commonly used git commands are:"
+msgstr ""
+
+#: builtin/help.c:367
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:384
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:392
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:447 builtin/help.c:454
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:470
+#, c-format
+msgid "`git %s' is aliased to `%s'"
+msgstr ""
+
+#: builtin/index-pack.c:170
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:190
+msgid "object of unexpected type"
+msgstr ""
+
+#: builtin/index-pack.c:227
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:237
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:238
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:250
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:257
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:273
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:278
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:292
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:294
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr ""
+
+#: builtin/index-pack.c:312
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr ""
+
+#: builtin/index-pack.c:434
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:483
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:491
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:499
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:530
+msgid "cannot pread pack file"
+msgstr ""
+
+#: builtin/index-pack.c:532
+#, 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:558
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
+#: builtin/index-pack.c:712 builtin/index-pack.c:721
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:652 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:262
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:718
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:732
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:747
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/index-pack.c:749
+msgid "Error in object"
+msgstr ""
+
+#: builtin/index-pack.c:751
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:821 builtin/index-pack.c:847
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:986
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:986
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:1012
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1017
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1020
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:1031
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1054
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1064
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1106
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1112
+#, c-format
+msgid "completed with %d local objects"
+msgstr ""
+
+#: builtin/index-pack.c:1121
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1125
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1150
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1229
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1253
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1266
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1274
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1287
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1298
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1331
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1337
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1341 builtin/index-pack.c:1514
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr ""
+
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1401
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1448
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1455
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1482
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1526 builtin/index-pack.c:1529
+#: builtin/index-pack.c:1541 builtin/index-pack.c:1545
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1559
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1563 builtin/index-pack.c:1573
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1582
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/init-db.c:35
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: builtin/init-db.c:62
+#, c-format
+msgid "insanely long template name %s"
+msgstr ""
+
+#: builtin/init-db.c:67
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/init-db.c:73
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:97
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:99
+#, c-format
+msgid "insanely long symlink %s"
+msgstr ""
+
+#: builtin/init-db.c:102
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:106
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:110
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:133
+#, c-format
+msgid "insanely long template path %s"
+msgstr ""
+
+#: builtin/init-db.c:141
+#, c-format
+msgid "templates not found %s"
+msgstr ""
+
+#: builtin/init-db.c:154
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr ""
+
+#: builtin/init-db.c:192
+#, c-format
+msgid "insane git directory %s"
+msgstr ""
+
+#: builtin/init-db.c:323 builtin/init-db.c:326
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:355
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:358
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %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:420
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:421
+msgid "Reinitialized existing"
+msgstr ""
+
+#: builtin/init-db.c:421
+msgid "Initialized empty"
+msgstr ""
+
+#: builtin/init-db.c:422
+msgid " shared"
+msgstr ""
+
+#: builtin/init-db.c:441
+msgid "cannot tell cwd"
+msgstr ""
+
+#: builtin/init-db.c:467
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
+"[=<permissions>]] [directory]"
+msgstr ""
+
+#: builtin/init-db.c:490
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:491
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:493 builtin/prune-packed.c:77
+msgid "be quiet"
+msgstr ""
+
+#: builtin/init-db.c:522 builtin/init-db.c:529
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:533
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:555
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:579
+msgid "Cannot access current working directory"
+msgstr ""
+
+#: builtin/init-db.c:586
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/log.c:37
+msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
+msgstr ""
+
+#: builtin/log.c:38
+msgid " or: git show [options] <object>..."
+msgstr ""
+
+#: builtin/log.c:100
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:101
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:102
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:189
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:403 builtin/log.c:494
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:518
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:608
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:682
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:693
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:707
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:715
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:789
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:862
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:890
+msgid "git format-patch [options] [<since> | <revision range>]"
+msgstr ""
+
+#: builtin/log.c:935
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1063
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1066
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1070
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1072
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1074
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1075
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1076
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1078
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1080
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1083
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1086
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1089
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1091
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1093
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1095
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1096
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1097
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1098 builtin/log.c:1100
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1098
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1100
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1102
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1103
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1104 builtin/log.c:1107
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1105
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1108
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1112
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1114
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1115
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1117
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1157
+#, c-format
+msgid "bogus committer info %s"
+msgstr ""
+
+#: builtin/log.c:1202
+msgid "-n and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1204
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1212
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1214
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1216
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1239
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1241
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1394
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:1443
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:1498
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/ls-files.c:408
+msgid "git ls-files [options] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:463
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:465
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:467
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:469
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:471
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:473
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:475
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:478
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:480
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:482
+msgid "show 'other' directories' name only"
+msgstr ""
+
+#: builtin/ls-files.c:485
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:488
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:490
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:492
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:495
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:498
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:500
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:503
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:506
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:507
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:508
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:510
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-tree.c:27
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:125
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:127
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:129
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:133
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:140
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:142
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/merge.c:43
+msgid "git merge [options] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:44
+msgid "git merge [options] <msg> HEAD <commit>"
+msgstr ""
+
+#: builtin/merge.c:45
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:90
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:127
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:128
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:133
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:183
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:186
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:187
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:189
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:192
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:194
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:196
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:198
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:200
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:203
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:204
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:205
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:207
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:211
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:240
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:245
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:250
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:269 builtin/merge.c:286
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:316
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:329
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:361
+msgid "Writing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:363
+msgid "Finishing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:386
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:436
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:535
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:628
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: builtin/merge.c:678
+msgid "failed to read the cache"
+msgstr ""
+
+#: builtin/merge.c:709
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:723
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:737
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:876
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:885
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:891
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '#' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:915
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:927
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:992
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "'%s' is not a commit"
+msgstr ""
+
+#: builtin/merge.c:1049
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:1051
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1053
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1058
+#, c-format
+msgid "No remote tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1145 builtin/merge.c:1302
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1213
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1229 git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+#: builtin/merge.c:1232 git-pull.sh:34
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1236
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+#: builtin/merge.c:1239
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1248
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1253
+msgid "You cannot combine --no-ff with --ff-only."
+msgstr ""
+
+#: builtin/merge.c:1260
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1292
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1295
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1297
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1412
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1450
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1457
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1489
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1512 builtin/merge.c:1591
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1516
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1582
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1584
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1593
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1605
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:26
+msgid "git merge-base [-a|--all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:27
+msgid "git merge-base [-a|--all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:28
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:29
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:98
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:99
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:100
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:102
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-file.c:8
+msgid ""
+"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
+"file2"
+msgstr ""
+
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig_file/file2"
+msgstr ""
+
+#: builtin/mktree.c:67
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:153
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:154 builtin/write-tree.c:24
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:155
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/mv.c:14
+msgid "git mv [options] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:64
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:65
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:108
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:112
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:115
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:118
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:128
+#, c-format
+msgid "Huh? %.*s is in index?"
+msgstr ""
+
+#: builtin/mv.c:140
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:171
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:173
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:181
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:184
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:187
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:202
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:212
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:215 builtin/remote.c:731
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:175
+msgid "git name-rev [options] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:176
+msgid "git name-rev [options] --all"
+msgstr ""
+
+#: builtin/name-rev.c:177
+msgid "git name-rev [options] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:229
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:230
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:232
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:234
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:235
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:236
+msgid "allow to print `undefined` names"
+msgstr ""
+
+#: builtin/notes.c:26
+msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:27
+msgid ""
+"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
+"<object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes_ref>] edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid "git notes [--ref <notes_ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid ""
+"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes_ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:42
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:47
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:52
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:53
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:58
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:63
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:68
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:73
+msgid "git notes merge [<options>] <notes_ref>"
+msgstr ""
+
+#: builtin/notes.c:74
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:80
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:85
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:90
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:142
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:148
+msgid "can't fdopen 'show' output fd"
+msgstr ""
+
+#: builtin/notes.c:158
+#, c-format
+msgid "failed to close pipe to 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:161
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:178 builtin/tag.c:347
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: builtin/notes.c:192
+msgid "Please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:213 builtin/notes.c:976
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:218
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:220
+#, c-format
+msgid "The note contents has been left in %s"
+msgstr ""
+
+#: builtin/notes.c:254 builtin/tag.c:542
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/notes.c:256 builtin/tag.c:545
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
+#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
+#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
+#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:278
+#, c-format
+msgid "Failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:302
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+
+#: builtin/notes.c:343
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr ""
+
+#: builtin/notes.c:353
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: builtin/notes.c:380
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr ""
+
+#: builtin/notes.c:444
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:459
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
+#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
+#: builtin/notes.c:1036
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:516 builtin/notes.c:775
+#, c-format
+msgid "No note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:538 builtin/notes.c:695
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:541 builtin/notes.c:698
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
+#: builtin/notes.c:703 builtin/tag.c:476
+msgid "object"
+msgstr ""
+
+#: builtin/notes.c:544 builtin/notes.c:701
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:547 builtin/notes.c:704
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:549 builtin/notes.c:617
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:583
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:588 builtin/notes.c:665
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:618
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:620
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:638
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:659
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:671
+#, c-format
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:720
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+
+#: builtin/notes.c:867
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:869
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:871
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:873
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:875
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:877
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:879
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:974
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:986
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:989
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:1070
+msgid "notes_ref"
+msgstr ""
+
+#: builtin/notes.c:1071
+msgid "use notes from <notes_ref>"
+msgstr ""
+
+#: builtin/notes.c:1106 builtin/remote.c:1598
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:23
+msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+msgstr ""
+
+#: builtin/pack-objects.c:24
+msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+msgstr ""
+
+#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: builtin/pack-objects.c:2398
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2402
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:2425
+#, c-format
+msgid "option %s does not accept negative form"
+msgstr ""
+
+#: builtin/pack-objects.c:2429
+#, c-format
+msgid "unable to parse value '%s' for option %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2448
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2450
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2452
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:2455
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:2456
+msgid "version[,offset]"
+msgstr ""
+
+#: builtin/pack-objects.c:2457
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:2460
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:2462
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:2464
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2466
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2468
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:2470
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:2472
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:2474
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2476
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2478
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:2480
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:2482
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:2484
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2487
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:2490
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:2493
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:2495
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2497
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2498 parse-options.h:141
+msgid "time"
+msgstr ""
+
+#: builtin/pack-objects.c:2499
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:2502
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:2504
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:2506
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:2508
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [options]"
+msgstr ""
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:7
+msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:132
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/push.c:14
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:45
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:64
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:99
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:102
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s %s\n"
+"%s"
+msgstr ""
+
+#: builtin/push.c:121
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:128
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:136
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:139
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+
+#: builtin/push.c:151
+msgid ""
+"push.default is unset; its implicit value is changing in\n"
+"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
+"and maintain the current behavior after the default changes, use:\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"To squelch this message and adopt the new behavior now, use:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"See 'git help config' and search for 'push.default' for further "
+"information.\n"
+"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
+"'current' instead of 'simple' if you sometimes use older versions of Git)"
+msgstr ""
+
+#: builtin/push.c:199
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:206
+msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:187
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration\n"
-"variable to 'current' or 'upstream' to push only the current branch."
+#: builtin/push.c:212
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. If you did not intend to push that branch, you may want to\n"
+"specify branches to push or set the 'push.default' configuration variable\n"
+"to 'simple', 'current' or 'upstream' to push only the current branch."
+msgstr ""
+
+#: builtin/push.c:218
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and merge the remote changes\n"
+"(e.g. 'git pull') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:258
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:262
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:294
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:295
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:310
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:311
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:316
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:317
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:322
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:382
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:383
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:384
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:386
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:387
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:390
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:391
+msgid "check"
+msgstr ""
+
+#: builtin/push.c:392
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:394
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:395 builtin/push.c:396
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:397
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:400
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:410
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:412
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/read-tree.c:36
+msgid ""
+"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+
+#: builtin/read-tree.c:108
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:111
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:113
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:115
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:117
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:119
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:121
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:122
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:123
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:126
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:128
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:129
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:132
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:133
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/remote.c:11
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:12
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:13 builtin/remote.c:32
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:14 builtin/remote.c:37
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | -d | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:18
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:19
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:68
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:21 builtin/remote.c:69
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:22 builtin/remote.c:70
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:27
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | -d | <branch>])"
+msgstr ""
+
+#: builtin/remote.c:47
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:48
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:58
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:63
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:172
+msgid "push|fetch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:195 builtin/remote.c:646
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:199 builtin/remote.c:650
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:243
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:299
+#, c-format
+msgid "more than one %s"
+msgstr ""
+
+#: builtin/remote.c:339
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:440 builtin/remote.c:448
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:452
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
+#, c-format
+msgid "Could not append '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
+#, c-format
+msgid "No such remote: %s"
+msgstr ""
+
+#: builtin/remote.c:656
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:662 builtin/remote.c:799
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:677
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:683
+#, c-format
+msgid "Could not append '%s'"
+msgstr ""
+
+#: builtin/remote.c:694
+#, c-format
+msgid "Could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:716
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:750
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:764
+#, c-format
+msgid "Could not remove branch %s"
+msgstr ""
+
+#: builtin/remote.c:834
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:943
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:946
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:948
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:950
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:991
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:998
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:1001
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:1002
+msgid " and with remote"
+msgstr ""
+
+#: builtin/remote.c:1004
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:1005
+msgid " and with remote"
+msgstr ""
+
+#: builtin/remote.c:1051
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1054
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1058
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1061
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1064
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1071
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1074
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1078
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1081
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1091
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1118
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1119
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1120 builtin/remote.c:1285
+msgid "(no URL)"
+msgstr ""
+
+#: builtin/remote.c:1129 builtin/remote.c:1131
+#, c-format
+msgid " Push URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1139
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1151
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1154 builtin/remote.c:1181
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1163
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1171
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1178
+#, 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:1199
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1201
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1216
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1218
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1228
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1236
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1238
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1274
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1275
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1282
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1295
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1298
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1321
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1387 builtin/remote.c:1461
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1407
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1414
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1436
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1438
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1440
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1447
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1487
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1495
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1497
+msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/push.c:193
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge the remote changes\n"
-"(e.g. 'git pull') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/remote.c:1569
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/push.c:233
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/replace.c:17
+msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: builtin/push.c:237
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/replace.c:18
+msgid "git replace -d <object>..."
msgstr ""
-#: builtin/push.c:269
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/replace.c:19
+msgid "git replace -l [<pattern>]"
msgstr ""
-#: builtin/push.c:270
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/replace.c:118
+msgid "list replace refs"
msgstr ""
-#: builtin/push.c:285
-msgid "--all and --tags are incompatible"
+#: builtin/replace.c:119
+msgid "delete replace refs"
msgstr ""
-#: builtin/push.c:286
-msgid "--all can't be combined with refspecs"
+#: builtin/replace.c:120
+msgid "replace the ref if it exists"
msgstr ""
-#: builtin/push.c:291
-msgid "--mirror and --tags are incompatible"
+#: builtin/rerere.c:11
+msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/push.c:292
-msgid "--mirror can't be combined with refspecs"
+#: builtin/rerere.c:56
+msgid "register clean resolutions in index"
msgstr ""
-#: builtin/push.c:297
-msgid "--all and --mirror are incompatible"
+#: builtin/reset.c:25
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/push.c:385
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/reset.c:26
+msgid "git reset [-q] <commit> [--] <paths>..."
msgstr ""
-#: builtin/push.c:387
-msgid "--delete doesn't make sense without any refs"
+#: builtin/reset.c:27
+msgid "git reset --patch [<commit>] [--] [<paths>...]"
msgstr ""
-#: builtin/remote.c:98
-#, c-format
-msgid "Updating %s"
+#: builtin/reset.c:33
+msgid "mixed"
msgstr ""
-#: builtin/remote.c:130
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/reset.c:33
+msgid "soft"
msgstr ""
-#: builtin/remote.c:147
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/reset.c:33
+msgid "hard"
msgstr ""
-#: builtin/remote.c:185
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/reset.c:33
+msgid "merge"
msgstr ""
-#: builtin/remote.c:187
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/reset.c:33
+msgid "keep"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:646
-#, c-format
-msgid "remote %s already exists."
+#: builtin/reset.c:77
+msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/remote.c:199 builtin/remote.c:650
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/reset.c:79
+msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/remote.c:243
+#: builtin/reset.c:85
#, c-format
-msgid "Could not setup master '%s'"
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/remote.c:299
-#, c-format
-msgid "more than one %s"
+#: builtin/reset.c:96
+msgid "Could not write new index file."
msgstr ""
-#: builtin/remote.c:339
+#: builtin/reset.c:106
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/remote.c:440 builtin/remote.c:448
-msgid "(matching)"
+#: builtin/reset.c:130
+msgid "Could not read index"
msgstr ""
-#: builtin/remote.c:452
-msgid "(delete)"
+#: builtin/reset.c:133
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
+#: builtin/reset.c:223
#, c-format
-msgid "Could not append '%s' to '%s'"
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
-#, c-format
-msgid "No such remote: %s"
+#: builtin/reset.c:238
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/remote.c:656
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/reset.c:240
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/remote.c:662 builtin/remote.c:799
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/reset.c:241
+msgid "reset only HEAD"
msgstr ""
-#: builtin/remote.c:677
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/reset.c:243 builtin/reset.c:245
+msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/remote.c:683
-#, c-format
-msgid "Could not append '%s'"
+#: builtin/reset.c:247
+msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/remote.c:694
+#: builtin/reset.c:303
#, c-format
-msgid "Could not set '%s'"
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/remote.c:716
+#: builtin/reset.c:308
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:317
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:319
#, c-format
-msgid "deleting '%s' failed"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/remote.c:750
+#: builtin/reset.c:331
#, c-format
-msgid "creating '%s' failed"
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/remote.c:764
+#: builtin/reset.c:347
#, c-format
-msgid "Could not remove branch %s"
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/remote.c:834
+#: builtin/rev-parse.c:339
+msgid "git rev-parse --parseopt [options] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:344
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:346
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:464
msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
+"git rev-parse --parseopt [options] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<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/remote.c:943
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/revert.c:22
+msgid "git revert [options] <commit-ish>"
msgstr ""
-#: builtin/remote.c:946
-msgid " tracked"
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/remote.c:948
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/revert.c:28
+msgid "git cherry-pick [options] <commit-ish>"
msgstr ""
-#: builtin/remote.c:950
-msgid " ???"
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/remote.c:991
+#: builtin/revert.c:70 builtin/revert.c:92
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/remote.c:998
-#, c-format
-msgid "rebases onto remote %s"
+#: builtin/revert.c:103
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1001
-#, c-format
-msgid " merges with remote %s"
+#: builtin/revert.c:104
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1002
-msgid " and with remote"
+#: builtin/revert.c:105
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1004
-#, c-format
-msgid "merges with remote %s"
+#: builtin/revert.c:106
+msgid "don't automatically commit"
msgstr ""
-#: builtin/remote.c:1005
-msgid " and with remote"
+#: builtin/revert.c:107
+msgid "edit the commit message"
msgstr ""
-#: builtin/remote.c:1051
-msgid "create"
+#: builtin/revert.c:110
+msgid "parent number"
msgstr ""
-#: builtin/remote.c:1054
-msgid "delete"
+#: builtin/revert.c:112
+msgid "merge strategy"
msgstr ""
-#: builtin/remote.c:1058
-msgid "up to date"
+#: builtin/revert.c:113
+msgid "option"
msgstr ""
-#: builtin/remote.c:1061
-msgid "fast-forwardable"
+#: builtin/revert.c:114
+msgid "option for merge strategy"
msgstr ""
-#: builtin/remote.c:1064
-msgid "local out of date"
+#: builtin/revert.c:125
+msgid "append commit name"
msgstr ""
-#: builtin/remote.c:1071
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/revert.c:126
+msgid "allow fast-forward"
msgstr ""
-#: builtin/remote.c:1074
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
msgstr ""
-#: builtin/remote.c:1078
-#, c-format
-msgid " %-*s forces to %s"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/remote.c:1081
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/remote.c:1118
-#, c-format
-msgid "* remote %s"
+#: builtin/revert.c:133
+msgid "program error"
msgstr ""
-#: builtin/remote.c:1119
-#, c-format
-msgid " Fetch URL: %s"
+#: builtin/revert.c:223
+msgid "revert failed"
msgstr ""
-#: builtin/remote.c:1120 builtin/remote.c:1285
-msgid "(no URL)"
+#: builtin/revert.c:238
+msgid "cherry-pick failed"
msgstr ""
-#: builtin/remote.c:1129 builtin/remote.c:1131
-#, c-format
-msgid " Push URL: %s"
+#: builtin/rm.c:14
+msgid "git rm [options] [--] <file>..."
msgstr ""
-#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#: builtin/rm.c:109
#, c-format
-msgid " HEAD branch: %s"
+msgid ""
+"'%s' has staged content different from both the file and the HEAD\n"
+"(use -f to force removal)"
msgstr ""
-#: builtin/remote.c:1139
+#: builtin/rm.c:115
#, c-format
msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+"'%s' has changes staged in the index\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/remote.c:1151
+#: builtin/rm.c:119
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1154 builtin/remote.c:1181
-msgid " (status not queried)"
+msgid ""
+"'%s' has local modifications\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/remote.c:1163
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/rm.c:134
+msgid "do not list removed files"
+msgstr ""
-#: builtin/remote.c:1171
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/rm.c:135
+msgid "only remove from the index"
msgstr ""
-#: builtin/remote.c:1178
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/rm.c:136
+msgid "override the up-to-date check"
+msgstr ""
-#: builtin/remote.c:1216
-msgid "Cannot determine remote HEAD"
+#: builtin/rm.c:137
+msgid "allow recursive removal"
msgstr ""
-#: builtin/remote.c:1218
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/rm.c:139
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/remote.c:1228
+#: builtin/rm.c:194
#, c-format
-msgid "Could not delete %s"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/remote.c:1236
+#: builtin/rm.c:230
#, c-format
-msgid "Not a valid ref: %s"
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/remote.c:1238
-#, c-format
-msgid "Could not setup %s"
+#: builtin/shortlog.c:13
+msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
msgstr ""
-#: builtin/remote.c:1274
+#: builtin/shortlog.c:157
#, c-format
-msgid " %s will become dangling!"
+msgid "Missing author: %s"
msgstr ""
-#: builtin/remote.c:1275
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/shortlog.c:253
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/remote.c:1281
-#, c-format
-msgid "Pruning %s"
+#: builtin/shortlog.c:255
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/remote.c:1282
-#, c-format
-msgid "URL: %s"
+#: builtin/shortlog.c:257
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:1295
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/shortlog.c:258
+msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/remote.c:1298
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/shortlog.c:259
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:1387 builtin/remote.c:1461
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/show-branch.c:9
+msgid ""
+"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
+"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
+"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
+"<glob>)...]"
msgstr ""
-#: builtin/remote.c:1414
-msgid "no remote specified"
+#: builtin/show-branch.c:10
+msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:1447
-msgid "--add --delete doesn't make sense"
+#: builtin/show-branch.c:651
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:1487
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/show-branch.c:653
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:1495
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/show-branch.c:655
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:1497
-msgid "Will not delete all non-push URLs"
+#: builtin/show-branch.c:657
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/reset.c:33
-msgid "mixed"
+#: builtin/show-branch.c:659
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/reset.c:33
-msgid "soft"
+#: builtin/show-branch.c:660
+msgid "suppress naming strings"
msgstr ""
-#: builtin/reset.c:33
-msgid "hard"
+#: builtin/show-branch.c:662
+msgid "include the current branch"
msgstr ""
-#: builtin/reset.c:33
-msgid "merge"
+#: builtin/show-branch.c:664
+msgid "name commits with their object names"
msgstr ""
-#: builtin/reset.c:33
-msgid "keep"
+#: builtin/show-branch.c:666
+msgid "show possible merge bases"
msgstr ""
-#: builtin/reset.c:77
-msgid "You do not have a valid HEAD."
+#: builtin/show-branch.c:668
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/reset.c:79
-msgid "Failed to find tree of HEAD."
+#: builtin/show-branch.c:670
+msgid "show commits in topological order"
msgstr ""
-#: builtin/reset.c:85
-#, c-format
-msgid "Failed to find tree of %s."
+#: builtin/show-branch.c:672
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/reset.c:96
-msgid "Could not write new index file."
+#: builtin/show-branch.c:674
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/reset.c:106
-#, c-format
-msgid "HEAD is now at %s"
+#: builtin/show-branch.c:676
+msgid "show commits where no parent comes before its children"
msgstr ""
-#: builtin/reset.c:130
-msgid "Could not read index"
+#: builtin/show-branch.c:678
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/reset.c:133
-msgid "Unstaged changes after reset:"
+#: builtin/show-branch.c:679
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/reset.c:223
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/show-ref.c:10
+msgid ""
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
+"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
msgstr ""
-#: builtin/reset.c:303
-#, c-format
-msgid "Could not parse object '%s'."
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=pattern] < ref-list"
msgstr ""
-#: builtin/reset.c:308
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/show-ref.c:182
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/reset.c:317
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/show-ref.c:183
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/reset.c:319
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/show-ref.c:184
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/reset.c:331
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/show-ref.c:187 builtin/show-ref.c:189
+msgid "show the HEAD reference"
msgstr ""
-#: builtin/reset.c:347
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/show-ref.c:191
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/revert.c:70 builtin/revert.c:92
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/show-ref.c:193
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/revert.c:131
-msgid "program error"
+#: builtin/show-ref.c:197
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/revert.c:221
-msgid "revert failed"
+#: builtin/show-ref.c:199
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/revert.c:236
-msgid "cherry-pick failed"
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [options] name [ref]"
msgstr ""
-#: builtin/rm.c:109
-#, c-format
-msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
-"(use -f to force removal)"
+#: builtin/symbolic-ref.c:38
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/rm.c:115
-#, c-format
-msgid ""
-"'%s' has changes staged in the index\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/symbolic-ref.c:39
+msgid "shorten ref output"
msgstr ""
-#: builtin/rm.c:119
-#, c-format
+#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
+msgid "reason of the update"
+msgstr ""
+
+#: builtin/tag.c:22
msgid ""
-"'%s' has local modifications\n"
-"(use --cached to keep the file, or -f to force removal)"
+"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
msgstr ""
-#: builtin/rm.c:194
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/tag.c:23
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/rm.c:230
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/tag.c:24
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
+"\t\t[<pattern>...]"
msgstr ""
-#: builtin/shortlog.c:157
-#, c-format
-msgid "Missing author: %s"
+#: builtin/tag.c:26
+msgid "git tag -v <tagname>..."
msgstr ""
#: builtin/tag.c:60
msgid "malformed object name '%s'"
msgstr ""
+#: builtin/tag.c:447
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:449
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:451
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:452
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:454
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:456
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:458
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:460
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:464
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:465
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:466
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:468
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:471
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:477
+msgid "print only tags of the object"
+msgstr ""
+
#: builtin/tag.c:506
msgid "--column and -n are incompatible"
msgstr ""
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: git.c:16
-msgid "See 'git help <command>' for more information on a specific command."
+#: builtin/update-index.c:401
+msgid "git update-index [options] [--] [<file>...]"
msgstr ""
-#: parse-options.h:133 parse-options.h:235
-msgid "n"
+#: builtin/update-index.c:717
+msgid "continue refresh even when index needs update"
msgstr ""
-#: parse-options.h:141
-msgid "time"
+#: builtin/update-index.c:720
+msgid "refresh: ignore submodules"
msgstr ""
-#: parse-options.h:149
-msgid "file"
+#: builtin/update-index.c:723
+msgid "do not ignore new files"
msgstr ""
-#: parse-options.h:151
-msgid "when"
+#: builtin/update-index.c:725
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:727
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:729
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:732
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:736
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:740
+msgid "<mode> <object> <path>"
+msgstr ""
+
+#: builtin/update-index.c:741
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:745
+msgid "(+/-)x"
+msgstr ""
+
+#: builtin/update-index.c:746
+msgid "override the executable bit of the listed files"
+msgstr ""
+
+#: builtin/update-index.c:750
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:753
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:756
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:759
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:762
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:764
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:766
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:768
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:772
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:776
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:780
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:784
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:787
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:789
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+
+#: builtin/update-index.c:793
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-ref.c:7
+msgid "git update-ref [options] -d <refname> [<oldval>]"
+msgstr ""
+
+#: builtin/update-ref.c:8
+msgid "git update-ref [options] <refname> <newval> [<oldval>]"
+msgstr ""
+
+#: builtin/update-ref.c:19
+msgid "delete the reference"
+msgstr ""
+
+#: builtin/update-ref.c:21
+msgid "update <refname> not the one it points to"
+msgstr ""
+
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
+msgstr ""
+
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
+msgstr ""
+
+#: builtin/verify-pack.c:56
+msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
+msgstr ""
+
+#: builtin/verify-pack.c:66
+msgid "verbose"
+msgstr ""
+
+#: builtin/verify-pack.c:68
+msgid "show statistics only"
+msgstr ""
+
+#: builtin/verify-tag.c:17
+msgid "git verify-tag [-v|--verbose] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:73
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr ""
+
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
+msgstr ""
+
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
+msgstr ""
+
+#: git.c:16
+msgid "See 'git help <command>' for more information on a specific command."
msgstr ""
#: parse-options.h:156
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
+#: git-am.sh:858
+#, sh-format
+msgid ""
+"The copy of the patch that failed is found in:\n"
+" $dotest/patch"
+msgstr ""
+
#: git-am.sh:876
msgid "applying to an empty history"
msgstr ""
msgid "Cannot rebase onto multiple branches"
msgstr ""
-#: git-rebase.sh:52
+#: git-rebase.sh:53
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"\"."
msgstr ""
-#: git-rebase.sh:159
+#: git-rebase.sh:160
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:164
+#: git-rebase.sh:165
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:295
+#: git-rebase.sh:296
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:300
+#: git-rebase.sh:301
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:313
+#: git-rebase.sh:312
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: git-rebase.sh:319
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:316
+#: git-rebase.sh:322
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:334
+#: git-rebase.sh:340
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:350
+#: git-rebase.sh:359
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:395
+#: git-rebase.sh:404
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:419
+#: git-rebase.sh:428
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:422 git-rebase.sh:426
+#: git-rebase.sh:431 git-rebase.sh:435
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:431
+#: git-rebase.sh:440
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:454
+#: git-rebase.sh:463
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:474
+#: git-rebase.sh:483
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:492
+#: git-rebase.sh:501
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:495
+#: git-rebase.sh:504
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:506
+#: git-rebase.sh:515
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
-#: git-rebase.sh:515
+#: git-rebase.sh:524
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:523
+#: git-rebase.sh:532
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:475
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:491
+#: git-stash.sh:492
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:492
+#: git-stash.sh:493
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:499
+#: git-stash.sh:500
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:571
msgid "(To restore them type \"git stash apply\")"
msgstr ""
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:145
+#: git-submodule.sh:167
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:189
+#: git-submodule.sh:211
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
-#: git-submodule.sh:201
+#: git-submodule.sh:223
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
-#: git-submodule.sh:290
+#: git-submodule.sh:312
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:307
+#: git-submodule.sh:329
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:311
+#: git-submodule.sh:333
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:322
+#: git-submodule.sh:344
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:324
+#: git-submodule.sh:346
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:338
+#: git-submodule.sh:360
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:343
+#: git-submodule.sh:365
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:348
+#: git-submodule.sh:370
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:390
+#: git-submodule.sh:413
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr ""
-#: git-submodule.sh:404
+#: git-submodule.sh:427
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:447
+#: git-submodule.sh:471
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr ""
-#: git-submodule.sh:456
+#: git-submodule.sh:480
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:458
+#: git-submodule.sh:482
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:466
+#: git-submodule.sh:490
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:565
+#: git-submodule.sh:590
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:578
+#: git-submodule.sh:603
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:597
+#: git-submodule.sh:622
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:611
+#: git-submodule.sh:636
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:612
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:617
+#: git-submodule.sh:642
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:618
+#: git-submodule.sh:643
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:623
+#: git-submodule.sh:648
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:624
+#: git-submodule.sh:649
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:646 git-submodule.sh:969
+#: git-submodule.sh:671 git-submodule.sh:995
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:754
+#: git-submodule.sh:779
msgid "The --cached option cannot be used with the --files option"
msgstr ""
#. unexpected type
-#: git-submodule.sh:794
+#: git-submodule.sh:819
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:812
+#: git-submodule.sh:837
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:815
+#: git-submodule.sh:840
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:818
+#: git-submodule.sh:843
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:843
+#: git-submodule.sh:868
msgid "blob"
msgstr ""
-#: git-submodule.sh:881
+#: git-submodule.sh:906
msgid "# Submodules changed but not updated:"
msgstr ""
-#: git-submodule.sh:883
+#: git-submodule.sh:908
msgid "# Submodule changes to be committed:"
msgstr ""
-#: git-submodule.sh:1027
+#: git-submodule.sh:1054
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""