1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 "POT-Creation-Date: 2013-04-30 08:25+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
17 "Content-Type: text/plain; charset=CHARSET\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
39 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgid "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52 msgid "git archive --remote <repo> [--exec <cmd>] --list"
60 msgid "archive format"
63 #: archive.c:324 builtin/log.c:1126
68 msgid "prepend prefix to each pathname in the archive"
71 #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
72 #: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
73 #: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
74 #: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
75 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
79 #: archive.c:327 builtin/archive.c:89
80 msgid "write the archive to this file"
84 msgid "read .gitattributes in working directory"
88 msgid "report archived files on stderr"
96 msgid "compress faster"
100 msgid "compress better"
104 msgid "list supported archive formats"
107 #: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
111 #: archive.c:346 builtin/archive.c:91
112 msgid "retrieve the archive from remote repository <repo>"
115 #: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
119 #: archive.c:348 builtin/archive.c:93
120 msgid "path to the remote git-upload-archive command"
125 "Negative patterns are ignored in git attributes\n"
126 "Use '\\!' for literal leading exclamation."
131 msgid "Not setting branch %s as its own upstream."
136 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
141 msgid "Branch %s set up to track remote branch %s from %s."
146 msgid "Branch %s set up to track local branch %s by rebasing."
151 msgid "Branch %s set up to track local branch %s."
156 msgid "Branch %s set up to track remote ref %s by rebasing."
161 msgid "Branch %s set up to track remote ref %s."
166 msgid "Branch %s set up to track local ref %s by rebasing."
171 msgid "Branch %s set up to track local ref %s."
176 msgid "Tracking not set up: name too long: %s"
181 msgid "Not tracking: ambiguous information for ref %s"
186 msgid "'%s' is not a valid branch name."
191 msgid "A branch named '%s' already exists."
195 msgid "Cannot force update the current branch."
200 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
205 msgid "the requested upstream branch '%s' does not exist"
211 "If you are planning on basing your work on an upstream\n"
212 "branch that already exists at the remote, you may need to\n"
213 "run \"git fetch\" to retrieve it.\n"
215 "If you are planning to push out a new local branch that\n"
216 "will track its remote counterpart, you may want to use\n"
217 "\"git push -u\" to set the upstream config as you push."
222 msgid "Not a valid object name: '%s'."
227 msgid "Ambiguous object name: '%s'."
232 msgid "Not a valid branch point: '%s'."
236 msgid "Failed to lock ref for update"
240 msgid "Failed to write ref"
245 msgid "'%s' does not look like a v2 bundle file"
250 msgid "unrecognized header: %s%s (%d)"
253 #: bundle.c:89 builtin/commit.c:676
255 msgid "could not open '%s'"
259 msgid "Repository lacks these prerequisite commits:"
262 #: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
263 #: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
264 #: builtin/shortlog.c:155
265 msgid "revision walk setup failed"
270 msgid "The bundle contains this ref:"
271 msgid_plural "The bundle contains these %d refs:"
276 msgid "The bundle records a complete history."
281 msgid "The bundle requires this ref:"
282 msgid_plural "The bundle requires these %d refs:"
287 msgid "rev-list died"
290 #: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
292 msgid "unrecognized argument: %s"
297 msgid "ref '%s' is excluded by the rev-list options"
301 msgid "Refusing to create empty bundle."
305 msgid "Could not spawn pack-objects"
309 msgid "pack-objects died"
314 msgid "cannot create '%s'"
318 msgid "index-pack died"
323 msgid "could not parse %s"
328 msgid "%s %s is not a commit!"
331 #: compat/obstack.c:406 compat/obstack.c:408
332 msgid "memory exhausted"
336 msgid "Could not run 'git rev-list'"
341 msgid "failed write to rev-list: %s"
346 msgid "failed to close rev-list's stdin: %s"
350 msgid "in the future"
355 msgid "%lu second ago"
356 msgid_plural "%lu seconds ago"
362 msgid "%lu minute ago"
363 msgid_plural "%lu minutes ago"
370 msgid_plural "%lu hours ago"
377 msgid_plural "%lu days ago"
384 msgid_plural "%lu weeks ago"
390 msgid "%lu month ago"
391 msgid_plural "%lu months ago"
398 msgid_plural "%lu years"
404 msgid "%s, %lu month ago"
405 msgid_plural "%s, %lu months ago"
409 #: date.c:154 date.c:159
412 msgid_plural "%lu years ago"
418 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
423 msgid " Unknown dirstat parameter '%s'\n"
428 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
434 "Found errors in 'diff.dirstat' config variable:\n"
441 "Failed to parse --dirstat/-X option parameter:\n"
447 msgid "Failed to parse --submodule option parameter: '%s'"
450 #: gpg-interface.c:59 gpg-interface.c:131
451 msgid "could not run gpg."
454 #: gpg-interface.c:71
455 msgid "gpg did not accept the data"
458 #: gpg-interface.c:82
459 msgid "gpg failed to sign the data"
462 #: gpg-interface.c:115
464 msgid "could not create temporary file '%s': %s"
467 #: gpg-interface.c:118
469 msgid "failed writing detached signature to '%s': %s"
474 msgid "'%s': unable to read %s"
484 msgid "'%s': short read %s"
489 msgid "available git commands in '%s'"
493 msgid "git commands available from elsewhere on your $PATH"
497 msgid "The most commonly used git commands are:"
503 "'%s' appears to be a git command, but we were not\n"
504 "able to execute it. Maybe git-%s is broken?"
508 msgid "Uh oh. Your system reports no Git commands at all."
514 "WARNING: You called a Git command named '%s', which does not exist.\n"
515 "Continuing under the assumption that you meant '%s'"
520 msgid "in %0.1f seconds automatically..."
525 msgid "git: '%s' is not a git command. See 'git --help'."
534 "Did you mean one of these?"
539 msgid "failed to read the cache"
542 #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
543 #: builtin/clone.c:645
544 msgid "unable to write new index file"
547 #: merge-recursive.c:190
549 msgid "(bad commit)\n"
552 #: merge-recursive.c:206
554 msgid "addinfo_cache failed for path '%s'"
557 #: merge-recursive.c:268
558 msgid "error building trees"
561 #: merge-recursive.c:672
563 msgid "failed to create path '%s'%s"
566 #: merge-recursive.c:683
568 msgid "Removing %s to make room for subdirectory\n"
571 #. something else exists
572 #. .. but not some other error (who really cares what?)
573 #: merge-recursive.c:697 merge-recursive.c:718
574 msgid ": perhaps a D/F conflict?"
577 #: merge-recursive.c:708
579 msgid "refusing to lose untracked file at '%s'"
582 #: merge-recursive.c:748
584 msgid "cannot read object %s '%s'"
587 #: merge-recursive.c:750
589 msgid "blob expected for %s '%s'"
592 #: merge-recursive.c:773 builtin/clone.c:313
594 msgid "failed to open '%s'"
597 #: merge-recursive.c:781
599 msgid "failed to symlink '%s'"
602 #: merge-recursive.c:784
604 msgid "do not know what to do with %06o %s '%s'"
607 #: merge-recursive.c:922
608 msgid "Failed to execute internal merge"
611 #: merge-recursive.c:926
613 msgid "Unable to add %s to database"
616 #: merge-recursive.c:942
617 msgid "unsupported object type in the tree"
620 #: merge-recursive.c:1021 merge-recursive.c:1035
623 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
627 #: merge-recursive.c:1027 merge-recursive.c:1040
630 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
634 #: merge-recursive.c:1081
638 #: merge-recursive.c:1081
642 #: merge-recursive.c:1137
644 msgid "%s is a directory in %s adding as %s instead"
647 #: merge-recursive.c:1159
650 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
651 "\"->\"%s\" in \"%s\"%s"
654 #: merge-recursive.c:1164
655 msgid " (left unresolved)"
658 #: merge-recursive.c:1218
660 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
663 #: merge-recursive.c:1248
665 msgid "Renaming %s to %s and %s to %s instead"
668 #: merge-recursive.c:1447
670 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
673 #: merge-recursive.c:1457
675 msgid "Adding merged %s"
678 #: merge-recursive.c:1462 merge-recursive.c:1660
680 msgid "Adding as %s instead"
683 #: merge-recursive.c:1513
685 msgid "cannot read object %s"
688 #: merge-recursive.c:1516
690 msgid "object %s is not a blob"
693 #: merge-recursive.c:1564
697 #: merge-recursive.c:1564
701 #: merge-recursive.c:1574
705 #: merge-recursive.c:1581
709 #: merge-recursive.c:1615
711 msgid "Skipped %s (merged same as existing)"
714 #: merge-recursive.c:1629
716 msgid "Auto-merging %s"
719 #: merge-recursive.c:1633 git-submodule.sh:1029
723 #: merge-recursive.c:1634
725 msgid "CONFLICT (%s): Merge conflict in %s"
728 #: merge-recursive.c:1724
733 #: merge-recursive.c:1749
734 msgid "file/directory"
737 #: merge-recursive.c:1755
738 msgid "directory/file"
741 #: merge-recursive.c:1760
743 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
746 #: merge-recursive.c:1770
751 #: merge-recursive.c:1787
752 msgid "Fatal merge failure, shouldn't happen."
755 #: merge-recursive.c:1806
756 msgid "Already up-to-date!"
759 #: merge-recursive.c:1815
761 msgid "merging of trees %s and %s failed"
764 #: merge-recursive.c:1845
766 msgid "Unprocessed path??? %s"
769 #: merge-recursive.c:1890
773 #: merge-recursive.c:1903
775 msgid "found %u common ancestor:"
776 msgid_plural "found %u common ancestors:"
780 #: merge-recursive.c:1940
781 msgid "merge returned no commit"
784 #: merge-recursive.c:1997
786 msgid "Could not parse object '%s'"
789 #: merge-recursive.c:2009 builtin/merge.c:658
790 msgid "Unable to write index."
795 msgid "unable to parse object: %s"
798 #: parse-options.c:489
802 #: parse-options.c:507
807 #. TRANSLATORS: the colon here should align with the
808 #. one in "usage: %s" translation
809 #: parse-options.c:511
814 #: parse-options.c:514
819 #: parse-options.c:548
825 msgid "Path '%s' is in submodule '%.*s'"
830 msgid "'%s' is beyond a symbolic link"
835 msgid "Your branch is ahead of '%s' by %d commit.\n"
836 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
841 msgid " (use \"git push\" to publish your local commits)\n"
846 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
848 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
853 msgid " (use \"git pull\" to update your local branch)\n"
859 "Your branch and '%s' have diverged,\n"
860 "and have %d and %d different commit each, respectively.\n"
862 "Your branch and '%s' have diverged,\n"
863 "and have %d and %d different commits each, respectively.\n"
868 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
871 #: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
872 #: builtin/merge.c:1009
874 msgid "Could not open '%s' for writing"
877 #: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
878 #: builtin/merge.c:1001 builtin/merge.c:1014
880 msgid "Could not write to '%s'"
885 "after resolving the conflicts, mark the corrected paths\n"
886 "with 'git add <paths>' or 'git rm <paths>'"
891 "after resolving the conflicts, mark the corrected paths\n"
892 "with 'git add <paths>' or 'git rm <paths>'\n"
893 "and commit the result with 'git commit'"
896 #: sequencer.c:245 sequencer.c:859 sequencer.c:942
898 msgid "Could not write to %s"
903 msgid "Error wrapping up %s"
907 msgid "Your local changes would be overwritten by cherry-pick."
911 msgid "Your local changes would be overwritten by revert."
915 msgid "Commit your changes or stash them to proceed."
918 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
921 msgid "%s: Unable to write new index file"
925 msgid "Could not resolve HEAD commit\n"
929 msgid "Unable to update cache tree\n"
934 msgid "Could not parse commit %s\n"
939 msgid "Could not parse parent commit %s\n"
943 msgid "Your index file is unmerged."
948 msgid "Commit %s is a merge but no -m option was given."
953 msgid "Commit %s does not have parent %d"
958 msgid "Mainline was specified but commit %s is not a merge."
961 #. TRANSLATORS: The first %s will be "revert" or
962 #. "cherry-pick", the second %s a SHA1
965 msgid "%s: cannot parse parent commit %s"
970 msgid "Cannot get commit message for %s"
975 msgid "could not revert %s... %s"
980 msgid "could not apply %s... %s"
984 msgid "empty commit set passed"
989 msgid "git %s: failed to read the index"
994 msgid "git %s: failed to refresh the index"
999 msgid "Cannot %s during a %s"
1004 msgid "Could not parse line %d."
1008 msgid "No commits parsed."
1013 msgid "Could not open %s"
1018 msgid "Could not read %s."
1023 msgid "Unusable instruction sheet: %s"
1028 msgid "Invalid key: %s"
1033 msgid "Invalid value for %s: %s"
1038 msgid "Malformed options sheet: %s"
1042 msgid "a cherry-pick or revert is already in progress"
1046 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1051 msgid "Could not create sequencer directory %s"
1054 #: sequencer.c:861 sequencer.c:946
1056 msgid "Error wrapping up %s."
1059 #: sequencer.c:880 sequencer.c:1014
1060 msgid "no cherry-pick or revert in progress"
1064 msgid "cannot resolve HEAD"
1068 msgid "cannot abort from a branch yet to be born"
1071 #: sequencer.c:906 builtin/apply.c:4060
1073 msgid "cannot open %s: %s"
1078 msgid "cannot read %s: %s"
1082 msgid "unexpected end of file"
1087 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1092 msgid "Could not format %s."
1097 msgid "%s: can't cherry-pick a %s"
1102 msgid "%s: bad revision"
1106 msgid "Can't revert as initial commit"
1110 msgid "Can't cherry-pick into empty head"
1114 msgid "HEAD does not point to a branch"
1119 msgid "No such branch: '%s'"
1124 msgid "No upstream configured for branch '%s'"
1129 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1134 msgid "unable to access '%s': %s"
1139 msgid "unable to access '%s'"
1144 msgid "unable to look up current user in the passwd file: %s"
1148 msgid "no such user"
1152 msgid "Unmerged paths:"
1155 #: wt-status.c:167 wt-status.c:194
1157 msgid " (use \"git reset %s <file>...\" to unstage)"
1160 #: wt-status.c:169 wt-status.c:196
1161 msgid " (use \"git rm --cached <file>...\" to unstage)"
1165 msgid " (use \"git add <file>...\" to mark resolution)"
1168 #: wt-status.c:175 wt-status.c:179
1169 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1173 msgid " (use \"git rm <file>...\" to mark resolution)"
1177 msgid "Changes to be committed:"
1181 msgid "Changes not staged for commit:"
1185 msgid " (use \"git add <file>...\" to update what will be committed)"
1189 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1194 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1198 msgid " (commit or discard the untracked or modified content in submodules)"
1203 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1211 msgid "both deleted:"
1215 msgid "added by us:"
1219 msgid "deleted by them:"
1223 msgid "added by them:"
1227 msgid "deleted by us:"
1235 msgid "both modified:"
1239 msgid "new commits, "
1243 msgid "modified content, "
1247 msgid "untracked content, "
1252 msgid "new file: %s"
1257 msgid "copied: %s -> %s"
1267 msgid "modified: %s"
1272 msgid "renamed: %s -> %s"
1277 msgid "typechange: %s"
1287 msgid "unmerged: %s"
1292 msgid "bug: unhandled diff status %c"
1296 msgid "You have unmerged paths."
1299 #: wt-status.c:806 wt-status.c:958
1300 msgid " (fix conflicts and run \"git commit\")"
1304 msgid "All conflicts fixed but you are still merging."
1308 msgid " (use \"git commit\" to conclude merge)"
1312 msgid "You are in the middle of an am session."
1316 msgid "The current patch is empty."
1320 msgid " (fix conflicts and then run \"git am --resolved\")"
1324 msgid " (use \"git am --skip\" to skip this patch)"
1328 msgid " (use \"git am --abort\" to restore the original branch)"
1331 #: wt-status.c:893 wt-status.c:910
1333 msgid "You are currently rebasing branch '%s' on '%s'."
1336 #: wt-status.c:898 wt-status.c:915
1337 msgid "You are currently rebasing."
1341 msgid " (fix conflicts and then run \"git rebase --continue\")"
1345 msgid " (use \"git rebase --skip\" to skip this patch)"
1349 msgid " (use \"git rebase --abort\" to check out the original branch)"
1353 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1359 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1363 msgid "You are currently splitting a commit during a rebase."
1367 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1372 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1376 msgid "You are currently editing a commit during a rebase."
1380 msgid " (use \"git commit --amend\" to amend the current commit)"
1385 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1389 msgid "You are currently cherry-picking."
1393 msgid " (all conflicts fixed: run \"git commit\")"
1398 msgid "You are currently reverting commit %s."
1402 msgid " (fix conflicts and run \"git revert --continue\")"
1406 msgid " (all conflicts fixed: run \"git revert --continue\")"
1410 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1415 msgid "You are currently bisecting, started from branch '%s'."
1419 msgid "You are currently bisecting."
1423 msgid " (use \"git bisect reset\" to get back to the original branch)"
1431 msgid "HEAD detached at "
1435 msgid "HEAD detached from "
1439 msgid "Not currently on any branch."
1443 msgid "Initial commit"
1447 msgid "Untracked files"
1451 msgid "Ignored files"
1457 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1458 "may speed it up, but you have to be careful not to forget to add\n"
1459 "new files yourself (see 'git help status')."
1464 msgid "Untracked files not listed%s"
1468 msgid " (use -u option to show untracked files)"
1477 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1482 msgid "no changes added to commit\n"
1488 "nothing added to commit but untracked files present (use \"git add\" to "
1494 msgid "nothing added to commit but untracked files present\n"
1499 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1502 #: wt-status.c:1260 wt-status.c:1265
1504 msgid "nothing to commit\n"
1509 msgid "nothing to commit (use -u to show untracked files)\n"
1514 msgid "nothing to commit, working directory clean\n"
1518 msgid "HEAD (no branch)"
1522 msgid "Initial commit on "
1529 #: wt-status.c:1399 wt-status.c:1402
1537 #: compat/precompose_utf8.c:58 builtin/clone.c:352
1539 msgid "failed to unlink '%s'"
1543 msgid "git add [options] [--] <pathspec>..."
1547 #. * To be consistent with "git add -p" and most Git
1548 #. * commands, we should default to being tree-wide, but
1549 #. * this is not the original behavior and can't be
1550 #. * changed until users trained themselves not to type
1551 #. * "git add -u" or "git add -A". For now, we warn and
1552 #. * keep the old behavior. Later, the behavior can be changed
1553 #. * to tree-wide, keeping the warning for a while, and
1554 #. * eventually we can drop the warning.
1559 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1560 "subdirectory of the tree will change in Git 2.0 and should not be used "
1562 "To add content for the whole tree, run:\n"
1565 " (or git add %s :/)\n"
1567 "To restrict the command to the current directory, run:\n"
1570 " (or git add %s .)\n"
1572 "With the current Git version, the command is restricted to the current "
1576 #: builtin/add.c:100
1579 "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1580 "whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1581 "Paths like '%s' that are\n"
1582 "removed from your working tree are ignored with this version of Git.\n"
1584 "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1585 " ignores paths you removed from your working tree.\n"
1587 "* 'git add --all <pathspec>' will let you also record the removals.\n"
1589 "Run 'git status' to check the paths you removed from your working tree.\n"
1592 #: builtin/add.c:144
1594 msgid "unexpected diff status %c"
1597 #: builtin/add.c:149 builtin/commit.c:233
1598 msgid "updating files failed"
1601 #: builtin/add.c:163
1603 msgid "remove '%s'\n"
1606 #: builtin/add.c:253
1607 msgid "Unstaged changes after refreshing the index:"
1610 #: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
1612 msgid "pathspec '%s' did not match any files"
1615 #: builtin/add.c:339
1616 msgid "Could not read the index"
1619 #: builtin/add.c:349
1621 msgid "Could not open '%s' for writing."
1624 #: builtin/add.c:353
1625 msgid "Could not write patch"
1628 #: builtin/add.c:358
1630 msgid "Could not stat '%s'"
1633 #: builtin/add.c:360
1634 msgid "Empty patch. Aborted."
1637 #: builtin/add.c:366
1639 msgid "Could not apply '%s'"
1642 #: builtin/add.c:376
1643 msgid "The following paths are ignored by one of your .gitignore files:\n"
1646 #: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1647 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1652 #: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
1653 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1654 #: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
1658 #: builtin/add.c:396
1659 msgid "interactive picking"
1662 #: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
1663 msgid "select hunks interactively"
1666 #: builtin/add.c:398
1667 msgid "edit current diff and apply"
1670 #: builtin/add.c:399
1671 msgid "allow adding otherwise ignored files"
1674 #: builtin/add.c:400
1675 msgid "update tracked files"
1678 #: builtin/add.c:401
1679 msgid "record only the fact that the path will be added later"
1682 #: builtin/add.c:402
1683 msgid "add changes from all tracked and untracked files"
1686 #. takes no arguments
1687 #: builtin/add.c:405
1688 msgid "ignore paths removed in the working tree (same as --no-all)"
1691 #: builtin/add.c:407
1692 msgid "don't add, only refresh the index"
1695 #: builtin/add.c:408
1696 msgid "just skip files which cannot be added because of errors"
1699 #: builtin/add.c:409
1700 msgid "check if - even missing - files are ignored in dry run"
1703 #: builtin/add.c:431
1705 msgid "Use -f if you really want to add them.\n"
1708 #: builtin/add.c:432
1709 msgid "no files added"
1712 #: builtin/add.c:438
1713 msgid "adding files failed"
1716 #: builtin/add.c:477
1717 msgid "-A and -u are mutually incompatible"
1720 #: builtin/add.c:495
1721 msgid "Option --ignore-missing can only be used together with --dry-run"
1724 #: builtin/add.c:525
1726 msgid "Nothing specified, nothing added.\n"
1729 #: builtin/add.c:526
1731 msgid "Maybe you wanted to say 'git add .'?\n"
1734 #: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
1735 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
1736 msgid "index file corrupt"
1739 #: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
1740 msgid "Unable to write new index file"
1743 #: builtin/apply.c:57
1744 msgid "git apply [options] [<patch>...]"
1747 #: builtin/apply.c:110
1749 msgid "unrecognized whitespace option '%s'"
1752 #: builtin/apply.c:125
1754 msgid "unrecognized whitespace ignore option '%s'"
1757 #: builtin/apply.c:823
1759 msgid "Cannot prepare timestamp regexp %s"
1762 #: builtin/apply.c:832
1764 msgid "regexec returned %d for input: %s"
1767 #: builtin/apply.c:913
1769 msgid "unable to find filename in patch at line %d"
1772 #: builtin/apply.c:945
1774 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1777 #: builtin/apply.c:949
1779 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1782 #: builtin/apply.c:950
1784 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1787 #: builtin/apply.c:957
1789 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1792 #: builtin/apply.c:1422
1794 msgid "recount: unexpected line: %.*s"
1797 #: builtin/apply.c:1479
1799 msgid "patch fragment without header at line %d: %.*s"
1802 #: builtin/apply.c:1496
1805 "git diff header lacks filename information when removing %d leading pathname "
1806 "component (line %d)"
1808 "git diff header lacks filename information when removing %d leading pathname "
1809 "components (line %d)"
1813 #: builtin/apply.c:1656
1814 msgid "new file depends on old contents"
1817 #: builtin/apply.c:1658
1818 msgid "deleted file still has contents"
1821 #: builtin/apply.c:1684
1823 msgid "corrupt patch at line %d"
1826 #: builtin/apply.c:1720
1828 msgid "new file %s depends on old contents"
1831 #: builtin/apply.c:1722
1833 msgid "deleted file %s still has contents"
1836 #: builtin/apply.c:1725
1838 msgid "** warning: file %s becomes empty but is not deleted"
1841 #: builtin/apply.c:1871
1843 msgid "corrupt binary patch at line %d: %.*s"
1846 #. there has to be one hunk (forward hunk)
1847 #: builtin/apply.c:1900
1849 msgid "unrecognized binary patch at line %d"
1852 #: builtin/apply.c:1986
1854 msgid "patch with only garbage at line %d"
1857 #: builtin/apply.c:2076
1859 msgid "unable to read symlink %s"
1862 #: builtin/apply.c:2080
1864 msgid "unable to open or read %s"
1867 #: builtin/apply.c:2688
1869 msgid "invalid start of line: '%c'"
1872 #: builtin/apply.c:2806
1874 msgid "Hunk #%d succeeded at %d (offset %d line)."
1875 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1879 #: builtin/apply.c:2818
1881 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1884 #: builtin/apply.c:2824
1887 "while searching for:\n"
1891 #: builtin/apply.c:2843
1893 msgid "missing binary patch data for '%s'"
1896 #: builtin/apply.c:2946
1898 msgid "binary patch does not apply to '%s'"
1901 #: builtin/apply.c:2952
1903 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1906 #: builtin/apply.c:2973
1908 msgid "patch failed: %s:%ld"
1911 #: builtin/apply.c:3095
1913 msgid "cannot checkout %s"
1916 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
1918 msgid "read of %s failed"
1921 #: builtin/apply.c:3173 builtin/apply.c:3395
1923 msgid "path %s has been renamed/deleted"
1926 #: builtin/apply.c:3254 builtin/apply.c:3409
1928 msgid "%s: does not exist in index"
1931 #: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
1936 #: builtin/apply.c:3263 builtin/apply.c:3417
1938 msgid "%s: does not match index"
1941 #: builtin/apply.c:3365
1942 msgid "removal patch leaves file contents"
1945 #: builtin/apply.c:3434
1947 msgid "%s: wrong type"
1950 #: builtin/apply.c:3436
1952 msgid "%s has type %o, expected %o"
1955 #: builtin/apply.c:3537
1957 msgid "%s: already exists in index"
1960 #: builtin/apply.c:3540
1962 msgid "%s: already exists in working directory"
1965 #: builtin/apply.c:3560
1967 msgid "new mode (%o) of %s does not match old mode (%o)"
1970 #: builtin/apply.c:3565
1972 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1975 #: builtin/apply.c:3573
1977 msgid "%s: patch does not apply"
1980 #: builtin/apply.c:3586
1982 msgid "Checking patch %s..."
1985 #: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
1987 msgid "make_cache_entry failed for path '%s'"
1990 #: builtin/apply.c:3822
1992 msgid "unable to remove %s from index"
1995 #: builtin/apply.c:3850
1997 msgid "corrupt patch for subproject %s"
2000 #: builtin/apply.c:3854
2002 msgid "unable to stat newly created file '%s'"
2005 #: builtin/apply.c:3859
2007 msgid "unable to create backing store for newly created file %s"
2010 #: builtin/apply.c:3862 builtin/apply.c:3970
2012 msgid "unable to add cache entry for %s"
2015 #: builtin/apply.c:3895
2017 msgid "closing file '%s'"
2020 #: builtin/apply.c:3944
2022 msgid "unable to write file '%s' mode %o"
2025 #: builtin/apply.c:4031
2027 msgid "Applied patch %s cleanly."
2030 #: builtin/apply.c:4039
2031 msgid "internal error"
2034 #. Say this even without --verbose
2035 #: builtin/apply.c:4042
2037 msgid "Applying patch %%s with %d reject..."
2038 msgid_plural "Applying patch %%s with %d rejects..."
2042 #: builtin/apply.c:4052
2044 msgid "truncating .rej filename to %.*s.rej"
2047 #: builtin/apply.c:4073
2049 msgid "Hunk #%d applied cleanly."
2052 #: builtin/apply.c:4076
2054 msgid "Rejected hunk #%d."
2057 #: builtin/apply.c:4226
2058 msgid "unrecognized input"
2061 #: builtin/apply.c:4237
2062 msgid "unable to read index file"
2065 #: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
2066 #: builtin/fetch.c:63
2070 #: builtin/apply.c:4357
2071 msgid "don't apply changes matching the given path"
2074 #: builtin/apply.c:4360
2075 msgid "apply changes matching the given path"
2078 #: builtin/apply.c:4362
2082 #: builtin/apply.c:4363
2083 msgid "remove <num> leading slashes from traditional diff paths"
2086 #: builtin/apply.c:4366
2087 msgid "ignore additions made by the patch"
2090 #: builtin/apply.c:4368
2091 msgid "instead of applying the patch, output diffstat for the input"
2094 #: builtin/apply.c:4372
2095 msgid "show number of added and deleted lines in decimal notation"
2098 #: builtin/apply.c:4374
2099 msgid "instead of applying the patch, output a summary for the input"
2102 #: builtin/apply.c:4376
2103 msgid "instead of applying the patch, see if the patch is applicable"
2106 #: builtin/apply.c:4378
2107 msgid "make sure the patch is applicable to the current index"
2110 #: builtin/apply.c:4380
2111 msgid "apply a patch without touching the working tree"
2114 #: builtin/apply.c:4382
2115 msgid "also apply the patch (use with --stat/--summary/--check)"
2118 #: builtin/apply.c:4384
2119 msgid "attempt three-way merge if a patch does not apply"
2122 #: builtin/apply.c:4386
2123 msgid "build a temporary index based on embedded index information"
2126 #: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
2127 msgid "paths are separated with NUL character"
2130 #: builtin/apply.c:4391
2131 msgid "ensure at least <n> lines of context match"
2134 #: builtin/apply.c:4392
2138 #: builtin/apply.c:4393
2139 msgid "detect new or modified lines that have whitespace errors"
2142 #: builtin/apply.c:4396 builtin/apply.c:4399
2143 msgid "ignore changes in whitespace when finding context"
2146 #: builtin/apply.c:4402
2147 msgid "apply the patch in reverse"
2150 #: builtin/apply.c:4404
2151 msgid "don't expect at least one line of context"
2154 #: builtin/apply.c:4406
2155 msgid "leave the rejected hunks in corresponding *.rej files"
2158 #: builtin/apply.c:4408
2159 msgid "allow overlapping hunks"
2162 #: builtin/apply.c:4411
2163 msgid "tolerate incorrectly detected missing new-line at the end of file"
2166 #: builtin/apply.c:4414
2167 msgid "do not trust the line counts in the hunk headers"
2170 #: builtin/apply.c:4416
2174 #: builtin/apply.c:4417
2175 msgid "prepend <root> to all filenames"
2178 #: builtin/apply.c:4439
2179 msgid "--3way outside a repository"
2182 #: builtin/apply.c:4447
2183 msgid "--index outside a repository"
2186 #: builtin/apply.c:4450
2187 msgid "--cached outside a repository"
2190 #: builtin/apply.c:4466
2192 msgid "can't open patch '%s'"
2195 #: builtin/apply.c:4480
2197 msgid "squelched %d whitespace error"
2198 msgid_plural "squelched %d whitespace errors"
2202 #: builtin/apply.c:4486 builtin/apply.c:4496
2204 msgid "%d line adds whitespace errors."
2205 msgid_plural "%d lines add whitespace errors."
2209 #: builtin/archive.c:17
2211 msgid "could not create archive file '%s'"
2214 #: builtin/archive.c:20
2215 msgid "could not redirect output"
2218 #: builtin/archive.c:37
2219 msgid "git archive: Remote with no URL"
2222 #: builtin/archive.c:58
2223 msgid "git archive: expected ACK/NAK, got EOF"
2226 #: builtin/archive.c:61
2228 msgid "git archive: NACK %s"
2231 #: builtin/archive.c:63
2233 msgid "remote error: %s"
2236 #: builtin/archive.c:64
2237 msgid "git archive: protocol error"
2240 #: builtin/archive.c:68
2241 msgid "git archive: expected a flush"
2244 #: builtin/bisect--helper.c:7
2245 msgid "git bisect--helper --next-all [--no-checkout]"
2248 #: builtin/bisect--helper.c:17
2249 msgid "perform 'git bisect next'"
2252 #: builtin/bisect--helper.c:19
2253 msgid "update BISECT_HEAD instead of checking out the current commit"
2256 #: builtin/blame.c:25
2257 msgid "git blame [options] [rev-opts] [rev] [--] file"
2260 #: builtin/blame.c:30
2261 msgid "[rev-opts] are documented in git-rev-list(1)"
2264 #: builtin/blame.c:2355
2265 msgid "Show blame entries as we find them, incrementally"
2268 #: builtin/blame.c:2356
2269 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2272 #: builtin/blame.c:2357
2273 msgid "Do not treat root commits as boundaries (Default: off)"
2276 #: builtin/blame.c:2358
2277 msgid "Show work cost statistics"
2280 #: builtin/blame.c:2359
2281 msgid "Show output score for blame entries"
2284 #: builtin/blame.c:2360
2285 msgid "Show original filename (Default: auto)"
2288 #: builtin/blame.c:2361
2289 msgid "Show original linenumber (Default: off)"
2292 #: builtin/blame.c:2362
2293 msgid "Show in a format designed for machine consumption"
2296 #: builtin/blame.c:2363
2297 msgid "Show porcelain format with per-line commit information"
2300 #: builtin/blame.c:2364
2301 msgid "Use the same output mode as git-annotate (Default: off)"
2304 #: builtin/blame.c:2365
2305 msgid "Show raw timestamp (Default: off)"
2308 #: builtin/blame.c:2366
2309 msgid "Show long commit SHA1 (Default: off)"
2312 #: builtin/blame.c:2367
2313 msgid "Suppress author name and timestamp (Default: off)"
2316 #: builtin/blame.c:2368
2317 msgid "Show author email instead of name (Default: off)"
2320 #: builtin/blame.c:2369
2321 msgid "Ignore whitespace differences"
2324 #: builtin/blame.c:2370
2325 msgid "Spend extra cycles to find better match"
2328 #: builtin/blame.c:2371
2329 msgid "Use revisions from <file> instead of calling git-rev-list"
2332 #: builtin/blame.c:2372
2333 msgid "Use <file>'s contents as the final image"
2336 #: builtin/blame.c:2373 builtin/blame.c:2374
2340 #: builtin/blame.c:2373
2341 msgid "Find line copies within and across files"
2344 #: builtin/blame.c:2374
2345 msgid "Find line movements within and across files"
2348 #: builtin/blame.c:2375
2352 #: builtin/blame.c:2375
2353 msgid "Process only line range n,m, counting from 1"
2356 #: builtin/branch.c:24
2357 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2360 #: builtin/branch.c:25
2361 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2364 #: builtin/branch.c:26
2365 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2368 #: builtin/branch.c:27
2369 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2372 #: builtin/branch.c:150
2375 "deleting branch '%s' that has been merged to\n"
2376 " '%s', but not yet merged to HEAD."
2379 #: builtin/branch.c:154
2382 "not deleting branch '%s' that is not yet merged to\n"
2383 " '%s', even though it is merged to HEAD."
2386 #: builtin/branch.c:168
2388 msgid "Couldn't look up commit object for '%s'"
2391 #: builtin/branch.c:172
2394 "The branch '%s' is not fully merged.\n"
2395 "If you are sure you want to delete it, run 'git branch -D %s'."
2398 #: builtin/branch.c:185
2399 msgid "Update of config-file failed"
2402 #: builtin/branch.c:213
2403 msgid "cannot use -a with -d"
2406 #: builtin/branch.c:219
2407 msgid "Couldn't look up commit object for HEAD"
2410 #: builtin/branch.c:227
2412 msgid "Cannot delete the branch '%s' which you are currently on."
2415 #: builtin/branch.c:240
2417 msgid "remote branch '%s' not found."
2420 #: builtin/branch.c:241
2422 msgid "branch '%s' not found."
2425 #: builtin/branch.c:255
2427 msgid "Error deleting remote branch '%s'"
2430 #: builtin/branch.c:256
2432 msgid "Error deleting branch '%s'"
2435 #: builtin/branch.c:263
2437 msgid "Deleted remote branch %s (was %s).\n"
2440 #: builtin/branch.c:264
2442 msgid "Deleted branch %s (was %s).\n"
2445 #: builtin/branch.c:366
2447 msgid "branch '%s' does not point at a commit"
2450 #: builtin/branch.c:453
2452 msgid "[%s: behind %d]"
2455 #: builtin/branch.c:455
2460 #: builtin/branch.c:459
2462 msgid "[%s: ahead %d]"
2465 #: builtin/branch.c:461
2470 #: builtin/branch.c:464
2472 msgid "[%s: ahead %d, behind %d]"
2475 #: builtin/branch.c:467
2477 msgid "[ahead %d, behind %d]"
2480 #: builtin/branch.c:490
2481 msgid " **** invalid ref ****"
2484 #: builtin/branch.c:582
2486 msgid "(no branch, rebasing %s)"
2489 #: builtin/branch.c:585
2491 msgid "(no branch, bisect started on %s)"
2494 #: builtin/branch.c:588
2496 msgid "(detached from %s)"
2499 #: builtin/branch.c:591
2503 #: builtin/branch.c:637
2505 msgid "object '%s' does not point to a commit"
2508 #: builtin/branch.c:669
2509 msgid "some refs could not be read"
2512 #: builtin/branch.c:682
2513 msgid "cannot rename the current branch while not on any."
2516 #: builtin/branch.c:692
2518 msgid "Invalid branch name: '%s'"
2521 #: builtin/branch.c:707
2522 msgid "Branch rename failed"
2525 #: builtin/branch.c:711
2527 msgid "Renamed a misnamed branch '%s' away"
2530 #: builtin/branch.c:715
2532 msgid "Branch renamed to %s, but HEAD is not updated!"
2535 #: builtin/branch.c:722
2536 msgid "Branch is renamed, but update of config-file failed"
2539 #: builtin/branch.c:737
2541 msgid "malformed object name %s"
2544 #: builtin/branch.c:761
2546 msgid "could not write branch description template: %s"
2549 #: builtin/branch.c:791
2550 msgid "Generic options"
2553 #: builtin/branch.c:793
2554 msgid "show hash and subject, give twice for upstream branch"
2557 #: builtin/branch.c:794
2558 msgid "suppress informational messages"
2561 #: builtin/branch.c:795
2562 msgid "set up tracking mode (see git-pull(1))"
2565 #: builtin/branch.c:797
2566 msgid "change upstream info"
2569 #: builtin/branch.c:801
2570 msgid "use colored output"
2573 #: builtin/branch.c:802
2574 msgid "act on remote-tracking branches"
2577 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2578 #: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
2579 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
2583 #: builtin/branch.c:806 builtin/branch.c:812
2584 msgid "print only branches that contain the commit"
2587 #: builtin/branch.c:818
2588 msgid "Specific git-branch actions:"
2591 #: builtin/branch.c:819
2592 msgid "list both remote-tracking and local branches"
2595 #: builtin/branch.c:821
2596 msgid "delete fully merged branch"
2599 #: builtin/branch.c:822
2600 msgid "delete branch (even if not merged)"
2603 #: builtin/branch.c:823
2604 msgid "move/rename a branch and its reflog"
2607 #: builtin/branch.c:824
2608 msgid "move/rename a branch, even if target exists"
2611 #: builtin/branch.c:825
2612 msgid "list branch names"
2615 #: builtin/branch.c:826
2616 msgid "create the branch's reflog"
2619 #: builtin/branch.c:828
2620 msgid "edit the description for the branch"
2623 #: builtin/branch.c:829
2624 msgid "force creation (when already exists)"
2627 #: builtin/branch.c:832
2628 msgid "print only not merged branches"
2631 #: builtin/branch.c:838
2632 msgid "print only merged branches"
2635 #: builtin/branch.c:842
2636 msgid "list branches in columns"
2639 #: builtin/branch.c:855
2640 msgid "Failed to resolve HEAD as a valid ref."
2643 #: builtin/branch.c:860 builtin/clone.c:619
2644 msgid "HEAD not found below refs/heads!"
2647 #: builtin/branch.c:883
2648 msgid "--column and --verbose are incompatible"
2651 #: builtin/branch.c:889 builtin/branch.c:928
2652 msgid "branch name required"
2655 #: builtin/branch.c:904
2656 msgid "Cannot give description to detached HEAD"
2659 #: builtin/branch.c:909
2660 msgid "cannot edit description of more than one branch"
2663 #: builtin/branch.c:916
2665 msgid "No commit on branch '%s' yet."
2668 #: builtin/branch.c:919
2670 msgid "No branch named '%s'."
2673 #: builtin/branch.c:934
2674 msgid "too many branches for a rename operation"
2677 #: builtin/branch.c:939
2678 msgid "too many branches to set new upstream"
2681 #: builtin/branch.c:943
2684 "could not set upstream of HEAD to %s when it does not point to any branch."
2687 #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
2689 msgid "no such branch '%s'"
2692 #: builtin/branch.c:950
2694 msgid "branch '%s' does not exist"
2697 #: builtin/branch.c:962
2698 msgid "too many branches to unset upstream"
2701 #: builtin/branch.c:966
2702 msgid "could not unset upstream of HEAD when it does not point to any branch."
2705 #: builtin/branch.c:972
2707 msgid "Branch '%s' has no upstream information"
2710 #: builtin/branch.c:987
2711 msgid "it does not make sense to create 'HEAD' manually"
2714 #: builtin/branch.c:993
2715 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2718 #: builtin/branch.c:996
2721 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2722 "track or --set-upstream-to\n"
2725 #: builtin/branch.c:1013
2729 "If you wanted to make '%s' track '%s', do this:\n"
2733 #: builtin/branch.c:1014
2735 msgid " git branch -d %s\n"
2738 #: builtin/branch.c:1015
2740 msgid " git branch --set-upstream-to %s\n"
2743 #: builtin/bundle.c:47
2745 msgid "%s is okay\n"
2748 #: builtin/bundle.c:56
2749 msgid "Need a repository to create a bundle."
2752 #: builtin/bundle.c:60
2753 msgid "Need a repository to unbundle."
2756 #: builtin/cat-file.c:176
2757 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2760 #: builtin/cat-file.c:177
2761 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2764 #: builtin/cat-file.c:195
2765 msgid "<type> can be one of: blob, tree, commit, tag"
2768 #: builtin/cat-file.c:196
2769 msgid "show object type"
2772 #: builtin/cat-file.c:197
2773 msgid "show object size"
2776 #: builtin/cat-file.c:199
2777 msgid "exit with zero when there's no error"
2780 #: builtin/cat-file.c:200
2781 msgid "pretty-print object's content"
2784 #: builtin/cat-file.c:202
2785 msgid "for blob objects, run textconv on object's content"
2788 #: builtin/cat-file.c:204
2789 msgid "show info and content of objects fed from the standard input"
2792 #: builtin/cat-file.c:207
2793 msgid "show info about objects fed from the standard input"
2796 #: builtin/check-attr.c:11
2797 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2800 #: builtin/check-attr.c:12
2801 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2804 #: builtin/check-attr.c:19
2805 msgid "report all attributes set on file"
2808 #: builtin/check-attr.c:20
2809 msgid "use .gitattributes only from the index"
2812 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2813 msgid "read file names from stdin"
2816 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2817 msgid "input paths are terminated by a null character"
2820 #: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177
2821 msgid "suppress progress reporting"
2824 #: builtin/check-ignore.c:146
2825 msgid "cannot specify pathnames with --stdin"
2828 #: builtin/check-ignore.c:149
2829 msgid "-z only makes sense with --stdin"
2832 #: builtin/check-ignore.c:151
2833 msgid "no path specified"
2836 #: builtin/check-ignore.c:155
2837 msgid "--quiet is only valid with a single pathname"
2840 #: builtin/check-ignore.c:157
2841 msgid "cannot have both --quiet and --verbose"
2844 #: builtin/checkout-index.c:126
2845 msgid "git checkout-index [options] [--] [<file>...]"
2848 #: builtin/checkout-index.c:187
2849 msgid "check out all files in the index"
2852 #: builtin/checkout-index.c:188
2853 msgid "force overwrite of existing files"
2856 #: builtin/checkout-index.c:190
2857 msgid "no warning for existing files and files not in index"
2860 #: builtin/checkout-index.c:192
2861 msgid "don't checkout new files"
2864 #: builtin/checkout-index.c:194
2865 msgid "update stat information in the index file"
2868 #: builtin/checkout-index.c:200
2869 msgid "read list of paths from the standard input"
2872 #: builtin/checkout-index.c:202
2873 msgid "write the content to temporary files"
2876 #: builtin/checkout-index.c:203 builtin/column.c:30
2880 #: builtin/checkout-index.c:204
2881 msgid "when creating files, prepend <string>"
2884 #: builtin/checkout-index.c:207
2885 msgid "copy out the files from named stage"
2888 #: builtin/checkout.c:25
2889 msgid "git checkout [options] <branch>"
2892 #: builtin/checkout.c:26
2893 msgid "git checkout [options] [<branch>] -- <file>..."
2896 #: builtin/checkout.c:117 builtin/checkout.c:150
2898 msgid "path '%s' does not have our version"
2901 #: builtin/checkout.c:119 builtin/checkout.c:152
2903 msgid "path '%s' does not have their version"
2906 #: builtin/checkout.c:135
2908 msgid "path '%s' does not have all necessary versions"
2911 #: builtin/checkout.c:179
2913 msgid "path '%s' does not have necessary versions"
2916 #: builtin/checkout.c:196
2918 msgid "path '%s': cannot merge"
2921 #: builtin/checkout.c:213
2923 msgid "Unable to add merge result for '%s'"
2926 #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
2927 #: builtin/checkout.c:246
2929 msgid "'%s' cannot be used with updating paths"
2932 #: builtin/checkout.c:249 builtin/checkout.c:252
2934 msgid "'%s' cannot be used with %s"
2937 #: builtin/checkout.c:255
2939 msgid "Cannot update paths and switch to branch '%s' at the same time."
2942 #: builtin/checkout.c:266 builtin/checkout.c:458
2943 msgid "corrupt index file"
2946 #: builtin/checkout.c:329 builtin/checkout.c:336
2948 msgid "path '%s' is unmerged"
2951 #: builtin/checkout.c:480
2952 msgid "you need to resolve your current index first"
2955 #: builtin/checkout.c:601
2957 msgid "Can not do reflog for '%s'\n"
2960 #: builtin/checkout.c:634
2961 msgid "HEAD is now at"
2964 #: builtin/checkout.c:641
2966 msgid "Reset branch '%s'\n"
2969 #: builtin/checkout.c:644
2971 msgid "Already on '%s'\n"
2974 #: builtin/checkout.c:648
2976 msgid "Switched to and reset branch '%s'\n"
2979 #: builtin/checkout.c:650 builtin/checkout.c:987
2981 msgid "Switched to a new branch '%s'\n"
2984 #: builtin/checkout.c:652
2986 msgid "Switched to branch '%s'\n"
2989 #: builtin/checkout.c:708
2991 msgid " ... and %d more.\n"
2994 #. The singular version
2995 #: builtin/checkout.c:714
2998 "Warning: you are leaving %d commit behind, not connected to\n"
2999 "any of your branches:\n"
3003 "Warning: you are leaving %d commits behind, not connected to\n"
3004 "any of your branches:\n"
3010 #: builtin/checkout.c:732
3013 "If you want to keep them by creating a new branch, this may be a good time\n"
3016 " git branch new_branch_name %s\n"
3020 #: builtin/checkout.c:762
3021 msgid "internal error in revision walk"
3024 #: builtin/checkout.c:766
3025 msgid "Previous HEAD position was"
3028 #: builtin/checkout.c:793 builtin/checkout.c:982
3029 msgid "You are on a branch yet to be born"
3033 #: builtin/checkout.c:918
3035 msgid "invalid reference: %s"
3038 #. case (1): want a tree
3039 #: builtin/checkout.c:957
3041 msgid "reference is not a tree: %s"
3044 #: builtin/checkout.c:996
3045 msgid "paths cannot be used with switching branches"
3048 #: builtin/checkout.c:999 builtin/checkout.c:1003
3050 msgid "'%s' cannot be used with switching branches"
3053 #: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015
3054 #: builtin/checkout.c:1018
3056 msgid "'%s' cannot be used with '%s'"
3059 #: builtin/checkout.c:1023
3061 msgid "Cannot switch branch to a non-commit '%s'"
3064 #: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90
3065 #: builtin/remote.c:169 builtin/remote.c:171
3069 #: builtin/checkout.c:1046
3070 msgid "create and checkout a new branch"
3073 #: builtin/checkout.c:1048
3074 msgid "create/reset and checkout a branch"
3077 #: builtin/checkout.c:1049
3078 msgid "create reflog for new branch"
3081 #: builtin/checkout.c:1050
3082 msgid "detach the HEAD at named commit"
3085 #: builtin/checkout.c:1051
3086 msgid "set upstream info for new branch"
3089 #: builtin/checkout.c:1053
3093 #: builtin/checkout.c:1053
3094 msgid "new unparented branch"
3097 #: builtin/checkout.c:1054
3098 msgid "checkout our version for unmerged files"
3101 #: builtin/checkout.c:1056
3102 msgid "checkout their version for unmerged files"
3105 #: builtin/checkout.c:1058
3106 msgid "force checkout (throw away local modifications)"
3109 #: builtin/checkout.c:1059
3110 msgid "perform a 3-way merge with the new branch"
3113 #: builtin/checkout.c:1060 builtin/merge.c:217
3114 msgid "update ignored files (default)"
3117 #: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245
3121 #: builtin/checkout.c:1062
3122 msgid "conflict style (merge or diff3)"
3125 #: builtin/checkout.c:1065
3126 msgid "do not limit pathspecs to sparse entries only"
3129 #: builtin/checkout.c:1067
3130 msgid "second guess 'git checkout no-such-branch'"
3133 #: builtin/checkout.c:1091
3134 msgid "-b, -B and --orphan are mutually exclusive"
3137 #: builtin/checkout.c:1108
3138 msgid "--track needs a branch name"
3141 #: builtin/checkout.c:1115
3142 msgid "Missing branch name; try -b"
3145 #: builtin/checkout.c:1150
3146 msgid "invalid path specification"
3149 #: builtin/checkout.c:1157
3152 "Cannot update paths and switch to branch '%s' at the same time.\n"
3153 "Did you intend to checkout '%s' which can not be resolved as commit?"
3156 #: builtin/checkout.c:1162
3158 msgid "git checkout: --detach does not take a path argument '%s'"
3161 #: builtin/checkout.c:1166
3163 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3164 "checking out of the index."
3167 #: builtin/clean.c:20
3168 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3171 #: builtin/clean.c:24
3173 msgid "Removing %s\n"
3176 #: builtin/clean.c:25
3178 msgid "Would remove %s\n"
3181 #: builtin/clean.c:26
3183 msgid "Skipping repository %s\n"
3186 #: builtin/clean.c:27
3188 msgid "Would skip repository %s\n"
3191 #: builtin/clean.c:28
3193 msgid "failed to remove %s"
3196 #: builtin/clean.c:160
3197 msgid "do not print names of files removed"
3200 #: builtin/clean.c:162
3204 #: builtin/clean.c:164
3205 msgid "remove whole directories"
3208 #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
3209 #: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182
3213 #: builtin/clean.c:166
3214 msgid "add <pattern> to ignore rules"
3217 #: builtin/clean.c:167
3218 msgid "remove ignored files, too"
3221 #: builtin/clean.c:169
3222 msgid "remove only ignored files"
3225 #: builtin/clean.c:187
3226 msgid "-x and -X cannot be used together"
3229 #: builtin/clean.c:191
3231 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3234 #: builtin/clean.c:194
3236 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3240 #: builtin/clone.c:37
3241 msgid "git clone [options] [--] <repo> [<dir>]"
3244 #: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
3245 #: builtin/push.c:436
3246 msgid "force progress reporting"
3249 #: builtin/clone.c:67
3250 msgid "don't create a checkout"
3253 #: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3254 msgid "create a bare repository"
3257 #: builtin/clone.c:73
3258 msgid "create a mirror repository (implies bare)"
3261 #: builtin/clone.c:75
3262 msgid "to clone from a local repository"
3265 #: builtin/clone.c:77
3266 msgid "don't use local hardlinks, always copy"
3269 #: builtin/clone.c:79
3270 msgid "setup as shared repository"
3273 #: builtin/clone.c:81 builtin/clone.c:83
3274 msgid "initialize submodules in the clone"
3277 #: builtin/clone.c:84 builtin/init-db.c:485
3278 msgid "template-directory"
3281 #: builtin/clone.c:85 builtin/init-db.c:486
3282 msgid "directory from which templates will be used"
3285 #: builtin/clone.c:87
3286 msgid "reference repository"
3289 #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3293 #: builtin/clone.c:89
3294 msgid "use <name> instead of 'origin' to track upstream"
3297 #: builtin/clone.c:91
3298 msgid "checkout <branch> instead of the remote's HEAD"
3301 #: builtin/clone.c:93
3302 msgid "path to git-upload-pack on the remote"
3305 #: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
3309 #: builtin/clone.c:95
3310 msgid "create a shallow clone of that depth"
3313 #: builtin/clone.c:97
3314 msgid "clone only one branch, HEAD or --branch"
3317 #: builtin/clone.c:98 builtin/init-db.c:494
3321 #: builtin/clone.c:99 builtin/init-db.c:495
3322 msgid "separate git dir from working tree"
3325 #: builtin/clone.c:100
3329 #: builtin/clone.c:101
3330 msgid "set config inside the new repository"
3333 #: builtin/clone.c:254
3335 msgid "reference repository '%s' is not a local repository."
3338 #: builtin/clone.c:317
3340 msgid "failed to create directory '%s'"
3343 #: builtin/clone.c:319 builtin/diff.c:77
3345 msgid "failed to stat '%s'"
3348 #: builtin/clone.c:321
3350 msgid "%s exists and is not a directory"
3353 #: builtin/clone.c:335
3355 msgid "failed to stat %s\n"
3358 #: builtin/clone.c:357
3360 msgid "failed to create link '%s'"
3363 #: builtin/clone.c:361
3365 msgid "failed to copy file to '%s'"
3368 #: builtin/clone.c:384
3373 #: builtin/clone.c:397
3375 "Clone succeeded, but checkout failed.\n"
3376 "You can inspect what was checked out with 'git status'\n"
3377 "and retry the checkout with 'git checkout -f HEAD'\n"
3380 #: builtin/clone.c:476
3382 msgid "Could not find remote branch %s to clone."
3385 #: builtin/clone.c:550
3386 msgid "remote did not send all necessary objects"
3389 #: builtin/clone.c:610
3390 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3393 #: builtin/clone.c:641
3394 msgid "unable to checkout working tree"
3397 #: builtin/clone.c:749
3398 msgid "Too many arguments."
3401 #: builtin/clone.c:753
3402 msgid "You must specify a repository to clone."
3405 #: builtin/clone.c:764
3407 msgid "--bare and --origin %s options are incompatible."
3410 #: builtin/clone.c:767
3411 msgid "--bare and --separate-git-dir are incompatible."
3414 #: builtin/clone.c:780
3416 msgid "repository '%s' does not exist"
3419 #: builtin/clone.c:785
3420 msgid "--depth is ignored in local clones; use file:// instead."
3423 #: builtin/clone.c:795
3425 msgid "destination path '%s' already exists and is not an empty directory."
3428 #: builtin/clone.c:805
3430 msgid "working tree '%s' already exists."
3433 #: builtin/clone.c:818 builtin/clone.c:830
3435 msgid "could not create leading directories of '%s'"
3438 #: builtin/clone.c:821
3440 msgid "could not create work tree dir '%s'."
3443 #: builtin/clone.c:840
3445 msgid "Cloning into bare repository '%s'...\n"
3448 #: builtin/clone.c:842
3450 msgid "Cloning into '%s'...\n"
3453 #: builtin/clone.c:877
3455 msgid "Don't know how to clone %s"
3458 #: builtin/clone.c:926
3460 msgid "Remote branch %s not found in upstream %s"
3463 #: builtin/clone.c:933
3464 msgid "You appear to have cloned an empty repository."
3467 #: builtin/column.c:9
3468 msgid "git column [options]"
3471 #: builtin/column.c:26
3472 msgid "lookup config vars"
3475 #: builtin/column.c:27 builtin/column.c:28
3476 msgid "layout to use"
3479 #: builtin/column.c:29
3480 msgid "Maximum width"
3483 #: builtin/column.c:30
3484 msgid "Padding space on left border"
3487 #: builtin/column.c:31
3488 msgid "Padding space on right border"
3491 #: builtin/column.c:32
3492 msgid "Padding space between columns"
3495 #: builtin/column.c:51
3496 msgid "--command must be the first argument"
3499 #: builtin/commit.c:34
3500 msgid "git commit [options] [--] <pathspec>..."
3503 #: builtin/commit.c:39
3504 msgid "git status [options] [--] <pathspec>..."
3507 #: builtin/commit.c:44
3509 "Your name and email address were configured automatically based\n"
3510 "on your username and hostname. Please check that they are accurate.\n"
3511 "You can suppress this message by setting them explicitly:\n"
3513 " git config --global user.name \"Your Name\"\n"
3514 " git config --global user.email you@example.com\n"
3516 "After doing this, you may fix the identity used for this commit with:\n"
3518 " git commit --amend --reset-author\n"
3521 #: builtin/commit.c:56
3523 "You asked to amend the most recent commit, but doing so would make\n"
3524 "it empty. You can repeat your command with --allow-empty, or you can\n"
3525 "remove the commit entirely with \"git reset HEAD^\".\n"
3528 #: builtin/commit.c:61
3530 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3531 "If you wish to commit it anyway, use:\n"
3533 " git commit --allow-empty\n"
3535 "Otherwise, please use 'git reset'\n"
3538 #: builtin/commit.c:260
3539 msgid "failed to unpack HEAD tree object"
3542 #: builtin/commit.c:302
3543 msgid "unable to create temporary index"
3546 #: builtin/commit.c:308
3547 msgid "interactive add failed"
3550 #: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
3551 msgid "unable to write new_index file"
3554 #: builtin/commit.c:393
3555 msgid "cannot do a partial commit during a merge."
3558 #: builtin/commit.c:395
3559 msgid "cannot do a partial commit during a cherry-pick."
3562 #: builtin/commit.c:405
3563 msgid "cannot read the index"
3566 #: builtin/commit.c:425
3567 msgid "unable to write temporary index file"
3570 #: builtin/commit.c:513 builtin/commit.c:519
3572 msgid "invalid commit: %s"
3575 #: builtin/commit.c:542
3576 msgid "malformed --author parameter"
3579 #: builtin/commit.c:562
3581 msgid "Malformed ident string: '%s'"
3584 #: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
3586 msgid "could not lookup commit %s"
3589 #: builtin/commit.c:612 builtin/shortlog.c:270
3591 msgid "(reading log message from standard input)\n"
3594 #: builtin/commit.c:614
3595 msgid "could not read log from standard input"
3598 #: builtin/commit.c:618
3600 msgid "could not read log file '%s'"
3603 #: builtin/commit.c:624
3604 msgid "commit has empty message"
3607 #: builtin/commit.c:640
3608 msgid "could not read MERGE_MSG"
3611 #: builtin/commit.c:644
3612 msgid "could not read SQUASH_MSG"
3615 #: builtin/commit.c:648
3617 msgid "could not read '%s'"
3620 #: builtin/commit.c:709
3621 msgid "could not write commit template"
3624 #: builtin/commit.c:720
3628 "It looks like you may be committing a merge.\n"
3629 "If this is not correct, please remove the file\n"
3634 #: builtin/commit.c:725
3638 "It looks like you may be committing a cherry-pick.\n"
3639 "If this is not correct, please remove the file\n"
3644 #: builtin/commit.c:737
3647 "Please enter the commit message for your changes. Lines starting\n"
3648 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3651 #: builtin/commit.c:742
3654 "Please enter the commit message for your changes. Lines starting\n"
3655 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3656 "An empty message aborts the commit.\n"
3659 #: builtin/commit.c:755
3661 msgid "%sAuthor: %s"
3664 #: builtin/commit.c:762
3666 msgid "%sCommitter: %s"
3669 #: builtin/commit.c:782
3670 msgid "Cannot read index"
3673 #: builtin/commit.c:819
3674 msgid "Error building trees"
3677 #: builtin/commit.c:834 builtin/tag.c:359
3679 msgid "Please supply the message using either -m or -F option.\n"
3682 #: builtin/commit.c:931
3684 msgid "No existing author found with '%s'"
3687 #: builtin/commit.c:946 builtin/commit.c:1140
3689 msgid "Invalid untracked files mode '%s'"
3692 #: builtin/commit.c:976
3693 msgid "Using both --reset-author and --author does not make sense"
3696 #: builtin/commit.c:987
3697 msgid "You have nothing to amend."
3700 #: builtin/commit.c:990
3701 msgid "You are in the middle of a merge -- cannot amend."
3704 #: builtin/commit.c:992
3705 msgid "You are in the middle of a cherry-pick -- cannot amend."
3708 #: builtin/commit.c:995
3709 msgid "Options --squash and --fixup cannot be used together"
3712 #: builtin/commit.c:1005
3713 msgid "Only one of -c/-C/-F/--fixup can be used."
3716 #: builtin/commit.c:1007
3717 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3720 #: builtin/commit.c:1015
3721 msgid "--reset-author can be used only with -C, -c or --amend."
3724 #: builtin/commit.c:1032
3725 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3728 #: builtin/commit.c:1034
3729 msgid "No paths with --include/--only does not make sense."
3732 #: builtin/commit.c:1036
3733 msgid "Clever... amending the last one with dirty index."
3736 #: builtin/commit.c:1038
3737 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3740 #: builtin/commit.c:1048 builtin/tag.c:575
3742 msgid "Invalid cleanup mode %s"
3745 #: builtin/commit.c:1053
3746 msgid "Paths with -a does not make sense."
3749 #: builtin/commit.c:1059 builtin/commit.c:1194
3750 msgid "--long and -z are incompatible"
3753 #: builtin/commit.c:1154 builtin/commit.c:1390
3754 msgid "show status concisely"
3757 #: builtin/commit.c:1156 builtin/commit.c:1392
3758 msgid "show branch information"
3761 #: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
3762 msgid "machine-readable output"
3765 #: builtin/commit.c:1161 builtin/commit.c:1396
3766 msgid "show status in long format (default)"
3769 #: builtin/commit.c:1164 builtin/commit.c:1399
3770 msgid "terminate entries with NUL"
3773 #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659
3774 #: builtin/fast-export.c:662 builtin/tag.c:459
3778 #: builtin/commit.c:1167 builtin/commit.c:1402
3779 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3782 #: builtin/commit.c:1170
3783 msgid "show ignored files"
3786 #: builtin/commit.c:1171 parse-options.h:151
3790 #: builtin/commit.c:1172
3792 "ignore changes to submodules, optional when: all, dirty, untracked. "
3796 #: builtin/commit.c:1174
3797 msgid "list untracked files in columns"
3800 #: builtin/commit.c:1248
3801 msgid "couldn't look up newly created commit"
3804 #: builtin/commit.c:1250
3805 msgid "could not parse newly created commit"
3808 #: builtin/commit.c:1291
3809 msgid "detached HEAD"
3812 #: builtin/commit.c:1293
3813 msgid " (root-commit)"
3816 #: builtin/commit.c:1360
3817 msgid "suppress summary after successful commit"
3820 #: builtin/commit.c:1361
3821 msgid "show diff in commit message template"
3824 #: builtin/commit.c:1363
3825 msgid "Commit message options"
3828 #: builtin/commit.c:1364 builtin/tag.c:457
3829 msgid "read message from file"
3832 #: builtin/commit.c:1365
3836 #: builtin/commit.c:1365
3837 msgid "override author for commit"
3840 #: builtin/commit.c:1366 builtin/gc.c:178
3844 #: builtin/commit.c:1366
3845 msgid "override date for commit"
3848 #: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
3849 #: builtin/notes.c:690 builtin/tag.c:455
3853 #: builtin/commit.c:1367
3854 msgid "commit message"
3857 #: builtin/commit.c:1368
3858 msgid "reuse and edit message from specified commit"
3861 #: builtin/commit.c:1369
3862 msgid "reuse message from specified commit"
3865 #: builtin/commit.c:1370
3866 msgid "use autosquash formatted message to fixup specified commit"
3869 #: builtin/commit.c:1371
3870 msgid "use autosquash formatted message to squash specified commit"
3873 #: builtin/commit.c:1372
3874 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3877 #: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109
3878 msgid "add Signed-off-by:"
3881 #: builtin/commit.c:1374
3882 msgid "use specified template file"
3885 #: builtin/commit.c:1375
3886 msgid "force edit of commit"
3889 #: builtin/commit.c:1376
3893 #: builtin/commit.c:1376 builtin/tag.c:460
3894 msgid "how to strip spaces and #comments from message"
3897 #: builtin/commit.c:1377
3898 msgid "include status in commit message template"
3901 #: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
3905 #: builtin/commit.c:1379 builtin/merge.c:216
3906 msgid "GPG sign commit"
3909 #. end commit message options
3910 #: builtin/commit.c:1382
3911 msgid "Commit contents options"
3914 #: builtin/commit.c:1383
3915 msgid "commit all changed files"
3918 #: builtin/commit.c:1384
3919 msgid "add specified files to index for commit"
3922 #: builtin/commit.c:1385
3923 msgid "interactively add files"
3926 #: builtin/commit.c:1386
3927 msgid "interactively add changes"
3930 #: builtin/commit.c:1387
3931 msgid "commit only specified files"
3934 #: builtin/commit.c:1388
3935 msgid "bypass pre-commit hook"
3938 #: builtin/commit.c:1389
3939 msgid "show what would be committed"
3942 #: builtin/commit.c:1400
3943 msgid "amend previous commit"
3946 #: builtin/commit.c:1401
3947 msgid "bypass post-rewrite hook"
3950 #: builtin/commit.c:1406
3951 msgid "ok to record an empty change"
3954 #: builtin/commit.c:1409
3955 msgid "ok to record a change with an empty message"
3958 #: builtin/commit.c:1441
3959 msgid "could not parse HEAD commit"
3962 #: builtin/commit.c:1479 builtin/merge.c:510
3964 msgid "could not open '%s' for reading"
3967 #: builtin/commit.c:1486
3969 msgid "Corrupt MERGE_HEAD file (%s)"
3972 #: builtin/commit.c:1493
3973 msgid "could not read MERGE_MODE"
3976 #: builtin/commit.c:1512
3978 msgid "could not read commit message: %s"
3981 #: builtin/commit.c:1526
3983 msgid "Aborting commit; you did not edit the message.\n"
3986 #: builtin/commit.c:1531
3988 msgid "Aborting commit due to empty commit message.\n"
3991 #: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
3992 msgid "failed to write commit object"
3995 #: builtin/commit.c:1567
3996 msgid "cannot lock HEAD ref"
3999 #: builtin/commit.c:1571
4000 msgid "cannot update HEAD ref"
4003 #: builtin/commit.c:1582
4005 "Repository has been updated, but unable to write\n"
4006 "new_index file. Check that disk is not full or quota is\n"
4007 "not exceeded, and then \"git reset HEAD\" to recover."
4010 #: builtin/config.c:7
4011 msgid "git config [options]"
4014 #: builtin/config.c:51
4015 msgid "Config file location"
4018 #: builtin/config.c:52
4019 msgid "use global config file"
4022 #: builtin/config.c:53
4023 msgid "use system config file"
4026 #: builtin/config.c:54
4027 msgid "use repository config file"
4030 #: builtin/config.c:55
4031 msgid "use given config file"
4034 #: builtin/config.c:56
4038 #: builtin/config.c:57
4039 msgid "get value: name [value-regex]"
4042 #: builtin/config.c:58
4043 msgid "get all values: key [value-regex]"
4046 #: builtin/config.c:59
4047 msgid "get values for regexp: name-regex [value-regex]"
4050 #: builtin/config.c:60
4051 msgid "replace all matching variables: name value [value_regex]"
4054 #: builtin/config.c:61
4055 msgid "add a new variable: name value"
4058 #: builtin/config.c:62
4059 msgid "remove a variable: name [value-regex]"
4062 #: builtin/config.c:63
4063 msgid "remove all matches: name [value-regex]"
4066 #: builtin/config.c:64
4067 msgid "rename section: old-name new-name"
4070 #: builtin/config.c:65
4071 msgid "remove a section: name"
4074 #: builtin/config.c:66
4078 #: builtin/config.c:67
4079 msgid "open an editor"
4082 #: builtin/config.c:68 builtin/config.c:69
4086 #: builtin/config.c:68
4087 msgid "find the color configured: [default]"
4090 #: builtin/config.c:69
4091 msgid "find the color setting: [stdout-is-tty]"
4094 #: builtin/config.c:70
4098 #: builtin/config.c:71
4099 msgid "value is \"true\" or \"false\""
4102 #: builtin/config.c:72
4103 msgid "value is decimal number"
4106 #: builtin/config.c:73
4107 msgid "value is --bool or --int"
4110 #: builtin/config.c:74
4111 msgid "value is a path (file or directory name)"
4114 #: builtin/config.c:75
4118 #: builtin/config.c:76
4119 msgid "terminate values with NUL byte"
4122 #: builtin/config.c:77
4123 msgid "respect include directives on lookup"
4126 #: builtin/count-objects.c:82
4127 msgid "git count-objects [-v] [-H | --human-readable]"
4130 #: builtin/count-objects.c:97
4131 msgid "print sizes in human readable format"
4134 #: builtin/describe.c:15
4135 msgid "git describe [options] <committish>*"
4138 #: builtin/describe.c:16
4139 msgid "git describe [options] --dirty"
4142 #: builtin/describe.c:233
4144 msgid "annotated tag %s not available"
4147 #: builtin/describe.c:237
4149 msgid "annotated tag %s has no embedded name"
4152 #: builtin/describe.c:239
4154 msgid "tag '%s' is really '%s' here"
4157 #: builtin/describe.c:266
4159 msgid "Not a valid object name %s"
4162 #: builtin/describe.c:269
4164 msgid "%s is not a valid '%s' object"
4167 #: builtin/describe.c:286
4169 msgid "no tag exactly matches '%s'"
4172 #: builtin/describe.c:288
4174 msgid "searching to describe %s\n"
4177 #: builtin/describe.c:328
4179 msgid "finished search at %s\n"
4182 #: builtin/describe.c:352
4185 "No annotated tags can describe '%s'.\n"
4186 "However, there were unannotated tags: try --tags."
4189 #: builtin/describe.c:356
4192 "No tags can describe '%s'.\n"
4193 "Try --always, or create some tags."
4196 #: builtin/describe.c:377
4198 msgid "traversed %lu commits\n"
4201 #: builtin/describe.c:380
4204 "more than %i tags found; listed %i most recent\n"
4205 "gave up search at %s\n"
4208 #: builtin/describe.c:402
4209 msgid "find the tag that comes after the commit"
4212 #: builtin/describe.c:403
4213 msgid "debug search strategy on stderr"
4216 #: builtin/describe.c:404
4220 #: builtin/describe.c:405
4221 msgid "use any tag, even unannotated"
4224 #: builtin/describe.c:406
4225 msgid "always use long format"
4228 #: builtin/describe.c:409
4229 msgid "only output exact matches"
4232 #: builtin/describe.c:411
4233 msgid "consider <n> most recent tags (default: 10)"
4236 #: builtin/describe.c:413
4237 msgid "only consider tags matching <pattern>"
4240 #: builtin/describe.c:415 builtin/name-rev.c:238
4241 msgid "show abbreviated commit object as fallback"
4244 #: builtin/describe.c:416
4248 #: builtin/describe.c:417
4249 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4252 #: builtin/describe.c:435
4253 msgid "--long is incompatible with --abbrev=0"
4256 #: builtin/describe.c:461
4257 msgid "No names found, cannot describe anything."
4260 #: builtin/describe.c:481
4261 msgid "--dirty is incompatible with committishes"
4264 #: builtin/diff.c:79
4266 msgid "'%s': not a regular file or symlink"
4269 #: builtin/diff.c:228
4271 msgid "invalid option: %s"
4274 #: builtin/diff.c:305
4275 msgid "Not a git repository"
4278 #: builtin/diff.c:348
4280 msgid "invalid object '%s' given."
4283 #: builtin/diff.c:353
4285 msgid "more than %d trees given: '%s'"
4288 #: builtin/diff.c:363
4290 msgid "more than two blobs given: '%s'"
4293 #: builtin/diff.c:371
4295 msgid "unhandled object '%s' given."
4298 #: builtin/fast-export.c:22
4299 msgid "git fast-export [rev-list-opts]"
4302 #: builtin/fast-export.c:658
4303 msgid "show progress after <n> objects"
4306 #: builtin/fast-export.c:660
4307 msgid "select handling of signed tags"
4310 #: builtin/fast-export.c:663
4311 msgid "select handling of tags that tag filtered objects"
4314 #: builtin/fast-export.c:666
4315 msgid "Dump marks to this file"
4318 #: builtin/fast-export.c:668
4319 msgid "Import marks from this file"
4322 #: builtin/fast-export.c:670
4323 msgid "Fake a tagger when tags lack one"
4326 #: builtin/fast-export.c:672
4327 msgid "Output full tree for each commit"
4330 #: builtin/fast-export.c:674
4331 msgid "Use the done feature to terminate the stream"
4334 #: builtin/fast-export.c:675
4335 msgid "Skip output of blob data"
4338 #: builtin/fetch.c:20
4339 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4342 #: builtin/fetch.c:21
4343 msgid "git fetch [<options>] <group>"
4346 #: builtin/fetch.c:22
4347 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4350 #: builtin/fetch.c:23
4351 msgid "git fetch --all [<options>]"
4354 #: builtin/fetch.c:60
4355 msgid "fetch from all remotes"
4358 #: builtin/fetch.c:62
4359 msgid "append to .git/FETCH_HEAD instead of overwriting"
4362 #: builtin/fetch.c:64
4363 msgid "path to upload pack on remote end"
4366 #: builtin/fetch.c:65
4367 msgid "force overwrite of local branch"
4370 #: builtin/fetch.c:67
4371 msgid "fetch from multiple remotes"
4374 #: builtin/fetch.c:69
4375 msgid "fetch all tags and associated objects"
4378 #: builtin/fetch.c:71
4379 msgid "do not fetch all tags (--no-tags)"
4382 #: builtin/fetch.c:73
4383 msgid "prune remote-tracking branches no longer on remote"
4386 #: builtin/fetch.c:74
4390 #: builtin/fetch.c:75
4391 msgid "control recursive fetching of submodules"
4394 #: builtin/fetch.c:79
4395 msgid "keep downloaded pack"
4398 #: builtin/fetch.c:81
4399 msgid "allow updating of HEAD ref"
4402 #: builtin/fetch.c:84
4403 msgid "deepen history of shallow clone"
4406 #: builtin/fetch.c:86
4407 msgid "convert to a complete repository"
4410 #: builtin/fetch.c:88 builtin/log.c:1130
4414 #: builtin/fetch.c:89
4415 msgid "prepend this to submodule path output"
4418 #: builtin/fetch.c:92
4419 msgid "default mode for recursion"
4422 #: builtin/fetch.c:204
4423 msgid "Couldn't find remote ref HEAD"
4426 #: builtin/fetch.c:257
4428 msgid "object %s not found"
4431 #: builtin/fetch.c:262
4432 msgid "[up to date]"
4435 #: builtin/fetch.c:276
4437 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4440 #: builtin/fetch.c:277 builtin/fetch.c:363
4444 #: builtin/fetch.c:288
4445 msgid "[tag update]"
4448 #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4449 msgid " (unable to update local ref)"
4452 #: builtin/fetch.c:308
4456 #: builtin/fetch.c:311
4457 msgid "[new branch]"
4460 #: builtin/fetch.c:314
4464 #: builtin/fetch.c:359
4465 msgid "unable to update local ref"
4468 #: builtin/fetch.c:359
4469 msgid "forced update"
4472 #: builtin/fetch.c:365
4473 msgid "(non-fast-forward)"
4476 #: builtin/fetch.c:396 builtin/fetch.c:688
4478 msgid "cannot open %s: %s\n"
4481 #: builtin/fetch.c:405
4483 msgid "%s did not send all necessary objects\n"
4486 #: builtin/fetch.c:491
4491 #: builtin/fetch.c:502
4494 "some local refs could not be updated; try running\n"
4495 " 'git remote prune %s' to remove any old, conflicting branches"
4498 #: builtin/fetch.c:552
4500 msgid " (%s will become dangling)"
4503 #: builtin/fetch.c:553
4505 msgid " (%s has become dangling)"
4508 #: builtin/fetch.c:560
4512 #: builtin/fetch.c:561 builtin/remote.c:1055
4516 #: builtin/fetch.c:678
4518 msgid "Refusing to fetch into current branch %s of non-bare repository"
4521 #: builtin/fetch.c:712
4523 msgid "Don't know how to fetch from %s"
4526 #: builtin/fetch.c:789
4528 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4531 #: builtin/fetch.c:792
4533 msgid "Option \"%s\" is ignored for %s\n"
4536 #: builtin/fetch.c:894
4538 msgid "Fetching %s\n"
4541 #: builtin/fetch.c:896 builtin/remote.c:100
4543 msgid "Could not fetch %s"
4546 #: builtin/fetch.c:915
4548 "No remote repository specified. Please, specify either a URL or a\n"
4549 "remote name from which new revisions should be fetched."
4552 #: builtin/fetch.c:935
4553 msgid "You need to specify a tag name."
4556 #: builtin/fetch.c:981
4557 msgid "--depth and --unshallow cannot be used together"
4560 #: builtin/fetch.c:983
4561 msgid "--unshallow on a complete repository does not make sense"
4564 #: builtin/fetch.c:1002
4565 msgid "fetch --all does not take a repository argument"
4568 #: builtin/fetch.c:1004
4569 msgid "fetch --all does not make sense with refspecs"
4572 #: builtin/fetch.c:1015
4574 msgid "No such remote or remote group: %s"
4577 #: builtin/fetch.c:1023
4578 msgid "Fetching a group and specifying refspecs does not make sense"
4581 #: builtin/fmt-merge-msg.c:13
4582 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4585 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701
4586 #: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175
4587 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4591 #: builtin/fmt-merge-msg.c:664
4592 msgid "populate log with at most <n> entries from shortlog"
4595 #: builtin/fmt-merge-msg.c:667
4596 msgid "alias for --log (deprecated)"
4599 #: builtin/fmt-merge-msg.c:670
4603 #: builtin/fmt-merge-msg.c:671
4604 msgid "use <text> as start of message"
4607 #: builtin/fmt-merge-msg.c:672
4608 msgid "file to read from"
4611 #: builtin/for-each-ref.c:979
4612 msgid "git for-each-ref [options] [<pattern>]"
4615 #: builtin/for-each-ref.c:994
4616 msgid "quote placeholders suitably for shells"
4619 #: builtin/for-each-ref.c:996
4620 msgid "quote placeholders suitably for perl"
4623 #: builtin/for-each-ref.c:998
4624 msgid "quote placeholders suitably for python"
4627 #: builtin/for-each-ref.c:1000
4628 msgid "quote placeholders suitably for tcl"
4631 #: builtin/for-each-ref.c:1003
4632 msgid "show only <n> matched refs"
4635 #: builtin/for-each-ref.c:1004
4639 #: builtin/for-each-ref.c:1004
4640 msgid "format to use for the output"
4643 #: builtin/for-each-ref.c:1005
4647 #: builtin/for-each-ref.c:1006
4648 msgid "field name to sort on"
4651 #: builtin/fsck.c:608
4652 msgid "git fsck [options] [<object>...]"
4655 #: builtin/fsck.c:614
4656 msgid "show unreachable objects"
4659 #: builtin/fsck.c:615
4660 msgid "show dangling objects"
4663 #: builtin/fsck.c:616
4667 #: builtin/fsck.c:617
4668 msgid "report root nodes"
4671 #: builtin/fsck.c:618
4672 msgid "make index objects head nodes"
4675 #: builtin/fsck.c:619
4676 msgid "make reflogs head nodes (default)"
4679 #: builtin/fsck.c:620
4680 msgid "also consider packs and alternate objects"
4683 #: builtin/fsck.c:621
4684 msgid "enable more strict checking"
4687 #: builtin/fsck.c:623
4688 msgid "write dangling objects in .git/lost-found"
4691 #: builtin/fsck.c:624 builtin/prune.c:134
4692 msgid "show progress"
4696 msgid "git gc [options]"
4701 msgid "Invalid %s: '%s'"
4706 msgid "insanely long object directory %.*s"
4710 msgid "prune unreferenced objects"
4714 msgid "be more thorough (increased runtime)"
4718 msgid "enable auto-gc mode"
4724 "Auto packing the repository for optimum performance. You may also\n"
4725 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4730 "There are too many unreachable loose objects; run 'git prune' to remove them."
4733 #: builtin/grep.c:22
4734 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4737 #: builtin/grep.c:217
4739 msgid "grep: failed to create thread: %s"
4742 #: builtin/grep.c:365
4744 msgid "Failed to chdir: %s"
4747 #: builtin/grep.c:443 builtin/grep.c:478
4749 msgid "unable to read tree (%s)"
4752 #: builtin/grep.c:493
4754 msgid "unable to grep from object of type %s"
4757 #: builtin/grep.c:551
4759 msgid "switch `%c' expects a numerical value"
4762 #: builtin/grep.c:568
4764 msgid "cannot open '%s'"
4767 #: builtin/grep.c:643
4768 msgid "search in index instead of in the work tree"
4771 #: builtin/grep.c:645
4772 msgid "find in contents not managed by git"
4775 #: builtin/grep.c:647
4776 msgid "search in both tracked and untracked files"
4779 #: builtin/grep.c:649
4780 msgid "search also in ignored files"
4783 #: builtin/grep.c:652
4784 msgid "show non-matching lines"
4787 #: builtin/grep.c:654
4788 msgid "case insensitive matching"
4791 #: builtin/grep.c:656
4792 msgid "match patterns only at word boundaries"
4795 #: builtin/grep.c:658
4796 msgid "process binary files as text"
4799 #: builtin/grep.c:660
4800 msgid "don't match patterns in binary files"
4803 #: builtin/grep.c:663
4804 msgid "descend at most <depth> levels"
4807 #: builtin/grep.c:667
4808 msgid "use extended POSIX regular expressions"
4811 #: builtin/grep.c:670
4812 msgid "use basic POSIX regular expressions (default)"
4815 #: builtin/grep.c:673
4816 msgid "interpret patterns as fixed strings"
4819 #: builtin/grep.c:676
4820 msgid "use Perl-compatible regular expressions"
4823 #: builtin/grep.c:679
4824 msgid "show line numbers"
4827 #: builtin/grep.c:680
4828 msgid "don't show filenames"
4831 #: builtin/grep.c:681
4832 msgid "show filenames"
4835 #: builtin/grep.c:683
4836 msgid "show filenames relative to top directory"
4839 #: builtin/grep.c:685
4840 msgid "show only filenames instead of matching lines"
4843 #: builtin/grep.c:687
4844 msgid "synonym for --files-with-matches"
4847 #: builtin/grep.c:690
4848 msgid "show only the names of files without match"
4851 #: builtin/grep.c:692
4852 msgid "print NUL after filenames"
4855 #: builtin/grep.c:694
4856 msgid "show the number of matches instead of matching lines"
4859 #: builtin/grep.c:695
4860 msgid "highlight matches"
4863 #: builtin/grep.c:697
4864 msgid "print empty line between matches from different files"
4867 #: builtin/grep.c:699
4868 msgid "show filename only once above matches from same file"
4871 #: builtin/grep.c:702
4872 msgid "show <n> context lines before and after matches"
4875 #: builtin/grep.c:705
4876 msgid "show <n> context lines before matches"
4879 #: builtin/grep.c:707
4880 msgid "show <n> context lines after matches"
4883 #: builtin/grep.c:708
4884 msgid "shortcut for -C NUM"
4887 #: builtin/grep.c:711
4888 msgid "show a line with the function name before matches"
4891 #: builtin/grep.c:713
4892 msgid "show the surrounding function"
4895 #: builtin/grep.c:716
4896 msgid "read patterns from file"
4899 #: builtin/grep.c:718
4900 msgid "match <pattern>"
4903 #: builtin/grep.c:720
4904 msgid "combine patterns specified with -e"
4907 #: builtin/grep.c:732
4908 msgid "indicate hit with exit status without output"
4911 #: builtin/grep.c:734
4912 msgid "show only matches from files that match all patterns"
4915 #: builtin/grep.c:736
4916 msgid "show parse tree for grep expression"
4919 #: builtin/grep.c:740
4923 #: builtin/grep.c:740
4924 msgid "show matching files in the pager"
4927 #: builtin/grep.c:743
4928 msgid "allow calling of grep(1) (ignored by this build)"
4931 #: builtin/grep.c:744 builtin/show-ref.c:184
4935 #: builtin/grep.c:811
4936 msgid "no pattern given."
4939 #: builtin/grep.c:866
4940 msgid "--open-files-in-pager only works on the worktree"
4943 #: builtin/grep.c:889
4944 msgid "--cached or --untracked cannot be used with --no-index."
4947 #: builtin/grep.c:894
4948 msgid "--no-index or --untracked cannot be used with revs."
4951 #: builtin/grep.c:897
4952 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4955 #: builtin/grep.c:905
4956 msgid "both --cached and trees are given."
4959 #: builtin/hash-object.c:60
4961 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4965 #: builtin/hash-object.c:61
4966 msgid "git hash-object --stdin-paths < <list-of-paths>"
4969 #: builtin/hash-object.c:72
4973 #: builtin/hash-object.c:72
4977 #: builtin/hash-object.c:73
4978 msgid "write the object into the object database"
4981 #: builtin/hash-object.c:74
4982 msgid "read the object from stdin"
4985 #: builtin/hash-object.c:76
4986 msgid "store file as is without filters"
4989 #: builtin/hash-object.c:77
4990 msgid "process file as it were from this path"
4993 #: builtin/help.c:43
4994 msgid "print all available commands"
4997 #: builtin/help.c:44
4998 msgid "print list of useful guides"
5001 #: builtin/help.c:45
5002 msgid "show man page"
5005 #: builtin/help.c:46
5006 msgid "show manual in web browser"
5009 #: builtin/help.c:48
5010 msgid "show info page"
5013 #: builtin/help.c:54
5014 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5017 #: builtin/help.c:66
5019 msgid "unrecognized help format '%s'"
5022 #: builtin/help.c:94
5023 msgid "Failed to start emacsclient."
5026 #: builtin/help.c:107
5027 msgid "Failed to parse emacsclient version."
5030 #: builtin/help.c:115
5032 msgid "emacsclient version '%d' too old (< 22)."
5035 #: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178
5037 msgid "failed to exec '%s': %s"
5040 #: builtin/help.c:218
5043 "'%s': path for unsupported man viewer.\n"
5044 "Please consider using 'man.<tool>.cmd' instead."
5047 #: builtin/help.c:230
5050 "'%s': cmd for supported man viewer.\n"
5051 "Please consider using 'man.<tool>.path' instead."
5054 #: builtin/help.c:351
5056 msgid "'%s': unknown man viewer."
5059 #: builtin/help.c:368
5060 msgid "no man viewer handled the request"
5063 #: builtin/help.c:376
5064 msgid "no info viewer handled the request"
5067 #: builtin/help.c:422
5068 msgid "Defining attributes per path"
5071 #: builtin/help.c:423
5072 msgid "A Git glossary"
5075 #: builtin/help.c:424
5076 msgid "Specifies intentionally untracked files to ignore"
5079 #: builtin/help.c:425
5080 msgid "Defining submodule properties"
5083 #: builtin/help.c:426
5084 msgid "Specifying revisions and ranges for Git"
5087 #: builtin/help.c:427
5088 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5091 #: builtin/help.c:428
5092 msgid "An overview of recommended workflows with Git"
5095 #: builtin/help.c:440
5096 msgid "The common Git guides are:\n"
5099 #: builtin/help.c:462 builtin/help.c:478
5104 #: builtin/help.c:494
5106 msgid "`git %s' is aliased to `%s'"
5109 #: builtin/index-pack.c:182
5111 msgid "object type mismatch at %s"
5114 #: builtin/index-pack.c:202
5115 msgid "object of unexpected type"
5118 #: builtin/index-pack.c:239
5120 msgid "cannot fill %d byte"
5121 msgid_plural "cannot fill %d bytes"
5125 #: builtin/index-pack.c:249
5129 #: builtin/index-pack.c:250
5130 msgid "read error on input"
5133 #: builtin/index-pack.c:262
5134 msgid "used more bytes than were available"
5137 #: builtin/index-pack.c:269
5138 msgid "pack too large for current definition of off_t"
5141 #: builtin/index-pack.c:285
5143 msgid "unable to create '%s'"
5146 #: builtin/index-pack.c:290
5148 msgid "cannot open packfile '%s'"
5151 #: builtin/index-pack.c:304
5152 msgid "pack signature mismatch"
5155 #: builtin/index-pack.c:306
5157 msgid "pack version %<PRIu32> unsupported"
5160 #: builtin/index-pack.c:324
5162 msgid "pack has bad object at offset %lu: %s"
5165 #: builtin/index-pack.c:446
5167 msgid "inflate returned %d"
5170 #: builtin/index-pack.c:495
5171 msgid "offset value overflow for delta base object"
5174 #: builtin/index-pack.c:503
5175 msgid "delta base offset is out of bound"
5178 #: builtin/index-pack.c:511
5180 msgid "unknown object type %d"
5183 #: builtin/index-pack.c:542
5184 msgid "cannot pread pack file"
5187 #: builtin/index-pack.c:544
5189 msgid "premature end of pack file, %lu byte missing"
5190 msgid_plural "premature end of pack file, %lu bytes missing"
5194 #: builtin/index-pack.c:570
5195 msgid "serious inflate inconsistency"
5198 #: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5199 #: builtin/index-pack.c:724 builtin/index-pack.c:733
5201 msgid "SHA1 COLLISION FOUND WITH %s !"
5204 #: builtin/index-pack.c:664 builtin/pack-objects.c:170
5205 #: builtin/pack-objects.c:262
5207 msgid "unable to read %s"
5210 #: builtin/index-pack.c:730
5212 msgid "cannot read existing object %s"
5215 #: builtin/index-pack.c:744
5217 msgid "invalid blob object %s"
5220 #: builtin/index-pack.c:759
5225 #: builtin/index-pack.c:761
5226 msgid "Error in object"
5229 #: builtin/index-pack.c:763
5231 msgid "Not all child objects of %s are reachable"
5234 #: builtin/index-pack.c:833 builtin/index-pack.c:863
5235 msgid "failed to apply delta"
5238 #: builtin/index-pack.c:1004
5239 msgid "Receiving objects"
5242 #: builtin/index-pack.c:1004
5243 msgid "Indexing objects"
5246 #: builtin/index-pack.c:1030
5247 msgid "pack is corrupted (SHA1 mismatch)"
5250 #: builtin/index-pack.c:1035
5251 msgid "cannot fstat packfile"
5254 #: builtin/index-pack.c:1038
5255 msgid "pack has junk at the end"
5258 #: builtin/index-pack.c:1049
5259 msgid "confusion beyond insanity in parse_pack_objects()"
5262 #: builtin/index-pack.c:1072
5263 msgid "Resolving deltas"
5266 #: builtin/index-pack.c:1082
5268 msgid "unable to create thread: %s"
5271 #: builtin/index-pack.c:1124
5272 msgid "confusion beyond insanity"
5275 #: builtin/index-pack.c:1132
5277 msgid "completed with %d local objects"
5280 #: builtin/index-pack.c:1142
5282 msgid "Unexpected tail checksum for %s (disk corruption?)"
5285 #: builtin/index-pack.c:1146
5287 msgid "pack has %d unresolved delta"
5288 msgid_plural "pack has %d unresolved deltas"
5292 #: builtin/index-pack.c:1171
5294 msgid "unable to deflate appended object (%d)"
5297 #: builtin/index-pack.c:1250
5299 msgid "local object %s is corrupt"
5302 #: builtin/index-pack.c:1274
5303 msgid "error while closing pack file"
5306 #: builtin/index-pack.c:1287
5308 msgid "cannot write keep file '%s'"
5311 #: builtin/index-pack.c:1295
5313 msgid "cannot close written keep file '%s'"
5316 #: builtin/index-pack.c:1308
5317 msgid "cannot store pack file"
5320 #: builtin/index-pack.c:1319
5321 msgid "cannot store index file"
5324 #: builtin/index-pack.c:1352
5326 msgid "bad pack.indexversion=%<PRIu32>"
5329 #: builtin/index-pack.c:1358
5331 msgid "invalid number of threads specified (%d)"
5334 #: builtin/index-pack.c:1362 builtin/index-pack.c:1535
5336 msgid "no threads support, ignoring %s"
5339 #: builtin/index-pack.c:1420
5341 msgid "Cannot open existing pack file '%s'"
5344 #: builtin/index-pack.c:1422
5346 msgid "Cannot open existing pack idx file for '%s'"
5349 #: builtin/index-pack.c:1469
5351 msgid "non delta: %d object"
5352 msgid_plural "non delta: %d objects"
5356 #: builtin/index-pack.c:1476
5358 msgid "chain length = %d: %lu object"
5359 msgid_plural "chain length = %d: %lu objects"
5363 #: builtin/index-pack.c:1503
5364 msgid "Cannot come back to cwd"
5367 #: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5368 #: builtin/index-pack.c:1562 builtin/index-pack.c:1566
5373 #: builtin/index-pack.c:1580
5374 msgid "--fix-thin cannot be used without --stdin"
5377 #: builtin/index-pack.c:1584 builtin/index-pack.c:1594
5379 msgid "packfile name '%s' does not end with '.pack'"
5382 #: builtin/index-pack.c:1603
5383 msgid "--verify with no packfile name given"
5386 #: builtin/init-db.c:35
5388 msgid "Could not make %s writable by group"
5391 #: builtin/init-db.c:62
5393 msgid "insanely long template name %s"
5396 #: builtin/init-db.c:67
5398 msgid "cannot stat '%s'"
5401 #: builtin/init-db.c:73
5403 msgid "cannot stat template '%s'"
5406 #: builtin/init-db.c:80
5408 msgid "cannot opendir '%s'"
5411 #: builtin/init-db.c:97
5413 msgid "cannot readlink '%s'"
5416 #: builtin/init-db.c:99
5418 msgid "insanely long symlink %s"
5421 #: builtin/init-db.c:102
5423 msgid "cannot symlink '%s' '%s'"
5426 #: builtin/init-db.c:106
5428 msgid "cannot copy '%s' to '%s'"
5431 #: builtin/init-db.c:110
5433 msgid "ignoring template %s"
5436 #: builtin/init-db.c:133
5438 msgid "insanely long template path %s"
5441 #: builtin/init-db.c:141
5443 msgid "templates not found %s"
5446 #: builtin/init-db.c:154
5448 msgid "not copying templates of a wrong format version %d from '%s'"
5451 #: builtin/init-db.c:192
5453 msgid "insane git directory %s"
5456 #: builtin/init-db.c:323 builtin/init-db.c:326
5458 msgid "%s already exists"
5461 #: builtin/init-db.c:355
5463 msgid "unable to handle file type %d"
5466 #: builtin/init-db.c:358
5468 msgid "unable to move %s to %s"
5471 #: builtin/init-db.c:363
5473 msgid "Could not create git link %s"
5477 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5478 #. * existing" or "Initialized empty", the second " shared" or
5479 #. * "", and the last '%s%s' is the verbatim directory name.
5481 #: builtin/init-db.c:420
5483 msgid "%s%s Git repository in %s%s\n"
5486 #: builtin/init-db.c:421
5487 msgid "Reinitialized existing"
5490 #: builtin/init-db.c:421
5491 msgid "Initialized empty"
5494 #: builtin/init-db.c:422
5498 #: builtin/init-db.c:441
5499 msgid "cannot tell cwd"
5502 #: builtin/init-db.c:467
5504 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5505 "shared[=<permissions>]] [directory]"
5508 #: builtin/init-db.c:490
5512 #: builtin/init-db.c:491
5513 msgid "specify that the git repository is to be shared amongst several users"
5516 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5520 #: builtin/init-db.c:522 builtin/init-db.c:529
5522 msgid "cannot mkdir %s"
5525 #: builtin/init-db.c:533
5527 msgid "cannot chdir to %s"
5530 #: builtin/init-db.c:555
5533 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5537 #: builtin/init-db.c:579
5538 msgid "Cannot access current working directory"
5541 #: builtin/init-db.c:586
5543 msgid "Cannot access work tree '%s'"
5547 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
5551 msgid " or: git show [options] <object>..."
5554 #: builtin/log.c:103
5555 msgid "suppress diff output"
5558 #: builtin/log.c:104
5562 #: builtin/log.c:105
5563 msgid "Use mail map file"
5566 #: builtin/log.c:106
5567 msgid "decorate options"
5570 #: builtin/log.c:199
5572 msgid "Final output: %d %s\n"
5575 #: builtin/log.c:422 builtin/log.c:514
5577 msgid "Could not read object %s"
5580 #: builtin/log.c:538
5582 msgid "Unknown type: %d"
5585 #: builtin/log.c:638
5586 msgid "format.headers without value"
5589 #: builtin/log.c:720
5590 msgid "name of output directory is too long"
5593 #: builtin/log.c:736
5595 msgid "Cannot open patch file %s"
5598 #: builtin/log.c:750
5599 msgid "Need exactly one range."
5602 #: builtin/log.c:758
5603 msgid "Not a range."
5606 #: builtin/log.c:860
5607 msgid "Cover letter needs email format"
5610 #: builtin/log.c:936
5612 msgid "insane in-reply-to: %s"
5615 #: builtin/log.c:964
5616 msgid "git format-patch [options] [<since> | <revision range>]"
5619 #: builtin/log.c:1009
5620 msgid "Two output directories?"
5623 #: builtin/log.c:1108
5624 msgid "use [PATCH n/m] even with a single patch"
5627 #: builtin/log.c:1111
5628 msgid "use [PATCH] even with multiple patches"
5631 #: builtin/log.c:1115
5632 msgid "print patches to standard out"
5635 #: builtin/log.c:1117
5636 msgid "generate a cover letter"
5639 #: builtin/log.c:1119
5640 msgid "use simple number sequence for output file names"
5643 #: builtin/log.c:1120
5647 #: builtin/log.c:1121
5648 msgid "use <sfx> instead of '.patch'"
5651 #: builtin/log.c:1123
5652 msgid "start numbering patches at <n> instead of 1"
5655 #: builtin/log.c:1125
5656 msgid "mark the series as Nth re-roll"
5659 #: builtin/log.c:1127
5660 msgid "Use [<prefix>] instead of [PATCH]"
5663 #: builtin/log.c:1130
5664 msgid "store resulting files in <dir>"
5667 #: builtin/log.c:1133
5668 msgid "don't strip/add [PATCH]"
5671 #: builtin/log.c:1136
5672 msgid "don't output binary diffs"
5675 #: builtin/log.c:1138
5676 msgid "don't include a patch matching a commit upstream"
5679 #: builtin/log.c:1140
5680 msgid "show patch format instead of default (patch + stat)"
5683 #: builtin/log.c:1142
5687 #: builtin/log.c:1143
5691 #: builtin/log.c:1144
5692 msgid "add email header"
5695 #: builtin/log.c:1145 builtin/log.c:1147
5699 #: builtin/log.c:1145
5700 msgid "add To: header"
5703 #: builtin/log.c:1147
5704 msgid "add Cc: header"
5707 #: builtin/log.c:1149
5711 #: builtin/log.c:1150
5712 msgid "make first mail a reply to <message-id>"
5715 #: builtin/log.c:1151 builtin/log.c:1154
5719 #: builtin/log.c:1152
5720 msgid "attach the patch"
5723 #: builtin/log.c:1155
5724 msgid "inline the patch"
5727 #: builtin/log.c:1159
5728 msgid "enable message threading, styles: shallow, deep"
5731 #: builtin/log.c:1161
5735 #: builtin/log.c:1162
5736 msgid "add a signature"
5739 #: builtin/log.c:1164
5740 msgid "don't print the patch filenames"
5743 #: builtin/log.c:1248
5744 msgid "-n and -k are mutually exclusive."
5747 #: builtin/log.c:1250
5748 msgid "--subject-prefix and -k are mutually exclusive."
5751 #: builtin/log.c:1258
5752 msgid "--name-only does not make sense"
5755 #: builtin/log.c:1260
5756 msgid "--name-status does not make sense"
5759 #: builtin/log.c:1262
5760 msgid "--check does not make sense"
5763 #: builtin/log.c:1285
5764 msgid "standard output, or directory, which one?"
5767 #: builtin/log.c:1287
5769 msgid "Could not create directory '%s'"
5772 #: builtin/log.c:1435
5773 msgid "Failed to create output files"
5776 #: builtin/log.c:1484
5777 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5780 #: builtin/log.c:1539
5783 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5786 #: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566
5788 msgid "Unknown commit %s"
5791 #: builtin/ls-files.c:402
5792 msgid "git ls-files [options] [<file>...]"
5795 #: builtin/ls-files.c:459
5796 msgid "identify the file status with tags"
5799 #: builtin/ls-files.c:461
5800 msgid "use lowercase letters for 'assume unchanged' files"
5803 #: builtin/ls-files.c:463
5804 msgid "show cached files in the output (default)"
5807 #: builtin/ls-files.c:465
5808 msgid "show deleted files in the output"
5811 #: builtin/ls-files.c:467
5812 msgid "show modified files in the output"
5815 #: builtin/ls-files.c:469
5816 msgid "show other files in the output"
5819 #: builtin/ls-files.c:471
5820 msgid "show ignored files in the output"
5823 #: builtin/ls-files.c:474
5824 msgid "show staged contents' object name in the output"
5827 #: builtin/ls-files.c:476
5828 msgid "show files on the filesystem that need to be removed"
5831 #: builtin/ls-files.c:478
5832 msgid "show 'other' directories' name only"
5835 #: builtin/ls-files.c:481
5836 msgid "don't show empty directories"
5839 #: builtin/ls-files.c:484
5840 msgid "show unmerged files in the output"
5843 #: builtin/ls-files.c:486
5844 msgid "show resolve-undo information"
5847 #: builtin/ls-files.c:488
5848 msgid "skip files matching pattern"
5851 #: builtin/ls-files.c:491
5852 msgid "exclude patterns are read from <file>"
5855 #: builtin/ls-files.c:494
5856 msgid "read additional per-directory exclude patterns in <file>"
5859 #: builtin/ls-files.c:496
5860 msgid "add the standard git exclusions"
5863 #: builtin/ls-files.c:499
5864 msgid "make the output relative to the project top directory"
5867 #: builtin/ls-files.c:502
5868 msgid "if any <file> is not in the index, treat this as an error"
5871 #: builtin/ls-files.c:503
5875 #: builtin/ls-files.c:504
5876 msgid "pretend that paths removed since <tree-ish> are still present"
5879 #: builtin/ls-files.c:506
5880 msgid "show debugging data"
5883 #: builtin/ls-tree.c:27
5884 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5887 #: builtin/ls-tree.c:125
5888 msgid "only show trees"
5891 #: builtin/ls-tree.c:127
5892 msgid "recurse into subtrees"
5895 #: builtin/ls-tree.c:129
5896 msgid "show trees when recursing"
5899 #: builtin/ls-tree.c:132
5900 msgid "terminate entries with NUL byte"
5903 #: builtin/ls-tree.c:133
5904 msgid "include object size"
5907 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5908 msgid "list only filenames"
5911 #: builtin/ls-tree.c:140
5912 msgid "use full path names"
5915 #: builtin/ls-tree.c:142
5916 msgid "list entire tree; not just current directory (implies --full-name)"
5919 #: builtin/merge.c:43
5920 msgid "git merge [options] [<commit>...]"
5923 #: builtin/merge.c:44
5924 msgid "git merge [options] <msg> HEAD <commit>"
5927 #: builtin/merge.c:45
5928 msgid "git merge --abort"
5931 #: builtin/merge.c:90
5932 msgid "switch `m' requires a value"
5935 #: builtin/merge.c:127
5937 msgid "Could not find merge strategy '%s'.\n"
5940 #: builtin/merge.c:128
5942 msgid "Available strategies are:"
5945 #: builtin/merge.c:133
5947 msgid "Available custom strategies are:"
5950 #: builtin/merge.c:183
5951 msgid "do not show a diffstat at the end of the merge"
5954 #: builtin/merge.c:186
5955 msgid "show a diffstat at the end of the merge"
5958 #: builtin/merge.c:187
5959 msgid "(synonym to --stat)"
5962 #: builtin/merge.c:189
5963 msgid "add (at most <n>) entries from shortlog to merge commit message"
5966 #: builtin/merge.c:192
5967 msgid "create a single commit instead of doing a merge"
5970 #: builtin/merge.c:194
5971 msgid "perform a commit if the merge succeeds (default)"
5974 #: builtin/merge.c:196
5975 msgid "edit message before committing"
5978 #: builtin/merge.c:198
5979 msgid "allow fast-forward (default)"
5982 #: builtin/merge.c:200
5983 msgid "abort if fast-forward is not possible"
5986 #: builtin/merge.c:203
5987 msgid "Verify that the named commit has a valid GPG signature"
5990 #: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
5994 #: builtin/merge.c:205
5995 msgid "merge strategy to use"
5998 #: builtin/merge.c:206
5999 msgid "option=value"
6002 #: builtin/merge.c:207
6003 msgid "option for selected merge strategy"
6006 #: builtin/merge.c:209
6007 msgid "merge commit message (for a non-fast-forward merge)"
6010 #: builtin/merge.c:213
6011 msgid "abort the current in-progress merge"
6014 #: builtin/merge.c:242
6015 msgid "could not run stash."
6018 #: builtin/merge.c:247
6019 msgid "stash failed"
6022 #: builtin/merge.c:252
6024 msgid "not a valid object: %s"
6027 #: builtin/merge.c:271 builtin/merge.c:288
6028 msgid "read-tree failed"
6031 #: builtin/merge.c:318
6032 msgid " (nothing to squash)"
6035 #: builtin/merge.c:331
6037 msgid "Squash commit -- not updating HEAD\n"
6040 #: builtin/merge.c:363
6041 msgid "Writing SQUASH_MSG"
6044 #: builtin/merge.c:365
6045 msgid "Finishing SQUASH_MSG"
6048 #: builtin/merge.c:388
6050 msgid "No merge message -- not updating HEAD\n"
6053 #: builtin/merge.c:438
6055 msgid "'%s' does not point to a commit"
6058 #: builtin/merge.c:550
6060 msgid "Bad branch.%s.mergeoptions string: %s"
6063 #: builtin/merge.c:643
6064 msgid "git write-tree failed to write a tree"
6067 #: builtin/merge.c:671
6068 msgid "Not handling anything other than two heads merge."
6071 #: builtin/merge.c:685
6073 msgid "Unknown option for merge-recursive: -X%s"
6076 #: builtin/merge.c:699
6078 msgid "unable to write %s"
6081 #: builtin/merge.c:788
6083 msgid "Could not read from '%s'"
6086 #: builtin/merge.c:797
6088 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6091 #: builtin/merge.c:803
6094 "Please enter a commit message to explain why this merge is necessary,\n"
6095 "especially if it merges an updated upstream into a topic branch.\n"
6097 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6101 #: builtin/merge.c:827
6102 msgid "Empty commit message."
6105 #: builtin/merge.c:839
6107 msgid "Wonderful.\n"
6110 #: builtin/merge.c:904
6112 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6115 #: builtin/merge.c:920
6117 msgid "'%s' is not a commit"
6120 #: builtin/merge.c:961
6121 msgid "No current branch."
6124 #: builtin/merge.c:963
6125 msgid "No remote for the current branch."
6128 #: builtin/merge.c:965
6129 msgid "No default upstream defined for the current branch."
6132 #: builtin/merge.c:970
6134 msgid "No remote tracking branch for %s from %s"
6137 #: builtin/merge.c:1057 builtin/merge.c:1214
6139 msgid "%s - not something we can merge"
6142 #: builtin/merge.c:1125
6143 msgid "There is no merge to abort (MERGE_HEAD missing)."
6146 #: builtin/merge.c:1141 git-pull.sh:31
6148 "You have not concluded your merge (MERGE_HEAD exists).\n"
6149 "Please, commit your changes before you can merge."
6152 #: builtin/merge.c:1144 git-pull.sh:34
6153 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6156 #: builtin/merge.c:1148
6158 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6159 "Please, commit your changes before you can merge."
6162 #: builtin/merge.c:1151
6163 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6166 #: builtin/merge.c:1160
6167 msgid "You cannot combine --squash with --no-ff."
6170 #: builtin/merge.c:1165
6171 msgid "You cannot combine --no-ff with --ff-only."
6174 #: builtin/merge.c:1172
6175 msgid "No commit specified and merge.defaultToUpstream not set."
6178 #: builtin/merge.c:1204
6179 msgid "Can merge only exactly one commit into empty head"
6182 #: builtin/merge.c:1207
6183 msgid "Squash commit into empty head not supported yet"
6186 #: builtin/merge.c:1209
6187 msgid "Non-fast-forward commit does not make sense into an empty head"
6190 #: builtin/merge.c:1265
6192 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6195 #: builtin/merge.c:1268
6197 msgid "Commit %s has a bad GPG signature allegedly by %s."
6201 #: builtin/merge.c:1271
6203 msgid "Commit %s does not have a GPG signature."
6206 #: builtin/merge.c:1274
6208 msgid "Commit %s has a good GPG signature by %s\n"
6211 #: builtin/merge.c:1358
6213 msgid "Updating %s..%s\n"
6216 #: builtin/merge.c:1397
6218 msgid "Trying really trivial in-index merge...\n"
6221 #: builtin/merge.c:1404
6226 #: builtin/merge.c:1436
6227 msgid "Not possible to fast-forward, aborting."
6230 #: builtin/merge.c:1459 builtin/merge.c:1538
6232 msgid "Rewinding the tree to pristine...\n"
6235 #: builtin/merge.c:1463
6237 msgid "Trying merge strategy %s...\n"
6240 #: builtin/merge.c:1529
6242 msgid "No merge strategy handled the merge.\n"
6245 #: builtin/merge.c:1531
6247 msgid "Merge with strategy %s failed.\n"
6250 #: builtin/merge.c:1540
6252 msgid "Using the %s to prepare resolving by hand.\n"
6255 #: builtin/merge.c:1552
6257 msgid "Automatic merge went well; stopped before committing as requested\n"
6260 #: builtin/merge-base.c:26
6261 msgid "git merge-base [-a|--all] <commit> <commit>..."
6264 #: builtin/merge-base.c:27
6265 msgid "git merge-base [-a|--all] --octopus <commit>..."
6268 #: builtin/merge-base.c:28
6269 msgid "git merge-base --independent <commit>..."
6272 #: builtin/merge-base.c:29
6273 msgid "git merge-base --is-ancestor <commit> <commit>"
6276 #: builtin/merge-base.c:98
6277 msgid "output all common ancestors"
6280 #: builtin/merge-base.c:99
6281 msgid "find ancestors for a single n-way merge"
6284 #: builtin/merge-base.c:100
6285 msgid "list revs not reachable from others"
6288 #: builtin/merge-base.c:102
6289 msgid "is the first one ancestor of the other?"
6292 #: builtin/merge-file.c:8
6294 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6298 #: builtin/merge-file.c:33
6299 msgid "send results to standard output"
6302 #: builtin/merge-file.c:34
6303 msgid "use a diff3 based merge"
6306 #: builtin/merge-file.c:35
6307 msgid "for conflicts, use our version"
6310 #: builtin/merge-file.c:37
6311 msgid "for conflicts, use their version"
6314 #: builtin/merge-file.c:39
6315 msgid "for conflicts, use a union version"
6318 #: builtin/merge-file.c:42
6319 msgid "for conflicts, use this marker size"
6322 #: builtin/merge-file.c:43
6323 msgid "do not warn about conflicts"
6326 #: builtin/merge-file.c:45
6327 msgid "set labels for file1/orig_file/file2"
6330 #: builtin/mktree.c:67
6331 msgid "git mktree [-z] [--missing] [--batch]"
6334 #: builtin/mktree.c:153
6335 msgid "input is NUL terminated"
6338 #: builtin/mktree.c:154 builtin/write-tree.c:24
6339 msgid "allow missing objects"
6342 #: builtin/mktree.c:155
6343 msgid "allow creation of more than one tree"
6347 msgid "git mv [options] <source>... <destination>"
6351 msgid "force move/rename even if target exists"
6355 msgid "skip move/rename errors"
6360 msgid "Checking rename of '%s' to '%s'\n"
6368 msgid "can not move directory into itself"
6372 msgid "cannot move directory over file"
6377 msgid "Huh? %.*s is in index?"
6381 msgid "source directory is empty"
6385 msgid "not under version control"
6389 msgid "destination exists"
6394 msgid "overwriting '%s'"
6398 msgid "Cannot overwrite"
6402 msgid "multiple sources for the same target"
6407 msgid "%s, source=%s, destination=%s"
6412 msgid "Renaming %s to %s\n"
6415 #: builtin/mv.c:215 builtin/remote.c:731
6417 msgid "renaming '%s' failed"
6420 #: builtin/name-rev.c:175
6421 msgid "git name-rev [options] <commit>..."
6424 #: builtin/name-rev.c:176
6425 msgid "git name-rev [options] --all"
6428 #: builtin/name-rev.c:177
6429 msgid "git name-rev [options] --stdin"
6432 #: builtin/name-rev.c:229
6433 msgid "print only names (no SHA-1)"
6436 #: builtin/name-rev.c:230
6437 msgid "only use tags to name the commits"
6440 #: builtin/name-rev.c:232
6441 msgid "only use refs matching <pattern>"
6444 #: builtin/name-rev.c:234
6445 msgid "list all commits reachable from all refs"
6448 #: builtin/name-rev.c:235
6449 msgid "read from stdin"
6452 #: builtin/name-rev.c:236
6453 msgid "allow to print `undefined` names"
6456 #: builtin/notes.c:26
6457 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6460 #: builtin/notes.c:27
6462 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6463 "<object>] [<object>]"
6466 #: builtin/notes.c:28
6467 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6470 #: builtin/notes.c:29
6472 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6473 "<object>] [<object>]"
6476 #: builtin/notes.c:30
6477 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6480 #: builtin/notes.c:31
6481 msgid "git notes [--ref <notes_ref>] show [<object>]"
6484 #: builtin/notes.c:32
6486 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6489 #: builtin/notes.c:33
6490 msgid "git notes merge --commit [-v | -q]"
6493 #: builtin/notes.c:34
6494 msgid "git notes merge --abort [-v | -q]"
6497 #: builtin/notes.c:35
6498 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6501 #: builtin/notes.c:36
6502 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6505 #: builtin/notes.c:37
6506 msgid "git notes [--ref <notes_ref>] get-ref"
6509 #: builtin/notes.c:42
6510 msgid "git notes [list [<object>]]"
6513 #: builtin/notes.c:47
6514 msgid "git notes add [<options>] [<object>]"
6517 #: builtin/notes.c:52
6518 msgid "git notes copy [<options>] <from-object> <to-object>"
6521 #: builtin/notes.c:53
6522 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6525 #: builtin/notes.c:58
6526 msgid "git notes append [<options>] [<object>]"
6529 #: builtin/notes.c:63
6530 msgid "git notes edit [<object>]"
6533 #: builtin/notes.c:68
6534 msgid "git notes show [<object>]"
6537 #: builtin/notes.c:73
6538 msgid "git notes merge [<options>] <notes_ref>"
6541 #: builtin/notes.c:74
6542 msgid "git notes merge --commit [<options>]"
6545 #: builtin/notes.c:75
6546 msgid "git notes merge --abort [<options>]"
6549 #: builtin/notes.c:80
6550 msgid "git notes remove [<object>]"
6553 #: builtin/notes.c:85
6554 msgid "git notes prune [<options>]"
6557 #: builtin/notes.c:90
6558 msgid "git notes get-ref"
6561 #: builtin/notes.c:139
6563 msgid "unable to start 'show' for object '%s'"
6566 #: builtin/notes.c:143
6567 msgid "could not read 'show' output"
6570 #: builtin/notes.c:151
6572 msgid "failed to finish 'show' for object '%s'"
6575 #: builtin/notes.c:169 builtin/tag.c:341
6577 msgid "could not create file '%s'"
6580 #: builtin/notes.c:188
6581 msgid "Please supply the note contents using either -m or -F option"
6584 #: builtin/notes.c:209 builtin/notes.c:972
6586 msgid "Removing note for object %s\n"
6589 #: builtin/notes.c:214
6590 msgid "unable to write note object"
6593 #: builtin/notes.c:216
6595 msgid "The note contents has been left in %s"
6598 #: builtin/notes.c:250 builtin/tag.c:540
6600 msgid "cannot read '%s'"
6603 #: builtin/notes.c:252 builtin/tag.c:543
6605 msgid "could not open or read '%s'"
6608 #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6609 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6610 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6611 #: builtin/notes.c:967 builtin/tag.c:556
6613 msgid "Failed to resolve '%s' as a valid ref."
6616 #: builtin/notes.c:274
6618 msgid "Failed to read object '%s'."
6621 #: builtin/notes.c:298
6622 msgid "Cannot commit uninitialized/unreferenced notes tree"
6625 #: builtin/notes.c:339
6627 msgid "Bad notes.rewriteMode value: '%s'"
6630 #: builtin/notes.c:349
6632 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6635 #. TRANSLATORS: The first %s is the name of the
6636 #. environment variable, the second %s is its value
6637 #: builtin/notes.c:376
6639 msgid "Bad %s value: '%s'"
6642 #: builtin/notes.c:440
6644 msgid "Malformed input line: '%s'."
6647 #: builtin/notes.c:455
6649 msgid "Failed to copy notes from '%s' to '%s'"
6652 #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6653 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6654 #: builtin/notes.c:1032
6655 msgid "too many parameters"
6658 #: builtin/notes.c:512 builtin/notes.c:771
6660 msgid "No note found for object %s."
6663 #: builtin/notes.c:534 builtin/notes.c:691
6664 msgid "note contents as a string"
6667 #: builtin/notes.c:537 builtin/notes.c:694
6668 msgid "note contents in a file"
6671 #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6672 #: builtin/notes.c:699 builtin/tag.c:474
6676 #: builtin/notes.c:540 builtin/notes.c:697
6677 msgid "reuse and edit specified note object"
6680 #: builtin/notes.c:543 builtin/notes.c:700
6681 msgid "reuse specified note object"
6684 #: builtin/notes.c:545 builtin/notes.c:613
6685 msgid "replace existing notes"
6688 #: builtin/notes.c:579
6691 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6695 #: builtin/notes.c:584 builtin/notes.c:661
6697 msgid "Overwriting existing notes for object %s\n"
6700 #: builtin/notes.c:614
6701 msgid "read objects from stdin"
6704 #: builtin/notes.c:616
6705 msgid "load rewriting config for <command> (implies --stdin)"
6708 #: builtin/notes.c:634
6709 msgid "too few parameters"
6712 #: builtin/notes.c:655
6715 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6719 #: builtin/notes.c:667
6721 msgid "Missing notes on source object %s. Cannot copy."
6724 #: builtin/notes.c:716
6727 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6728 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6731 #: builtin/notes.c:863
6732 msgid "General options"
6735 #: builtin/notes.c:865
6736 msgid "Merge options"
6739 #: builtin/notes.c:867
6741 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6745 #: builtin/notes.c:869
6746 msgid "Committing unmerged notes"
6749 #: builtin/notes.c:871
6750 msgid "finalize notes merge by committing unmerged notes"
6753 #: builtin/notes.c:873
6754 msgid "Aborting notes merge resolution"
6757 #: builtin/notes.c:875
6758 msgid "abort notes merge"
6761 #: builtin/notes.c:970
6763 msgid "Object %s has no note\n"
6766 #: builtin/notes.c:982
6767 msgid "attempt to remove non-existent note is not an error"
6770 #: builtin/notes.c:985
6771 msgid "read object names from the standard input"
6774 #: builtin/notes.c:1066
6778 #: builtin/notes.c:1067
6779 msgid "use notes from <notes_ref>"
6782 #: builtin/notes.c:1102 builtin/remote.c:1598
6784 msgid "Unknown subcommand: %s"
6787 #: builtin/pack-objects.c:23
6788 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6791 #: builtin/pack-objects.c:24
6792 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6795 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6797 msgid "deflate error (%d)"
6800 #: builtin/pack-objects.c:2397
6802 msgid "unsupported index version %s"
6805 #: builtin/pack-objects.c:2401
6807 msgid "bad index version '%s'"
6810 #: builtin/pack-objects.c:2424
6812 msgid "option %s does not accept negative form"
6815 #: builtin/pack-objects.c:2428
6817 msgid "unable to parse value '%s' for option %s"
6820 #: builtin/pack-objects.c:2447
6821 msgid "do not show progress meter"
6824 #: builtin/pack-objects.c:2449
6825 msgid "show progress meter"
6828 #: builtin/pack-objects.c:2451
6829 msgid "show progress meter during object writing phase"
6832 #: builtin/pack-objects.c:2454
6833 msgid "similar to --all-progress when progress meter is shown"
6836 #: builtin/pack-objects.c:2455
6837 msgid "version[,offset]"
6840 #: builtin/pack-objects.c:2456
6841 msgid "write the pack index file in the specified idx format version"
6844 #: builtin/pack-objects.c:2459
6845 msgid "maximum size of each output pack file"
6848 #: builtin/pack-objects.c:2461
6849 msgid "ignore borrowed objects from alternate object store"
6852 #: builtin/pack-objects.c:2463
6853 msgid "ignore packed objects"
6856 #: builtin/pack-objects.c:2465
6857 msgid "limit pack window by objects"
6860 #: builtin/pack-objects.c:2467
6861 msgid "limit pack window by memory in addition to object limit"
6864 #: builtin/pack-objects.c:2469
6865 msgid "maximum length of delta chain allowed in the resulting pack"
6868 #: builtin/pack-objects.c:2471
6869 msgid "reuse existing deltas"
6872 #: builtin/pack-objects.c:2473
6873 msgid "reuse existing objects"
6876 #: builtin/pack-objects.c:2475
6877 msgid "use OFS_DELTA objects"
6880 #: builtin/pack-objects.c:2477
6881 msgid "use threads when searching for best delta matches"
6884 #: builtin/pack-objects.c:2479
6885 msgid "do not create an empty pack output"
6888 #: builtin/pack-objects.c:2481
6889 msgid "read revision arguments from standard input"
6892 #: builtin/pack-objects.c:2483
6893 msgid "limit the objects to those that are not yet packed"
6896 #: builtin/pack-objects.c:2486
6897 msgid "include objects reachable from any reference"
6900 #: builtin/pack-objects.c:2489
6901 msgid "include objects referred by reflog entries"
6904 #: builtin/pack-objects.c:2492
6905 msgid "output pack to stdout"
6908 #: builtin/pack-objects.c:2494
6909 msgid "include tag objects that refer to objects to be packed"
6912 #: builtin/pack-objects.c:2496
6913 msgid "keep unreachable objects"
6916 #: builtin/pack-objects.c:2497 parse-options.h:141
6920 #: builtin/pack-objects.c:2498
6921 msgid "unpack unreachable objects newer than <time>"
6924 #: builtin/pack-objects.c:2501
6925 msgid "create thin packs"
6928 #: builtin/pack-objects.c:2503
6929 msgid "ignore packs that have companion .keep file"
6932 #: builtin/pack-objects.c:2505
6933 msgid "pack compression level"
6936 #: builtin/pack-objects.c:2507
6937 msgid "do not hide commits by grafts"
6940 #: builtin/pack-refs.c:6
6941 msgid "git pack-refs [options]"
6944 #: builtin/pack-refs.c:14
6945 msgid "pack everything"
6948 #: builtin/pack-refs.c:15
6949 msgid "prune loose refs (default)"
6952 #: builtin/prune-packed.c:7
6953 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6956 #: builtin/prune.c:12
6957 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6960 #: builtin/prune.c:132
6961 msgid "do not remove, show only"
6964 #: builtin/prune.c:133
6965 msgid "report pruned objects"
6968 #: builtin/prune.c:136
6969 msgid "expire objects older than <time>"
6972 #: builtin/push.c:14
6973 msgid "git push [<options>] [<repository> [<refspec>...]]"
6976 #: builtin/push.c:45
6977 msgid "tag shorthand without <tag>"
6980 #: builtin/push.c:64
6981 msgid "--delete only accepts plain target ref names"
6984 #: builtin/push.c:99
6987 "To choose either option permanently, see push.default in 'git help config'."
6990 #: builtin/push.c:102
6993 "The upstream branch of your current branch does not match\n"
6994 "the name of your current branch. To push to the upstream branch\n"
6995 "on the remote, use\n"
6997 " git push %s HEAD:%s\n"
6999 "To push to the branch of the same name on the remote, use\n"
7005 #: builtin/push.c:121
7008 "You are not currently on a branch.\n"
7009 "To push the history leading to the current (detached HEAD)\n"
7012 " git push %s HEAD:<name-of-remote-branch>\n"
7015 #: builtin/push.c:128
7018 "The current branch %s has no upstream branch.\n"
7019 "To push the current branch and set the remote as upstream, use\n"
7021 " git push --set-upstream %s %s\n"
7024 #: builtin/push.c:136
7026 msgid "The current branch %s has multiple upstream branches, refusing to push."
7029 #: builtin/push.c:139
7032 "You are pushing to remote '%s', which is not the upstream of\n"
7033 "your current branch '%s', without telling me what to push\n"
7034 "to update which remote branch."
7037 #: builtin/push.c:151
7039 "push.default is unset; its implicit value is changing in\n"
7040 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7041 "and maintain the current behavior after the default changes, use:\n"
7043 " git config --global push.default matching\n"
7045 "To squelch this message and adopt the new behavior now, use:\n"
7047 " git config --global push.default simple\n"
7049 "See 'git help config' and search for 'push.default' for further "
7051 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7052 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7055 #: builtin/push.c:199
7057 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7060 #: builtin/push.c:206
7062 "Updates were rejected because the tip of your current branch is behind\n"
7063 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7064 "before pushing again.\n"
7065 "See the 'Note about fast-forwards' in 'git push --help' for details."
7068 #: builtin/push.c:212
7070 "Updates were rejected because a pushed branch tip is behind its remote\n"
7071 "counterpart. If you did not intend to push that branch, you may want to\n"
7072 "specify branches to push or set the 'push.default' configuration variable\n"
7073 "to 'simple', 'current' or 'upstream' to push only the current branch."
7076 #: builtin/push.c:218
7078 "Updates were rejected because a pushed branch tip is behind its remote\n"
7079 "counterpart. Check out this branch and merge the remote changes\n"
7080 "(e.g. 'git pull') before pushing again.\n"
7081 "See the 'Note about fast-forwards' in 'git push --help' for details."
7084 #: builtin/push.c:224
7086 "Updates were rejected because the remote contains work that you do\n"
7087 "not have locally. This is usually caused by another repository pushing\n"
7088 "to the same ref. You may want to first merge the remote changes (e.g.,\n"
7089 "'git pull') before pushing again.\n"
7090 "See the 'Note about fast-forwards' in 'git push --help' for details."
7093 #: builtin/push.c:231
7094 msgid "Updates were rejected because the tag already exists in the remote."
7097 #: builtin/push.c:234
7099 "You cannot update a remote ref that points at a non-commit object,\n"
7100 "or update a remote ref to make it point at a non-commit object,\n"
7101 "without using the '--force' option.\n"
7104 #: builtin/push.c:294
7106 msgid "Pushing to %s\n"
7109 #: builtin/push.c:298
7111 msgid "failed to push some refs to '%s'"
7114 #: builtin/push.c:331
7116 msgid "bad repository '%s'"
7119 #: builtin/push.c:332
7121 "No configured push destination.\n"
7122 "Either specify the URL from the command-line or configure a remote "
7123 "repository using\n"
7125 " git remote add <name> <url>\n"
7127 "and then push using the remote name\n"
7129 " git push <name>\n"
7132 #: builtin/push.c:347
7133 msgid "--all and --tags are incompatible"
7136 #: builtin/push.c:348
7137 msgid "--all can't be combined with refspecs"
7140 #: builtin/push.c:353
7141 msgid "--mirror and --tags are incompatible"
7144 #: builtin/push.c:354
7145 msgid "--mirror can't be combined with refspecs"
7148 #: builtin/push.c:359
7149 msgid "--all and --mirror are incompatible"
7152 #: builtin/push.c:419
7156 #: builtin/push.c:420
7157 msgid "push all refs"
7160 #: builtin/push.c:421
7161 msgid "mirror all refs"
7164 #: builtin/push.c:423
7168 #: builtin/push.c:424
7169 msgid "push tags (can't be used with --all or --mirror)"
7172 #: builtin/push.c:427
7173 msgid "force updates"
7176 #: builtin/push.c:428
7180 #: builtin/push.c:429
7181 msgid "control recursive pushing of submodules"
7184 #: builtin/push.c:431
7185 msgid "use thin pack"
7188 #: builtin/push.c:432 builtin/push.c:433
7189 msgid "receive pack program"
7192 #: builtin/push.c:434
7193 msgid "set upstream for git pull/status"
7196 #: builtin/push.c:437
7197 msgid "prune locally removed refs"
7200 #: builtin/push.c:439
7201 msgid "bypass pre-push hook"
7204 #: builtin/push.c:440
7205 msgid "push missing but relevant tags"
7208 #: builtin/push.c:450
7209 msgid "--delete is incompatible with --all, --mirror and --tags"
7212 #: builtin/push.c:452
7213 msgid "--delete doesn't make sense without any refs"
7216 #: builtin/read-tree.c:36
7218 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7219 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7220 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7223 #: builtin/read-tree.c:108
7224 msgid "write resulting index to <file>"
7227 #: builtin/read-tree.c:111
7228 msgid "only empty the index"
7231 #: builtin/read-tree.c:113
7235 #: builtin/read-tree.c:115
7236 msgid "perform a merge in addition to a read"
7239 #: builtin/read-tree.c:117
7240 msgid "3-way merge if no file level merging required"
7243 #: builtin/read-tree.c:119
7244 msgid "3-way merge in presence of adds and removes"
7247 #: builtin/read-tree.c:121
7248 msgid "same as -m, but discard unmerged entries"
7251 #: builtin/read-tree.c:122
7252 msgid "<subdirectory>/"
7255 #: builtin/read-tree.c:123
7256 msgid "read the tree into the index under <subdirectory>/"
7259 #: builtin/read-tree.c:126
7260 msgid "update working tree with merge result"
7263 #: builtin/read-tree.c:128
7267 #: builtin/read-tree.c:129
7268 msgid "allow explicitly ignored files to be overwritten"
7271 #: builtin/read-tree.c:132
7272 msgid "don't check the working tree after merging"
7275 #: builtin/read-tree.c:133
7276 msgid "don't update the index or the work tree"
7279 #: builtin/read-tree.c:135
7280 msgid "skip applying sparse checkout filter"
7283 #: builtin/read-tree.c:137
7284 msgid "debug unpack-trees"
7287 #: builtin/remote.c:11
7288 msgid "git remote [-v | --verbose]"
7291 #: builtin/remote.c:12
7293 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7294 "mirror=<fetch|push>] <name> <url>"
7297 #: builtin/remote.c:13 builtin/remote.c:32
7298 msgid "git remote rename <old> <new>"
7301 #: builtin/remote.c:14 builtin/remote.c:37
7302 msgid "git remote remove <name>"
7305 #: builtin/remote.c:15 builtin/remote.c:42
7306 msgid "git remote set-head <name> (-a | -d | <branch>)"
7309 #: builtin/remote.c:16
7310 msgid "git remote [-v | --verbose] show [-n] <name>"
7313 #: builtin/remote.c:17
7314 msgid "git remote prune [-n | --dry-run] <name>"
7317 #: builtin/remote.c:18
7319 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7322 #: builtin/remote.c:19
7323 msgid "git remote set-branches [--add] <name> <branch>..."
7326 #: builtin/remote.c:20 builtin/remote.c:68
7327 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7330 #: builtin/remote.c:21 builtin/remote.c:69
7331 msgid "git remote set-url --add <name> <newurl>"
7334 #: builtin/remote.c:22 builtin/remote.c:70
7335 msgid "git remote set-url --delete <name> <url>"
7338 #: builtin/remote.c:27
7339 msgid "git remote add [<options>] <name> <url>"
7342 #: builtin/remote.c:47
7343 msgid "git remote set-branches <name> <branch>..."
7346 #: builtin/remote.c:48
7347 msgid "git remote set-branches --add <name> <branch>..."
7350 #: builtin/remote.c:53
7351 msgid "git remote show [<options>] <name>"
7354 #: builtin/remote.c:58
7355 msgid "git remote prune [<options>] <name>"
7358 #: builtin/remote.c:63
7359 msgid "git remote update [<options>] [<group> | <remote>]..."
7362 #: builtin/remote.c:98
7367 #: builtin/remote.c:130
7369 "--mirror is dangerous and deprecated; please\n"
7370 "\t use --mirror=fetch or --mirror=push instead"
7373 #: builtin/remote.c:147
7375 msgid "unknown mirror argument: %s"
7378 #: builtin/remote.c:163
7379 msgid "fetch the remote branches"
7382 #: builtin/remote.c:165
7383 msgid "import all tags and associated objects when fetching"
7386 #: builtin/remote.c:168
7387 msgid "or do not fetch any tag at all (--no-tags)"
7390 #: builtin/remote.c:170
7391 msgid "branch(es) to track"
7394 #: builtin/remote.c:171
7395 msgid "master branch"
7398 #: builtin/remote.c:172
7402 #: builtin/remote.c:173
7403 msgid "set up remote as a mirror to push to or fetch from"
7406 #: builtin/remote.c:185
7407 msgid "specifying a master branch makes no sense with --mirror"
7410 #: builtin/remote.c:187
7411 msgid "specifying branches to track makes sense only with fetch mirrors"
7414 #: builtin/remote.c:195 builtin/remote.c:646
7416 msgid "remote %s already exists."
7419 #: builtin/remote.c:199 builtin/remote.c:650
7421 msgid "'%s' is not a valid remote name"
7424 #: builtin/remote.c:243
7426 msgid "Could not setup master '%s'"
7429 #: builtin/remote.c:299
7431 msgid "more than one %s"
7434 #: builtin/remote.c:339
7436 msgid "Could not get fetch map for refspec %s"
7439 #: builtin/remote.c:440 builtin/remote.c:448
7443 #: builtin/remote.c:452
7447 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7449 msgid "Could not append '%s' to '%s'"
7452 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7454 msgid "No such remote: %s"
7457 #: builtin/remote.c:656
7459 msgid "Could not rename config section '%s' to '%s'"
7462 #: builtin/remote.c:662 builtin/remote.c:799
7464 msgid "Could not remove config section '%s'"
7467 #: builtin/remote.c:677
7470 "Not updating non-default fetch refspec\n"
7472 "\tPlease update the configuration manually if necessary."
7475 #: builtin/remote.c:683
7477 msgid "Could not append '%s'"
7480 #: builtin/remote.c:694
7482 msgid "Could not set '%s'"
7485 #: builtin/remote.c:716
7487 msgid "deleting '%s' failed"
7490 #: builtin/remote.c:750
7492 msgid "creating '%s' failed"
7495 #: builtin/remote.c:764
7497 msgid "Could not remove branch %s"
7500 #: builtin/remote.c:834
7502 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7503 "to delete it, use:"
7505 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7506 "to delete them, use:"
7510 #: builtin/remote.c:943
7512 msgid " new (next fetch will store in remotes/%s)"
7515 #: builtin/remote.c:946
7519 #: builtin/remote.c:948
7520 msgid " stale (use 'git remote prune' to remove)"
7523 #: builtin/remote.c:950
7527 #: builtin/remote.c:991
7529 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7532 #: builtin/remote.c:998
7534 msgid "rebases onto remote %s"
7537 #: builtin/remote.c:1001
7539 msgid " merges with remote %s"
7542 #: builtin/remote.c:1002
7543 msgid " and with remote"
7546 #: builtin/remote.c:1004
7548 msgid "merges with remote %s"
7551 #: builtin/remote.c:1005
7552 msgid " and with remote"
7555 #: builtin/remote.c:1051
7559 #: builtin/remote.c:1054
7563 #: builtin/remote.c:1058
7567 #: builtin/remote.c:1061
7568 msgid "fast-forwardable"
7571 #: builtin/remote.c:1064
7572 msgid "local out of date"
7575 #: builtin/remote.c:1071
7577 msgid " %-*s forces to %-*s (%s)"
7580 #: builtin/remote.c:1074
7582 msgid " %-*s pushes to %-*s (%s)"
7585 #: builtin/remote.c:1078
7587 msgid " %-*s forces to %s"
7590 #: builtin/remote.c:1081
7592 msgid " %-*s pushes to %s"
7595 #: builtin/remote.c:1091
7596 msgid "do not query remotes"
7599 #: builtin/remote.c:1118
7604 #: builtin/remote.c:1119
7606 msgid " Fetch URL: %s"
7609 #: builtin/remote.c:1120 builtin/remote.c:1285
7613 #: builtin/remote.c:1129 builtin/remote.c:1131
7615 msgid " Push URL: %s"
7618 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7620 msgid " HEAD branch: %s"
7623 #: builtin/remote.c:1139
7626 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7629 #: builtin/remote.c:1151
7631 msgid " Remote branch:%s"
7632 msgid_plural " Remote branches:%s"
7636 #: builtin/remote.c:1154 builtin/remote.c:1181
7637 msgid " (status not queried)"
7640 #: builtin/remote.c:1163
7641 msgid " Local branch configured for 'git pull':"
7642 msgid_plural " Local branches configured for 'git pull':"
7646 #: builtin/remote.c:1171
7647 msgid " Local refs will be mirrored by 'git push'"
7650 #: builtin/remote.c:1178
7652 msgid " Local ref configured for 'git push'%s:"
7653 msgid_plural " Local refs configured for 'git push'%s:"
7657 #: builtin/remote.c:1199
7658 msgid "set refs/remotes/<name>/HEAD according to remote"
7661 #: builtin/remote.c:1201
7662 msgid "delete refs/remotes/<name>/HEAD"
7665 #: builtin/remote.c:1216
7666 msgid "Cannot determine remote HEAD"
7669 #: builtin/remote.c:1218
7670 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7673 #: builtin/remote.c:1228
7675 msgid "Could not delete %s"
7678 #: builtin/remote.c:1236
7680 msgid "Not a valid ref: %s"
7683 #: builtin/remote.c:1238
7685 msgid "Could not setup %s"
7688 #: builtin/remote.c:1274
7690 msgid " %s will become dangling!"
7693 #: builtin/remote.c:1275
7695 msgid " %s has become dangling!"
7698 #: builtin/remote.c:1281
7703 #: builtin/remote.c:1282
7708 #: builtin/remote.c:1295
7710 msgid " * [would prune] %s"
7713 #: builtin/remote.c:1298
7715 msgid " * [pruned] %s"
7718 #: builtin/remote.c:1321
7719 msgid "prune remotes after fetching"
7722 #: builtin/remote.c:1387 builtin/remote.c:1461
7724 msgid "No such remote '%s'"
7727 #: builtin/remote.c:1407
7731 #: builtin/remote.c:1414
7732 msgid "no remote specified"
7735 #: builtin/remote.c:1436
7736 msgid "manipulate push URLs"
7739 #: builtin/remote.c:1438
7743 #: builtin/remote.c:1440
7747 #: builtin/remote.c:1447
7748 msgid "--add --delete doesn't make sense"
7751 #: builtin/remote.c:1487
7753 msgid "Invalid old URL pattern: %s"
7756 #: builtin/remote.c:1495
7758 msgid "No such URL found: %s"
7761 #: builtin/remote.c:1497
7762 msgid "Will not delete all non-push URLs"
7765 #: builtin/remote.c:1569
7766 msgid "be verbose; must be placed before a subcommand"
7769 #: builtin/replace.c:17
7770 msgid "git replace [-f] <object> <replacement>"
7773 #: builtin/replace.c:18
7774 msgid "git replace -d <object>..."
7777 #: builtin/replace.c:19
7778 msgid "git replace -l [<pattern>]"
7781 #: builtin/replace.c:121
7782 msgid "list replace refs"
7785 #: builtin/replace.c:122
7786 msgid "delete replace refs"
7789 #: builtin/replace.c:123
7790 msgid "replace the ref if it exists"
7793 #: builtin/rerere.c:11
7794 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7797 #: builtin/rerere.c:56
7798 msgid "register clean resolutions in index"
7801 #: builtin/reset.c:25
7803 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7806 #: builtin/reset.c:26
7807 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7810 #: builtin/reset.c:27
7811 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7814 #: builtin/reset.c:33
7818 #: builtin/reset.c:33
7822 #: builtin/reset.c:33
7826 #: builtin/reset.c:33
7830 #: builtin/reset.c:33
7834 #: builtin/reset.c:73
7835 msgid "You do not have a valid HEAD."
7838 #: builtin/reset.c:75
7839 msgid "Failed to find tree of HEAD."
7842 #: builtin/reset.c:81
7844 msgid "Failed to find tree of %s."
7847 #: builtin/reset.c:98
7849 msgid "HEAD is now at %s"
7852 #: builtin/reset.c:169
7854 msgid "Cannot do a %s reset in the middle of a merge."
7857 #: builtin/reset.c:248
7858 msgid "be quiet, only report errors"
7861 #: builtin/reset.c:250
7862 msgid "reset HEAD and index"
7865 #: builtin/reset.c:251
7866 msgid "reset only HEAD"
7869 #: builtin/reset.c:253 builtin/reset.c:255
7870 msgid "reset HEAD, index and working tree"
7873 #: builtin/reset.c:257
7874 msgid "reset HEAD but keep local changes"
7877 #: builtin/reset.c:275
7879 msgid "Failed to resolve '%s' as a valid revision."
7882 #: builtin/reset.c:278 builtin/reset.c:286
7884 msgid "Could not parse object '%s'."
7887 #: builtin/reset.c:283
7889 msgid "Failed to resolve '%s' as a valid tree."
7892 #: builtin/reset.c:292
7893 msgid "--patch is incompatible with --{hard,mixed,soft}"
7896 #: builtin/reset.c:301
7897 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7900 #: builtin/reset.c:303
7902 msgid "Cannot do %s reset with paths."
7905 #: builtin/reset.c:313
7907 msgid "%s reset is not allowed in a bare repository"
7910 #: builtin/reset.c:333
7912 msgid "Could not reset index file to revision '%s'."
7915 #: builtin/reset.c:339
7916 msgid "Unstaged changes after reset:"
7919 #: builtin/reset.c:344
7920 msgid "Could not write new index file."
7923 #: builtin/rev-parse.c:339
7924 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7927 #: builtin/rev-parse.c:344
7928 msgid "keep the `--` passed as an arg"
7931 #: builtin/rev-parse.c:346
7932 msgid "stop parsing after the first non-option argument"
7935 #: builtin/rev-parse.c:464
7937 "git rev-parse --parseopt [options] -- [<args>...]\n"
7938 " or: git rev-parse --sq-quote [<arg>...]\n"
7939 " or: git rev-parse [options] [<arg>...]\n"
7941 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7944 #: builtin/revert.c:22
7945 msgid "git revert [options] <commit-ish>..."
7948 #: builtin/revert.c:23
7949 msgid "git revert <subcommand>"
7952 #: builtin/revert.c:28
7953 msgid "git cherry-pick [options] <commit-ish>..."
7956 #: builtin/revert.c:29
7957 msgid "git cherry-pick <subcommand>"
7960 #: builtin/revert.c:70 builtin/revert.c:92
7962 msgid "%s: %s cannot be used with %s"
7965 #: builtin/revert.c:103
7966 msgid "end revert or cherry-pick sequence"
7969 #: builtin/revert.c:104
7970 msgid "resume revert or cherry-pick sequence"
7973 #: builtin/revert.c:105
7974 msgid "cancel revert or cherry-pick sequence"
7977 #: builtin/revert.c:106
7978 msgid "don't automatically commit"
7981 #: builtin/revert.c:107
7982 msgid "edit the commit message"
7985 #: builtin/revert.c:110
7986 msgid "parent number"
7989 #: builtin/revert.c:112
7990 msgid "merge strategy"
7993 #: builtin/revert.c:113
7997 #: builtin/revert.c:114
7998 msgid "option for merge strategy"
8001 #: builtin/revert.c:125
8002 msgid "append commit name"
8005 #: builtin/revert.c:126
8006 msgid "allow fast-forward"
8009 #: builtin/revert.c:127
8010 msgid "preserve initially empty commits"
8013 #: builtin/revert.c:128
8014 msgid "allow commits with empty messages"
8017 #: builtin/revert.c:129
8018 msgid "keep redundant, empty commits"
8021 #: builtin/revert.c:133
8022 msgid "program error"
8025 #: builtin/revert.c:223
8026 msgid "revert failed"
8029 #: builtin/revert.c:238
8030 msgid "cherry-pick failed"
8034 msgid "git rm [options] [--] <file>..."
8037 #: builtin/rm.c:64 builtin/rm.c:186
8040 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8041 "(use 'rm -rf' if you really want to remove it including all of its history)"
8047 "'%s' has staged content different from both the file and the HEAD\n"
8048 "(use -f to force removal)"
8054 "'%s' has changes staged in the index\n"
8055 "(use --cached to keep the file, or -f to force removal)"
8061 "'%s' has local modifications\n"
8062 "(use --cached to keep the file, or -f to force removal)"
8066 msgid "do not list removed files"
8070 msgid "only remove from the index"
8074 msgid "override the up-to-date check"
8078 msgid "allow recursive removal"
8082 msgid "exit with a zero status even if nothing matched"
8087 msgid "not removing '%s' recursively without -r"
8092 msgid "git rm: unable to remove %s"
8095 #: builtin/shortlog.c:13
8096 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8099 #: builtin/shortlog.c:131
8101 msgid "Missing author: %s"
8104 #: builtin/shortlog.c:227
8105 msgid "sort output according to the number of commits per author"
8108 #: builtin/shortlog.c:229
8109 msgid "Suppress commit descriptions, only provides commit count"
8112 #: builtin/shortlog.c:231
8113 msgid "Show the email address of each author"
8116 #: builtin/shortlog.c:232
8120 #: builtin/shortlog.c:233
8121 msgid "Linewrap output"
8124 #: builtin/show-branch.c:9
8126 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8127 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8128 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8132 #: builtin/show-branch.c:10
8133 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8136 #: builtin/show-branch.c:650
8137 msgid "show remote-tracking and local branches"
8140 #: builtin/show-branch.c:652
8141 msgid "show remote-tracking branches"
8144 #: builtin/show-branch.c:654
8145 msgid "color '*!+-' corresponding to the branch"
8148 #: builtin/show-branch.c:656
8149 msgid "show <n> more commits after the common ancestor"
8152 #: builtin/show-branch.c:658
8153 msgid "synonym to more=-1"
8156 #: builtin/show-branch.c:659
8157 msgid "suppress naming strings"
8160 #: builtin/show-branch.c:661
8161 msgid "include the current branch"
8164 #: builtin/show-branch.c:663
8165 msgid "name commits with their object names"
8168 #: builtin/show-branch.c:665
8169 msgid "show possible merge bases"
8172 #: builtin/show-branch.c:667
8173 msgid "show refs unreachable from any other ref"
8176 #: builtin/show-branch.c:669
8177 msgid "show commits in topological order"
8180 #: builtin/show-branch.c:671
8181 msgid "show only commits not on the first branch"
8184 #: builtin/show-branch.c:673
8185 msgid "show merges reachable from only one tip"
8188 #: builtin/show-branch.c:675
8189 msgid "show commits where no parent comes before its children"
8192 #: builtin/show-branch.c:677
8193 msgid "<n>[,<base>]"
8196 #: builtin/show-branch.c:678
8197 msgid "show <n> most recent ref-log entries starting at base"
8200 #: builtin/show-ref.c:10
8202 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8203 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8206 #: builtin/show-ref.c:11
8207 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8210 #: builtin/show-ref.c:165
8211 msgid "only show tags (can be combined with heads)"
8214 #: builtin/show-ref.c:166
8215 msgid "only show heads (can be combined with tags)"
8218 #: builtin/show-ref.c:167
8219 msgid "stricter reference checking, requires exact ref path"
8222 #: builtin/show-ref.c:170 builtin/show-ref.c:172
8223 msgid "show the HEAD reference"
8226 #: builtin/show-ref.c:174
8227 msgid "dereference tags into object IDs"
8230 #: builtin/show-ref.c:176
8231 msgid "only show SHA1 hash using <n> digits"
8234 #: builtin/show-ref.c:180
8235 msgid "do not print results to stdout (useful with --verify)"
8238 #: builtin/show-ref.c:182
8239 msgid "show refs from stdin that aren't in local repository"
8242 #: builtin/symbolic-ref.c:7
8243 msgid "git symbolic-ref [options] name [ref]"
8246 #: builtin/symbolic-ref.c:8
8247 msgid "git symbolic-ref -d [-q] name"
8250 #: builtin/symbolic-ref.c:40
8251 msgid "suppress error message for non-symbolic (detached) refs"
8254 #: builtin/symbolic-ref.c:41
8255 msgid "delete symbolic ref"
8258 #: builtin/symbolic-ref.c:42
8259 msgid "shorten ref output"
8262 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8266 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8267 msgid "reason of the update"
8272 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8276 msgid "git tag -d <tagname>..."
8281 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8282 "\t\t[<pattern>...]"
8286 msgid "git tag -v <tagname>..."
8291 msgid "malformed object at '%s'"
8294 #: builtin/tag.c:207
8296 msgid "tag name too long: %.*s..."
8299 #: builtin/tag.c:212
8301 msgid "tag '%s' not found."
8304 #: builtin/tag.c:227
8306 msgid "Deleted tag '%s' (was %s)\n"
8309 #: builtin/tag.c:239
8311 msgid "could not verify the tag '%s'"
8314 #: builtin/tag.c:249
8318 "Write a tag message\n"
8319 "Lines starting with '%c' will be ignored.\n"
8322 #: builtin/tag.c:253
8326 "Write a tag message\n"
8327 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8331 #: builtin/tag.c:292
8332 msgid "unable to sign the tag"
8335 #: builtin/tag.c:294
8336 msgid "unable to write tag file"
8339 #: builtin/tag.c:319
8340 msgid "bad object type."
8343 #: builtin/tag.c:332
8344 msgid "tag header too big."
8347 #: builtin/tag.c:368
8348 msgid "no tag message?"
8351 #: builtin/tag.c:374
8353 msgid "The tag message has been left in %s\n"
8356 #: builtin/tag.c:423
8357 msgid "switch 'points-at' requires an object"
8360 #: builtin/tag.c:425
8362 msgid "malformed object name '%s'"
8365 #: builtin/tag.c:445
8366 msgid "list tag names"
8369 #: builtin/tag.c:447
8370 msgid "print <n> lines of each tag message"
8373 #: builtin/tag.c:449
8377 #: builtin/tag.c:450
8381 #: builtin/tag.c:452
8382 msgid "Tag creation options"
8385 #: builtin/tag.c:454
8386 msgid "annotated tag, needs a message"
8389 #: builtin/tag.c:456
8393 #: builtin/tag.c:458
8394 msgid "annotated and GPG-signed tag"
8397 #: builtin/tag.c:462
8398 msgid "use another key to sign the tag"
8401 #: builtin/tag.c:463
8402 msgid "replace the tag if exists"
8405 #: builtin/tag.c:464
8406 msgid "show tag list in columns"
8409 #: builtin/tag.c:466
8410 msgid "Tag listing options"
8413 #: builtin/tag.c:469
8414 msgid "print only tags that contain the commit"
8417 #: builtin/tag.c:475
8418 msgid "print only tags of the object"
8421 #: builtin/tag.c:504
8422 msgid "--column and -n are incompatible"
8425 #: builtin/tag.c:521
8426 msgid "-n option is only allowed with -l."
8429 #: builtin/tag.c:523
8430 msgid "--contains option is only allowed with -l."
8433 #: builtin/tag.c:525
8434 msgid "--points-at option is only allowed with -l."
8437 #: builtin/tag.c:533
8438 msgid "only one -F or -m option is allowed."
8441 #: builtin/tag.c:553
8442 msgid "too many params"
8445 #: builtin/tag.c:559
8447 msgid "'%s' is not a valid tag name."
8450 #: builtin/tag.c:564
8452 msgid "tag '%s' already exists"
8455 #: builtin/tag.c:582
8457 msgid "%s: cannot lock the ref"
8460 #: builtin/tag.c:584
8462 msgid "%s: cannot update the ref"
8465 #: builtin/tag.c:586
8467 msgid "Updated tag '%s' (was %s)\n"
8470 #: builtin/update-index.c:401
8471 msgid "git update-index [options] [--] [<file>...]"
8474 #: builtin/update-index.c:718
8475 msgid "continue refresh even when index needs update"
8478 #: builtin/update-index.c:721
8479 msgid "refresh: ignore submodules"
8482 #: builtin/update-index.c:724
8483 msgid "do not ignore new files"
8486 #: builtin/update-index.c:726
8487 msgid "let files replace directories and vice-versa"
8490 #: builtin/update-index.c:728
8491 msgid "notice files missing from worktree"
8494 #: builtin/update-index.c:730
8495 msgid "refresh even if index contains unmerged entries"
8498 #: builtin/update-index.c:733
8499 msgid "refresh stat information"
8502 #: builtin/update-index.c:737
8503 msgid "like --refresh, but ignore assume-unchanged setting"
8506 #: builtin/update-index.c:741
8507 msgid "<mode> <object> <path>"
8510 #: builtin/update-index.c:742
8511 msgid "add the specified entry to the index"
8514 #: builtin/update-index.c:746
8518 #: builtin/update-index.c:747
8519 msgid "override the executable bit of the listed files"
8522 #: builtin/update-index.c:751
8523 msgid "mark files as \"not changing\""
8526 #: builtin/update-index.c:754
8527 msgid "clear assumed-unchanged bit"
8530 #: builtin/update-index.c:757
8531 msgid "mark files as \"index-only\""
8534 #: builtin/update-index.c:760
8535 msgid "clear skip-worktree bit"
8538 #: builtin/update-index.c:763
8539 msgid "add to index only; do not add content to object database"
8542 #: builtin/update-index.c:765
8543 msgid "remove named paths even if present in worktree"
8546 #: builtin/update-index.c:767
8547 msgid "with --stdin: input lines are terminated by null bytes"
8550 #: builtin/update-index.c:769
8551 msgid "read list of paths to be updated from standard input"
8554 #: builtin/update-index.c:773
8555 msgid "add entries from standard input to the index"
8558 #: builtin/update-index.c:777
8559 msgid "repopulate stages #2 and #3 for the listed paths"
8562 #: builtin/update-index.c:781
8563 msgid "only update entries that differ from HEAD"
8566 #: builtin/update-index.c:785
8567 msgid "ignore files missing from worktree"
8570 #: builtin/update-index.c:788
8571 msgid "report actions to standard output"
8574 #: builtin/update-index.c:790
8575 msgid "(for porcelains) forget saved unresolved conflicts"
8578 #: builtin/update-index.c:794
8579 msgid "write index in this format"
8582 #: builtin/update-ref.c:7
8583 msgid "git update-ref [options] -d <refname> [<oldval>]"
8586 #: builtin/update-ref.c:8
8587 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8590 #: builtin/update-ref.c:19
8591 msgid "delete the reference"
8594 #: builtin/update-ref.c:21
8595 msgid "update <refname> not the one it points to"
8598 #: builtin/update-server-info.c:6
8599 msgid "git update-server-info [--force]"
8602 #: builtin/update-server-info.c:14
8603 msgid "update the info files from scratch"
8606 #: builtin/verify-pack.c:56
8607 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8610 #: builtin/verify-pack.c:66
8614 #: builtin/verify-pack.c:68
8615 msgid "show statistics only"
8618 #: builtin/verify-tag.c:17
8619 msgid "git verify-tag [-v|--verbose] <tag>..."
8622 #: builtin/verify-tag.c:73
8623 msgid "print tag contents"
8626 #: builtin/write-tree.c:13
8627 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8630 #: builtin/write-tree.c:26
8634 #: builtin/write-tree.c:27
8635 msgid "write tree object for a subdirectory <prefix>"
8638 #: builtin/write-tree.c:30
8639 msgid "only useful for debugging"
8644 "'git help -a' and 'git help -g' lists available subcommands and some\n"
8645 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
8646 "to read about a specific subcommand or concept."
8649 #: parse-options.h:156
8650 msgid "no-op (backward compatibility)"
8653 #: parse-options.h:232
8654 msgid "be more verbose"
8657 #: parse-options.h:234
8658 msgid "be more quiet"
8661 #: parse-options.h:240
8662 msgid "use <n> digits to display SHA-1s"
8666 msgid "Add file contents to the index"
8670 msgid "Find by binary search the change that introduced a bug"
8674 msgid "List, create, or delete branches"
8678 msgid "Checkout a branch or paths to the working tree"
8682 msgid "Clone a repository into a new directory"
8686 msgid "Record changes to the repository"
8690 msgid "Show changes between commits, commit and working tree, etc"
8694 msgid "Download objects and refs from another repository"
8698 msgid "Print lines matching a pattern"
8702 msgid "Create an empty Git repository or reinitialize an existing one"
8706 msgid "Show commit logs"
8710 msgid "Join two or more development histories together"
8714 msgid "Move or rename a file, a directory, or a symlink"
8718 msgid "Fetch from and merge with another repository or a local branch"
8722 msgid "Update remote refs along with associated objects"
8726 msgid "Forward-port local commits to the updated upstream head"
8730 msgid "Reset current HEAD to the specified state"
8734 msgid "Remove files from the working tree and from the index"
8738 msgid "Show various types of objects"
8742 msgid "Show the working tree status"
8746 msgid "Create, list, delete or verify a tag object signed with GPG"
8750 msgid "You need to set your committer info first"
8755 "You seem to have moved HEAD since the last 'am' failure.\n"
8756 "Not rewinding to ORIG_HEAD"
8762 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8763 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8764 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8768 msgid "Cannot fall back to three-way merge."
8772 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8776 msgid "Using index info to reconstruct a base tree..."
8781 "Did you hand edit your patch?\n"
8782 "It does not apply to blobs recorded in its index."
8786 msgid "Falling back to patching base and 3-way merge..."
8790 msgid "Failed to merge in the changes."
8794 msgid "Only one StGIT patch series can be applied at once"
8799 msgid "Patch format $patch_format is not supported."
8803 msgid "Patch format detection failed."
8808 "The -b/--binary option has been a no-op for long time, and\n"
8809 "it will be removed. Please do not use it anymore."
8814 msgid "previous rebase directory $dotest still exists but mbox given."
8818 msgid "Please make up your mind. --skip or --abort?"
8822 msgid "Resolve operation not in progress, we are not resuming."
8827 msgid "Dirty index: cannot apply patches (dirty: $files)"
8833 "Patch is empty. Was it split wrong?\n"
8834 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8835 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8839 msgid "Patch does not have a valid e-mail address."
8843 msgid "cannot be interactive without stdin connected to a terminal."
8847 msgid "Commit Body is:"
8850 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8851 #. in your translation. The program will only accept English
8852 #. input at this point.
8854 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8859 msgid "Applying: $FIRSTLINE"
8864 "No changes - did you forget to use 'git add'?\n"
8865 "If there is nothing left to stage, chances are that something else\n"
8866 "already introduced the same changes; you might want to skip this patch."
8871 "You still have unmerged paths in your index\n"
8872 "did you forget to use 'git add'?"
8876 msgid "No changes -- Patch already applied."
8881 msgid "Patch failed at $msgnum $FIRSTLINE"
8887 "The copy of the patch that failed is found in:\n"
8892 msgid "applying to an empty history"
8896 msgid "You need to start by \"git bisect start\""
8899 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8900 #. translation. The program will only accept English input
8903 msgid "Do you want me to do it for you [Y/n]? "
8908 msgid "unrecognised option: '$arg'"
8913 msgid "'$arg' does not appear to be a valid revision"
8916 #: git-bisect.sh:117
8917 msgid "Bad HEAD - I need a HEAD"
8920 #: git-bisect.sh:130
8923 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8926 #: git-bisect.sh:140
8927 msgid "won't bisect on seeked tree"
8930 #: git-bisect.sh:144
8931 msgid "Bad HEAD - strange symbolic ref"
8934 #: git-bisect.sh:189
8936 msgid "Bad bisect_write argument: $state"
8939 #: git-bisect.sh:218
8941 msgid "Bad rev input: $arg"
8944 #: git-bisect.sh:232
8945 msgid "Please call 'bisect_state' with at least one argument."
8948 #: git-bisect.sh:244
8950 msgid "Bad rev input: $rev"
8953 #: git-bisect.sh:250
8954 msgid "'git bisect bad' can take only one argument."
8957 #. have bad but not good. we could bisect although
8958 #. this is less optimum.
8959 #: git-bisect.sh:273
8960 msgid "Warning: bisecting only with a bad commit."
8963 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8964 #. translation. The program will only accept English input
8966 #: git-bisect.sh:279
8967 msgid "Are you sure [Y/n]? "
8970 #: git-bisect.sh:289
8972 "You need to give me at least one good and one bad revisions.\n"
8973 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8976 #: git-bisect.sh:292
8978 "You need to start by \"git bisect start\".\n"
8979 "You then need to give me at least one good and one bad revisions.\n"
8980 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8983 #: git-bisect.sh:363 git-bisect.sh:490
8984 msgid "We are not bisecting."
8987 #: git-bisect.sh:370
8989 msgid "'$invalid' is not a valid commit"
8992 #: git-bisect.sh:379
8995 "Could not check out original HEAD '$branch'.\n"
8996 "Try 'git bisect reset <commit>'."
8999 #: git-bisect.sh:406
9000 msgid "No logfile given"
9003 #: git-bisect.sh:407
9005 msgid "cannot read $file for replaying"
9008 #: git-bisect.sh:424
9009 msgid "?? what are you talking about?"
9012 #: git-bisect.sh:436
9014 msgid "running $command"
9017 #: git-bisect.sh:443
9020 "bisect run failed:\n"
9021 "exit code $res from '$command' is < 0 or >= 128"
9024 #: git-bisect.sh:469
9025 msgid "bisect run cannot continue any more"
9028 #: git-bisect.sh:475
9031 "bisect run failed:\n"
9032 "'bisect_state $state' exited with error code $res"
9035 #: git-bisect.sh:482
9036 msgid "bisect run success"
9041 "Pull is not possible because you have unmerged files.\n"
9042 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9043 "as appropriate to mark resolution, or use 'git commit -a'."
9047 msgid "Pull is not possible because you have unmerged files."
9051 msgid "updating an unborn branch with changes added to the index"
9054 #. The fetch involved updating the current branch.
9055 #. The working tree and the index file is still based on the
9056 #. $orig_head commit, but we are merging into $curr_head.
9057 #. First update the working tree to match $curr_head.
9061 "Warning: fetch updated the current branch head.\n"
9062 "Warning: fast-forwarding your working tree from\n"
9063 "Warning: commit $orig_head."
9067 msgid "Cannot merge multiple branches into empty head"
9071 msgid "Cannot rebase onto multiple branches"
9076 "When you have resolved this problem, run \"git rebase --continue\".\n"
9077 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9078 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9082 #: git-rebase.sh:160
9083 msgid "The pre-rebase hook refused to rebase."
9086 #: git-rebase.sh:165
9087 msgid "It looks like git-am is in progress. Cannot rebase."
9090 #: git-rebase.sh:296
9091 msgid "The --exec option must be used with the --interactive option"
9094 #: git-rebase.sh:301
9095 msgid "No rebase in progress?"
9098 #: git-rebase.sh:312
9099 msgid "The --edit-todo action can only be used during interactive rebase."
9102 #: git-rebase.sh:319
9103 msgid "Cannot read HEAD"
9106 #: git-rebase.sh:322
9108 "You must edit all merge conflicts and then\n"
9109 "mark them as resolved using git add"
9112 #: git-rebase.sh:340
9114 msgid "Could not move back to $head_name"
9117 #: git-rebase.sh:359
9120 "It seems that there is already a $state_dir_base directory, and\n"
9121 "I wonder if you are in the middle of another rebase. If that is the\n"
9122 "case, please try\n"
9123 "\t$cmd_live_rebase\n"
9124 "If that is not the case, please\n"
9125 "\t$cmd_clear_stale_rebase\n"
9126 "and run me again. I am stopping in case you still have something\n"
9130 #: git-rebase.sh:404
9132 msgid "invalid upstream $upstream_name"
9135 #: git-rebase.sh:428
9137 msgid "$onto_name: there are more than one merge bases"
9140 #: git-rebase.sh:431 git-rebase.sh:435
9142 msgid "$onto_name: there is no merge base"
9145 #: git-rebase.sh:440
9147 msgid "Does not point to a valid commit: $onto_name"
9150 #: git-rebase.sh:463
9152 msgid "fatal: no such branch: $branch_name"
9155 #: git-rebase.sh:483
9156 msgid "Please commit or stash them."
9159 #: git-rebase.sh:501
9161 msgid "Current branch $branch_name is up to date."
9164 #: git-rebase.sh:504
9166 msgid "Current branch $branch_name is up to date, rebase forced."
9169 #: git-rebase.sh:515
9171 msgid "Changes from $mb to $onto:"
9174 #. Detach HEAD and reset the tree
9175 #: git-rebase.sh:524
9176 msgid "First, rewinding head to replay your work on top of it..."
9179 #: git-rebase.sh:532
9181 msgid "Fast-forwarded $branch_name to $onto_name."
9185 msgid "git stash clear with parameters is unimplemented"
9189 msgid "You do not have the initial commit yet"
9193 msgid "Cannot save the current index state"
9196 #: git-stash.sh:123 git-stash.sh:136
9197 msgid "Cannot save the current worktree state"
9201 msgid "No changes selected"
9205 msgid "Cannot remove temporary index (can't happen)"
9209 msgid "Cannot record working tree state"
9212 #. TRANSLATORS: $option is an invalid option, like
9213 #. `--blah-blah'. The 7 spaces at the beginning of the
9214 #. second line correspond to "error: ". So you should line
9215 #. up the second line with however many characters the
9216 #. translation of "error: " takes in your language. E.g. in
9219 #. $ git stash save --blah-blah 2>&1 | head -n 2
9220 #. error: unknown option for 'stash save': --blah-blah
9221 #. To provide a message, use git stash save -- '--blah-blah'
9225 "error: unknown option for 'stash save': $option\n"
9226 " To provide a message, use git stash save -- '$option'"
9230 msgid "No local changes to save"
9234 msgid "Cannot initialize stash"
9238 msgid "Cannot save the current status"
9242 msgid "Cannot remove worktree changes"
9246 msgid "No stash found."
9251 msgid "Too many revisions specified: $REV"
9256 msgid "$reference is not valid reference"
9261 msgid "'$args' is not a stash-like commit"
9266 msgid "'$args' is not a stash reference"
9270 msgid "unable to refresh index"
9274 msgid "Cannot apply a stash in the middle of a merge"
9278 msgid "Conflicts in index. Try without --index."
9282 msgid "Could not save index tree"
9286 msgid "Cannot unstage modified files"
9290 msgid "Index was not unstashed."
9295 msgid "Dropped ${REV} ($s)"
9300 msgid "${REV}: Could not drop stash entry"
9304 msgid "No branch name specified"
9308 msgid "(To restore them type \"git stash apply\")"
9311 #: git-submodule.sh:91
9313 msgid "cannot strip one component off url '$remoteurl'"
9316 #: git-submodule.sh:196
9318 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9321 #: git-submodule.sh:239
9323 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9326 #: git-submodule.sh:251
9328 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9331 #: git-submodule.sh:349
9333 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9336 #: git-submodule.sh:366
9338 msgid "'$sm_path' already exists in the index"
9341 #: git-submodule.sh:370
9344 "The following path is ignored by one of your .gitignore files:\n"
9346 "Use -f if you really want to add it."
9349 #: git-submodule.sh:388
9351 msgid "Adding existing repo at '$sm_path' to the index"
9354 #: git-submodule.sh:390
9356 msgid "'$sm_path' already exists and is not a valid git repo"
9359 #: git-submodule.sh:398
9361 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9364 #: git-submodule.sh:400
9367 "If you want to reuse this local git directory instead of cloning again from"
9370 #: git-submodule.sh:402
9373 "use the '--force' option. If the local git directory is not the correct repo"
9376 #: git-submodule.sh:403
9379 "or you are unsure what this means choose another name with the '--name' "
9383 #: git-submodule.sh:405
9385 msgid "Reactivating local git directory for submodule '$sm_name'."
9388 #: git-submodule.sh:417
9390 msgid "Unable to checkout submodule '$sm_path'"
9393 #: git-submodule.sh:422
9395 msgid "Failed to add submodule '$sm_path'"
9398 #: git-submodule.sh:431
9400 msgid "Failed to register submodule '$sm_path'"
9403 #: git-submodule.sh:474
9405 msgid "Entering '$prefix$sm_path'"
9408 #: git-submodule.sh:488
9410 msgid "Stopping at '$sm_path'; script returned non-zero status."
9413 #: git-submodule.sh:532
9415 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9418 #: git-submodule.sh:541
9420 msgid "Failed to register url for submodule path '$sm_path'"
9423 #: git-submodule.sh:543
9425 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9428 #: git-submodule.sh:551
9430 msgid "Failed to register update mode for submodule path '$sm_path'"
9433 #: git-submodule.sh:588
9435 msgid "Use '.' if you really want to deinitialize all submodules"
9438 #: git-submodule.sh:603
9440 msgid "Submodule work tree '$sm_path' contains a .git directory"
9443 #: git-submodule.sh:604
9446 "(use 'rm -rf' if you really want to remove it including all of its history)"
9449 #: git-submodule.sh:610
9452 "Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9456 #: git-submodule.sh:613
9458 msgid "Cleared directory '$sm_path'"
9461 #: git-submodule.sh:614
9463 msgid "Could not remove submodule work tree '$sm_path'"
9466 #: git-submodule.sh:617
9468 msgid "Could not create empty submodule directory '$sm_path'"
9471 #: git-submodule.sh:626
9473 msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9476 #: git-submodule.sh:731
9479 "Submodule path '$prefix$sm_path' not initialized\n"
9480 "Maybe you want to use 'update --init'?"
9483 #: git-submodule.sh:744
9485 msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9488 #: git-submodule.sh:753
9490 msgid "Unable to fetch in submodule path '$sm_path'"
9493 #: git-submodule.sh:777
9495 msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9498 #: git-submodule.sh:791
9500 msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9503 #: git-submodule.sh:792
9505 msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9508 #: git-submodule.sh:797
9510 msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9513 #: git-submodule.sh:798
9515 msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9518 #: git-submodule.sh:803
9520 msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9523 #: git-submodule.sh:804
9525 msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9528 #: git-submodule.sh:831
9530 msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9533 #: git-submodule.sh:939
9534 msgid "The --cached option cannot be used with the --files option"
9538 #: git-submodule.sh:979
9540 msgid "unexpected mode $mod_dst"
9543 #: git-submodule.sh:997
9545 msgid " Warn: $name doesn't contain commit $sha1_src"
9548 #: git-submodule.sh:1000
9550 msgid " Warn: $name doesn't contain commit $sha1_dst"
9553 #: git-submodule.sh:1003
9555 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9558 #: git-submodule.sh:1028
9562 #: git-submodule.sh:1066
9563 msgid "Submodules changed but not updated:"
9566 #: git-submodule.sh:1068
9567 msgid "Submodule changes to be committed:"
9570 #: git-submodule.sh:1153
9572 msgid "Failed to recurse into submodule path '$sm_path'"
9575 #: git-submodule.sh:1216
9577 msgid "Synchronizing submodule url for '$prefix$sm_path'"