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-11-02 08:06+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"
55 #: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
57 msgid "pathspec '%s' did not match any files"
65 msgid "archive format"
68 #: archive.c:328 builtin/log.c:1193
73 msgid "prepend prefix to each pathname in the archive"
76 #: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
77 #: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
78 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
79 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
80 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
84 #: archive.c:331 builtin/archive.c:89
85 msgid "write the archive to this file"
89 msgid "read .gitattributes in working directory"
93 msgid "report archived files on stderr"
101 msgid "compress faster"
105 msgid "compress better"
109 msgid "list supported archive formats"
112 #: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
116 #: archive.c:350 builtin/archive.c:91
117 msgid "retrieve the archive from remote repository <repo>"
120 #: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
124 #: archive.c:352 builtin/archive.c:93
125 msgid "path to the remote git-upload-archive command"
130 "Negative patterns are ignored in git attributes\n"
131 "Use '\\!' for literal leading exclamation."
136 msgid "Not setting branch %s as its own upstream."
141 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
146 msgid "Branch %s set up to track remote branch %s from %s."
151 msgid "Branch %s set up to track local branch %s by rebasing."
156 msgid "Branch %s set up to track local branch %s."
161 msgid "Branch %s set up to track remote ref %s by rebasing."
166 msgid "Branch %s set up to track remote ref %s."
171 msgid "Branch %s set up to track local ref %s by rebasing."
176 msgid "Branch %s set up to track local ref %s."
181 msgid "Tracking not set up: name too long: %s"
186 msgid "Not tracking: ambiguous information for ref %s"
191 msgid "'%s' is not a valid branch name."
196 msgid "A branch named '%s' already exists."
200 msgid "Cannot force update the current branch."
205 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
210 msgid "the requested upstream branch '%s' does not exist"
216 "If you are planning on basing your work on an upstream\n"
217 "branch that already exists at the remote, you may need to\n"
218 "run \"git fetch\" to retrieve it.\n"
220 "If you are planning to push out a new local branch that\n"
221 "will track its remote counterpart, you may want to use\n"
222 "\"git push -u\" to set the upstream config as you push."
227 msgid "Not a valid object name: '%s'."
232 msgid "Ambiguous object name: '%s'."
237 msgid "Not a valid branch point: '%s'."
241 msgid "Failed to lock ref for update"
245 msgid "Failed to write ref"
250 msgid "'%s' does not look like a v2 bundle file"
255 msgid "unrecognized header: %s%s (%d)"
258 #: bundle.c:89 builtin/commit.c:706
260 msgid "could not open '%s'"
264 msgid "Repository lacks these prerequisite commits:"
267 #: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
268 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
269 #: builtin/shortlog.c:158
270 msgid "revision walk setup failed"
275 msgid "The bundle contains this ref:"
276 msgid_plural "The bundle contains these %d refs:"
281 msgid "The bundle records a complete history."
286 msgid "The bundle requires this ref:"
287 msgid_plural "The bundle requires these %d refs:"
292 msgid "rev-list died"
295 #: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
297 msgid "unrecognized argument: %s"
302 msgid "ref '%s' is excluded by the rev-list options"
306 msgid "Refusing to create empty bundle."
310 msgid "Could not spawn pack-objects"
314 msgid "pack-objects died"
319 msgid "cannot create '%s'"
323 msgid "index-pack died"
328 msgid "could not parse %s"
333 msgid "%s %s is not a commit!"
336 #: compat/obstack.c:406 compat/obstack.c:408
337 msgid "memory exhausted"
341 msgid "Could not run 'git rev-list'"
346 msgid "failed write to rev-list: %s"
351 msgid "failed to close rev-list's stdin: %s"
355 msgid "in the future"
360 msgid "%lu second ago"
361 msgid_plural "%lu seconds ago"
367 msgid "%lu minute ago"
368 msgid_plural "%lu minutes ago"
375 msgid_plural "%lu hours ago"
382 msgid_plural "%lu days ago"
389 msgid_plural "%lu weeks ago"
395 msgid "%lu month ago"
396 msgid_plural "%lu months ago"
403 msgid_plural "%lu years"
409 msgid "%s, %lu month ago"
410 msgid_plural "%s, %lu months ago"
414 #: date.c:154 date.c:159
417 msgid_plural "%lu years ago"
423 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
428 msgid " Unknown dirstat parameter '%s'\n"
433 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
439 "Found errors in 'diff.dirstat' config variable:\n"
446 "Failed to parse --dirstat/-X option parameter:\n"
452 msgid "Failed to parse --submodule option parameter: '%s'"
455 #: gpg-interface.c:59 gpg-interface.c:131
456 msgid "could not run gpg."
459 #: gpg-interface.c:71
460 msgid "gpg did not accept the data"
463 #: gpg-interface.c:82
464 msgid "gpg failed to sign the data"
467 #: gpg-interface.c:115
469 msgid "could not create temporary file '%s': %s"
472 #: gpg-interface.c:118
474 msgid "failed writing detached signature to '%s': %s"
479 msgid "'%s': unable to read %s"
489 msgid "'%s': short read %s"
494 msgid "available git commands in '%s'"
498 msgid "git commands available from elsewhere on your $PATH"
502 msgid "The most commonly used git commands are:"
508 "'%s' appears to be a git command, but we were not\n"
509 "able to execute it. Maybe git-%s is broken?"
513 msgid "Uh oh. Your system reports no Git commands at all."
519 "WARNING: You called a Git command named '%s', which does not exist.\n"
520 "Continuing under the assumption that you meant '%s'"
525 msgid "in %0.1f seconds automatically..."
530 msgid "git: '%s' is not a git command. See 'git --help'."
533 #: help.c:385 help.c:444
539 "Did you mean one of these?"
549 msgid "failed to read the cache"
552 #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
553 #: builtin/clone.c:655
554 msgid "unable to write new index file"
557 #: merge-recursive.c:190
559 msgid "(bad commit)\n"
562 #: merge-recursive.c:206
564 msgid "addinfo_cache failed for path '%s'"
567 #: merge-recursive.c:269
568 msgid "error building trees"
571 #: merge-recursive.c:673
573 msgid "failed to create path '%s'%s"
576 #: merge-recursive.c:684
578 msgid "Removing %s to make room for subdirectory\n"
581 #. something else exists
582 #. .. but not some other error (who really cares what?)
583 #: merge-recursive.c:698 merge-recursive.c:719
584 msgid ": perhaps a D/F conflict?"
587 #: merge-recursive.c:709
589 msgid "refusing to lose untracked file at '%s'"
592 #: merge-recursive.c:749
594 msgid "cannot read object %s '%s'"
597 #: merge-recursive.c:751
599 msgid "blob expected for %s '%s'"
602 #: merge-recursive.c:774 builtin/clone.c:311
604 msgid "failed to open '%s'"
607 #: merge-recursive.c:782
609 msgid "failed to symlink '%s'"
612 #: merge-recursive.c:785
614 msgid "do not know what to do with %06o %s '%s'"
617 #: merge-recursive.c:923
618 msgid "Failed to execute internal merge"
621 #: merge-recursive.c:927
623 msgid "Unable to add %s to database"
626 #: merge-recursive.c:943
627 msgid "unsupported object type in the tree"
630 #: merge-recursive.c:1022 merge-recursive.c:1036
633 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
637 #: merge-recursive.c:1028 merge-recursive.c:1041
640 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
644 #: merge-recursive.c:1082
648 #: merge-recursive.c:1082
652 #: merge-recursive.c:1138
654 msgid "%s is a directory in %s adding as %s instead"
657 #: merge-recursive.c:1160
660 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
661 "\"->\"%s\" in \"%s\"%s"
664 #: merge-recursive.c:1165
665 msgid " (left unresolved)"
668 #: merge-recursive.c:1219
670 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
673 #: merge-recursive.c:1249
675 msgid "Renaming %s to %s and %s to %s instead"
678 #: merge-recursive.c:1448
680 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
683 #: merge-recursive.c:1458
685 msgid "Adding merged %s"
688 #: merge-recursive.c:1463 merge-recursive.c:1661
690 msgid "Adding as %s instead"
693 #: merge-recursive.c:1514
695 msgid "cannot read object %s"
698 #: merge-recursive.c:1517
700 msgid "object %s is not a blob"
703 #: merge-recursive.c:1565
707 #: merge-recursive.c:1565
711 #: merge-recursive.c:1575
715 #: merge-recursive.c:1582
719 #: merge-recursive.c:1616
721 msgid "Skipped %s (merged same as existing)"
724 #: merge-recursive.c:1630
726 msgid "Auto-merging %s"
729 #: merge-recursive.c:1634 git-submodule.sh:1125
733 #: merge-recursive.c:1635
735 msgid "CONFLICT (%s): Merge conflict in %s"
738 #: merge-recursive.c:1725
743 #: merge-recursive.c:1750
744 msgid "file/directory"
747 #: merge-recursive.c:1756
748 msgid "directory/file"
751 #: merge-recursive.c:1761
753 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
756 #: merge-recursive.c:1771
761 #: merge-recursive.c:1788
762 msgid "Fatal merge failure, shouldn't happen."
765 #: merge-recursive.c:1807
766 msgid "Already up-to-date!"
769 #: merge-recursive.c:1816
771 msgid "merging of trees %s and %s failed"
774 #: merge-recursive.c:1846
776 msgid "Unprocessed path??? %s"
779 #: merge-recursive.c:1891
783 #: merge-recursive.c:1904
785 msgid "found %u common ancestor:"
786 msgid_plural "found %u common ancestors:"
790 #: merge-recursive.c:1941
791 msgid "merge returned no commit"
794 #: merge-recursive.c:1998
796 msgid "Could not parse object '%s'"
799 #: merge-recursive.c:2010 builtin/merge.c:672
800 msgid "Unable to write index."
804 msgid "Cannot commit uninitialized/unreferenced notes tree"
809 msgid "Bad notes.rewriteMode value: '%s'"
814 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
817 #. TRANSLATORS: The first %s is the name of the
818 #. environment variable, the second %s is its value
821 msgid "Bad %s value: '%s'"
826 msgid "unable to parse object: %s"
829 #: parse-options.c:537
833 #: parse-options.c:555
838 #. TRANSLATORS: the colon here should align with the
839 #. one in "usage: %s" translation
840 #: parse-options.c:559
845 #: parse-options.c:562
850 #: parse-options.c:596
855 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
860 "global 'literal' pathspec setting is incompatible with all other global "
865 msgid "invalid parameter for pathspec magic 'prefix'"
870 msgid "Invalid pathspec magic '%.*s' in '%s'"
875 msgid "Missing ')' at the end of pathspec magic in '%s'"
880 msgid "Unimplemented pathspec magic '%c' in '%s'"
885 msgid "%s: 'literal' and 'glob' are incompatible"
890 msgid "%s: '%s' is outside repository"
895 msgid "Pathspec '%s' is in submodule '%.*s'"
899 #. * We may want to substitute "this command" with a command
900 #. * name. E.g. when add--interactive dies when running
905 msgid "%s: pathspec magic not supported by this command: %s"
910 msgid "pathspec '%s' is beyond a symbolic link"
915 msgid "Your branch is based on '%s', but the upstream is gone.\n"
919 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
924 msgid "Your branch is up-to-date with '%s'.\n"
929 msgid "Your branch is ahead of '%s' by %d commit.\n"
930 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
935 msgid " (use \"git push\" to publish your local commits)\n"
940 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
942 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
947 msgid " (use \"git pull\" to update your local branch)\n"
953 "Your branch and '%s' have diverged,\n"
954 "and have %d and %d different commit each, respectively.\n"
956 "Your branch and '%s' have diverged,\n"
957 "and have %d and %d different commits each, respectively.\n"
962 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
966 msgid "open /dev/null failed"
971 msgid "dup2(%d,%d) failed"
974 #: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
975 #: builtin/merge.c:1013 builtin/merge.c:1023
977 msgid "Could not open '%s' for writing"
980 #: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
981 #: builtin/merge.c:1015 builtin/merge.c:1028
983 msgid "Could not write to '%s'"
988 "after resolving the conflicts, mark the corrected paths\n"
989 "with 'git add <paths>' or 'git rm <paths>'"
994 "after resolving the conflicts, mark the corrected paths\n"
995 "with 'git add <paths>' or 'git rm <paths>'\n"
996 "and commit the result with 'git commit'"
999 #: sequencer.c:245 sequencer.c:870 sequencer.c:953
1001 msgid "Could not write to %s"
1006 msgid "Error wrapping up %s"
1010 msgid "Your local changes would be overwritten by cherry-pick."
1014 msgid "Your local changes would be overwritten by revert."
1018 msgid "Commit your changes or stash them to proceed."
1021 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1024 msgid "%s: Unable to write new index file"
1028 msgid "Could not resolve HEAD commit\n"
1032 msgid "Unable to update cache tree\n"
1037 msgid "Could not parse commit %s\n"
1042 msgid "Could not parse parent commit %s\n"
1046 msgid "Your index file is unmerged."
1051 msgid "Commit %s is a merge but no -m option was given."
1056 msgid "Commit %s does not have parent %d"
1061 msgid "Mainline was specified but commit %s is not a merge."
1064 #. TRANSLATORS: The first %s will be "revert" or
1065 #. "cherry-pick", the second %s a SHA1
1068 msgid "%s: cannot parse parent commit %s"
1073 msgid "Cannot get commit message for %s"
1078 msgid "could not revert %s... %s"
1083 msgid "could not apply %s... %s"
1087 msgid "empty commit set passed"
1092 msgid "git %s: failed to read the index"
1097 msgid "git %s: failed to refresh the index"
1102 msgid "Cannot %s during a %s"
1107 msgid "Could not parse line %d."
1111 msgid "No commits parsed."
1116 msgid "Could not open %s"
1121 msgid "Could not read %s."
1126 msgid "Unusable instruction sheet: %s"
1131 msgid "Invalid key: %s"
1136 msgid "Invalid value for %s: %s"
1141 msgid "Malformed options sheet: %s"
1145 msgid "a cherry-pick or revert is already in progress"
1149 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1154 msgid "Could not create sequencer directory %s"
1157 #: sequencer.c:872 sequencer.c:957
1159 msgid "Error wrapping up %s."
1162 #: sequencer.c:891 sequencer.c:1025
1163 msgid "no cherry-pick or revert in progress"
1167 msgid "cannot resolve HEAD"
1171 msgid "cannot abort from a branch yet to be born"
1174 #: sequencer.c:917 builtin/apply.c:4061
1176 msgid "cannot open %s: %s"
1181 msgid "cannot read %s: %s"
1185 msgid "unexpected end of file"
1190 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1195 msgid "Could not format %s."
1200 msgid "%s: can't cherry-pick a %s"
1205 msgid "%s: bad revision"
1209 msgid "Can't revert as initial commit"
1213 msgid "Can't cherry-pick into empty head"
1218 "Git normally never creates a ref that ends with 40 hex characters\n"
1219 "because it will be ignored when you just specify 40-hex. These refs\n"
1220 "may be created by mistake. For example,\n"
1222 " git checkout -b $br $(git rev-parse ...)\n"
1224 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1225 "examine these refs and maybe delete them. Turn this message off by\n"
1226 "running \"git config advice.objectNameWarning false\""
1230 msgid "HEAD does not point to a branch"
1235 msgid "No such branch: '%s'"
1240 msgid "No upstream configured for branch '%s'"
1245 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1248 #: submodule.c:64 submodule.c:98
1249 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1252 #: submodule.c:68 submodule.c:102
1254 msgid "Could not find section in .gitmodules where path=%s"
1257 #. Maybe the user already did that, don't error out here
1260 msgid "Could not update .gitmodules entry %s"
1263 #. Maybe the user already did that, don't error out here
1266 msgid "Could not remove .gitmodules entry for %s"
1270 msgid "could not find .gitmodules in index"
1274 msgid "reading updated .gitmodules failed"
1278 msgid "unable to stat updated .gitmodules"
1282 msgid "unable to remove .gitmodules from index"
1286 msgid "adding updated .gitmodules failed"
1290 msgid "staging updated .gitmodules failed"
1293 #: submodule.c:1144 builtin/init-db.c:363
1295 msgid "Could not create git link %s"
1300 msgid "Could not set core.worktree in %s"
1304 msgid "invalid URL scheme name or missing '://' suffix"
1307 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1309 msgid "invalid %XX escape sequence"
1313 msgid "missing host and scheme is not 'file:'"
1317 msgid "a 'file:' URL may not have a port number"
1321 msgid "invalid characters in host name"
1324 #: urlmatch.c:244 urlmatch.c:255
1325 msgid "invalid port number"
1329 msgid "invalid '..' path segment"
1334 msgid "unable to access '%s': %s"
1339 msgid "unable to access '%s'"
1344 msgid "unable to look up current user in the passwd file: %s"
1348 msgid "no such user"
1352 msgid "Unmerged paths:"
1355 #: wt-status.c:173 wt-status.c:200
1357 msgid " (use \"git reset %s <file>...\" to unstage)"
1360 #: wt-status.c:175 wt-status.c:202
1361 msgid " (use \"git rm --cached <file>...\" to unstage)"
1365 msgid " (use \"git add <file>...\" to mark resolution)"
1368 #: wt-status.c:181 wt-status.c:185
1369 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1373 msgid " (use \"git rm <file>...\" to mark resolution)"
1377 msgid "Changes to be committed:"
1381 msgid "Changes not staged for commit:"
1385 msgid " (use \"git add <file>...\" to update what will be committed)"
1389 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1394 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1398 msgid " (commit or discard the untracked or modified content in submodules)"
1403 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1411 msgid "both deleted:"
1415 msgid "added by us:"
1419 msgid "deleted by them:"
1423 msgid "added by them:"
1427 msgid "deleted by us:"
1435 msgid "both modified:"
1439 msgid "new commits, "
1443 msgid "modified content, "
1447 msgid "untracked content, "
1452 msgid "new file: %s"
1457 msgid "copied: %s -> %s"
1467 msgid "modified: %s"
1472 msgid "renamed: %s -> %s"
1477 msgid "typechange: %s"
1487 msgid "unmerged: %s"
1492 msgid "bug: unhandled diff status %c"
1496 msgid "Submodules changed but not updated:"
1500 msgid "Submodule changes to be committed:"
1504 msgid "You have unmerged paths."
1508 msgid " (fix conflicts and run \"git commit\")"
1512 msgid "All conflicts fixed but you are still merging."
1516 msgid " (use \"git commit\" to conclude merge)"
1520 msgid "You are in the middle of an am session."
1524 msgid "The current patch is empty."
1528 msgid " (fix conflicts and then run \"git am --continue\")"
1532 msgid " (use \"git am --skip\" to skip this patch)"
1536 msgid " (use \"git am --abort\" to restore the original branch)"
1539 #: wt-status.c:938 wt-status.c:955
1541 msgid "You are currently rebasing branch '%s' on '%s'."
1544 #: wt-status.c:943 wt-status.c:960
1545 msgid "You are currently rebasing."
1549 msgid " (fix conflicts and then run \"git rebase --continue\")"
1553 msgid " (use \"git rebase --skip\" to skip this patch)"
1557 msgid " (use \"git rebase --abort\" to check out the original branch)"
1561 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1567 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1571 msgid "You are currently splitting a commit during a rebase."
1575 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1580 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1584 msgid "You are currently editing a commit during a rebase."
1588 msgid " (use \"git commit --amend\" to amend the current commit)"
1593 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1598 msgid "You are currently cherry-picking commit %s."
1602 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1606 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1610 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1615 msgid "You are currently reverting commit %s."
1619 msgid " (fix conflicts and run \"git revert --continue\")"
1623 msgid " (all conflicts fixed: run \"git revert --continue\")"
1627 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1632 msgid "You are currently bisecting, started from branch '%s'."
1636 msgid "You are currently bisecting."
1640 msgid " (use \"git bisect reset\" to get back to the original branch)"
1648 msgid "rebase in progress; onto "
1652 msgid "HEAD detached at "
1656 msgid "HEAD detached from "
1660 msgid "Not currently on any branch."
1664 msgid "Initial commit"
1668 msgid "Untracked files"
1672 msgid "Ignored files"
1678 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1679 "may speed it up, but you have to be careful not to forget to add\n"
1680 "new files yourself (see 'git help status')."
1685 msgid "Untracked files not listed%s"
1689 msgid " (use -u option to show untracked files)"
1698 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1703 msgid "no changes added to commit\n"
1709 "nothing added to commit but untracked files present (use \"git add\" to "
1715 msgid "nothing added to commit but untracked files present\n"
1720 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1723 #: wt-status.c:1311 wt-status.c:1316
1725 msgid "nothing to commit\n"
1730 msgid "nothing to commit (use -u to show untracked files)\n"
1735 msgid "nothing to commit, working directory clean\n"
1739 msgid "HEAD (no branch)"
1743 msgid "Initial commit on "
1754 #: wt-status.c:1468 wt-status.c:1471
1762 #: compat/precompose_utf8.c:55 builtin/clone.c:350
1764 msgid "failed to unlink '%s'"
1768 msgid "git add [options] [--] <pathspec>..."
1772 #. * To be consistent with "git add -p" and most Git
1773 #. * commands, we should default to being tree-wide, but
1774 #. * this is not the original behavior and can't be
1775 #. * changed until users trained themselves not to type
1776 #. * "git add -u" or "git add -A". For now, we warn and
1777 #. * keep the old behavior. Later, the behavior can be changed
1778 #. * to tree-wide, keeping the warning for a while, and
1779 #. * eventually we can drop the warning.
1784 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1785 "subdirectory of the tree will change in Git 2.0 and should not be used "
1787 "To add content for the whole tree, run:\n"
1790 " (or git add %s :/)\n"
1792 "To restrict the command to the current directory, run:\n"
1795 " (or git add %s .)\n"
1797 "With the current Git version, the command is restricted to the current "
1801 #: builtin/add.c:100
1804 "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1805 "whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1806 "Paths like '%s' that are\n"
1807 "removed from your working tree are ignored with this version of Git.\n"
1809 "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1810 " ignores paths you removed from your working tree.\n"
1812 "* 'git add --all <pathspec>' will let you also record the removals.\n"
1814 "Run 'git status' to check the paths you removed from your working tree.\n"
1817 #: builtin/add.c:144
1819 msgid "unexpected diff status %c"
1822 #: builtin/add.c:149 builtin/commit.c:260
1823 msgid "updating files failed"
1826 #: builtin/add.c:163
1828 msgid "remove '%s'\n"
1831 #: builtin/add.c:237
1832 msgid "Unstaged changes after refreshing the index:"
1835 #: builtin/add.c:299
1836 msgid "Could not read the index"
1839 #: builtin/add.c:310
1841 msgid "Could not open '%s' for writing."
1844 #: builtin/add.c:314
1845 msgid "Could not write patch"
1848 #: builtin/add.c:319
1850 msgid "Could not stat '%s'"
1853 #: builtin/add.c:321
1854 msgid "Empty patch. Aborted."
1857 #: builtin/add.c:327
1859 msgid "Could not apply '%s'"
1862 #: builtin/add.c:337
1863 msgid "The following paths are ignored by one of your .gitignore files:\n"
1866 #: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
1867 #: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
1872 #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
1873 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
1874 #: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
1878 #: builtin/add.c:357
1879 msgid "interactive picking"
1882 #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
1883 msgid "select hunks interactively"
1886 #: builtin/add.c:359
1887 msgid "edit current diff and apply"
1890 #: builtin/add.c:360
1891 msgid "allow adding otherwise ignored files"
1894 #: builtin/add.c:361
1895 msgid "update tracked files"
1898 #: builtin/add.c:362
1899 msgid "record only the fact that the path will be added later"
1902 #: builtin/add.c:363
1903 msgid "add changes from all tracked and untracked files"
1906 #. takes no arguments
1907 #: builtin/add.c:366
1908 msgid "ignore paths removed in the working tree (same as --no-all)"
1911 #: builtin/add.c:368
1912 msgid "don't add, only refresh the index"
1915 #: builtin/add.c:369
1916 msgid "just skip files which cannot be added because of errors"
1919 #: builtin/add.c:370
1920 msgid "check if - even missing - files are ignored in dry run"
1923 #: builtin/add.c:392
1925 msgid "Use -f if you really want to add them.\n"
1928 #: builtin/add.c:393
1929 msgid "no files added"
1932 #: builtin/add.c:399
1933 msgid "adding files failed"
1936 #: builtin/add.c:438
1937 msgid "-A and -u are mutually incompatible"
1940 #: builtin/add.c:456
1941 msgid "Option --ignore-missing can only be used together with --dry-run"
1944 #: builtin/add.c:486
1946 msgid "Nothing specified, nothing added.\n"
1949 #: builtin/add.c:487
1951 msgid "Maybe you wanted to say 'git add .'?\n"
1954 #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
1955 #: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
1956 msgid "index file corrupt"
1959 #: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
1960 msgid "Unable to write new index file"
1963 #: builtin/apply.c:57
1964 msgid "git apply [options] [<patch>...]"
1967 #: builtin/apply.c:110
1969 msgid "unrecognized whitespace option '%s'"
1972 #: builtin/apply.c:125
1974 msgid "unrecognized whitespace ignore option '%s'"
1977 #: builtin/apply.c:823
1979 msgid "Cannot prepare timestamp regexp %s"
1982 #: builtin/apply.c:832
1984 msgid "regexec returned %d for input: %s"
1987 #: builtin/apply.c:913
1989 msgid "unable to find filename in patch at line %d"
1992 #: builtin/apply.c:945
1994 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1997 #: builtin/apply.c:949
1999 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2002 #: builtin/apply.c:950
2004 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2007 #: builtin/apply.c:957
2009 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2012 #: builtin/apply.c:1422
2014 msgid "recount: unexpected line: %.*s"
2017 #: builtin/apply.c:1479
2019 msgid "patch fragment without header at line %d: %.*s"
2022 #: builtin/apply.c:1496
2025 "git diff header lacks filename information when removing %d leading pathname "
2026 "component (line %d)"
2028 "git diff header lacks filename information when removing %d leading pathname "
2029 "components (line %d)"
2033 #: builtin/apply.c:1656
2034 msgid "new file depends on old contents"
2037 #: builtin/apply.c:1658
2038 msgid "deleted file still has contents"
2041 #: builtin/apply.c:1684
2043 msgid "corrupt patch at line %d"
2046 #: builtin/apply.c:1720
2048 msgid "new file %s depends on old contents"
2051 #: builtin/apply.c:1722
2053 msgid "deleted file %s still has contents"
2056 #: builtin/apply.c:1725
2058 msgid "** warning: file %s becomes empty but is not deleted"
2061 #: builtin/apply.c:1871
2063 msgid "corrupt binary patch at line %d: %.*s"
2066 #. there has to be one hunk (forward hunk)
2067 #: builtin/apply.c:1900
2069 msgid "unrecognized binary patch at line %d"
2072 #: builtin/apply.c:1986
2074 msgid "patch with only garbage at line %d"
2077 #: builtin/apply.c:2076
2079 msgid "unable to read symlink %s"
2082 #: builtin/apply.c:2080
2084 msgid "unable to open or read %s"
2087 #: builtin/apply.c:2688
2089 msgid "invalid start of line: '%c'"
2092 #: builtin/apply.c:2806
2094 msgid "Hunk #%d succeeded at %d (offset %d line)."
2095 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2099 #: builtin/apply.c:2818
2101 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2104 #: builtin/apply.c:2824
2107 "while searching for:\n"
2111 #: builtin/apply.c:2843
2113 msgid "missing binary patch data for '%s'"
2116 #: builtin/apply.c:2946
2118 msgid "binary patch does not apply to '%s'"
2121 #: builtin/apply.c:2952
2123 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2126 #: builtin/apply.c:2973
2128 msgid "patch failed: %s:%ld"
2131 #: builtin/apply.c:3095
2133 msgid "cannot checkout %s"
2136 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2138 msgid "read of %s failed"
2141 #: builtin/apply.c:3174 builtin/apply.c:3396
2143 msgid "path %s has been renamed/deleted"
2146 #: builtin/apply.c:3255 builtin/apply.c:3410
2148 msgid "%s: does not exist in index"
2151 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2156 #: builtin/apply.c:3264 builtin/apply.c:3418
2158 msgid "%s: does not match index"
2161 #: builtin/apply.c:3366
2162 msgid "removal patch leaves file contents"
2165 #: builtin/apply.c:3435
2167 msgid "%s: wrong type"
2170 #: builtin/apply.c:3437
2172 msgid "%s has type %o, expected %o"
2175 #: builtin/apply.c:3538
2177 msgid "%s: already exists in index"
2180 #: builtin/apply.c:3541
2182 msgid "%s: already exists in working directory"
2185 #: builtin/apply.c:3561
2187 msgid "new mode (%o) of %s does not match old mode (%o)"
2190 #: builtin/apply.c:3566
2192 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2195 #: builtin/apply.c:3574
2197 msgid "%s: patch does not apply"
2200 #: builtin/apply.c:3587
2202 msgid "Checking patch %s..."
2205 #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
2207 msgid "make_cache_entry failed for path '%s'"
2210 #: builtin/apply.c:3823
2212 msgid "unable to remove %s from index"
2215 #: builtin/apply.c:3851
2217 msgid "corrupt patch for submodule %s"
2220 #: builtin/apply.c:3855
2222 msgid "unable to stat newly created file '%s'"
2225 #: builtin/apply.c:3860
2227 msgid "unable to create backing store for newly created file %s"
2230 #: builtin/apply.c:3863 builtin/apply.c:3971
2232 msgid "unable to add cache entry for %s"
2235 #: builtin/apply.c:3896
2237 msgid "closing file '%s'"
2240 #: builtin/apply.c:3945
2242 msgid "unable to write file '%s' mode %o"
2245 #: builtin/apply.c:4032
2247 msgid "Applied patch %s cleanly."
2250 #: builtin/apply.c:4040
2251 msgid "internal error"
2254 #. Say this even without --verbose
2255 #: builtin/apply.c:4043
2257 msgid "Applying patch %%s with %d reject..."
2258 msgid_plural "Applying patch %%s with %d rejects..."
2262 #: builtin/apply.c:4053
2264 msgid "truncating .rej filename to %.*s.rej"
2267 #: builtin/apply.c:4074
2269 msgid "Hunk #%d applied cleanly."
2272 #: builtin/apply.c:4077
2274 msgid "Rejected hunk #%d."
2277 #: builtin/apply.c:4227
2278 msgid "unrecognized input"
2281 #: builtin/apply.c:4238
2282 msgid "unable to read index file"
2285 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2286 #: builtin/fetch.c:77
2290 #: builtin/apply.c:4358
2291 msgid "don't apply changes matching the given path"
2294 #: builtin/apply.c:4361
2295 msgid "apply changes matching the given path"
2298 #: builtin/apply.c:4363
2302 #: builtin/apply.c:4364
2303 msgid "remove <num> leading slashes from traditional diff paths"
2306 #: builtin/apply.c:4367
2307 msgid "ignore additions made by the patch"
2310 #: builtin/apply.c:4369
2311 msgid "instead of applying the patch, output diffstat for the input"
2314 #: builtin/apply.c:4373
2315 msgid "show number of added and deleted lines in decimal notation"
2318 #: builtin/apply.c:4375
2319 msgid "instead of applying the patch, output a summary for the input"
2322 #: builtin/apply.c:4377
2323 msgid "instead of applying the patch, see if the patch is applicable"
2326 #: builtin/apply.c:4379
2327 msgid "make sure the patch is applicable to the current index"
2330 #: builtin/apply.c:4381
2331 msgid "apply a patch without touching the working tree"
2334 #: builtin/apply.c:4383
2335 msgid "also apply the patch (use with --stat/--summary/--check)"
2338 #: builtin/apply.c:4385
2339 msgid "attempt three-way merge if a patch does not apply"
2342 #: builtin/apply.c:4387
2343 msgid "build a temporary index based on embedded index information"
2346 #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
2347 msgid "paths are separated with NUL character"
2350 #: builtin/apply.c:4392
2351 msgid "ensure at least <n> lines of context match"
2354 #: builtin/apply.c:4393
2358 #: builtin/apply.c:4394
2359 msgid "detect new or modified lines that have whitespace errors"
2362 #: builtin/apply.c:4397 builtin/apply.c:4400
2363 msgid "ignore changes in whitespace when finding context"
2366 #: builtin/apply.c:4403
2367 msgid "apply the patch in reverse"
2370 #: builtin/apply.c:4405
2371 msgid "don't expect at least one line of context"
2374 #: builtin/apply.c:4407
2375 msgid "leave the rejected hunks in corresponding *.rej files"
2378 #: builtin/apply.c:4409
2379 msgid "allow overlapping hunks"
2382 #: builtin/apply.c:4412
2383 msgid "tolerate incorrectly detected missing new-line at the end of file"
2386 #: builtin/apply.c:4415
2387 msgid "do not trust the line counts in the hunk headers"
2390 #: builtin/apply.c:4417
2394 #: builtin/apply.c:4418
2395 msgid "prepend <root> to all filenames"
2398 #: builtin/apply.c:4440
2399 msgid "--3way outside a repository"
2402 #: builtin/apply.c:4448
2403 msgid "--index outside a repository"
2406 #: builtin/apply.c:4451
2407 msgid "--cached outside a repository"
2410 #: builtin/apply.c:4467
2412 msgid "can't open patch '%s'"
2415 #: builtin/apply.c:4481
2417 msgid "squelched %d whitespace error"
2418 msgid_plural "squelched %d whitespace errors"
2422 #: builtin/apply.c:4487 builtin/apply.c:4497
2424 msgid "%d line adds whitespace errors."
2425 msgid_plural "%d lines add whitespace errors."
2429 #: builtin/archive.c:17
2431 msgid "could not create archive file '%s'"
2434 #: builtin/archive.c:20
2435 msgid "could not redirect output"
2438 #: builtin/archive.c:37
2439 msgid "git archive: Remote with no URL"
2442 #: builtin/archive.c:58
2443 msgid "git archive: expected ACK/NAK, got EOF"
2446 #: builtin/archive.c:61
2448 msgid "git archive: NACK %s"
2451 #: builtin/archive.c:63
2453 msgid "remote error: %s"
2456 #: builtin/archive.c:64
2457 msgid "git archive: protocol error"
2460 #: builtin/archive.c:68
2461 msgid "git archive: expected a flush"
2464 #: builtin/bisect--helper.c:7
2465 msgid "git bisect--helper --next-all [--no-checkout]"
2468 #: builtin/bisect--helper.c:17
2469 msgid "perform 'git bisect next'"
2472 #: builtin/bisect--helper.c:19
2473 msgid "update BISECT_HEAD instead of checking out the current commit"
2476 #: builtin/blame.c:27
2477 msgid "git blame [options] [rev-opts] [rev] [--] file"
2480 #: builtin/blame.c:32
2481 msgid "[rev-opts] are documented in git-rev-list(1)"
2484 #: builtin/blame.c:2248
2485 msgid "Show blame entries as we find them, incrementally"
2488 #: builtin/blame.c:2249
2489 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2492 #: builtin/blame.c:2250
2493 msgid "Do not treat root commits as boundaries (Default: off)"
2496 #: builtin/blame.c:2251
2497 msgid "Show work cost statistics"
2500 #: builtin/blame.c:2252
2501 msgid "Show output score for blame entries"
2504 #: builtin/blame.c:2253
2505 msgid "Show original filename (Default: auto)"
2508 #: builtin/blame.c:2254
2509 msgid "Show original linenumber (Default: off)"
2512 #: builtin/blame.c:2255
2513 msgid "Show in a format designed for machine consumption"
2516 #: builtin/blame.c:2256
2517 msgid "Show porcelain format with per-line commit information"
2520 #: builtin/blame.c:2257
2521 msgid "Use the same output mode as git-annotate (Default: off)"
2524 #: builtin/blame.c:2258
2525 msgid "Show raw timestamp (Default: off)"
2528 #: builtin/blame.c:2259
2529 msgid "Show long commit SHA1 (Default: off)"
2532 #: builtin/blame.c:2260
2533 msgid "Suppress author name and timestamp (Default: off)"
2536 #: builtin/blame.c:2261
2537 msgid "Show author email instead of name (Default: off)"
2540 #: builtin/blame.c:2262
2541 msgid "Ignore whitespace differences"
2544 #: builtin/blame.c:2263
2545 msgid "Spend extra cycles to find better match"
2548 #: builtin/blame.c:2264
2549 msgid "Use revisions from <file> instead of calling git-rev-list"
2552 #: builtin/blame.c:2265
2553 msgid "Use <file>'s contents as the final image"
2556 #: builtin/blame.c:2266 builtin/blame.c:2267
2560 #: builtin/blame.c:2266
2561 msgid "Find line copies within and across files"
2564 #: builtin/blame.c:2267
2565 msgid "Find line movements within and across files"
2568 #: builtin/blame.c:2268
2572 #: builtin/blame.c:2268
2573 msgid "Process only line range n,m, counting from 1"
2576 #: builtin/branch.c:24
2577 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2580 #: builtin/branch.c:25
2581 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2584 #: builtin/branch.c:26
2585 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2588 #: builtin/branch.c:27
2589 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2592 #: builtin/branch.c:150
2595 "deleting branch '%s' that has been merged to\n"
2596 " '%s', but not yet merged to HEAD."
2599 #: builtin/branch.c:154
2602 "not deleting branch '%s' that is not yet merged to\n"
2603 " '%s', even though it is merged to HEAD."
2606 #: builtin/branch.c:168
2608 msgid "Couldn't look up commit object for '%s'"
2611 #: builtin/branch.c:172
2614 "The branch '%s' is not fully merged.\n"
2615 "If you are sure you want to delete it, run 'git branch -D %s'."
2618 #: builtin/branch.c:185
2619 msgid "Update of config-file failed"
2622 #: builtin/branch.c:213
2623 msgid "cannot use -a with -d"
2626 #: builtin/branch.c:219
2627 msgid "Couldn't look up commit object for HEAD"
2630 #: builtin/branch.c:227
2632 msgid "Cannot delete the branch '%s' which you are currently on."
2635 #: builtin/branch.c:240
2637 msgid "remote branch '%s' not found."
2640 #: builtin/branch.c:241
2642 msgid "branch '%s' not found."
2645 #: builtin/branch.c:255
2647 msgid "Error deleting remote branch '%s'"
2650 #: builtin/branch.c:256
2652 msgid "Error deleting branch '%s'"
2655 #: builtin/branch.c:263
2657 msgid "Deleted remote branch %s (was %s).\n"
2660 #: builtin/branch.c:264
2662 msgid "Deleted branch %s (was %s).\n"
2665 #: builtin/branch.c:366
2667 msgid "branch '%s' does not point at a commit"
2670 #: builtin/branch.c:453
2675 #: builtin/branch.c:456
2680 #: builtin/branch.c:459
2682 msgid "[%s: behind %d]"
2685 #: builtin/branch.c:461
2690 #: builtin/branch.c:465
2692 msgid "[%s: ahead %d]"
2695 #: builtin/branch.c:467
2700 #: builtin/branch.c:470
2702 msgid "[%s: ahead %d, behind %d]"
2705 #: builtin/branch.c:473
2707 msgid "[ahead %d, behind %d]"
2710 #: builtin/branch.c:496
2711 msgid " **** invalid ref ****"
2714 #: builtin/branch.c:588
2716 msgid "(no branch, rebasing %s)"
2719 #: builtin/branch.c:591
2721 msgid "(no branch, bisect started on %s)"
2724 #: builtin/branch.c:594
2726 msgid "(detached from %s)"
2729 #: builtin/branch.c:597
2733 #: builtin/branch.c:643
2735 msgid "object '%s' does not point to a commit"
2738 #: builtin/branch.c:675
2739 msgid "some refs could not be read"
2742 #: builtin/branch.c:688
2743 msgid "cannot rename the current branch while not on any."
2746 #: builtin/branch.c:698
2748 msgid "Invalid branch name: '%s'"
2751 #: builtin/branch.c:713
2752 msgid "Branch rename failed"
2755 #: builtin/branch.c:717
2757 msgid "Renamed a misnamed branch '%s' away"
2760 #: builtin/branch.c:721
2762 msgid "Branch renamed to %s, but HEAD is not updated!"
2765 #: builtin/branch.c:728
2766 msgid "Branch is renamed, but update of config-file failed"
2769 #: builtin/branch.c:743
2771 msgid "malformed object name %s"
2774 #: builtin/branch.c:767
2776 msgid "could not write branch description template: %s"
2779 #: builtin/branch.c:797
2780 msgid "Generic options"
2783 #: builtin/branch.c:799
2784 msgid "show hash and subject, give twice for upstream branch"
2787 #: builtin/branch.c:800
2788 msgid "suppress informational messages"
2791 #: builtin/branch.c:801
2792 msgid "set up tracking mode (see git-pull(1))"
2795 #: builtin/branch.c:803
2796 msgid "change upstream info"
2799 #: builtin/branch.c:807
2800 msgid "use colored output"
2803 #: builtin/branch.c:808
2804 msgid "act on remote-tracking branches"
2807 #: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
2808 #: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
2809 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
2813 #: builtin/branch.c:812 builtin/branch.c:818
2814 msgid "print only branches that contain the commit"
2817 #: builtin/branch.c:824
2818 msgid "Specific git-branch actions:"
2821 #: builtin/branch.c:825
2822 msgid "list both remote-tracking and local branches"
2825 #: builtin/branch.c:827
2826 msgid "delete fully merged branch"
2829 #: builtin/branch.c:828
2830 msgid "delete branch (even if not merged)"
2833 #: builtin/branch.c:829
2834 msgid "move/rename a branch and its reflog"
2837 #: builtin/branch.c:830
2838 msgid "move/rename a branch, even if target exists"
2841 #: builtin/branch.c:831
2842 msgid "list branch names"
2845 #: builtin/branch.c:832
2846 msgid "create the branch's reflog"
2849 #: builtin/branch.c:834
2850 msgid "edit the description for the branch"
2853 #: builtin/branch.c:835
2854 msgid "force creation (when already exists)"
2857 #: builtin/branch.c:838
2858 msgid "print only not merged branches"
2861 #: builtin/branch.c:844
2862 msgid "print only merged branches"
2865 #: builtin/branch.c:848
2866 msgid "list branches in columns"
2869 #: builtin/branch.c:861
2870 msgid "Failed to resolve HEAD as a valid ref."
2873 #: builtin/branch.c:866 builtin/clone.c:629
2874 msgid "HEAD not found below refs/heads!"
2877 #: builtin/branch.c:890
2878 msgid "--column and --verbose are incompatible"
2881 #: builtin/branch.c:896 builtin/branch.c:935
2882 msgid "branch name required"
2885 #: builtin/branch.c:911
2886 msgid "Cannot give description to detached HEAD"
2889 #: builtin/branch.c:916
2890 msgid "cannot edit description of more than one branch"
2893 #: builtin/branch.c:923
2895 msgid "No commit on branch '%s' yet."
2898 #: builtin/branch.c:926
2900 msgid "No branch named '%s'."
2903 #: builtin/branch.c:941
2904 msgid "too many branches for a rename operation"
2907 #: builtin/branch.c:946
2908 msgid "too many branches to set new upstream"
2911 #: builtin/branch.c:950
2914 "could not set upstream of HEAD to %s when it does not point to any branch."
2917 #: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
2919 msgid "no such branch '%s'"
2922 #: builtin/branch.c:957
2924 msgid "branch '%s' does not exist"
2927 #: builtin/branch.c:969
2928 msgid "too many branches to unset upstream"
2931 #: builtin/branch.c:973
2932 msgid "could not unset upstream of HEAD when it does not point to any branch."
2935 #: builtin/branch.c:979
2937 msgid "Branch '%s' has no upstream information"
2940 #: builtin/branch.c:994
2941 msgid "it does not make sense to create 'HEAD' manually"
2944 #: builtin/branch.c:1000
2945 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2948 #: builtin/branch.c:1003
2951 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2952 "track or --set-upstream-to\n"
2955 #: builtin/branch.c:1020
2959 "If you wanted to make '%s' track '%s', do this:\n"
2963 #: builtin/branch.c:1021
2965 msgid " git branch -d %s\n"
2968 #: builtin/branch.c:1022
2970 msgid " git branch --set-upstream-to %s\n"
2973 #: builtin/bundle.c:47
2975 msgid "%s is okay\n"
2978 #: builtin/bundle.c:56
2979 msgid "Need a repository to create a bundle."
2982 #: builtin/bundle.c:60
2983 msgid "Need a repository to unbundle."
2986 #: builtin/cat-file.c:312
2987 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2990 #: builtin/cat-file.c:313
2991 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2994 #: builtin/cat-file.c:350
2995 msgid "<type> can be one of: blob, tree, commit, tag"
2998 #: builtin/cat-file.c:351
2999 msgid "show object type"
3002 #: builtin/cat-file.c:352
3003 msgid "show object size"
3006 #: builtin/cat-file.c:354
3007 msgid "exit with zero when there's no error"
3010 #: builtin/cat-file.c:355
3011 msgid "pretty-print object's content"
3014 #: builtin/cat-file.c:357
3015 msgid "for blob objects, run textconv on object's content"
3018 #: builtin/cat-file.c:359
3019 msgid "show info and content of objects fed from the standard input"
3022 #: builtin/cat-file.c:362
3023 msgid "show info about objects fed from the standard input"
3026 #: builtin/check-attr.c:11
3027 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3030 #: builtin/check-attr.c:12
3031 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3034 #: builtin/check-attr.c:19
3035 msgid "report all attributes set on file"
3038 #: builtin/check-attr.c:20
3039 msgid "use .gitattributes only from the index"
3042 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3043 msgid "read file names from stdin"
3046 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3047 msgid "terminate input and output records by a NUL character"
3050 #: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
3051 msgid "suppress progress reporting"
3054 #: builtin/check-ignore.c:26
3055 msgid "show non-matching input paths"
3058 #: builtin/check-ignore.c:28
3059 msgid "ignore index when checking"
3062 #: builtin/check-ignore.c:154
3063 msgid "cannot specify pathnames with --stdin"
3066 #: builtin/check-ignore.c:157
3067 msgid "-z only makes sense with --stdin"
3070 #: builtin/check-ignore.c:159
3071 msgid "no path specified"
3074 #: builtin/check-ignore.c:163
3075 msgid "--quiet is only valid with a single pathname"
3078 #: builtin/check-ignore.c:165
3079 msgid "cannot have both --quiet and --verbose"
3082 #: builtin/check-ignore.c:168
3083 msgid "--non-matching is only valid with --verbose"
3086 #: builtin/check-mailmap.c:8
3087 msgid "git check-mailmap [options] <contact>..."
3090 #: builtin/check-mailmap.c:13
3091 msgid "also read contacts from stdin"
3094 #: builtin/check-mailmap.c:24
3096 msgid "unable to parse contact: %s"
3099 #: builtin/check-mailmap.c:47
3100 msgid "no contacts specified"
3103 #: builtin/checkout-index.c:126
3104 msgid "git checkout-index [options] [--] [<file>...]"
3107 #: builtin/checkout-index.c:187
3108 msgid "check out all files in the index"
3111 #: builtin/checkout-index.c:188
3112 msgid "force overwrite of existing files"
3115 #: builtin/checkout-index.c:190
3116 msgid "no warning for existing files and files not in index"
3119 #: builtin/checkout-index.c:192
3120 msgid "don't checkout new files"
3123 #: builtin/checkout-index.c:194
3124 msgid "update stat information in the index file"
3127 #: builtin/checkout-index.c:200
3128 msgid "read list of paths from the standard input"
3131 #: builtin/checkout-index.c:202
3132 msgid "write the content to temporary files"
3135 #: builtin/checkout-index.c:203 builtin/column.c:30
3139 #: builtin/checkout-index.c:204
3140 msgid "when creating files, prepend <string>"
3143 #: builtin/checkout-index.c:207
3144 msgid "copy out the files from named stage"
3147 #: builtin/checkout.c:25
3148 msgid "git checkout [options] <branch>"
3151 #: builtin/checkout.c:26
3152 msgid "git checkout [options] [<branch>] -- <file>..."
3155 #: builtin/checkout.c:114 builtin/checkout.c:147
3157 msgid "path '%s' does not have our version"
3160 #: builtin/checkout.c:116 builtin/checkout.c:149
3162 msgid "path '%s' does not have their version"
3165 #: builtin/checkout.c:132
3167 msgid "path '%s' does not have all necessary versions"
3170 #: builtin/checkout.c:176
3172 msgid "path '%s' does not have necessary versions"
3175 #: builtin/checkout.c:193
3177 msgid "path '%s': cannot merge"
3180 #: builtin/checkout.c:210
3182 msgid "Unable to add merge result for '%s'"
3185 #: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3186 #: builtin/checkout.c:241
3188 msgid "'%s' cannot be used with updating paths"
3191 #: builtin/checkout.c:244 builtin/checkout.c:247
3193 msgid "'%s' cannot be used with %s"
3196 #: builtin/checkout.c:250
3198 msgid "Cannot update paths and switch to branch '%s' at the same time."
3201 #: builtin/checkout.c:261 builtin/checkout.c:451
3202 msgid "corrupt index file"
3205 #: builtin/checkout.c:322 builtin/checkout.c:329
3207 msgid "path '%s' is unmerged"
3210 #: builtin/checkout.c:473
3211 msgid "you need to resolve your current index first"
3214 #: builtin/checkout.c:594
3216 msgid "Can not do reflog for '%s'\n"
3219 #: builtin/checkout.c:632
3220 msgid "HEAD is now at"
3223 #: builtin/checkout.c:639
3225 msgid "Reset branch '%s'\n"
3228 #: builtin/checkout.c:642
3230 msgid "Already on '%s'\n"
3233 #: builtin/checkout.c:646
3235 msgid "Switched to and reset branch '%s'\n"
3238 #: builtin/checkout.c:648 builtin/checkout.c:1033
3240 msgid "Switched to a new branch '%s'\n"
3243 #: builtin/checkout.c:650
3245 msgid "Switched to branch '%s'\n"
3248 #: builtin/checkout.c:706
3250 msgid " ... and %d more.\n"
3253 #. The singular version
3254 #: builtin/checkout.c:712
3257 "Warning: you are leaving %d commit behind, not connected to\n"
3258 "any of your branches:\n"
3262 "Warning: you are leaving %d commits behind, not connected to\n"
3263 "any of your branches:\n"
3269 #: builtin/checkout.c:730
3272 "If you want to keep them by creating a new branch, this may be a good time\n"
3275 " git branch new_branch_name %s\n"
3279 #: builtin/checkout.c:760
3280 msgid "internal error in revision walk"
3283 #: builtin/checkout.c:764
3284 msgid "Previous HEAD position was"
3287 #: builtin/checkout.c:791 builtin/checkout.c:1028
3288 msgid "You are on a branch yet to be born"
3291 #: builtin/checkout.c:935
3293 msgid "only one reference expected, %d given."
3296 #: builtin/checkout.c:974
3298 msgid "invalid reference: %s"
3301 #. case (1): want a tree
3302 #: builtin/checkout.c:1003
3304 msgid "reference is not a tree: %s"
3307 #: builtin/checkout.c:1042
3308 msgid "paths cannot be used with switching branches"
3311 #: builtin/checkout.c:1045 builtin/checkout.c:1049
3313 msgid "'%s' cannot be used with switching branches"
3316 #: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
3317 #: builtin/checkout.c:1064
3319 msgid "'%s' cannot be used with '%s'"
3322 #: builtin/checkout.c:1069
3324 msgid "Cannot switch branch to a non-commit '%s'"
3327 #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
3328 #: builtin/remote.c:169 builtin/remote.c:171
3332 #: builtin/checkout.c:1092
3333 msgid "create and checkout a new branch"
3336 #: builtin/checkout.c:1094
3337 msgid "create/reset and checkout a branch"
3340 #: builtin/checkout.c:1095
3341 msgid "create reflog for new branch"
3344 #: builtin/checkout.c:1096
3345 msgid "detach the HEAD at named commit"
3348 #: builtin/checkout.c:1097
3349 msgid "set upstream info for new branch"
3352 #: builtin/checkout.c:1099
3356 #: builtin/checkout.c:1099
3357 msgid "new unparented branch"
3360 #: builtin/checkout.c:1100
3361 msgid "checkout our version for unmerged files"
3364 #: builtin/checkout.c:1102
3365 msgid "checkout their version for unmerged files"
3368 #: builtin/checkout.c:1104
3369 msgid "force checkout (throw away local modifications)"
3372 #: builtin/checkout.c:1105
3373 msgid "perform a 3-way merge with the new branch"
3376 #: builtin/checkout.c:1106 builtin/merge.c:232
3377 msgid "update ignored files (default)"
3380 #: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
3384 #: builtin/checkout.c:1108
3385 msgid "conflict style (merge or diff3)"
3388 #: builtin/checkout.c:1111
3389 msgid "do not limit pathspecs to sparse entries only"
3392 #: builtin/checkout.c:1113
3393 msgid "second guess 'git checkout no-such-branch'"
3396 #: builtin/checkout.c:1136
3397 msgid "-b, -B and --orphan are mutually exclusive"
3400 #: builtin/checkout.c:1153
3401 msgid "--track needs a branch name"
3404 #: builtin/checkout.c:1160
3405 msgid "Missing branch name; try -b"
3408 #: builtin/checkout.c:1197
3409 msgid "invalid path specification"
3412 #: builtin/checkout.c:1204
3415 "Cannot update paths and switch to branch '%s' at the same time.\n"
3416 "Did you intend to checkout '%s' which can not be resolved as commit?"
3419 #: builtin/checkout.c:1209
3421 msgid "git checkout: --detach does not take a path argument '%s'"
3424 #: builtin/checkout.c:1213
3426 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3427 "checking out of the index."
3430 #: builtin/clean.c:26
3432 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3435 #: builtin/clean.c:30
3437 msgid "Removing %s\n"
3440 #: builtin/clean.c:31
3442 msgid "Would remove %s\n"
3445 #: builtin/clean.c:32
3447 msgid "Skipping repository %s\n"
3450 #: builtin/clean.c:33
3452 msgid "Would skip repository %s\n"
3455 #: builtin/clean.c:34
3457 msgid "failed to remove %s"
3460 #: builtin/clean.c:294
3463 "1 - select a numbered item\n"
3464 "foo - select item based on unique prefix\n"
3465 " - (empty) select nothing"
3468 #: builtin/clean.c:298
3471 "1 - select a single item\n"
3472 "3-5 - select a range of items\n"
3473 "2-3,6-9 - select multiple ranges\n"
3474 "foo - select item based on unique prefix\n"
3475 "-... - unselect specified items\n"
3476 "* - choose all items\n"
3477 " - (empty) finish selecting"
3480 #: builtin/clean.c:516
3485 #: builtin/clean.c:659
3487 msgid "Input ignore patterns>> "
3490 #: builtin/clean.c:696
3492 msgid "WARNING: Cannot find items matched by: %s"
3495 #: builtin/clean.c:717
3496 msgid "Select items to delete"
3499 #: builtin/clean.c:757
3504 #: builtin/clean.c:782
3508 #: builtin/clean.c:790
3510 "clean - start cleaning\n"
3511 "filter by pattern - exclude items from deletion\n"
3512 "select by numbers - select items to be deleted by numbers\n"
3513 "ask each - confirm each deletion (like \"rm -i\")\n"
3514 "quit - stop cleaning\n"
3515 "help - this screen\n"
3516 "? - help for prompt selection"
3519 #: builtin/clean.c:817
3520 msgid "*** Commands ***"
3523 #: builtin/clean.c:818
3527 #: builtin/clean.c:826
3528 msgid "Would remove the following item:"
3529 msgid_plural "Would remove the following items:"
3533 #: builtin/clean.c:843
3534 msgid "No more files to clean, exiting."
3537 #: builtin/clean.c:874
3538 msgid "do not print names of files removed"
3541 #: builtin/clean.c:876
3545 #: builtin/clean.c:877
3546 msgid "interactive cleaning"
3549 #: builtin/clean.c:879
3550 msgid "remove whole directories"
3553 #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
3554 #: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
3558 #: builtin/clean.c:881
3559 msgid "add <pattern> to ignore rules"
3562 #: builtin/clean.c:882
3563 msgid "remove ignored files, too"
3566 #: builtin/clean.c:884
3567 msgid "remove only ignored files"
3570 #: builtin/clean.c:902
3571 msgid "-x and -X cannot be used together"
3574 #: builtin/clean.c:906
3576 "clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3580 #: builtin/clean.c:909
3582 "clean.requireForce defaults to true and neither -i, -n nor -f given; "
3586 #: builtin/clone.c:36
3587 msgid "git clone [options] [--] <repo> [<dir>]"
3590 #: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
3591 #: builtin/push.c:474
3592 msgid "force progress reporting"
3595 #: builtin/clone.c:66
3596 msgid "don't create a checkout"
3599 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3600 msgid "create a bare repository"
3603 #: builtin/clone.c:71
3604 msgid "create a mirror repository (implies bare)"
3607 #: builtin/clone.c:73
3608 msgid "to clone from a local repository"
3611 #: builtin/clone.c:75
3612 msgid "don't use local hardlinks, always copy"
3615 #: builtin/clone.c:77
3616 msgid "setup as shared repository"
3619 #: builtin/clone.c:79 builtin/clone.c:81
3620 msgid "initialize submodules in the clone"
3623 #: builtin/clone.c:82 builtin/init-db.c:485
3624 msgid "template-directory"
3627 #: builtin/clone.c:83 builtin/init-db.c:486
3628 msgid "directory from which templates will be used"
3631 #: builtin/clone.c:85
3632 msgid "reference repository"
3635 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3639 #: builtin/clone.c:87
3640 msgid "use <name> instead of 'origin' to track upstream"
3643 #: builtin/clone.c:89
3644 msgid "checkout <branch> instead of the remote's HEAD"
3647 #: builtin/clone.c:91
3648 msgid "path to git-upload-pack on the remote"
3651 #: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
3655 #: builtin/clone.c:93
3656 msgid "create a shallow clone of that depth"
3659 #: builtin/clone.c:95
3660 msgid "clone only one branch, HEAD or --branch"
3663 #: builtin/clone.c:96 builtin/init-db.c:494
3667 #: builtin/clone.c:97 builtin/init-db.c:495
3668 msgid "separate git dir from working tree"
3671 #: builtin/clone.c:98
3675 #: builtin/clone.c:99
3676 msgid "set config inside the new repository"
3679 #: builtin/clone.c:252
3681 msgid "reference repository '%s' is not a local repository."
3684 #: builtin/clone.c:315
3686 msgid "failed to create directory '%s'"
3689 #: builtin/clone.c:317 builtin/diff.c:77
3691 msgid "failed to stat '%s'"
3694 #: builtin/clone.c:319
3696 msgid "%s exists and is not a directory"
3699 #: builtin/clone.c:333
3701 msgid "failed to stat %s\n"
3704 #: builtin/clone.c:355
3706 msgid "failed to create link '%s'"
3709 #: builtin/clone.c:359
3711 msgid "failed to copy file to '%s'"
3714 #: builtin/clone.c:382 builtin/clone.c:559
3719 #: builtin/clone.c:395
3721 "Clone succeeded, but checkout failed.\n"
3722 "You can inspect what was checked out with 'git status'\n"
3723 "and retry the checkout with 'git checkout -f HEAD'\n"
3726 #: builtin/clone.c:474
3728 msgid "Could not find remote branch %s to clone."
3731 #: builtin/clone.c:554
3733 msgid "Checking connectivity... "
3736 #: builtin/clone.c:557
3737 msgid "remote did not send all necessary objects"
3740 #: builtin/clone.c:620
3741 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3744 #: builtin/clone.c:651
3745 msgid "unable to checkout working tree"
3748 #: builtin/clone.c:759
3749 msgid "Too many arguments."
3752 #: builtin/clone.c:763
3753 msgid "You must specify a repository to clone."
3756 #: builtin/clone.c:774
3758 msgid "--bare and --origin %s options are incompatible."
3761 #: builtin/clone.c:777
3762 msgid "--bare and --separate-git-dir are incompatible."
3765 #: builtin/clone.c:790
3767 msgid "repository '%s' does not exist"
3770 #: builtin/clone.c:795
3771 msgid "--depth is ignored in local clones; use file:// instead."
3774 #: builtin/clone.c:797
3775 msgid "--local is ignored"
3778 #: builtin/clone.c:807
3780 msgid "destination path '%s' already exists and is not an empty directory."
3783 #: builtin/clone.c:817
3785 msgid "working tree '%s' already exists."
3788 #: builtin/clone.c:830 builtin/clone.c:842
3790 msgid "could not create leading directories of '%s'"
3793 #: builtin/clone.c:833
3795 msgid "could not create work tree dir '%s'."
3798 #: builtin/clone.c:852
3800 msgid "Cloning into bare repository '%s'...\n"
3803 #: builtin/clone.c:854
3805 msgid "Cloning into '%s'...\n"
3808 #: builtin/clone.c:888
3810 msgid "Don't know how to clone %s"
3813 #: builtin/clone.c:939 builtin/clone.c:947
3815 msgid "Remote branch %s not found in upstream %s"
3818 #: builtin/clone.c:950
3819 msgid "You appear to have cloned an empty repository."
3822 #: builtin/column.c:9
3823 msgid "git column [options]"
3826 #: builtin/column.c:26
3827 msgid "lookup config vars"
3830 #: builtin/column.c:27 builtin/column.c:28
3831 msgid "layout to use"
3834 #: builtin/column.c:29
3835 msgid "Maximum width"
3838 #: builtin/column.c:30
3839 msgid "Padding space on left border"
3842 #: builtin/column.c:31
3843 msgid "Padding space on right border"
3846 #: builtin/column.c:32
3847 msgid "Padding space between columns"
3850 #: builtin/column.c:51
3851 msgid "--command must be the first argument"
3854 #: builtin/commit.c:36
3855 msgid "git commit [options] [--] <pathspec>..."
3858 #: builtin/commit.c:41
3859 msgid "git status [options] [--] <pathspec>..."
3862 #: builtin/commit.c:46
3864 "Your name and email address were configured automatically based\n"
3865 "on your username and hostname. Please check that they are accurate.\n"
3866 "You can suppress this message by setting them explicitly:\n"
3868 " git config --global user.name \"Your Name\"\n"
3869 " git config --global user.email you@example.com\n"
3871 "After doing this, you may fix the identity used for this commit with:\n"
3873 " git commit --amend --reset-author\n"
3876 #: builtin/commit.c:58
3878 "You asked to amend the most recent commit, but doing so would make\n"
3879 "it empty. You can repeat your command with --allow-empty, or you can\n"
3880 "remove the commit entirely with \"git reset HEAD^\".\n"
3883 #: builtin/commit.c:63
3885 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3886 "If you wish to commit it anyway, use:\n"
3888 " git commit --allow-empty\n"
3892 #: builtin/commit.c:70
3893 msgid "Otherwise, please use 'git reset'\n"
3896 #: builtin/commit.c:73
3898 "If you wish to skip this commit, use:\n"
3902 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3903 "the remaining commits.\n"
3906 #: builtin/commit.c:287
3907 msgid "failed to unpack HEAD tree object"
3910 #: builtin/commit.c:329
3911 msgid "unable to create temporary index"
3914 #: builtin/commit.c:335
3915 msgid "interactive add failed"
3918 #: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
3919 msgid "unable to write new_index file"
3922 #: builtin/commit.c:420
3923 msgid "cannot do a partial commit during a merge."
3926 #: builtin/commit.c:422
3927 msgid "cannot do a partial commit during a cherry-pick."
3930 #: builtin/commit.c:432
3931 msgid "cannot read the index"
3934 #: builtin/commit.c:452
3935 msgid "unable to write temporary index file"
3938 #: builtin/commit.c:543 builtin/commit.c:549
3940 msgid "invalid commit: %s"
3943 #: builtin/commit.c:571
3944 msgid "malformed --author parameter"
3947 #: builtin/commit.c:591
3949 msgid "Malformed ident string: '%s'"
3952 #: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
3954 msgid "could not lookup commit %s"
3957 #: builtin/commit.c:642 builtin/shortlog.c:273
3959 msgid "(reading log message from standard input)\n"
3962 #: builtin/commit.c:644
3963 msgid "could not read log from standard input"
3966 #: builtin/commit.c:648
3968 msgid "could not read log file '%s'"
3971 #: builtin/commit.c:654
3972 msgid "commit has empty message"
3975 #: builtin/commit.c:670
3976 msgid "could not read MERGE_MSG"
3979 #: builtin/commit.c:674
3980 msgid "could not read SQUASH_MSG"
3983 #: builtin/commit.c:678
3985 msgid "could not read '%s'"
3988 #: builtin/commit.c:749
3989 msgid "could not write commit template"
3992 #: builtin/commit.c:760
3996 "It looks like you may be committing a merge.\n"
3997 "If this is not correct, please remove the file\n"
4002 #: builtin/commit.c:765
4006 "It looks like you may be committing a cherry-pick.\n"
4007 "If this is not correct, please remove the file\n"
4012 #: builtin/commit.c:777
4015 "Please enter the commit message for your changes. Lines starting\n"
4016 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4019 #: builtin/commit.c:782
4022 "Please enter the commit message for your changes. Lines starting\n"
4023 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4024 "An empty message aborts the commit.\n"
4027 #: builtin/commit.c:795
4029 msgid "%sAuthor: %s"
4032 #: builtin/commit.c:802
4034 msgid "%sCommitter: %s"
4037 #: builtin/commit.c:822
4038 msgid "Cannot read index"
4041 #: builtin/commit.c:865
4042 msgid "Error building trees"
4045 #: builtin/commit.c:880 builtin/tag.c:359
4047 msgid "Please supply the message using either -m or -F option.\n"
4050 #: builtin/commit.c:982
4052 msgid "No existing author found with '%s'"
4055 #: builtin/commit.c:997 builtin/commit.c:1237
4057 msgid "Invalid untracked files mode '%s'"
4060 #: builtin/commit.c:1034
4061 msgid "--long and -z are incompatible"
4064 #: builtin/commit.c:1064
4065 msgid "Using both --reset-author and --author does not make sense"
4068 #: builtin/commit.c:1075
4069 msgid "You have nothing to amend."
4072 #: builtin/commit.c:1078
4073 msgid "You are in the middle of a merge -- cannot amend."
4076 #: builtin/commit.c:1080
4077 msgid "You are in the middle of a cherry-pick -- cannot amend."
4080 #: builtin/commit.c:1083
4081 msgid "Options --squash and --fixup cannot be used together"
4084 #: builtin/commit.c:1093
4085 msgid "Only one of -c/-C/-F/--fixup can be used."
4088 #: builtin/commit.c:1095
4089 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4092 #: builtin/commit.c:1103
4093 msgid "--reset-author can be used only with -C, -c or --amend."
4096 #: builtin/commit.c:1120
4097 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4100 #: builtin/commit.c:1122
4101 msgid "No paths with --include/--only does not make sense."
4104 #: builtin/commit.c:1124
4105 msgid "Clever... amending the last one with dirty index."
4108 #: builtin/commit.c:1126
4109 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
4112 #: builtin/commit.c:1136 builtin/tag.c:572
4114 msgid "Invalid cleanup mode %s"
4117 #: builtin/commit.c:1141
4118 msgid "Paths with -a does not make sense."
4121 #: builtin/commit.c:1251 builtin/commit.c:1482
4122 msgid "show status concisely"
4125 #: builtin/commit.c:1253 builtin/commit.c:1484
4126 msgid "show branch information"
4129 #: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
4130 msgid "machine-readable output"
4133 #: builtin/commit.c:1258 builtin/commit.c:1488
4134 msgid "show status in long format (default)"
4137 #: builtin/commit.c:1261 builtin/commit.c:1491
4138 msgid "terminate entries with NUL"
4141 #: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
4142 #: builtin/fast-export.c:677 builtin/tag.c:459
4146 #: builtin/commit.c:1264 builtin/commit.c:1494
4147 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4150 #: builtin/commit.c:1267
4151 msgid "show ignored files"
4154 #: builtin/commit.c:1268 parse-options.h:156
4158 #: builtin/commit.c:1269
4160 "ignore changes to submodules, optional when: all, dirty, untracked. "
4164 #: builtin/commit.c:1271
4165 msgid "list untracked files in columns"
4168 #: builtin/commit.c:1340
4169 msgid "couldn't look up newly created commit"
4172 #: builtin/commit.c:1342
4173 msgid "could not parse newly created commit"
4176 #: builtin/commit.c:1383
4177 msgid "detached HEAD"
4180 #: builtin/commit.c:1385
4181 msgid " (root-commit)"
4184 #: builtin/commit.c:1452
4185 msgid "suppress summary after successful commit"
4188 #: builtin/commit.c:1453
4189 msgid "show diff in commit message template"
4192 #: builtin/commit.c:1455
4193 msgid "Commit message options"
4196 #: builtin/commit.c:1456 builtin/tag.c:457
4197 msgid "read message from file"
4200 #: builtin/commit.c:1457
4204 #: builtin/commit.c:1457
4205 msgid "override author for commit"
4208 #: builtin/commit.c:1458 builtin/gc.c:260
4212 #: builtin/commit.c:1458
4213 msgid "override date for commit"
4216 #: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
4217 #: builtin/notes.c:562 builtin/tag.c:455
4221 #: builtin/commit.c:1459
4222 msgid "commit message"
4225 #: builtin/commit.c:1460
4226 msgid "reuse and edit message from specified commit"
4229 #: builtin/commit.c:1461
4230 msgid "reuse message from specified commit"
4233 #: builtin/commit.c:1462
4234 msgid "use autosquash formatted message to fixup specified commit"
4237 #: builtin/commit.c:1463
4238 msgid "use autosquash formatted message to squash specified commit"
4241 #: builtin/commit.c:1464
4242 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4245 #: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
4246 msgid "add Signed-off-by:"
4249 #: builtin/commit.c:1466
4250 msgid "use specified template file"
4253 #: builtin/commit.c:1467
4254 msgid "force edit of commit"
4257 #: builtin/commit.c:1468
4261 #: builtin/commit.c:1468 builtin/tag.c:460
4262 msgid "how to strip spaces and #comments from message"
4265 #: builtin/commit.c:1469
4266 msgid "include status in commit message template"
4269 #: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
4273 #: builtin/commit.c:1471 builtin/merge.c:231
4274 msgid "GPG sign commit"
4277 #. end commit message options
4278 #: builtin/commit.c:1474
4279 msgid "Commit contents options"
4282 #: builtin/commit.c:1475
4283 msgid "commit all changed files"
4286 #: builtin/commit.c:1476
4287 msgid "add specified files to index for commit"
4290 #: builtin/commit.c:1477
4291 msgid "interactively add files"
4294 #: builtin/commit.c:1478
4295 msgid "interactively add changes"
4298 #: builtin/commit.c:1479
4299 msgid "commit only specified files"
4302 #: builtin/commit.c:1480
4303 msgid "bypass pre-commit hook"
4306 #: builtin/commit.c:1481
4307 msgid "show what would be committed"
4310 #: builtin/commit.c:1492
4311 msgid "amend previous commit"
4314 #: builtin/commit.c:1493
4315 msgid "bypass post-rewrite hook"
4318 #: builtin/commit.c:1498
4319 msgid "ok to record an empty change"
4322 #: builtin/commit.c:1500
4323 msgid "ok to record a change with an empty message"
4326 #: builtin/commit.c:1529
4327 msgid "could not parse HEAD commit"
4330 #: builtin/commit.c:1567 builtin/merge.c:525
4332 msgid "could not open '%s' for reading"
4335 #: builtin/commit.c:1574
4337 msgid "Corrupt MERGE_HEAD file (%s)"
4340 #: builtin/commit.c:1581
4341 msgid "could not read MERGE_MODE"
4344 #: builtin/commit.c:1600
4346 msgid "could not read commit message: %s"
4349 #: builtin/commit.c:1614
4351 msgid "Aborting commit; you did not edit the message.\n"
4354 #: builtin/commit.c:1619
4356 msgid "Aborting commit due to empty commit message.\n"
4359 #: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
4360 msgid "failed to write commit object"
4363 #: builtin/commit.c:1655
4364 msgid "cannot lock HEAD ref"
4367 #: builtin/commit.c:1659
4368 msgid "cannot update HEAD ref"
4371 #: builtin/commit.c:1670
4373 "Repository has been updated, but unable to write\n"
4374 "new_index file. Check that disk is not full or quota is\n"
4375 "not exceeded, and then \"git reset HEAD\" to recover."
4378 #: builtin/config.c:8
4379 msgid "git config [options]"
4382 #: builtin/config.c:54
4383 msgid "Config file location"
4386 #: builtin/config.c:55
4387 msgid "use global config file"
4390 #: builtin/config.c:56
4391 msgid "use system config file"
4394 #: builtin/config.c:57
4395 msgid "use repository config file"
4398 #: builtin/config.c:58
4399 msgid "use given config file"
4402 #: builtin/config.c:59
4406 #: builtin/config.c:59
4407 msgid "read config from given blob object"
4410 #: builtin/config.c:60
4414 #: builtin/config.c:61
4415 msgid "get value: name [value-regex]"
4418 #: builtin/config.c:62
4419 msgid "get all values: key [value-regex]"
4422 #: builtin/config.c:63
4423 msgid "get values for regexp: name-regex [value-regex]"
4426 #: builtin/config.c:64
4427 msgid "get value specific for the URL: section[.var] URL"
4430 #: builtin/config.c:65
4431 msgid "replace all matching variables: name value [value_regex]"
4434 #: builtin/config.c:66
4435 msgid "add a new variable: name value"
4438 #: builtin/config.c:67
4439 msgid "remove a variable: name [value-regex]"
4442 #: builtin/config.c:68
4443 msgid "remove all matches: name [value-regex]"
4446 #: builtin/config.c:69
4447 msgid "rename section: old-name new-name"
4450 #: builtin/config.c:70
4451 msgid "remove a section: name"
4454 #: builtin/config.c:71
4458 #: builtin/config.c:72
4459 msgid "open an editor"
4462 #: builtin/config.c:73 builtin/config.c:74
4466 #: builtin/config.c:73
4467 msgid "find the color configured: [default]"
4470 #: builtin/config.c:74
4471 msgid "find the color setting: [stdout-is-tty]"
4474 #: builtin/config.c:75
4478 #: builtin/config.c:76
4479 msgid "value is \"true\" or \"false\""
4482 #: builtin/config.c:77
4483 msgid "value is decimal number"
4486 #: builtin/config.c:78
4487 msgid "value is --bool or --int"
4490 #: builtin/config.c:79
4491 msgid "value is a path (file or directory name)"
4494 #: builtin/config.c:80
4498 #: builtin/config.c:81
4499 msgid "terminate values with NUL byte"
4502 #: builtin/config.c:82
4503 msgid "respect include directives on lookup"
4506 #: builtin/count-objects.c:82
4507 msgid "git count-objects [-v] [-H | --human-readable]"
4510 #: builtin/count-objects.c:97
4511 msgid "print sizes in human readable format"
4514 #: builtin/describe.c:16
4515 msgid "git describe [options] <commit-ish>*"
4518 #: builtin/describe.c:17
4519 msgid "git describe [options] --dirty"
4522 #: builtin/describe.c:237
4524 msgid "annotated tag %s not available"
4527 #: builtin/describe.c:241
4529 msgid "annotated tag %s has no embedded name"
4532 #: builtin/describe.c:243
4534 msgid "tag '%s' is really '%s' here"
4537 #: builtin/describe.c:270
4539 msgid "Not a valid object name %s"
4542 #: builtin/describe.c:273
4544 msgid "%s is not a valid '%s' object"
4547 #: builtin/describe.c:290
4549 msgid "no tag exactly matches '%s'"
4552 #: builtin/describe.c:292
4554 msgid "searching to describe %s\n"
4557 #: builtin/describe.c:332
4559 msgid "finished search at %s\n"
4562 #: builtin/describe.c:359
4565 "No annotated tags can describe '%s'.\n"
4566 "However, there were unannotated tags: try --tags."
4569 #: builtin/describe.c:363
4572 "No tags can describe '%s'.\n"
4573 "Try --always, or create some tags."
4576 #: builtin/describe.c:384
4578 msgid "traversed %lu commits\n"
4581 #: builtin/describe.c:387
4584 "more than %i tags found; listed %i most recent\n"
4585 "gave up search at %s\n"
4588 #: builtin/describe.c:409
4589 msgid "find the tag that comes after the commit"
4592 #: builtin/describe.c:410
4593 msgid "debug search strategy on stderr"
4596 #: builtin/describe.c:411
4600 #: builtin/describe.c:412
4601 msgid "use any tag, even unannotated"
4604 #: builtin/describe.c:413
4605 msgid "always use long format"
4608 #: builtin/describe.c:414
4609 msgid "only follow first parent"
4612 #: builtin/describe.c:417
4613 msgid "only output exact matches"
4616 #: builtin/describe.c:419
4617 msgid "consider <n> most recent tags (default: 10)"
4620 #: builtin/describe.c:421
4621 msgid "only consider tags matching <pattern>"
4624 #: builtin/describe.c:423 builtin/name-rev.c:322
4625 msgid "show abbreviated commit object as fallback"
4628 #: builtin/describe.c:424
4632 #: builtin/describe.c:425
4633 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4636 #: builtin/describe.c:443
4637 msgid "--long is incompatible with --abbrev=0"
4640 #: builtin/describe.c:469
4641 msgid "No names found, cannot describe anything."
4644 #: builtin/describe.c:489
4645 msgid "--dirty is incompatible with commit-ishes"
4648 #: builtin/diff.c:79
4650 msgid "'%s': not a regular file or symlink"
4653 #: builtin/diff.c:230
4655 msgid "invalid option: %s"
4658 #: builtin/diff.c:307
4659 msgid "Not a git repository"
4662 #: builtin/diff.c:350
4664 msgid "invalid object '%s' given."
4667 #: builtin/diff.c:359
4669 msgid "more than two blobs given: '%s'"
4672 #: builtin/diff.c:366
4674 msgid "unhandled object '%s' given."
4677 #: builtin/fast-export.c:22
4678 msgid "git fast-export [rev-list-opts]"
4681 #: builtin/fast-export.c:673
4682 msgid "show progress after <n> objects"
4685 #: builtin/fast-export.c:675
4686 msgid "select handling of signed tags"
4689 #: builtin/fast-export.c:678
4690 msgid "select handling of tags that tag filtered objects"
4693 #: builtin/fast-export.c:681
4694 msgid "Dump marks to this file"
4697 #: builtin/fast-export.c:683
4698 msgid "Import marks from this file"
4701 #: builtin/fast-export.c:685
4702 msgid "Fake a tagger when tags lack one"
4705 #: builtin/fast-export.c:687
4706 msgid "Output full tree for each commit"
4709 #: builtin/fast-export.c:689
4710 msgid "Use the done feature to terminate the stream"
4713 #: builtin/fast-export.c:690
4714 msgid "Skip output of blob data"
4717 #: builtin/fetch.c:20
4718 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4721 #: builtin/fetch.c:21
4722 msgid "git fetch [<options>] <group>"
4725 #: builtin/fetch.c:22
4726 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4729 #: builtin/fetch.c:23
4730 msgid "git fetch --all [<options>]"
4733 #: builtin/fetch.c:74
4734 msgid "fetch from all remotes"
4737 #: builtin/fetch.c:76
4738 msgid "append to .git/FETCH_HEAD instead of overwriting"
4741 #: builtin/fetch.c:78
4742 msgid "path to upload pack on remote end"
4745 #: builtin/fetch.c:79
4746 msgid "force overwrite of local branch"
4749 #: builtin/fetch.c:81
4750 msgid "fetch from multiple remotes"
4753 #: builtin/fetch.c:83
4754 msgid "fetch all tags and associated objects"
4757 #: builtin/fetch.c:85
4758 msgid "do not fetch all tags (--no-tags)"
4761 #: builtin/fetch.c:87
4762 msgid "prune remote-tracking branches no longer on remote"
4765 #: builtin/fetch.c:88
4769 #: builtin/fetch.c:89
4770 msgid "control recursive fetching of submodules"
4773 #: builtin/fetch.c:93
4774 msgid "keep downloaded pack"
4777 #: builtin/fetch.c:95
4778 msgid "allow updating of HEAD ref"
4781 #: builtin/fetch.c:98
4782 msgid "deepen history of shallow clone"
4785 #: builtin/fetch.c:100
4786 msgid "convert to a complete repository"
4789 #: builtin/fetch.c:102 builtin/log.c:1197
4793 #: builtin/fetch.c:103
4794 msgid "prepend this to submodule path output"
4797 #: builtin/fetch.c:106
4798 msgid "default mode for recursion"
4801 #: builtin/fetch.c:236
4802 msgid "Couldn't find remote ref HEAD"
4805 #: builtin/fetch.c:290
4807 msgid "object %s not found"
4810 #: builtin/fetch.c:295
4811 msgid "[up to date]"
4814 #: builtin/fetch.c:309
4816 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4819 #: builtin/fetch.c:310 builtin/fetch.c:396
4823 #: builtin/fetch.c:321
4824 msgid "[tag update]"
4827 #: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
4828 msgid " (unable to update local ref)"
4831 #: builtin/fetch.c:341
4835 #: builtin/fetch.c:344
4836 msgid "[new branch]"
4839 #: builtin/fetch.c:347
4843 #: builtin/fetch.c:392
4844 msgid "unable to update local ref"
4847 #: builtin/fetch.c:392
4848 msgid "forced update"
4851 #: builtin/fetch.c:398
4852 msgid "(non-fast-forward)"
4855 #: builtin/fetch.c:429 builtin/fetch.c:735
4857 msgid "cannot open %s: %s\n"
4860 #: builtin/fetch.c:438
4862 msgid "%s did not send all necessary objects\n"
4865 #: builtin/fetch.c:537
4870 #: builtin/fetch.c:548
4873 "some local refs could not be updated; try running\n"
4874 " 'git remote prune %s' to remove any old, conflicting branches"
4877 #: builtin/fetch.c:598
4879 msgid " (%s will become dangling)"
4882 #: builtin/fetch.c:599
4884 msgid " (%s has become dangling)"
4887 #: builtin/fetch.c:606
4891 #: builtin/fetch.c:607 builtin/remote.c:1055
4895 #: builtin/fetch.c:725
4897 msgid "Refusing to fetch into current branch %s of non-bare repository"
4900 #: builtin/fetch.c:744
4902 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4905 #: builtin/fetch.c:747
4907 msgid "Option \"%s\" is ignored for %s\n"
4910 #: builtin/fetch.c:801
4912 msgid "Don't know how to fetch from %s"
4915 #: builtin/fetch.c:976
4917 msgid "Fetching %s\n"
4920 #: builtin/fetch.c:978 builtin/remote.c:100
4922 msgid "Could not fetch %s"
4925 #: builtin/fetch.c:997
4927 "No remote repository specified. Please, specify either a URL or a\n"
4928 "remote name from which new revisions should be fetched."
4931 #: builtin/fetch.c:1020
4932 msgid "You need to specify a tag name."
4935 #: builtin/fetch.c:1068
4936 msgid "--depth and --unshallow cannot be used together"
4939 #: builtin/fetch.c:1070
4940 msgid "--unshallow on a complete repository does not make sense"
4943 #: builtin/fetch.c:1089
4944 msgid "fetch --all does not take a repository argument"
4947 #: builtin/fetch.c:1091
4948 msgid "fetch --all does not make sense with refspecs"
4951 #: builtin/fetch.c:1102
4953 msgid "No such remote or remote group: %s"
4956 #: builtin/fetch.c:1110
4957 msgid "Fetching a group and specifying refspecs does not make sense"
4960 #: builtin/fmt-merge-msg.c:13
4961 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4964 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
4965 #: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
4966 #: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
4970 #: builtin/fmt-merge-msg.c:664
4971 msgid "populate log with at most <n> entries from shortlog"
4974 #: builtin/fmt-merge-msg.c:667
4975 msgid "alias for --log (deprecated)"
4978 #: builtin/fmt-merge-msg.c:670
4982 #: builtin/fmt-merge-msg.c:671
4983 msgid "use <text> as start of message"
4986 #: builtin/fmt-merge-msg.c:672
4987 msgid "file to read from"
4990 #: builtin/for-each-ref.c:995
4991 msgid "git for-each-ref [options] [<pattern>]"
4994 #: builtin/for-each-ref.c:1010
4995 msgid "quote placeholders suitably for shells"
4998 #: builtin/for-each-ref.c:1012
4999 msgid "quote placeholders suitably for perl"
5002 #: builtin/for-each-ref.c:1014
5003 msgid "quote placeholders suitably for python"
5006 #: builtin/for-each-ref.c:1016
5007 msgid "quote placeholders suitably for tcl"
5010 #: builtin/for-each-ref.c:1019
5011 msgid "show only <n> matched refs"
5014 #: builtin/for-each-ref.c:1020
5018 #: builtin/for-each-ref.c:1020
5019 msgid "format to use for the output"
5022 #: builtin/for-each-ref.c:1021
5026 #: builtin/for-each-ref.c:1022
5027 msgid "field name to sort on"
5030 #: builtin/fsck.c:607
5031 msgid "git fsck [options] [<object>...]"
5034 #: builtin/fsck.c:613
5035 msgid "show unreachable objects"
5038 #: builtin/fsck.c:614
5039 msgid "show dangling objects"
5042 #: builtin/fsck.c:615
5046 #: builtin/fsck.c:616
5047 msgid "report root nodes"
5050 #: builtin/fsck.c:617
5051 msgid "make index objects head nodes"
5054 #: builtin/fsck.c:618
5055 msgid "make reflogs head nodes (default)"
5058 #: builtin/fsck.c:619
5059 msgid "also consider packs and alternate objects"
5062 #: builtin/fsck.c:620
5063 msgid "enable more strict checking"
5066 #: builtin/fsck.c:622
5067 msgid "write dangling objects in .git/lost-found"
5070 #: builtin/fsck.c:623 builtin/prune.c:134
5071 msgid "show progress"
5075 msgid "git gc [options]"
5080 msgid "Invalid %s: '%s'"
5085 msgid "insanely long object directory %.*s"
5089 msgid "prune unreferenced objects"
5093 msgid "be more thorough (increased runtime)"
5097 msgid "enable auto-gc mode"
5101 msgid "force running gc even if there may be another gc running"
5107 "Auto packing the repository for optimum performance. You may also\n"
5108 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
5111 #. be quiet on --auto
5115 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5120 "There are too many unreachable loose objects; run 'git prune' to remove them."
5123 #: builtin/grep.c:23
5124 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5127 #: builtin/grep.c:218
5129 msgid "grep: failed to create thread: %s"
5132 #: builtin/grep.c:365
5134 msgid "Failed to chdir: %s"
5137 #: builtin/grep.c:443 builtin/grep.c:478
5139 msgid "unable to read tree (%s)"
5142 #: builtin/grep.c:493
5144 msgid "unable to grep from object of type %s"
5147 #: builtin/grep.c:551
5149 msgid "switch `%c' expects a numerical value"
5152 #: builtin/grep.c:568
5154 msgid "cannot open '%s'"
5157 #: builtin/grep.c:642
5158 msgid "search in index instead of in the work tree"
5161 #: builtin/grep.c:644
5162 msgid "find in contents not managed by git"
5165 #: builtin/grep.c:646
5166 msgid "search in both tracked and untracked files"
5169 #: builtin/grep.c:648
5170 msgid "search also in ignored files"
5173 #: builtin/grep.c:651
5174 msgid "show non-matching lines"
5177 #: builtin/grep.c:653
5178 msgid "case insensitive matching"
5181 #: builtin/grep.c:655
5182 msgid "match patterns only at word boundaries"
5185 #: builtin/grep.c:657
5186 msgid "process binary files as text"
5189 #: builtin/grep.c:659
5190 msgid "don't match patterns in binary files"
5193 #: builtin/grep.c:662
5194 msgid "process binary files with textconv filters"
5197 #: builtin/grep.c:664
5198 msgid "descend at most <depth> levels"
5201 #: builtin/grep.c:668
5202 msgid "use extended POSIX regular expressions"
5205 #: builtin/grep.c:671
5206 msgid "use basic POSIX regular expressions (default)"
5209 #: builtin/grep.c:674
5210 msgid "interpret patterns as fixed strings"
5213 #: builtin/grep.c:677
5214 msgid "use Perl-compatible regular expressions"
5217 #: builtin/grep.c:680
5218 msgid "show line numbers"
5221 #: builtin/grep.c:681
5222 msgid "don't show filenames"
5225 #: builtin/grep.c:682
5226 msgid "show filenames"
5229 #: builtin/grep.c:684
5230 msgid "show filenames relative to top directory"
5233 #: builtin/grep.c:686
5234 msgid "show only filenames instead of matching lines"
5237 #: builtin/grep.c:688
5238 msgid "synonym for --files-with-matches"
5241 #: builtin/grep.c:691
5242 msgid "show only the names of files without match"
5245 #: builtin/grep.c:693
5246 msgid "print NUL after filenames"
5249 #: builtin/grep.c:695
5250 msgid "show the number of matches instead of matching lines"
5253 #: builtin/grep.c:696
5254 msgid "highlight matches"
5257 #: builtin/grep.c:698
5258 msgid "print empty line between matches from different files"
5261 #: builtin/grep.c:700
5262 msgid "show filename only once above matches from same file"
5265 #: builtin/grep.c:703
5266 msgid "show <n> context lines before and after matches"
5269 #: builtin/grep.c:706
5270 msgid "show <n> context lines before matches"
5273 #: builtin/grep.c:708
5274 msgid "show <n> context lines after matches"
5277 #: builtin/grep.c:709
5278 msgid "shortcut for -C NUM"
5281 #: builtin/grep.c:712
5282 msgid "show a line with the function name before matches"
5285 #: builtin/grep.c:714
5286 msgid "show the surrounding function"
5289 #: builtin/grep.c:717
5290 msgid "read patterns from file"
5293 #: builtin/grep.c:719
5294 msgid "match <pattern>"
5297 #: builtin/grep.c:721
5298 msgid "combine patterns specified with -e"
5301 #: builtin/grep.c:733
5302 msgid "indicate hit with exit status without output"
5305 #: builtin/grep.c:735
5306 msgid "show only matches from files that match all patterns"
5309 #: builtin/grep.c:737
5310 msgid "show parse tree for grep expression"
5313 #: builtin/grep.c:741
5317 #: builtin/grep.c:741
5318 msgid "show matching files in the pager"
5321 #: builtin/grep.c:744
5322 msgid "allow calling of grep(1) (ignored by this build)"
5325 #: builtin/grep.c:745 builtin/show-ref.c:187
5329 #: builtin/grep.c:812
5330 msgid "no pattern given."
5333 #: builtin/grep.c:870
5334 msgid "--open-files-in-pager only works on the worktree"
5337 #: builtin/grep.c:893
5338 msgid "--cached or --untracked cannot be used with --no-index."
5341 #: builtin/grep.c:898
5342 msgid "--no-index or --untracked cannot be used with revs."
5345 #: builtin/grep.c:901
5346 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5349 #: builtin/grep.c:909
5350 msgid "both --cached and trees are given."
5353 #: builtin/hash-object.c:60
5355 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5359 #: builtin/hash-object.c:61
5360 msgid "git hash-object --stdin-paths < <list-of-paths>"
5363 #: builtin/hash-object.c:72
5367 #: builtin/hash-object.c:72
5371 #: builtin/hash-object.c:73
5372 msgid "write the object into the object database"
5375 #: builtin/hash-object.c:74
5376 msgid "read the object from stdin"
5379 #: builtin/hash-object.c:76
5380 msgid "store file as is without filters"
5383 #: builtin/hash-object.c:77
5384 msgid "process file as it were from this path"
5387 #: builtin/help.c:41
5388 msgid "print all available commands"
5391 #: builtin/help.c:42
5392 msgid "print list of useful guides"
5395 #: builtin/help.c:43
5396 msgid "show man page"
5399 #: builtin/help.c:44
5400 msgid "show manual in web browser"
5403 #: builtin/help.c:46
5404 msgid "show info page"
5407 #: builtin/help.c:52
5408 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5411 #: builtin/help.c:64
5413 msgid "unrecognized help format '%s'"
5416 #: builtin/help.c:92
5417 msgid "Failed to start emacsclient."
5420 #: builtin/help.c:105
5421 msgid "Failed to parse emacsclient version."
5424 #: builtin/help.c:113
5426 msgid "emacsclient version '%d' too old (< 22)."
5429 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5431 msgid "failed to exec '%s': %s"
5434 #: builtin/help.c:216
5437 "'%s': path for unsupported man viewer.\n"
5438 "Please consider using 'man.<tool>.cmd' instead."
5441 #: builtin/help.c:228
5444 "'%s': cmd for supported man viewer.\n"
5445 "Please consider using 'man.<tool>.path' instead."
5448 #: builtin/help.c:349
5450 msgid "'%s': unknown man viewer."
5453 #: builtin/help.c:366
5454 msgid "no man viewer handled the request"
5457 #: builtin/help.c:374
5458 msgid "no info viewer handled the request"
5461 #: builtin/help.c:420
5462 msgid "Defining attributes per path"
5465 #: builtin/help.c:421
5466 msgid "A Git glossary"
5469 #: builtin/help.c:422
5470 msgid "Specifies intentionally untracked files to ignore"
5473 #: builtin/help.c:423
5474 msgid "Defining submodule properties"
5477 #: builtin/help.c:424
5478 msgid "Specifying revisions and ranges for Git"
5481 #: builtin/help.c:425
5482 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5485 #: builtin/help.c:426
5486 msgid "An overview of recommended workflows with Git"
5489 #: builtin/help.c:438
5490 msgid "The common Git guides are:\n"
5493 #: builtin/help.c:460 builtin/help.c:476
5498 #: builtin/help.c:492
5500 msgid "`git %s' is aliased to `%s'"
5503 #: builtin/index-pack.c:184
5505 msgid "object type mismatch at %s"
5508 #: builtin/index-pack.c:204
5509 msgid "object of unexpected type"
5512 #: builtin/index-pack.c:244
5514 msgid "cannot fill %d byte"
5515 msgid_plural "cannot fill %d bytes"
5519 #: builtin/index-pack.c:254
5523 #: builtin/index-pack.c:255
5524 msgid "read error on input"
5527 #: builtin/index-pack.c:267
5528 msgid "used more bytes than were available"
5531 #: builtin/index-pack.c:274
5532 msgid "pack too large for current definition of off_t"
5535 #: builtin/index-pack.c:290
5537 msgid "unable to create '%s'"
5540 #: builtin/index-pack.c:295
5542 msgid "cannot open packfile '%s'"
5545 #: builtin/index-pack.c:309
5546 msgid "pack signature mismatch"
5549 #: builtin/index-pack.c:311
5551 msgid "pack version %<PRIu32> unsupported"
5554 #: builtin/index-pack.c:329
5556 msgid "pack has bad object at offset %lu: %s"
5559 #: builtin/index-pack.c:451
5561 msgid "inflate returned %d"
5564 #: builtin/index-pack.c:500
5565 msgid "offset value overflow for delta base object"
5568 #: builtin/index-pack.c:508
5569 msgid "delta base offset is out of bound"
5572 #: builtin/index-pack.c:516
5574 msgid "unknown object type %d"
5577 #: builtin/index-pack.c:547
5578 msgid "cannot pread pack file"
5581 #: builtin/index-pack.c:549
5583 msgid "premature end of pack file, %lu byte missing"
5584 msgid_plural "premature end of pack file, %lu bytes missing"
5588 #: builtin/index-pack.c:575
5589 msgid "serious inflate inconsistency"
5592 #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5593 #: builtin/index-pack.c:729 builtin/index-pack.c:738
5595 msgid "SHA1 COLLISION FOUND WITH %s !"
5598 #: builtin/index-pack.c:669 builtin/pack-objects.c:171
5599 #: builtin/pack-objects.c:263
5601 msgid "unable to read %s"
5604 #: builtin/index-pack.c:735
5606 msgid "cannot read existing object %s"
5609 #: builtin/index-pack.c:749
5611 msgid "invalid blob object %s"
5614 #: builtin/index-pack.c:763
5619 #: builtin/index-pack.c:766
5620 msgid "Error in object"
5623 #: builtin/index-pack.c:768
5625 msgid "Not all child objects of %s are reachable"
5628 #: builtin/index-pack.c:839 builtin/index-pack.c:869
5629 msgid "failed to apply delta"
5632 #: builtin/index-pack.c:1010
5633 msgid "Receiving objects"
5636 #: builtin/index-pack.c:1010
5637 msgid "Indexing objects"
5640 #: builtin/index-pack.c:1036
5641 msgid "pack is corrupted (SHA1 mismatch)"
5644 #: builtin/index-pack.c:1041
5645 msgid "cannot fstat packfile"
5648 #: builtin/index-pack.c:1044
5649 msgid "pack has junk at the end"
5652 #: builtin/index-pack.c:1055
5653 msgid "confusion beyond insanity in parse_pack_objects()"
5656 #: builtin/index-pack.c:1078
5657 msgid "Resolving deltas"
5660 #: builtin/index-pack.c:1088
5662 msgid "unable to create thread: %s"
5665 #: builtin/index-pack.c:1130
5666 msgid "confusion beyond insanity"
5669 #: builtin/index-pack.c:1138
5671 msgid "completed with %d local objects"
5674 #: builtin/index-pack.c:1148
5676 msgid "Unexpected tail checksum for %s (disk corruption?)"
5679 #: builtin/index-pack.c:1152
5681 msgid "pack has %d unresolved delta"
5682 msgid_plural "pack has %d unresolved deltas"
5686 #: builtin/index-pack.c:1177
5688 msgid "unable to deflate appended object (%d)"
5691 #: builtin/index-pack.c:1256
5693 msgid "local object %s is corrupt"
5696 #: builtin/index-pack.c:1280
5697 msgid "error while closing pack file"
5700 #: builtin/index-pack.c:1293
5702 msgid "cannot write keep file '%s'"
5705 #: builtin/index-pack.c:1301
5707 msgid "cannot close written keep file '%s'"
5710 #: builtin/index-pack.c:1314
5711 msgid "cannot store pack file"
5714 #: builtin/index-pack.c:1325
5715 msgid "cannot store index file"
5718 #: builtin/index-pack.c:1358
5720 msgid "bad pack.indexversion=%<PRIu32>"
5723 #: builtin/index-pack.c:1364
5725 msgid "invalid number of threads specified (%d)"
5728 #: builtin/index-pack.c:1368 builtin/index-pack.c:1546
5730 msgid "no threads support, ignoring %s"
5733 #: builtin/index-pack.c:1426
5735 msgid "Cannot open existing pack file '%s'"
5738 #: builtin/index-pack.c:1428
5740 msgid "Cannot open existing pack idx file for '%s'"
5743 #: builtin/index-pack.c:1475
5745 msgid "non delta: %d object"
5746 msgid_plural "non delta: %d objects"
5750 #: builtin/index-pack.c:1482
5752 msgid "chain length = %d: %lu object"
5753 msgid_plural "chain length = %d: %lu objects"
5757 #: builtin/index-pack.c:1510
5758 msgid "Cannot come back to cwd"
5761 #: builtin/index-pack.c:1558 builtin/index-pack.c:1561
5762 #: builtin/index-pack.c:1573 builtin/index-pack.c:1577
5767 #: builtin/index-pack.c:1591
5768 msgid "--fix-thin cannot be used without --stdin"
5771 #: builtin/index-pack.c:1595 builtin/index-pack.c:1605
5773 msgid "packfile name '%s' does not end with '.pack'"
5776 #: builtin/index-pack.c:1614
5777 msgid "--verify with no packfile name given"
5780 #: builtin/init-db.c:35
5782 msgid "Could not make %s writable by group"
5785 #: builtin/init-db.c:62
5787 msgid "insanely long template name %s"
5790 #: builtin/init-db.c:67
5792 msgid "cannot stat '%s'"
5795 #: builtin/init-db.c:73
5797 msgid "cannot stat template '%s'"
5800 #: builtin/init-db.c:80
5802 msgid "cannot opendir '%s'"
5805 #: builtin/init-db.c:97
5807 msgid "cannot readlink '%s'"
5810 #: builtin/init-db.c:99
5812 msgid "insanely long symlink %s"
5815 #: builtin/init-db.c:102
5817 msgid "cannot symlink '%s' '%s'"
5820 #: builtin/init-db.c:106
5822 msgid "cannot copy '%s' to '%s'"
5825 #: builtin/init-db.c:110
5827 msgid "ignoring template %s"
5830 #: builtin/init-db.c:133
5832 msgid "insanely long template path %s"
5835 #: builtin/init-db.c:141
5837 msgid "templates not found %s"
5840 #: builtin/init-db.c:154
5842 msgid "not copying templates of a wrong format version %d from '%s'"
5845 #: builtin/init-db.c:192
5847 msgid "insane git directory %s"
5850 #: builtin/init-db.c:323 builtin/init-db.c:326
5852 msgid "%s already exists"
5855 #: builtin/init-db.c:355
5857 msgid "unable to handle file type %d"
5860 #: builtin/init-db.c:358
5862 msgid "unable to move %s to %s"
5866 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5867 #. * existing" or "Initialized empty", the second " shared" or
5868 #. * "", and the last '%s%s' is the verbatim directory name.
5870 #: builtin/init-db.c:420
5872 msgid "%s%s Git repository in %s%s\n"
5875 #: builtin/init-db.c:421
5876 msgid "Reinitialized existing"
5879 #: builtin/init-db.c:421
5880 msgid "Initialized empty"
5883 #: builtin/init-db.c:422
5887 #: builtin/init-db.c:441
5888 msgid "cannot tell cwd"
5891 #: builtin/init-db.c:467
5893 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5894 "shared[=<permissions>]] [directory]"
5897 #: builtin/init-db.c:490
5901 #: builtin/init-db.c:491
5902 msgid "specify that the git repository is to be shared amongst several users"
5905 #: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
5909 #: builtin/init-db.c:522 builtin/init-db.c:529
5911 msgid "cannot mkdir %s"
5914 #: builtin/init-db.c:533
5916 msgid "cannot chdir to %s"
5919 #: builtin/init-db.c:555
5922 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5926 #: builtin/init-db.c:579
5927 msgid "Cannot access current working directory"
5930 #: builtin/init-db.c:586
5932 msgid "Cannot access work tree '%s'"
5936 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
5940 msgid " or: git show [options] <object>..."
5943 #: builtin/log.c:125
5944 msgid "suppress diff output"
5947 #: builtin/log.c:126
5951 #: builtin/log.c:127
5952 msgid "Use mail map file"
5955 #: builtin/log.c:128
5956 msgid "decorate options"
5959 #: builtin/log.c:231
5961 msgid "Final output: %d %s\n"
5964 #: builtin/log.c:473 builtin/log.c:565
5966 msgid "Could not read object %s"
5969 #: builtin/log.c:589
5971 msgid "Unknown type: %d"
5974 #: builtin/log.c:689
5975 msgid "format.headers without value"
5978 #: builtin/log.c:771
5979 msgid "name of output directory is too long"
5982 #: builtin/log.c:787
5984 msgid "Cannot open patch file %s"
5987 #: builtin/log.c:801
5988 msgid "Need exactly one range."
5991 #: builtin/log.c:809
5992 msgid "Not a range."
5995 #: builtin/log.c:911
5996 msgid "Cover letter needs email format"
5999 #: builtin/log.c:987
6001 msgid "insane in-reply-to: %s"
6004 #: builtin/log.c:1015
6005 msgid "git format-patch [options] [<since> | <revision range>]"
6008 #: builtin/log.c:1060
6009 msgid "Two output directories?"
6012 #: builtin/log.c:1175
6013 msgid "use [PATCH n/m] even with a single patch"
6016 #: builtin/log.c:1178
6017 msgid "use [PATCH] even with multiple patches"
6020 #: builtin/log.c:1182
6021 msgid "print patches to standard out"
6024 #: builtin/log.c:1184
6025 msgid "generate a cover letter"
6028 #: builtin/log.c:1186
6029 msgid "use simple number sequence for output file names"
6032 #: builtin/log.c:1187
6036 #: builtin/log.c:1188
6037 msgid "use <sfx> instead of '.patch'"
6040 #: builtin/log.c:1190
6041 msgid "start numbering patches at <n> instead of 1"
6044 #: builtin/log.c:1192
6045 msgid "mark the series as Nth re-roll"
6048 #: builtin/log.c:1194
6049 msgid "Use [<prefix>] instead of [PATCH]"
6052 #: builtin/log.c:1197
6053 msgid "store resulting files in <dir>"
6056 #: builtin/log.c:1200
6057 msgid "don't strip/add [PATCH]"
6060 #: builtin/log.c:1203
6061 msgid "don't output binary diffs"
6064 #: builtin/log.c:1205
6065 msgid "don't include a patch matching a commit upstream"
6068 #: builtin/log.c:1207
6069 msgid "show patch format instead of default (patch + stat)"
6072 #: builtin/log.c:1209
6076 #: builtin/log.c:1210
6080 #: builtin/log.c:1211
6081 msgid "add email header"
6084 #: builtin/log.c:1212 builtin/log.c:1214
6088 #: builtin/log.c:1212
6089 msgid "add To: header"
6092 #: builtin/log.c:1214
6093 msgid "add Cc: header"
6096 #: builtin/log.c:1216
6100 #: builtin/log.c:1217
6101 msgid "set From address to <ident> (or committer ident if absent)"
6104 #: builtin/log.c:1219
6108 #: builtin/log.c:1220
6109 msgid "make first mail a reply to <message-id>"
6112 #: builtin/log.c:1221 builtin/log.c:1224
6116 #: builtin/log.c:1222
6117 msgid "attach the patch"
6120 #: builtin/log.c:1225
6121 msgid "inline the patch"
6124 #: builtin/log.c:1229
6125 msgid "enable message threading, styles: shallow, deep"
6128 #: builtin/log.c:1231
6132 #: builtin/log.c:1232
6133 msgid "add a signature"
6136 #: builtin/log.c:1233
6137 msgid "don't print the patch filenames"
6140 #: builtin/log.c:1307
6142 msgid "invalid ident line: %s"
6145 #: builtin/log.c:1322
6146 msgid "-n and -k are mutually exclusive."
6149 #: builtin/log.c:1324
6150 msgid "--subject-prefix and -k are mutually exclusive."
6153 #: builtin/log.c:1332
6154 msgid "--name-only does not make sense"
6157 #: builtin/log.c:1334
6158 msgid "--name-status does not make sense"
6161 #: builtin/log.c:1336
6162 msgid "--check does not make sense"
6165 #: builtin/log.c:1359
6166 msgid "standard output, or directory, which one?"
6169 #: builtin/log.c:1361
6171 msgid "Could not create directory '%s'"
6174 #: builtin/log.c:1509
6175 msgid "Failed to create output files"
6178 #: builtin/log.c:1558
6179 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6182 #: builtin/log.c:1613
6185 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6188 #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6190 msgid "Unknown commit %s"
6193 #: builtin/ls-files.c:398
6194 msgid "git ls-files [options] [<file>...]"
6197 #: builtin/ls-files.c:455
6198 msgid "identify the file status with tags"
6201 #: builtin/ls-files.c:457
6202 msgid "use lowercase letters for 'assume unchanged' files"
6205 #: builtin/ls-files.c:459
6206 msgid "show cached files in the output (default)"
6209 #: builtin/ls-files.c:461
6210 msgid "show deleted files in the output"
6213 #: builtin/ls-files.c:463
6214 msgid "show modified files in the output"
6217 #: builtin/ls-files.c:465
6218 msgid "show other files in the output"
6221 #: builtin/ls-files.c:467
6222 msgid "show ignored files in the output"
6225 #: builtin/ls-files.c:470
6226 msgid "show staged contents' object name in the output"
6229 #: builtin/ls-files.c:472
6230 msgid "show files on the filesystem that need to be removed"
6233 #: builtin/ls-files.c:474
6234 msgid "show 'other' directories' name only"
6237 #: builtin/ls-files.c:477
6238 msgid "don't show empty directories"
6241 #: builtin/ls-files.c:480
6242 msgid "show unmerged files in the output"
6245 #: builtin/ls-files.c:482
6246 msgid "show resolve-undo information"
6249 #: builtin/ls-files.c:484
6250 msgid "skip files matching pattern"
6253 #: builtin/ls-files.c:487
6254 msgid "exclude patterns are read from <file>"
6257 #: builtin/ls-files.c:490
6258 msgid "read additional per-directory exclude patterns in <file>"
6261 #: builtin/ls-files.c:492
6262 msgid "add the standard git exclusions"
6265 #: builtin/ls-files.c:495
6266 msgid "make the output relative to the project top directory"
6269 #: builtin/ls-files.c:498
6270 msgid "if any <file> is not in the index, treat this as an error"
6273 #: builtin/ls-files.c:499
6277 #: builtin/ls-files.c:500
6278 msgid "pretend that paths removed since <tree-ish> are still present"
6281 #: builtin/ls-files.c:502
6282 msgid "show debugging data"
6285 #: builtin/ls-tree.c:28
6286 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6289 #: builtin/ls-tree.c:126
6290 msgid "only show trees"
6293 #: builtin/ls-tree.c:128
6294 msgid "recurse into subtrees"
6297 #: builtin/ls-tree.c:130
6298 msgid "show trees when recursing"
6301 #: builtin/ls-tree.c:133
6302 msgid "terminate entries with NUL byte"
6305 #: builtin/ls-tree.c:134
6306 msgid "include object size"
6309 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6310 msgid "list only filenames"
6313 #: builtin/ls-tree.c:141
6314 msgid "use full path names"
6317 #: builtin/ls-tree.c:143
6318 msgid "list entire tree; not just current directory (implies --full-name)"
6321 #: builtin/merge.c:43
6322 msgid "git merge [options] [<commit>...]"
6325 #: builtin/merge.c:44
6326 msgid "git merge [options] <msg> HEAD <commit>"
6329 #: builtin/merge.c:45
6330 msgid "git merge --abort"
6333 #: builtin/merge.c:98
6334 msgid "switch `m' requires a value"
6337 #: builtin/merge.c:135
6339 msgid "Could not find merge strategy '%s'.\n"
6342 #: builtin/merge.c:136
6344 msgid "Available strategies are:"
6347 #: builtin/merge.c:141
6349 msgid "Available custom strategies are:"
6352 #: builtin/merge.c:198
6353 msgid "do not show a diffstat at the end of the merge"
6356 #: builtin/merge.c:201
6357 msgid "show a diffstat at the end of the merge"
6360 #: builtin/merge.c:202
6361 msgid "(synonym to --stat)"
6364 #: builtin/merge.c:204
6365 msgid "add (at most <n>) entries from shortlog to merge commit message"
6368 #: builtin/merge.c:207
6369 msgid "create a single commit instead of doing a merge"
6372 #: builtin/merge.c:209
6373 msgid "perform a commit if the merge succeeds (default)"
6376 #: builtin/merge.c:211
6377 msgid "edit message before committing"
6380 #: builtin/merge.c:212
6381 msgid "allow fast-forward (default)"
6384 #: builtin/merge.c:214
6385 msgid "abort if fast-forward is not possible"
6388 #: builtin/merge.c:218
6389 msgid "Verify that the named commit has a valid GPG signature"
6392 #: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
6396 #: builtin/merge.c:220
6397 msgid "merge strategy to use"
6400 #: builtin/merge.c:221
6401 msgid "option=value"
6404 #: builtin/merge.c:222
6405 msgid "option for selected merge strategy"
6408 #: builtin/merge.c:224
6409 msgid "merge commit message (for a non-fast-forward merge)"
6412 #: builtin/merge.c:228
6413 msgid "abort the current in-progress merge"
6416 #: builtin/merge.c:257
6417 msgid "could not run stash."
6420 #: builtin/merge.c:262
6421 msgid "stash failed"
6424 #: builtin/merge.c:267
6426 msgid "not a valid object: %s"
6429 #: builtin/merge.c:286 builtin/merge.c:303
6430 msgid "read-tree failed"
6433 #: builtin/merge.c:333
6434 msgid " (nothing to squash)"
6437 #: builtin/merge.c:346
6439 msgid "Squash commit -- not updating HEAD\n"
6442 #: builtin/merge.c:378
6443 msgid "Writing SQUASH_MSG"
6446 #: builtin/merge.c:380
6447 msgid "Finishing SQUASH_MSG"
6450 #: builtin/merge.c:403
6452 msgid "No merge message -- not updating HEAD\n"
6455 #: builtin/merge.c:453
6457 msgid "'%s' does not point to a commit"
6460 #: builtin/merge.c:565
6462 msgid "Bad branch.%s.mergeoptions string: %s"
6465 #: builtin/merge.c:657
6466 msgid "git write-tree failed to write a tree"
6469 #: builtin/merge.c:685
6470 msgid "Not handling anything other than two heads merge."
6473 #: builtin/merge.c:699
6475 msgid "Unknown option for merge-recursive: -X%s"
6478 #: builtin/merge.c:713
6480 msgid "unable to write %s"
6483 #: builtin/merge.c:802
6485 msgid "Could not read from '%s'"
6488 #: builtin/merge.c:811
6490 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6493 #: builtin/merge.c:817
6496 "Please enter a commit message to explain why this merge is necessary,\n"
6497 "especially if it merges an updated upstream into a topic branch.\n"
6499 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6503 #: builtin/merge.c:841
6504 msgid "Empty commit message."
6507 #: builtin/merge.c:853
6509 msgid "Wonderful.\n"
6512 #: builtin/merge.c:918
6514 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6517 #: builtin/merge.c:934
6519 msgid "'%s' is not a commit"
6522 #: builtin/merge.c:975
6523 msgid "No current branch."
6526 #: builtin/merge.c:977
6527 msgid "No remote for the current branch."
6530 #: builtin/merge.c:979
6531 msgid "No default upstream defined for the current branch."
6534 #: builtin/merge.c:984
6536 msgid "No remote-tracking branch for %s from %s"
6539 #: builtin/merge.c:1140
6540 msgid "There is no merge to abort (MERGE_HEAD missing)."
6543 #: builtin/merge.c:1156 git-pull.sh:31
6545 "You have not concluded your merge (MERGE_HEAD exists).\n"
6546 "Please, commit your changes before you can merge."
6549 #: builtin/merge.c:1159 git-pull.sh:34
6550 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6553 #: builtin/merge.c:1163
6555 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6556 "Please, commit your changes before you can merge."
6559 #: builtin/merge.c:1166
6560 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6563 #: builtin/merge.c:1175
6564 msgid "You cannot combine --squash with --no-ff."
6567 #: builtin/merge.c:1184
6568 msgid "No commit specified and merge.defaultToUpstream not set."
6571 #: builtin/merge.c:1216
6572 msgid "Can merge only exactly one commit into empty head"
6575 #: builtin/merge.c:1219
6576 msgid "Squash commit into empty head not supported yet"
6579 #: builtin/merge.c:1221
6580 msgid "Non-fast-forward commit does not make sense into an empty head"
6583 #: builtin/merge.c:1226
6585 msgid "%s - not something we can merge"
6588 #: builtin/merge.c:1277
6590 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6593 #: builtin/merge.c:1280
6595 msgid "Commit %s has a bad GPG signature allegedly by %s."
6599 #: builtin/merge.c:1283
6601 msgid "Commit %s does not have a GPG signature."
6604 #: builtin/merge.c:1286
6606 msgid "Commit %s has a good GPG signature by %s\n"
6609 #: builtin/merge.c:1370
6611 msgid "Updating %s..%s\n"
6614 #: builtin/merge.c:1409
6616 msgid "Trying really trivial in-index merge...\n"
6619 #: builtin/merge.c:1416
6624 #: builtin/merge.c:1448
6625 msgid "Not possible to fast-forward, aborting."
6628 #: builtin/merge.c:1471 builtin/merge.c:1550
6630 msgid "Rewinding the tree to pristine...\n"
6633 #: builtin/merge.c:1475
6635 msgid "Trying merge strategy %s...\n"
6638 #: builtin/merge.c:1541
6640 msgid "No merge strategy handled the merge.\n"
6643 #: builtin/merge.c:1543
6645 msgid "Merge with strategy %s failed.\n"
6648 #: builtin/merge.c:1552
6650 msgid "Using the %s to prepare resolving by hand.\n"
6653 #: builtin/merge.c:1564
6655 msgid "Automatic merge went well; stopped before committing as requested\n"
6658 #: builtin/merge-base.c:26
6659 msgid "git merge-base [-a|--all] <commit> <commit>..."
6662 #: builtin/merge-base.c:27
6663 msgid "git merge-base [-a|--all] --octopus <commit>..."
6666 #: builtin/merge-base.c:28
6667 msgid "git merge-base --independent <commit>..."
6670 #: builtin/merge-base.c:29
6671 msgid "git merge-base --is-ancestor <commit> <commit>"
6674 #: builtin/merge-base.c:98
6675 msgid "output all common ancestors"
6678 #: builtin/merge-base.c:99
6679 msgid "find ancestors for a single n-way merge"
6682 #: builtin/merge-base.c:100
6683 msgid "list revs not reachable from others"
6686 #: builtin/merge-base.c:102
6687 msgid "is the first one ancestor of the other?"
6690 #: builtin/merge-file.c:8
6692 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6696 #: builtin/merge-file.c:33
6697 msgid "send results to standard output"
6700 #: builtin/merge-file.c:34
6701 msgid "use a diff3 based merge"
6704 #: builtin/merge-file.c:35
6705 msgid "for conflicts, use our version"
6708 #: builtin/merge-file.c:37
6709 msgid "for conflicts, use their version"
6712 #: builtin/merge-file.c:39
6713 msgid "for conflicts, use a union version"
6716 #: builtin/merge-file.c:42
6717 msgid "for conflicts, use this marker size"
6720 #: builtin/merge-file.c:43
6721 msgid "do not warn about conflicts"
6724 #: builtin/merge-file.c:45
6725 msgid "set labels for file1/orig_file/file2"
6728 #: builtin/mktree.c:67
6729 msgid "git mktree [-z] [--missing] [--batch]"
6732 #: builtin/mktree.c:153
6733 msgid "input is NUL terminated"
6736 #: builtin/mktree.c:154 builtin/write-tree.c:24
6737 msgid "allow missing objects"
6740 #: builtin/mktree.c:155
6741 msgid "allow creation of more than one tree"
6745 msgid "git mv [options] <source>... <destination>"
6749 msgid "force move/rename even if target exists"
6753 msgid "skip move/rename errors"
6758 msgid "Checking rename of '%s' to '%s'\n"
6766 msgid "can not move directory into itself"
6770 msgid "cannot move directory over file"
6775 msgid "Huh? Directory %s is in index and no submodule?"
6778 #: builtin/mv.c:131 builtin/rm.c:318
6779 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
6784 msgid "Huh? %.*s is in index?"
6788 msgid "source directory is empty"
6792 msgid "not under version control"
6796 msgid "destination exists"
6801 msgid "overwriting '%s'"
6805 msgid "Cannot overwrite"
6809 msgid "multiple sources for the same target"
6814 msgid "%s, source=%s, destination=%s"
6819 msgid "Renaming %s to %s\n"
6822 #: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
6824 msgid "renaming '%s' failed"
6827 #: builtin/name-rev.c:259
6828 msgid "git name-rev [options] <commit>..."
6831 #: builtin/name-rev.c:260
6832 msgid "git name-rev [options] --all"
6835 #: builtin/name-rev.c:261
6836 msgid "git name-rev [options] --stdin"
6839 #: builtin/name-rev.c:313
6840 msgid "print only names (no SHA-1)"
6843 #: builtin/name-rev.c:314
6844 msgid "only use tags to name the commits"
6847 #: builtin/name-rev.c:316
6848 msgid "only use refs matching <pattern>"
6851 #: builtin/name-rev.c:318
6852 msgid "list all commits reachable from all refs"
6855 #: builtin/name-rev.c:319
6856 msgid "read from stdin"
6859 #: builtin/name-rev.c:320
6860 msgid "allow to print `undefined` names (default)"
6863 #: builtin/name-rev.c:326
6864 msgid "dereference tags in the input (internal use)"
6867 #: builtin/notes.c:24
6868 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6871 #: builtin/notes.c:25
6873 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6874 "<object>] [<object>]"
6877 #: builtin/notes.c:26
6878 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6881 #: builtin/notes.c:27
6883 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6884 "<object>] [<object>]"
6887 #: builtin/notes.c:28
6888 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6891 #: builtin/notes.c:29
6892 msgid "git notes [--ref <notes_ref>] show [<object>]"
6895 #: builtin/notes.c:30
6897 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6900 #: builtin/notes.c:31
6901 msgid "git notes merge --commit [-v | -q]"
6904 #: builtin/notes.c:32
6905 msgid "git notes merge --abort [-v | -q]"
6908 #: builtin/notes.c:33
6909 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6912 #: builtin/notes.c:34
6913 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6916 #: builtin/notes.c:35
6917 msgid "git notes [--ref <notes_ref>] get-ref"
6920 #: builtin/notes.c:40
6921 msgid "git notes [list [<object>]]"
6924 #: builtin/notes.c:45
6925 msgid "git notes add [<options>] [<object>]"
6928 #: builtin/notes.c:50
6929 msgid "git notes copy [<options>] <from-object> <to-object>"
6932 #: builtin/notes.c:51
6933 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6936 #: builtin/notes.c:56
6937 msgid "git notes append [<options>] [<object>]"
6940 #: builtin/notes.c:61
6941 msgid "git notes edit [<object>]"
6944 #: builtin/notes.c:66
6945 msgid "git notes show [<object>]"
6948 #: builtin/notes.c:71
6949 msgid "git notes merge [<options>] <notes_ref>"
6952 #: builtin/notes.c:72
6953 msgid "git notes merge --commit [<options>]"
6956 #: builtin/notes.c:73
6957 msgid "git notes merge --abort [<options>]"
6960 #: builtin/notes.c:78
6961 msgid "git notes remove [<object>]"
6964 #: builtin/notes.c:83
6965 msgid "git notes prune [<options>]"
6968 #: builtin/notes.c:88
6969 msgid "git notes get-ref"
6972 #: builtin/notes.c:137
6974 msgid "unable to start 'show' for object '%s'"
6977 #: builtin/notes.c:141
6978 msgid "could not read 'show' output"
6981 #: builtin/notes.c:149
6983 msgid "failed to finish 'show' for object '%s'"
6986 #: builtin/notes.c:167 builtin/tag.c:341
6988 msgid "could not create file '%s'"
6991 #: builtin/notes.c:186
6992 msgid "Please supply the note contents using either -m or -F option"
6995 #: builtin/notes.c:207 builtin/notes.c:844
6997 msgid "Removing note for object %s\n"
7000 #: builtin/notes.c:212
7001 msgid "unable to write note object"
7004 #: builtin/notes.c:214
7006 msgid "The note contents has been left in %s"
7009 #: builtin/notes.c:248 builtin/tag.c:537
7011 msgid "cannot read '%s'"
7014 #: builtin/notes.c:250 builtin/tag.c:540
7016 msgid "could not open or read '%s'"
7019 #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7020 #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7021 #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
7022 #: builtin/notes.c:839 builtin/tag.c:553
7024 msgid "Failed to resolve '%s' as a valid ref."
7027 #: builtin/notes.c:272
7029 msgid "Failed to read object '%s'."
7032 #: builtin/notes.c:312
7034 msgid "Malformed input line: '%s'."
7037 #: builtin/notes.c:327
7039 msgid "Failed to copy notes from '%s' to '%s'"
7042 #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7043 #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7044 #: builtin/notes.c:904
7045 msgid "too many parameters"
7048 #: builtin/notes.c:384 builtin/notes.c:643
7050 msgid "No note found for object %s."
7053 #: builtin/notes.c:406 builtin/notes.c:563
7054 msgid "note contents as a string"
7057 #: builtin/notes.c:409 builtin/notes.c:566
7058 msgid "note contents in a file"
7061 #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7062 #: builtin/notes.c:571 builtin/tag.c:474
7066 #: builtin/notes.c:412 builtin/notes.c:569
7067 msgid "reuse and edit specified note object"
7070 #: builtin/notes.c:415 builtin/notes.c:572
7071 msgid "reuse specified note object"
7074 #: builtin/notes.c:417 builtin/notes.c:485
7075 msgid "replace existing notes"
7078 #: builtin/notes.c:451
7081 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7085 #: builtin/notes.c:456 builtin/notes.c:533
7087 msgid "Overwriting existing notes for object %s\n"
7090 #: builtin/notes.c:486
7091 msgid "read objects from stdin"
7094 #: builtin/notes.c:488
7095 msgid "load rewriting config for <command> (implies --stdin)"
7098 #: builtin/notes.c:506
7099 msgid "too few parameters"
7102 #: builtin/notes.c:527
7105 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7109 #: builtin/notes.c:539
7111 msgid "Missing notes on source object %s. Cannot copy."
7114 #: builtin/notes.c:588
7117 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7118 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7121 #: builtin/notes.c:735
7122 msgid "General options"
7125 #: builtin/notes.c:737
7126 msgid "Merge options"
7129 #: builtin/notes.c:739
7131 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7135 #: builtin/notes.c:741
7136 msgid "Committing unmerged notes"
7139 #: builtin/notes.c:743
7140 msgid "finalize notes merge by committing unmerged notes"
7143 #: builtin/notes.c:745
7144 msgid "Aborting notes merge resolution"
7147 #: builtin/notes.c:747
7148 msgid "abort notes merge"
7151 #: builtin/notes.c:842
7153 msgid "Object %s has no note\n"
7156 #: builtin/notes.c:854
7157 msgid "attempt to remove non-existent note is not an error"
7160 #: builtin/notes.c:857
7161 msgid "read object names from the standard input"
7164 #: builtin/notes.c:938
7168 #: builtin/notes.c:939
7169 msgid "use notes from <notes_ref>"
7172 #: builtin/notes.c:974 builtin/remote.c:1598
7174 msgid "Unknown subcommand: %s"
7177 #: builtin/pack-objects.c:23
7178 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7181 #: builtin/pack-objects.c:24
7182 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7185 #: builtin/pack-objects.c:184 builtin/pack-objects.c:187
7187 msgid "deflate error (%d)"
7190 #: builtin/pack-objects.c:2398
7192 msgid "unsupported index version %s"
7195 #: builtin/pack-objects.c:2402
7197 msgid "bad index version '%s'"
7200 #: builtin/pack-objects.c:2425
7202 msgid "option %s does not accept negative form"
7205 #: builtin/pack-objects.c:2429
7207 msgid "unable to parse value '%s' for option %s"
7210 #: builtin/pack-objects.c:2448
7211 msgid "do not show progress meter"
7214 #: builtin/pack-objects.c:2450
7215 msgid "show progress meter"
7218 #: builtin/pack-objects.c:2452
7219 msgid "show progress meter during object writing phase"
7222 #: builtin/pack-objects.c:2455
7223 msgid "similar to --all-progress when progress meter is shown"
7226 #: builtin/pack-objects.c:2456
7227 msgid "version[,offset]"
7230 #: builtin/pack-objects.c:2457
7231 msgid "write the pack index file in the specified idx format version"
7234 #: builtin/pack-objects.c:2460
7235 msgid "maximum size of each output pack file"
7238 #: builtin/pack-objects.c:2462
7239 msgid "ignore borrowed objects from alternate object store"
7242 #: builtin/pack-objects.c:2464
7243 msgid "ignore packed objects"
7246 #: builtin/pack-objects.c:2466
7247 msgid "limit pack window by objects"
7250 #: builtin/pack-objects.c:2468
7251 msgid "limit pack window by memory in addition to object limit"
7254 #: builtin/pack-objects.c:2470
7255 msgid "maximum length of delta chain allowed in the resulting pack"
7258 #: builtin/pack-objects.c:2472
7259 msgid "reuse existing deltas"
7262 #: builtin/pack-objects.c:2474
7263 msgid "reuse existing objects"
7266 #: builtin/pack-objects.c:2476
7267 msgid "use OFS_DELTA objects"
7270 #: builtin/pack-objects.c:2478
7271 msgid "use threads when searching for best delta matches"
7274 #: builtin/pack-objects.c:2480
7275 msgid "do not create an empty pack output"
7278 #: builtin/pack-objects.c:2482
7279 msgid "read revision arguments from standard input"
7282 #: builtin/pack-objects.c:2484
7283 msgid "limit the objects to those that are not yet packed"
7286 #: builtin/pack-objects.c:2487
7287 msgid "include objects reachable from any reference"
7290 #: builtin/pack-objects.c:2490
7291 msgid "include objects referred by reflog entries"
7294 #: builtin/pack-objects.c:2493
7295 msgid "output pack to stdout"
7298 #: builtin/pack-objects.c:2495
7299 msgid "include tag objects that refer to objects to be packed"
7302 #: builtin/pack-objects.c:2497
7303 msgid "keep unreachable objects"
7306 #: builtin/pack-objects.c:2498 parse-options.h:143
7310 #: builtin/pack-objects.c:2499
7311 msgid "unpack unreachable objects newer than <time>"
7314 #: builtin/pack-objects.c:2502
7315 msgid "create thin packs"
7318 #: builtin/pack-objects.c:2504
7319 msgid "ignore packs that have companion .keep file"
7322 #: builtin/pack-objects.c:2506
7323 msgid "pack compression level"
7326 #: builtin/pack-objects.c:2508
7327 msgid "do not hide commits by grafts"
7330 #: builtin/pack-refs.c:6
7331 msgid "git pack-refs [options]"
7334 #: builtin/pack-refs.c:14
7335 msgid "pack everything"
7338 #: builtin/pack-refs.c:15
7339 msgid "prune loose refs (default)"
7342 #: builtin/prune-packed.c:7
7343 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7346 #: builtin/prune.c:12
7347 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7350 #: builtin/prune.c:132
7351 msgid "do not remove, show only"
7354 #: builtin/prune.c:133
7355 msgid "report pruned objects"
7358 #: builtin/prune.c:136
7359 msgid "expire objects older than <time>"
7362 #: builtin/push.c:14
7363 msgid "git push [<options>] [<repository> [<refspec>...]]"
7366 #: builtin/push.c:47
7367 msgid "tag shorthand without <tag>"
7370 #: builtin/push.c:66
7371 msgid "--delete only accepts plain target ref names"
7374 #: builtin/push.c:101
7377 "To choose either option permanently, see push.default in 'git help config'."
7380 #: builtin/push.c:104
7383 "The upstream branch of your current branch does not match\n"
7384 "the name of your current branch. To push to the upstream branch\n"
7385 "on the remote, use\n"
7387 " git push %s HEAD:%s\n"
7389 "To push to the branch of the same name on the remote, use\n"
7395 #: builtin/push.c:119
7398 "You are not currently on a branch.\n"
7399 "To push the history leading to the current (detached HEAD)\n"
7402 " git push %s HEAD:<name-of-remote-branch>\n"
7405 #: builtin/push.c:133
7408 "The current branch %s has no upstream branch.\n"
7409 "To push the current branch and set the remote as upstream, use\n"
7411 " git push --set-upstream %s %s\n"
7414 #: builtin/push.c:141
7416 msgid "The current branch %s has multiple upstream branches, refusing to push."
7419 #: builtin/push.c:144
7422 "You are pushing to remote '%s', which is not the upstream of\n"
7423 "your current branch '%s', without telling me what to push\n"
7424 "to update which remote branch."
7427 #: builtin/push.c:167
7429 "push.default is unset; its implicit value is changing in\n"
7430 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7431 "and maintain the current behavior after the default changes, use:\n"
7433 " git config --global push.default matching\n"
7435 "To squelch this message and adopt the new behavior now, use:\n"
7437 " git config --global push.default simple\n"
7439 "See 'git help config' and search for 'push.default' for further "
7441 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7442 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7445 #: builtin/push.c:227
7447 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7450 #: builtin/push.c:234
7452 "Updates were rejected because the tip of your current branch is behind\n"
7453 "its remote counterpart. Integrate the remote changes (e.g.\n"
7454 "'git pull ...') before pushing again.\n"
7455 "See the 'Note about fast-forwards' in 'git push --help' for details."
7458 #: builtin/push.c:240
7460 "Updates were rejected because a pushed branch tip is behind its remote\n"
7461 "counterpart. If you did not intend to push that branch, you may want to\n"
7462 "specify branches to push or set the 'push.default' configuration variable\n"
7463 "to 'simple', 'current' or 'upstream' to push only the current branch."
7466 #: builtin/push.c:246
7468 "Updates were rejected because a pushed branch tip is behind its remote\n"
7469 "counterpart. Check out this branch and integrate the remote changes\n"
7470 "(e.g. 'git pull ...') before pushing again.\n"
7471 "See the 'Note about fast-forwards' in 'git push --help' for details."
7474 #: builtin/push.c:252
7476 "Updates were rejected because the remote contains work that you do\n"
7477 "not have locally. This is usually caused by another repository pushing\n"
7478 "to the same ref. You may want to first integrate the remote changes\n"
7479 "(e.g., 'git pull ...') before pushing again.\n"
7480 "See the 'Note about fast-forwards' in 'git push --help' for details."
7483 #: builtin/push.c:259
7484 msgid "Updates were rejected because the tag already exists in the remote."
7487 #: builtin/push.c:262
7489 "You cannot update a remote ref that points at a non-commit object,\n"
7490 "or update a remote ref to make it point at a non-commit object,\n"
7491 "without using the '--force' option.\n"
7494 #: builtin/push.c:328
7496 msgid "Pushing to %s\n"
7499 #: builtin/push.c:332
7501 msgid "failed to push some refs to '%s'"
7504 #: builtin/push.c:365
7506 msgid "bad repository '%s'"
7509 #: builtin/push.c:366
7511 "No configured push destination.\n"
7512 "Either specify the URL from the command-line or configure a remote "
7513 "repository using\n"
7515 " git remote add <name> <url>\n"
7517 "and then push using the remote name\n"
7519 " git push <name>\n"
7522 #: builtin/push.c:381
7523 msgid "--all and --tags are incompatible"
7526 #: builtin/push.c:382
7527 msgid "--all can't be combined with refspecs"
7530 #: builtin/push.c:387
7531 msgid "--mirror and --tags are incompatible"
7534 #: builtin/push.c:388
7535 msgid "--mirror can't be combined with refspecs"
7538 #: builtin/push.c:393
7539 msgid "--all and --mirror are incompatible"
7542 #: builtin/push.c:453
7546 #: builtin/push.c:454
7547 msgid "push all refs"
7550 #: builtin/push.c:455
7551 msgid "mirror all refs"
7554 #: builtin/push.c:457
7558 #: builtin/push.c:458
7559 msgid "push tags (can't be used with --all or --mirror)"
7562 #: builtin/push.c:461
7563 msgid "force updates"
7566 #: builtin/push.c:463
7567 msgid "refname>:<expect"
7570 #: builtin/push.c:464
7571 msgid "require old value of ref to be at this value"
7574 #: builtin/push.c:466
7578 #: builtin/push.c:467
7579 msgid "control recursive pushing of submodules"
7582 #: builtin/push.c:469
7583 msgid "use thin pack"
7586 #: builtin/push.c:470 builtin/push.c:471
7587 msgid "receive pack program"
7590 #: builtin/push.c:472
7591 msgid "set upstream for git pull/status"
7594 #: builtin/push.c:475
7595 msgid "prune locally removed refs"
7598 #: builtin/push.c:477
7599 msgid "bypass pre-push hook"
7602 #: builtin/push.c:478
7603 msgid "push missing but relevant tags"
7606 #: builtin/push.c:488
7607 msgid "--delete is incompatible with --all, --mirror and --tags"
7610 #: builtin/push.c:490
7611 msgid "--delete doesn't make sense without any refs"
7614 #: builtin/read-tree.c:36
7616 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7617 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7618 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7621 #: builtin/read-tree.c:109
7622 msgid "write resulting index to <file>"
7625 #: builtin/read-tree.c:112
7626 msgid "only empty the index"
7629 #: builtin/read-tree.c:114
7633 #: builtin/read-tree.c:116
7634 msgid "perform a merge in addition to a read"
7637 #: builtin/read-tree.c:118
7638 msgid "3-way merge if no file level merging required"
7641 #: builtin/read-tree.c:120
7642 msgid "3-way merge in presence of adds and removes"
7645 #: builtin/read-tree.c:122
7646 msgid "same as -m, but discard unmerged entries"
7649 #: builtin/read-tree.c:123
7650 msgid "<subdirectory>/"
7653 #: builtin/read-tree.c:124
7654 msgid "read the tree into the index under <subdirectory>/"
7657 #: builtin/read-tree.c:127
7658 msgid "update working tree with merge result"
7661 #: builtin/read-tree.c:129
7665 #: builtin/read-tree.c:130
7666 msgid "allow explicitly ignored files to be overwritten"
7669 #: builtin/read-tree.c:133
7670 msgid "don't check the working tree after merging"
7673 #: builtin/read-tree.c:134
7674 msgid "don't update the index or the work tree"
7677 #: builtin/read-tree.c:136
7678 msgid "skip applying sparse checkout filter"
7681 #: builtin/read-tree.c:138
7682 msgid "debug unpack-trees"
7685 #: builtin/reflog.c:499
7687 msgid "%s' for '%s' is not a valid timestamp"
7690 #: builtin/reflog.c:615 builtin/reflog.c:620
7692 msgid "'%s' is not a valid timestamp"
7695 #: builtin/remote.c:11
7696 msgid "git remote [-v | --verbose]"
7699 #: builtin/remote.c:12
7701 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7702 "mirror=<fetch|push>] <name> <url>"
7705 #: builtin/remote.c:13 builtin/remote.c:32
7706 msgid "git remote rename <old> <new>"
7709 #: builtin/remote.c:14 builtin/remote.c:37
7710 msgid "git remote remove <name>"
7713 #: builtin/remote.c:15
7714 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
7717 #: builtin/remote.c:16
7718 msgid "git remote [-v | --verbose] show [-n] <name>"
7721 #: builtin/remote.c:17
7722 msgid "git remote prune [-n | --dry-run] <name>"
7725 #: builtin/remote.c:18
7727 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7730 #: builtin/remote.c:19
7731 msgid "git remote set-branches [--add] <name> <branch>..."
7734 #: builtin/remote.c:20 builtin/remote.c:68
7735 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7738 #: builtin/remote.c:21 builtin/remote.c:69
7739 msgid "git remote set-url --add <name> <newurl>"
7742 #: builtin/remote.c:22 builtin/remote.c:70
7743 msgid "git remote set-url --delete <name> <url>"
7746 #: builtin/remote.c:27
7747 msgid "git remote add [<options>] <name> <url>"
7750 #: builtin/remote.c:42
7751 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
7754 #: builtin/remote.c:47
7755 msgid "git remote set-branches <name> <branch>..."
7758 #: builtin/remote.c:48
7759 msgid "git remote set-branches --add <name> <branch>..."
7762 #: builtin/remote.c:53
7763 msgid "git remote show [<options>] <name>"
7766 #: builtin/remote.c:58
7767 msgid "git remote prune [<options>] <name>"
7770 #: builtin/remote.c:63
7771 msgid "git remote update [<options>] [<group> | <remote>]..."
7774 #: builtin/remote.c:98
7779 #: builtin/remote.c:130
7781 "--mirror is dangerous and deprecated; please\n"
7782 "\t use --mirror=fetch or --mirror=push instead"
7785 #: builtin/remote.c:147
7787 msgid "unknown mirror argument: %s"
7790 #: builtin/remote.c:163
7791 msgid "fetch the remote branches"
7794 #: builtin/remote.c:165
7795 msgid "import all tags and associated objects when fetching"
7798 #: builtin/remote.c:168
7799 msgid "or do not fetch any tag at all (--no-tags)"
7802 #: builtin/remote.c:170
7803 msgid "branch(es) to track"
7806 #: builtin/remote.c:171
7807 msgid "master branch"
7810 #: builtin/remote.c:172
7814 #: builtin/remote.c:173
7815 msgid "set up remote as a mirror to push to or fetch from"
7818 #: builtin/remote.c:185
7819 msgid "specifying a master branch makes no sense with --mirror"
7822 #: builtin/remote.c:187
7823 msgid "specifying branches to track makes sense only with fetch mirrors"
7826 #: builtin/remote.c:195 builtin/remote.c:646
7828 msgid "remote %s already exists."
7831 #: builtin/remote.c:199 builtin/remote.c:650
7833 msgid "'%s' is not a valid remote name"
7836 #: builtin/remote.c:243
7838 msgid "Could not setup master '%s'"
7841 #: builtin/remote.c:299
7843 msgid "more than one %s"
7846 #: builtin/remote.c:339
7848 msgid "Could not get fetch map for refspec %s"
7851 #: builtin/remote.c:440 builtin/remote.c:448
7855 #: builtin/remote.c:452
7859 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7861 msgid "Could not append '%s' to '%s'"
7864 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7866 msgid "No such remote: %s"
7869 #: builtin/remote.c:656
7871 msgid "Could not rename config section '%s' to '%s'"
7874 #: builtin/remote.c:662 builtin/remote.c:799
7876 msgid "Could not remove config section '%s'"
7879 #: builtin/remote.c:677
7882 "Not updating non-default fetch refspec\n"
7884 "\tPlease update the configuration manually if necessary."
7887 #: builtin/remote.c:683
7889 msgid "Could not append '%s'"
7892 #: builtin/remote.c:694
7894 msgid "Could not set '%s'"
7897 #: builtin/remote.c:716
7899 msgid "deleting '%s' failed"
7902 #: builtin/remote.c:750
7904 msgid "creating '%s' failed"
7907 #: builtin/remote.c:764
7909 msgid "Could not remove branch %s"
7912 #: builtin/remote.c:834
7914 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7915 "to delete it, use:"
7917 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7918 "to delete them, use:"
7922 #: builtin/remote.c:943
7924 msgid " new (next fetch will store in remotes/%s)"
7927 #: builtin/remote.c:946
7931 #: builtin/remote.c:948
7932 msgid " stale (use 'git remote prune' to remove)"
7935 #: builtin/remote.c:950
7939 #: builtin/remote.c:991
7941 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7944 #: builtin/remote.c:998
7946 msgid "rebases onto remote %s"
7949 #: builtin/remote.c:1001
7951 msgid " merges with remote %s"
7954 #: builtin/remote.c:1002
7955 msgid " and with remote"
7958 #: builtin/remote.c:1004
7960 msgid "merges with remote %s"
7963 #: builtin/remote.c:1005
7964 msgid " and with remote"
7967 #: builtin/remote.c:1051
7971 #: builtin/remote.c:1054
7975 #: builtin/remote.c:1058
7979 #: builtin/remote.c:1061
7980 msgid "fast-forwardable"
7983 #: builtin/remote.c:1064
7984 msgid "local out of date"
7987 #: builtin/remote.c:1071
7989 msgid " %-*s forces to %-*s (%s)"
7992 #: builtin/remote.c:1074
7994 msgid " %-*s pushes to %-*s (%s)"
7997 #: builtin/remote.c:1078
7999 msgid " %-*s forces to %s"
8002 #: builtin/remote.c:1081
8004 msgid " %-*s pushes to %s"
8007 #: builtin/remote.c:1091
8008 msgid "do not query remotes"
8011 #: builtin/remote.c:1118
8016 #: builtin/remote.c:1119
8018 msgid " Fetch URL: %s"
8021 #: builtin/remote.c:1120 builtin/remote.c:1285
8025 #: builtin/remote.c:1129 builtin/remote.c:1131
8027 msgid " Push URL: %s"
8030 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
8032 msgid " HEAD branch: %s"
8035 #: builtin/remote.c:1139
8038 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8041 #: builtin/remote.c:1151
8043 msgid " Remote branch:%s"
8044 msgid_plural " Remote branches:%s"
8048 #: builtin/remote.c:1154 builtin/remote.c:1181
8049 msgid " (status not queried)"
8052 #: builtin/remote.c:1163
8053 msgid " Local branch configured for 'git pull':"
8054 msgid_plural " Local branches configured for 'git pull':"
8058 #: builtin/remote.c:1171
8059 msgid " Local refs will be mirrored by 'git push'"
8062 #: builtin/remote.c:1178
8064 msgid " Local ref configured for 'git push'%s:"
8065 msgid_plural " Local refs configured for 'git push'%s:"
8069 #: builtin/remote.c:1199
8070 msgid "set refs/remotes/<name>/HEAD according to remote"
8073 #: builtin/remote.c:1201
8074 msgid "delete refs/remotes/<name>/HEAD"
8077 #: builtin/remote.c:1216
8078 msgid "Cannot determine remote HEAD"
8081 #: builtin/remote.c:1218
8082 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8085 #: builtin/remote.c:1228
8087 msgid "Could not delete %s"
8090 #: builtin/remote.c:1236
8092 msgid "Not a valid ref: %s"
8095 #: builtin/remote.c:1238
8097 msgid "Could not setup %s"
8100 #: builtin/remote.c:1274
8102 msgid " %s will become dangling!"
8105 #: builtin/remote.c:1275
8107 msgid " %s has become dangling!"
8110 #: builtin/remote.c:1281
8115 #: builtin/remote.c:1282
8120 #: builtin/remote.c:1295
8122 msgid " * [would prune] %s"
8125 #: builtin/remote.c:1298
8127 msgid " * [pruned] %s"
8130 #: builtin/remote.c:1321
8131 msgid "prune remotes after fetching"
8134 #: builtin/remote.c:1387 builtin/remote.c:1461
8136 msgid "No such remote '%s'"
8139 #: builtin/remote.c:1407
8143 #: builtin/remote.c:1414
8144 msgid "no remote specified"
8147 #: builtin/remote.c:1436
8148 msgid "manipulate push URLs"
8151 #: builtin/remote.c:1438
8155 #: builtin/remote.c:1440
8159 #: builtin/remote.c:1447
8160 msgid "--add --delete doesn't make sense"
8163 #: builtin/remote.c:1487
8165 msgid "Invalid old URL pattern: %s"
8168 #: builtin/remote.c:1495
8170 msgid "No such URL found: %s"
8173 #: builtin/remote.c:1497
8174 msgid "Will not delete all non-push URLs"
8177 #: builtin/remote.c:1569
8178 msgid "be verbose; must be placed before a subcommand"
8181 #: builtin/repack.c:15
8182 msgid "git repack [options]"
8185 #: builtin/repack.c:143
8186 msgid "pack everything in a single pack"
8189 #: builtin/repack.c:145
8190 msgid "same as -a, and turn unreachable objects loose"
8193 #: builtin/repack.c:148
8194 msgid "remove redundant packs, and run git-prune-packed"
8197 #: builtin/repack.c:150
8198 msgid "pass --no-reuse-delta to git-pack-objects"
8201 #: builtin/repack.c:152
8202 msgid "pass --no-reuse-object to git-pack-objects"
8205 #: builtin/repack.c:154
8206 msgid "do not run git-update-server-info"
8209 #: builtin/repack.c:157
8210 msgid "pass --local to git-pack-objects"
8213 #: builtin/repack.c:158
8217 #: builtin/repack.c:159
8218 msgid "with -A, do not loosen objects older than this"
8221 #: builtin/repack.c:161
8222 msgid "size of the window used for delta compression"
8225 #: builtin/repack.c:163
8226 msgid "same as the above, but limit memory size instead of entries count"
8229 #: builtin/repack.c:165
8230 msgid "limits the maximum delta depth"
8233 #: builtin/repack.c:167
8234 msgid "maximum size of each packfile"
8237 #: builtin/repack.c:345
8239 msgid "removing '%s' failed"
8242 #: builtin/replace.c:17
8243 msgid "git replace [-f] <object> <replacement>"
8246 #: builtin/replace.c:18
8247 msgid "git replace -d <object>..."
8250 #: builtin/replace.c:19
8251 msgid "git replace -l [<pattern>]"
8254 #: builtin/replace.c:131
8255 msgid "list replace refs"
8258 #: builtin/replace.c:132
8259 msgid "delete replace refs"
8262 #: builtin/replace.c:133
8263 msgid "replace the ref if it exists"
8266 #: builtin/rerere.c:12
8267 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8270 #: builtin/rerere.c:57
8271 msgid "register clean resolutions in index"
8274 #: builtin/reset.c:25
8276 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8279 #: builtin/reset.c:26
8280 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8283 #: builtin/reset.c:27
8284 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8287 #: builtin/reset.c:33
8291 #: builtin/reset.c:33
8295 #: builtin/reset.c:33
8299 #: builtin/reset.c:33
8303 #: builtin/reset.c:33
8307 #: builtin/reset.c:73
8308 msgid "You do not have a valid HEAD."
8311 #: builtin/reset.c:75
8312 msgid "Failed to find tree of HEAD."
8315 #: builtin/reset.c:81
8317 msgid "Failed to find tree of %s."
8320 #: builtin/reset.c:99
8322 msgid "HEAD is now at %s"
8325 #: builtin/reset.c:172
8327 msgid "Cannot do a %s reset in the middle of a merge."
8330 #: builtin/reset.c:262
8331 msgid "be quiet, only report errors"
8334 #: builtin/reset.c:264
8335 msgid "reset HEAD and index"
8338 #: builtin/reset.c:265
8339 msgid "reset only HEAD"
8342 #: builtin/reset.c:267 builtin/reset.c:269
8343 msgid "reset HEAD, index and working tree"
8346 #: builtin/reset.c:271
8347 msgid "reset HEAD but keep local changes"
8350 #: builtin/reset.c:289
8352 msgid "Failed to resolve '%s' as a valid revision."
8355 #: builtin/reset.c:292 builtin/reset.c:300
8357 msgid "Could not parse object '%s'."
8360 #: builtin/reset.c:297
8362 msgid "Failed to resolve '%s' as a valid tree."
8365 #: builtin/reset.c:306
8366 msgid "--patch is incompatible with --{hard,mixed,soft}"
8369 #: builtin/reset.c:315
8370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8373 #: builtin/reset.c:317
8375 msgid "Cannot do %s reset with paths."
8378 #: builtin/reset.c:327
8380 msgid "%s reset is not allowed in a bare repository"
8383 #: builtin/reset.c:344
8384 msgid "Unstaged changes after reset:"
8387 #: builtin/reset.c:350
8389 msgid "Could not reset index file to revision '%s'."
8392 #: builtin/reset.c:355
8393 msgid "Could not write new index file."
8396 #: builtin/rev-parse.c:345
8397 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8400 #: builtin/rev-parse.c:350
8401 msgid "keep the `--` passed as an arg"
8404 #: builtin/rev-parse.c:352
8405 msgid "stop parsing after the first non-option argument"
8408 #: builtin/rev-parse.c:470
8410 "git rev-parse --parseopt [options] -- [<args>...]\n"
8411 " or: git rev-parse --sq-quote [<arg>...]\n"
8412 " or: git rev-parse [options] [<arg>...]\n"
8414 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8417 #: builtin/revert.c:22
8418 msgid "git revert [options] <commit-ish>..."
8421 #: builtin/revert.c:23
8422 msgid "git revert <subcommand>"
8425 #: builtin/revert.c:28
8426 msgid "git cherry-pick [options] <commit-ish>..."
8429 #: builtin/revert.c:29
8430 msgid "git cherry-pick <subcommand>"
8433 #: builtin/revert.c:71
8435 msgid "%s: %s cannot be used with %s"
8438 #: builtin/revert.c:80
8439 msgid "end revert or cherry-pick sequence"
8442 #: builtin/revert.c:81
8443 msgid "resume revert or cherry-pick sequence"
8446 #: builtin/revert.c:82
8447 msgid "cancel revert or cherry-pick sequence"
8450 #: builtin/revert.c:83
8451 msgid "don't automatically commit"
8454 #: builtin/revert.c:84
8455 msgid "edit the commit message"
8458 #: builtin/revert.c:87
8459 msgid "parent number"
8462 #: builtin/revert.c:89
8463 msgid "merge strategy"
8466 #: builtin/revert.c:90
8470 #: builtin/revert.c:91
8471 msgid "option for merge strategy"
8474 #: builtin/revert.c:102
8475 msgid "append commit name"
8478 #: builtin/revert.c:103
8479 msgid "allow fast-forward"
8482 #: builtin/revert.c:104
8483 msgid "preserve initially empty commits"
8486 #: builtin/revert.c:105
8487 msgid "allow commits with empty messages"
8490 #: builtin/revert.c:106
8491 msgid "keep redundant, empty commits"
8494 #: builtin/revert.c:110
8495 msgid "program error"
8498 #: builtin/revert.c:195
8499 msgid "revert failed"
8502 #: builtin/revert.c:210
8503 msgid "cherry-pick failed"
8507 msgid "git rm [options] [--] <file>..."
8512 "the following submodule (or one of its nested submodules)\n"
8513 "uses a .git directory:"
8515 "the following submodules (or one of its nested submodules)\n"
8516 "use a .git directory:"
8523 "(use 'rm -rf' if you really want to remove it including all of its history)"
8528 "the following file has staged content different from both the\n"
8529 "file and the HEAD:"
8531 "the following files have staged content different from both the\n"
8532 "file and the HEAD:"
8539 "(use -f to force removal)"
8543 msgid "the following file has changes staged in the index:"
8544 msgid_plural "the following files have changes staged in the index:"
8548 #: builtin/rm.c:244 builtin/rm.c:255
8551 "(use --cached to keep the file, or -f to force removal)"
8555 msgid "the following file has local modifications:"
8556 msgid_plural "the following files have local modifications:"
8561 msgid "do not list removed files"
8565 msgid "only remove from the index"
8569 msgid "override the up-to-date check"
8573 msgid "allow recursive removal"
8577 msgid "exit with a zero status even if nothing matched"
8582 msgid "not removing '%s' recursively without -r"
8587 msgid "git rm: unable to remove %s"
8590 #: builtin/shortlog.c:13
8591 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8594 #: builtin/shortlog.c:131
8596 msgid "Missing author: %s"
8599 #: builtin/shortlog.c:230
8600 msgid "sort output according to the number of commits per author"
8603 #: builtin/shortlog.c:232
8604 msgid "Suppress commit descriptions, only provides commit count"
8607 #: builtin/shortlog.c:234
8608 msgid "Show the email address of each author"
8611 #: builtin/shortlog.c:235
8615 #: builtin/shortlog.c:236
8616 msgid "Linewrap output"
8619 #: builtin/show-branch.c:9
8621 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8622 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8623 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8627 #: builtin/show-branch.c:10
8628 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8631 #: builtin/show-branch.c:650
8632 msgid "show remote-tracking and local branches"
8635 #: builtin/show-branch.c:652
8636 msgid "show remote-tracking branches"
8639 #: builtin/show-branch.c:654
8640 msgid "color '*!+-' corresponding to the branch"
8643 #: builtin/show-branch.c:656
8644 msgid "show <n> more commits after the common ancestor"
8647 #: builtin/show-branch.c:658
8648 msgid "synonym to more=-1"
8651 #: builtin/show-branch.c:659
8652 msgid "suppress naming strings"
8655 #: builtin/show-branch.c:661
8656 msgid "include the current branch"
8659 #: builtin/show-branch.c:663
8660 msgid "name commits with their object names"
8663 #: builtin/show-branch.c:665
8664 msgid "show possible merge bases"
8667 #: builtin/show-branch.c:667
8668 msgid "show refs unreachable from any other ref"
8671 #: builtin/show-branch.c:669
8672 msgid "show commits in topological order"
8675 #: builtin/show-branch.c:672
8676 msgid "show only commits not on the first branch"
8679 #: builtin/show-branch.c:674
8680 msgid "show merges reachable from only one tip"
8683 #: builtin/show-branch.c:676
8684 msgid "topologically sort, maintaining date order where possible"
8687 #: builtin/show-branch.c:679
8688 msgid "<n>[,<base>]"
8691 #: builtin/show-branch.c:680
8692 msgid "show <n> most recent ref-log entries starting at base"
8695 #: builtin/show-ref.c:10
8697 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8698 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8701 #: builtin/show-ref.c:11
8702 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8705 #: builtin/show-ref.c:168
8706 msgid "only show tags (can be combined with heads)"
8709 #: builtin/show-ref.c:169
8710 msgid "only show heads (can be combined with tags)"
8713 #: builtin/show-ref.c:170
8714 msgid "stricter reference checking, requires exact ref path"
8717 #: builtin/show-ref.c:173 builtin/show-ref.c:175
8718 msgid "show the HEAD reference, even if it would be filtered out"
8721 #: builtin/show-ref.c:177
8722 msgid "dereference tags into object IDs"
8725 #: builtin/show-ref.c:179
8726 msgid "only show SHA1 hash using <n> digits"
8729 #: builtin/show-ref.c:183
8730 msgid "do not print results to stdout (useful with --verify)"
8733 #: builtin/show-ref.c:185
8734 msgid "show refs from stdin that aren't in local repository"
8737 #: builtin/symbolic-ref.c:7
8738 msgid "git symbolic-ref [options] name [ref]"
8741 #: builtin/symbolic-ref.c:8
8742 msgid "git symbolic-ref -d [-q] name"
8745 #: builtin/symbolic-ref.c:40
8746 msgid "suppress error message for non-symbolic (detached) refs"
8749 #: builtin/symbolic-ref.c:41
8750 msgid "delete symbolic ref"
8753 #: builtin/symbolic-ref.c:42
8754 msgid "shorten ref output"
8757 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
8761 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
8762 msgid "reason of the update"
8767 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8771 msgid "git tag -d <tagname>..."
8776 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8777 "\t\t[<pattern>...]"
8781 msgid "git tag -v <tagname>..."
8786 msgid "malformed object at '%s'"
8789 #: builtin/tag.c:207
8791 msgid "tag name too long: %.*s..."
8794 #: builtin/tag.c:212
8796 msgid "tag '%s' not found."
8799 #: builtin/tag.c:227
8801 msgid "Deleted tag '%s' (was %s)\n"
8804 #: builtin/tag.c:239
8806 msgid "could not verify the tag '%s'"
8809 #: builtin/tag.c:249
8813 "Write a tag message\n"
8814 "Lines starting with '%c' will be ignored.\n"
8817 #: builtin/tag.c:253
8821 "Write a tag message\n"
8822 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8826 #: builtin/tag.c:292
8827 msgid "unable to sign the tag"
8830 #: builtin/tag.c:294
8831 msgid "unable to write tag file"
8834 #: builtin/tag.c:319
8835 msgid "bad object type."
8838 #: builtin/tag.c:332
8839 msgid "tag header too big."
8842 #: builtin/tag.c:368
8843 msgid "no tag message?"
8846 #: builtin/tag.c:374
8848 msgid "The tag message has been left in %s\n"
8851 #: builtin/tag.c:423
8852 msgid "switch 'points-at' requires an object"
8855 #: builtin/tag.c:425
8857 msgid "malformed object name '%s'"
8860 #: builtin/tag.c:445
8861 msgid "list tag names"
8864 #: builtin/tag.c:447
8865 msgid "print <n> lines of each tag message"
8868 #: builtin/tag.c:449
8872 #: builtin/tag.c:450
8876 #: builtin/tag.c:452
8877 msgid "Tag creation options"
8880 #: builtin/tag.c:454
8881 msgid "annotated tag, needs a message"
8884 #: builtin/tag.c:456
8888 #: builtin/tag.c:458
8889 msgid "annotated and GPG-signed tag"
8892 #: builtin/tag.c:462
8893 msgid "use another key to sign the tag"
8896 #: builtin/tag.c:463
8897 msgid "replace the tag if exists"
8900 #: builtin/tag.c:464
8901 msgid "show tag list in columns"
8904 #: builtin/tag.c:466
8905 msgid "Tag listing options"
8908 #: builtin/tag.c:469
8909 msgid "print only tags that contain the commit"
8912 #: builtin/tag.c:475
8913 msgid "print only tags of the object"
8916 #: builtin/tag.c:501
8917 msgid "--column and -n are incompatible"
8920 #: builtin/tag.c:518
8921 msgid "-n option is only allowed with -l."
8924 #: builtin/tag.c:520
8925 msgid "--contains option is only allowed with -l."
8928 #: builtin/tag.c:522
8929 msgid "--points-at option is only allowed with -l."
8932 #: builtin/tag.c:530
8933 msgid "only one -F or -m option is allowed."
8936 #: builtin/tag.c:550
8937 msgid "too many params"
8940 #: builtin/tag.c:556
8942 msgid "'%s' is not a valid tag name."
8945 #: builtin/tag.c:561
8947 msgid "tag '%s' already exists"
8950 #: builtin/tag.c:579
8952 msgid "%s: cannot lock the ref"
8955 #: builtin/tag.c:581
8957 msgid "%s: cannot update the ref"
8960 #: builtin/tag.c:583
8962 msgid "Updated tag '%s' (was %s)\n"
8965 #: builtin/update-index.c:402
8966 msgid "git update-index [options] [--] [<file>...]"
8969 #: builtin/update-index.c:720
8970 msgid "continue refresh even when index needs update"
8973 #: builtin/update-index.c:723
8974 msgid "refresh: ignore submodules"
8977 #: builtin/update-index.c:726
8978 msgid "do not ignore new files"
8981 #: builtin/update-index.c:728
8982 msgid "let files replace directories and vice-versa"
8985 #: builtin/update-index.c:730
8986 msgid "notice files missing from worktree"
8989 #: builtin/update-index.c:732
8990 msgid "refresh even if index contains unmerged entries"
8993 #: builtin/update-index.c:735
8994 msgid "refresh stat information"
8997 #: builtin/update-index.c:739
8998 msgid "like --refresh, but ignore assume-unchanged setting"
9001 #: builtin/update-index.c:743
9002 msgid "<mode> <object> <path>"
9005 #: builtin/update-index.c:744
9006 msgid "add the specified entry to the index"
9009 #: builtin/update-index.c:748
9013 #: builtin/update-index.c:749
9014 msgid "override the executable bit of the listed files"
9017 #: builtin/update-index.c:753
9018 msgid "mark files as \"not changing\""
9021 #: builtin/update-index.c:756
9022 msgid "clear assumed-unchanged bit"
9025 #: builtin/update-index.c:759
9026 msgid "mark files as \"index-only\""
9029 #: builtin/update-index.c:762
9030 msgid "clear skip-worktree bit"
9033 #: builtin/update-index.c:765
9034 msgid "add to index only; do not add content to object database"
9037 #: builtin/update-index.c:767
9038 msgid "remove named paths even if present in worktree"
9041 #: builtin/update-index.c:769
9042 msgid "with --stdin: input lines are terminated by null bytes"
9045 #: builtin/update-index.c:771
9046 msgid "read list of paths to be updated from standard input"
9049 #: builtin/update-index.c:775
9050 msgid "add entries from standard input to the index"
9053 #: builtin/update-index.c:779
9054 msgid "repopulate stages #2 and #3 for the listed paths"
9057 #: builtin/update-index.c:783
9058 msgid "only update entries that differ from HEAD"
9061 #: builtin/update-index.c:787
9062 msgid "ignore files missing from worktree"
9065 #: builtin/update-index.c:790
9066 msgid "report actions to standard output"
9069 #: builtin/update-index.c:792
9070 msgid "(for porcelains) forget saved unresolved conflicts"
9073 #: builtin/update-index.c:796
9074 msgid "write index in this format"
9077 #: builtin/update-ref.c:9
9078 msgid "git update-ref [options] -d <refname> [<oldval>]"
9081 #: builtin/update-ref.c:10
9082 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9085 #: builtin/update-ref.c:11
9086 msgid "git update-ref [options] --stdin [-z]"
9089 #: builtin/update-ref.c:255
9090 msgid "delete the reference"
9093 #: builtin/update-ref.c:257
9094 msgid "update <refname> not the one it points to"
9097 #: builtin/update-ref.c:258
9098 msgid "stdin has NUL-terminated arguments"
9101 #: builtin/update-ref.c:259
9102 msgid "read updates from stdin"
9105 #: builtin/update-server-info.c:6
9106 msgid "git update-server-info [--force]"
9109 #: builtin/update-server-info.c:14
9110 msgid "update the info files from scratch"
9113 #: builtin/verify-pack.c:56
9114 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9117 #: builtin/verify-pack.c:66
9121 #: builtin/verify-pack.c:68
9122 msgid "show statistics only"
9125 #: builtin/verify-tag.c:17
9126 msgid "git verify-tag [-v|--verbose] <tag>..."
9129 #: builtin/verify-tag.c:73
9130 msgid "print tag contents"
9133 #: builtin/write-tree.c:13
9134 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9137 #: builtin/write-tree.c:26
9141 #: builtin/write-tree.c:27
9142 msgid "write tree object for a subdirectory <prefix>"
9145 #: builtin/write-tree.c:30
9146 msgid "only useful for debugging"
9151 "'git help -a' and 'git help -g' lists available subcommands and some\n"
9152 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9153 "to read about a specific subcommand or concept."
9156 #: parse-options.h:146
9160 #: parse-options.h:161
9161 msgid "no-op (backward compatibility)"
9164 #: parse-options.h:238
9165 msgid "be more verbose"
9168 #: parse-options.h:240
9169 msgid "be more quiet"
9172 #: parse-options.h:246
9173 msgid "use <n> digits to display SHA-1s"
9177 msgid "Add file contents to the index"
9181 msgid "Find by binary search the change that introduced a bug"
9185 msgid "List, create, or delete branches"
9189 msgid "Checkout a branch or paths to the working tree"
9193 msgid "Clone a repository into a new directory"
9197 msgid "Record changes to the repository"
9201 msgid "Show changes between commits, commit and working tree, etc"
9205 msgid "Download objects and refs from another repository"
9209 msgid "Print lines matching a pattern"
9213 msgid "Create an empty Git repository or reinitialize an existing one"
9217 msgid "Show commit logs"
9221 msgid "Join two or more development histories together"
9225 msgid "Move or rename a file, a directory, or a symlink"
9229 msgid "Fetch from and integrate with another repository or a local branch"
9233 msgid "Update remote refs along with associated objects"
9237 msgid "Forward-port local commits to the updated upstream head"
9241 msgid "Reset current HEAD to the specified state"
9245 msgid "Remove files from the working tree and from the index"
9249 msgid "Show various types of objects"
9253 msgid "Show the working tree status"
9257 msgid "Create, list, delete or verify a tag object signed with GPG"
9261 msgid "You need to set your committer info first"
9266 "You seem to have moved HEAD since the last 'am' failure.\n"
9267 "Not rewinding to ORIG_HEAD"
9273 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9274 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9275 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9279 msgid "Cannot fall back to three-way merge."
9283 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9287 msgid "Using index info to reconstruct a base tree..."
9292 "Did you hand edit your patch?\n"
9293 "It does not apply to blobs recorded in its index."
9297 msgid "Falling back to patching base and 3-way merge..."
9301 msgid "Failed to merge in the changes."
9305 msgid "Only one StGIT patch series can be applied at once"
9310 msgid "Patch format $patch_format is not supported."
9314 msgid "Patch format detection failed."
9319 "The -b/--binary option has been a no-op for long time, and\n"
9320 "it will be removed. Please do not use it anymore."
9325 msgid "previous rebase directory $dotest still exists but mbox given."
9329 msgid "Please make up your mind. --skip or --abort?"
9335 "Stray $dotest directory found.\n"
9336 "Use \"git am --abort\" to remove it."
9340 msgid "Resolve operation not in progress, we are not resuming."
9345 msgid "Dirty index: cannot apply patches (dirty: $files)"
9351 "Patch is empty. Was it split wrong?\n"
9352 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9353 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9357 msgid "Patch does not have a valid e-mail address."
9361 msgid "cannot be interactive without stdin connected to a terminal."
9365 msgid "Commit Body is:"
9368 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9369 #. in your translation. The program will only accept English
9370 #. input at this point.
9372 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9377 msgid "Applying: $FIRSTLINE"
9382 "No changes - did you forget to use 'git add'?\n"
9383 "If there is nothing left to stage, chances are that something else\n"
9384 "already introduced the same changes; you might want to skip this patch."
9389 "You still have unmerged paths in your index\n"
9390 "did you forget to use 'git add'?"
9394 msgid "No changes -- Patch already applied."
9399 msgid "Patch failed at $msgnum $FIRSTLINE"
9405 "The copy of the patch that failed is found in:\n"
9410 msgid "applying to an empty history"
9414 msgid "You need to start by \"git bisect start\""
9417 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9418 #. translation. The program will only accept English input
9421 msgid "Do you want me to do it for you [Y/n]? "
9426 msgid "unrecognised option: '$arg'"
9431 msgid "'$arg' does not appear to be a valid revision"
9434 #: git-bisect.sh:117
9435 msgid "Bad HEAD - I need a HEAD"
9438 #: git-bisect.sh:130
9441 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9444 #: git-bisect.sh:140
9445 msgid "won't bisect on seeked tree"
9448 #: git-bisect.sh:144
9449 msgid "Bad HEAD - strange symbolic ref"
9452 #: git-bisect.sh:189
9454 msgid "Bad bisect_write argument: $state"
9457 #: git-bisect.sh:218
9459 msgid "Bad rev input: $arg"
9462 #: git-bisect.sh:232
9463 msgid "Please call 'bisect_state' with at least one argument."
9466 #: git-bisect.sh:244
9468 msgid "Bad rev input: $rev"
9471 #: git-bisect.sh:250
9472 msgid "'git bisect bad' can take only one argument."
9475 #. have bad but not good. we could bisect although
9476 #. this is less optimum.
9477 #: git-bisect.sh:273
9478 msgid "Warning: bisecting only with a bad commit."
9481 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9482 #. translation. The program will only accept English input
9484 #: git-bisect.sh:279
9485 msgid "Are you sure [Y/n]? "
9488 #: git-bisect.sh:289
9490 "You need to give me at least one good and one bad revisions.\n"
9491 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9494 #: git-bisect.sh:292
9496 "You need to start by \"git bisect start\".\n"
9497 "You then need to give me at least one good and one bad revisions.\n"
9498 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9501 #: git-bisect.sh:363 git-bisect.sh:490
9502 msgid "We are not bisecting."
9505 #: git-bisect.sh:370
9507 msgid "'$invalid' is not a valid commit"
9510 #: git-bisect.sh:379
9513 "Could not check out original HEAD '$branch'.\n"
9514 "Try 'git bisect reset <commit>'."
9517 #: git-bisect.sh:406
9518 msgid "No logfile given"
9521 #: git-bisect.sh:407
9523 msgid "cannot read $file for replaying"
9526 #: git-bisect.sh:424
9527 msgid "?? what are you talking about?"
9530 #: git-bisect.sh:436
9532 msgid "running $command"
9535 #: git-bisect.sh:443
9538 "bisect run failed:\n"
9539 "exit code $res from '$command' is < 0 or >= 128"
9542 #: git-bisect.sh:469
9543 msgid "bisect run cannot continue any more"
9546 #: git-bisect.sh:475
9549 "bisect run failed:\n"
9550 "'bisect_state $state' exited with error code $res"
9553 #: git-bisect.sh:482
9554 msgid "bisect run success"
9559 "Pull is not possible because you have unmerged files.\n"
9560 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9561 "as appropriate to mark resolution, or use 'git commit -a'."
9565 msgid "Pull is not possible because you have unmerged files."
9569 msgid "updating an unborn branch with changes added to the index"
9572 #. The fetch involved updating the current branch.
9573 #. The working tree and the index file is still based on the
9574 #. $orig_head commit, but we are merging into $curr_head.
9575 #. First update the working tree to match $curr_head.
9579 "Warning: fetch updated the current branch head.\n"
9580 "Warning: fast-forwarding your working tree from\n"
9581 "Warning: commit $orig_head."
9585 msgid "Cannot merge multiple branches into empty head"
9589 msgid "Cannot rebase onto multiple branches"
9594 "When you have resolved this problem, run \"git rebase --continue\".\n"
9595 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9596 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9600 #: git-rebase.sh:156
9601 msgid "Applied autostash."
9604 #: git-rebase.sh:159
9606 msgid "Cannot store $stash_sha1"
9609 #: git-rebase.sh:160
9611 "Applying autostash resulted in conflicts.\n"
9612 "Your changes are safe in the stash.\n"
9613 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
9616 #: git-rebase.sh:199
9617 msgid "The pre-rebase hook refused to rebase."
9620 #: git-rebase.sh:204
9621 msgid "It looks like git-am is in progress. Cannot rebase."
9624 #: git-rebase.sh:338
9625 msgid "The --exec option must be used with the --interactive option"
9628 #: git-rebase.sh:343
9629 msgid "No rebase in progress?"
9632 #: git-rebase.sh:354
9633 msgid "The --edit-todo action can only be used during interactive rebase."
9636 #: git-rebase.sh:361
9637 msgid "Cannot read HEAD"
9640 #: git-rebase.sh:364
9642 "You must edit all merge conflicts and then\n"
9643 "mark them as resolved using git add"
9646 #: git-rebase.sh:382
9648 msgid "Could not move back to $head_name"
9651 #: git-rebase.sh:401
9654 "It seems that there is already a $state_dir_base directory, and\n"
9655 "I wonder if you are in the middle of another rebase. If that is the\n"
9656 "case, please try\n"
9657 "\t$cmd_live_rebase\n"
9658 "If that is not the case, please\n"
9659 "\t$cmd_clear_stale_rebase\n"
9660 "and run me again. I am stopping in case you still have something\n"
9664 #: git-rebase.sh:446
9666 msgid "invalid upstream $upstream_name"
9669 #: git-rebase.sh:470
9671 msgid "$onto_name: there are more than one merge bases"
9674 #: git-rebase.sh:473 git-rebase.sh:477
9676 msgid "$onto_name: there is no merge base"
9679 #: git-rebase.sh:482
9681 msgid "Does not point to a valid commit: $onto_name"
9684 #: git-rebase.sh:505
9686 msgid "fatal: no such branch: $branch_name"
9689 #: git-rebase.sh:528
9690 msgid "Cannot autostash"
9693 #: git-rebase.sh:533
9695 msgid "Created autostash: $stash_abbrev"
9698 #: git-rebase.sh:537
9699 msgid "Please commit or stash them."
9702 #: git-rebase.sh:557
9704 msgid "Current branch $branch_name is up to date."
9707 #: git-rebase.sh:561
9709 msgid "Current branch $branch_name is up to date, rebase forced."
9712 #: git-rebase.sh:572
9714 msgid "Changes from $mb to $onto:"
9717 #. Detach HEAD and reset the tree
9718 #: git-rebase.sh:581
9719 msgid "First, rewinding head to replay your work on top of it..."
9722 #: git-rebase.sh:591
9724 msgid "Fast-forwarded $branch_name to $onto_name."
9728 msgid "git stash clear with parameters is unimplemented"
9732 msgid "You do not have the initial commit yet"
9736 msgid "Cannot save the current index state"
9739 #: git-stash.sh:123 git-stash.sh:136
9740 msgid "Cannot save the current worktree state"
9744 msgid "No changes selected"
9748 msgid "Cannot remove temporary index (can't happen)"
9752 msgid "Cannot record working tree state"
9757 msgid "Cannot update $ref_stash with $w_commit"
9760 #. TRANSLATORS: $option is an invalid option, like
9761 #. `--blah-blah'. The 7 spaces at the beginning of the
9762 #. second line correspond to "error: ". So you should line
9763 #. up the second line with however many characters the
9764 #. translation of "error: " takes in your language. E.g. in
9767 #. $ git stash save --blah-blah 2>&1 | head -n 2
9768 #. error: unknown option for 'stash save': --blah-blah
9769 #. To provide a message, use git stash save -- '--blah-blah'
9773 "error: unknown option for 'stash save': $option\n"
9774 " To provide a message, use git stash save -- '$option'"
9778 msgid "No local changes to save"
9782 msgid "Cannot initialize stash"
9786 msgid "Cannot save the current status"
9790 msgid "Cannot remove worktree changes"
9794 msgid "No stash found."
9799 msgid "Too many revisions specified: $REV"
9804 msgid "$reference is not valid reference"
9809 msgid "'$args' is not a stash-like commit"
9814 msgid "'$args' is not a stash reference"
9818 msgid "unable to refresh index"
9822 msgid "Cannot apply a stash in the middle of a merge"
9826 msgid "Conflicts in index. Try without --index."
9830 msgid "Could not save index tree"
9834 msgid "Cannot unstage modified files"
9838 msgid "Index was not unstashed."
9843 msgid "Dropped ${REV} ($s)"
9848 msgid "${REV}: Could not drop stash entry"
9852 msgid "No branch name specified"
9856 msgid "(To restore them type \"git stash apply\")"
9859 #: git-submodule.sh:95
9861 msgid "cannot strip one component off url '$remoteurl'"
9864 #: git-submodule.sh:237
9866 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9869 #: git-submodule.sh:281
9871 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9874 #: git-submodule.sh:293
9876 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9879 #: git-submodule.sh:403
9880 msgid "Relative path can only be used from the toplevel of the working tree"
9883 #: git-submodule.sh:413
9885 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9888 #: git-submodule.sh:430
9890 msgid "'$sm_path' already exists in the index"
9893 #: git-submodule.sh:434
9896 "The following path is ignored by one of your .gitignore files:\n"
9898 "Use -f if you really want to add it."
9901 #: git-submodule.sh:452
9903 msgid "Adding existing repo at '$sm_path' to the index"
9906 #: git-submodule.sh:454
9908 msgid "'$sm_path' already exists and is not a valid git repo"
9911 #: git-submodule.sh:462
9913 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9916 #: git-submodule.sh:464
9919 "If you want to reuse this local git directory instead of cloning again from"
9922 #: git-submodule.sh:466
9925 "use the '--force' option. If the local git directory is not the correct repo"
9928 #: git-submodule.sh:467
9931 "or you are unsure what this means choose another name with the '--name' "
9935 #: git-submodule.sh:469
9937 msgid "Reactivating local git directory for submodule '$sm_name'."
9940 #: git-submodule.sh:481
9942 msgid "Unable to checkout submodule '$sm_path'"
9945 #: git-submodule.sh:486
9947 msgid "Failed to add submodule '$sm_path'"
9950 #: git-submodule.sh:495
9952 msgid "Failed to register submodule '$sm_path'"
9955 #: git-submodule.sh:539
9957 msgid "Entering '$prefix$displaypath'"
9960 #: git-submodule.sh:554
9962 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
9965 #: git-submodule.sh:600
9967 msgid "No url found for submodule path '$displaypath' in .gitmodules"
9970 #: git-submodule.sh:609
9972 msgid "Failed to register url for submodule path '$displaypath'"
9975 #: git-submodule.sh:611
9977 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
9980 #: git-submodule.sh:619
9982 msgid "Failed to register update mode for submodule path '$displaypath'"
9985 #: git-submodule.sh:656
9987 msgid "Use '.' if you really want to deinitialize all submodules"
9990 #: git-submodule.sh:673
9992 msgid "Submodule work tree '$displaypath' contains a .git directory"
9995 #: git-submodule.sh:674
9998 "(use 'rm -rf' if you really want to remove it including all of its history)"
10001 #: git-submodule.sh:680
10004 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10008 #: git-submodule.sh:683
10010 msgid "Cleared directory '$displaypath'"
10013 #: git-submodule.sh:684
10015 msgid "Could not remove submodule work tree '$displaypath'"
10018 #: git-submodule.sh:687
10020 msgid "Could not create empty submodule directory '$displaypath'"
10023 #: git-submodule.sh:696
10025 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10028 #: git-submodule.sh:811
10031 "Submodule path '$displaypath' not initialized\n"
10032 "Maybe you want to use 'update --init'?"
10035 #: git-submodule.sh:824
10037 msgid "Unable to find current revision in submodule path '$displaypath'"
10040 #: git-submodule.sh:833
10042 msgid "Unable to fetch in submodule path '$sm_path'"
10045 #: git-submodule.sh:857
10047 msgid "Unable to fetch in submodule path '$displaypath'"
10050 #: git-submodule.sh:871
10052 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10055 #: git-submodule.sh:872
10057 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10060 #: git-submodule.sh:877
10062 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10065 #: git-submodule.sh:878
10067 msgid "Submodule path '$displaypath': merged in '$sha1'"
10070 #: git-submodule.sh:883
10073 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10076 #: git-submodule.sh:884
10078 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10081 #: git-submodule.sh:889
10083 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10086 #: git-submodule.sh:890
10088 msgid "Submodule path '$displaypath': checked out '$sha1'"
10091 #: git-submodule.sh:917
10093 msgid "Failed to recurse into submodule path '$displaypath'"
10096 #: git-submodule.sh:1025
10097 msgid "The --cached option cannot be used with the --files option"
10101 #: git-submodule.sh:1073
10103 msgid "unexpected mode $mod_dst"
10106 #: git-submodule.sh:1093
10108 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10111 #: git-submodule.sh:1096
10113 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10116 #: git-submodule.sh:1099
10118 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10121 #: git-submodule.sh:1124
10125 #: git-submodule.sh:1238
10127 msgid "Failed to recurse into submodule path '$sm_path'"
10130 #: git-submodule.sh:1302
10132 msgid "Synchronizing submodule url for '$displaypath'"